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

2659 files changed, 161442 insertions, 158899 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index eabdd869..800819fc 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -638,3 +638,2670 @@
 <xi:include href="swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.asnet.am-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs.kienict.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fsso-qa1.springer.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/fsso-qa2.springer.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/fsso.springer.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml"/>
+<xi:include href="swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml"/>
+<xi:include href="swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml"/>
+<xi:include href="swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gcs.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/giasso.univr.it-idp-idem.xml"/>
+<xi:include href="swamid-interfederations-2.0/gidp.federations.renam.md.xml"/>
+<xi:include href="swamid-interfederations-2.0/gidp.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml"/>
+<xi:include href="swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/groupes-aa.renater.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
+<xi:include href="swamid-interfederations-2.0/groupes.renater.fr-sympa.xml"/>
+<xi:include href="swamid-interfederations-2.0/gryf.mlp.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/g-shib.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gteavirtual.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml"/>
+<xi:include href="swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/heinonline.org-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml"/>
+<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml"/>
+<xi:include href="swamid-interfederations-2.0/hood.accessiblelearning.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/hstalks.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites2.ec-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites.enim.fr-idp-.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.lbl.gov-prod-identitylinking.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.lbl.gov-prod-tokenmanagement.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.bcot.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3.insa-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aai.um.si-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.amu.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.apus.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bbk.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bolton.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-cafe.unifal-mg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.canterbury.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.chester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cit.ie-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.clarion.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cmccd.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csusb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.curie.fr-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.devsnc.com-openam.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enorf.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.exe-coll.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.feide.no.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.geant.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.herts.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hud.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iapg.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inalco.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ionio.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.istructe.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ittralee.ie-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lancs.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.le.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lincoln.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lipa.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lit.ie-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ltcc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lut.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-manage.dev.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.marine.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.merit.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.metropolia.fi-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mines-paristech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.newman.ac.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nhl.nl-.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.northlindsey.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nss.udel.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nuca.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.open.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.palmers.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.politecnica.edu.co-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.port.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.prz.edu.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-qa.shef.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.qeliz.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.qmc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.raidp.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ram.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idprnp.univates.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.roehampton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rsceng.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sans-ec.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sciencespo-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shh.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shi.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shipley.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.smu.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sparsholt.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.statistics.gov.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stmarys-ca.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.surfnet.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.surf.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tcd.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.univ-lille1.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tower.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.trinity-cm.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucb.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucreative.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufca.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ulster.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-psud.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uran.ua-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utfpr.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uvic.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpv3.staffs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpv3.tcat.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.weber.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.westkentandashford.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.west-thames.ac.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wlc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wmcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.writtle.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/inacademia.org-metadata-t01-p-test.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/inacademia.org-metadata-t01-t-test.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/incommon.slb.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml"/>
+<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/involvio.com-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/ipm.weill.cornell.edu-federated-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/is.proteomics.ceitec.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/its.longwood.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/janus.cnrs.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/karma.cines.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/keelesu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/kent.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/kentsso.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ku.nupark.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/lafayette.mediaspace.kaltura.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/laketahoecc.instructure.com-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lanet-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/learn.eduopen.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/lincbattels.linc.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lists.eocoe.eu.xml"/>
+<xi:include href="swamid-interfederations-2.0/lists.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/lists.geant.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/lists.lbl.gov-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lists.test.lbl.gov-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.airhead.io-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.auth.gr-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.cedia.org.ec.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.fhv.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.figshare.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.figsh.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.justis.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.maastrichtuniversity.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.mijnhelicon.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.offcampuspartners.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ou.nl-oam-fed.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.regis.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.smith.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.talisaspire.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.teologialugano.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.uea.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/lse.ac.uk-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lumii-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/manage.federations.renam.md.xml"/>
+<xi:include href="swamid-interfederations-2.0/manchester.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/meals.st-annes.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mediathek.hgk.fhnw.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/metadata.pingdemo.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml"/>
+<xi:include href="swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/missouri.nupark.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml"/>
+<xi:include href="swamid-interfederations-2.0/msjc.instructure.com-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/nbcol.ac.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nd.onecampus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/ndsandbox.onecampus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml"/>
+<xi:include href="swamid-interfederations-2.0/nerckwshibb1.nerc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml"/>
+<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/nyu.reclaimhosting.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa.globaldata.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml"/>
+<xi:include href="swamid-interfederations-2.0/o-las.net-simplesaml.xml"/>
+<xi:include href="swamid-interfederations-2.0/olympic.accessiblelearning.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/online.statref.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml"/>
+<xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ousu.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml"/>
+<xi:include href="swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/passport-dev.pitt.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/passport.ucdenver.edu-oam-fed.xml"/>
+<xi:include href="swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/perfsonarui.geant.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/portail.u-picardie.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/portal.clarin.inl.nl-.xml"/>
+<xi:include href="swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ppms.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ppms.us-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/prod.worktribe.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml"/>
+<xi:include href="swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml"/>
+<xi:include href="swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml"/>
+<xi:include href="swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml"/>
+<xi:include href="swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/qmulfed.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/qmul.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml"/>
+<xi:include href="swamid-interfederations-2.0/ra-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/rcn.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/redcap.uncg.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/rellias.imodules.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml"/>
+<xi:include href="swamid-interfederations-2.0/rrzfilrshib.uni-regensburg.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saas1.kuali.co-auth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.adu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml-auth.teststudentconnectapi.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.educdesign.lu-saml_metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.edusafe.nordu.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.lynda.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.nelnet.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.psui.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/scccd.instructure.com-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/screeningshorts.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sdstate.infoready4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml"/>
+<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-search.xml"/>
+<xi:include href="swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.huygens.knaw.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.nature.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/secure.uva.nl-cas.xml"/>
+<xi:include href="swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml"/>
+<xi:include href="swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/services01.hobsons.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sharjah.imodules.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shastacollege.instructure.com-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/shfed.augusta.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth3t.lsbu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.eb.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.nss.udel.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.statista.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unisi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-grenoble-alpes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo-test.ec-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibdev3.stir.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.globaldata.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.lexisnexis.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-pp.unicaen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.rz.tu-harburg.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp-01.ads.ntu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp-01.ntu.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp.mediacore.tv.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sir2.rediris.es-hub-metadata-federation-validation.xml"/>
+<xi:include href="swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/skmms-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/soasunion.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/software.msdnaa.dk-.xml"/>
+<xi:include href="swamid-interfederations-2.0/solutions.sciquest.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/somgateway.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sonny.furman.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.catalog.clarin.eu.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.clarin.si-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-suncat.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.korp.csc.fi-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.lat.csc.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.lux17.mpi.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.refme.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.sae.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acpv2-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acpv2-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-amav2-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-amav2-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.tapingo.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-vaas.asknet.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-vaas-stage.asknet.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.www.kielipankki.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.3plearning.com-ukfederation.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssoa.bl.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.bl.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.educause.edu-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.eur.nl-opensso.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.han.nl-ssp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.idm.uni-hannover.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.kolola.net-default-sp-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.medicatconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.nelnet.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.pdx.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.saxion.nl-opensso.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.sron.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.vito.be.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssp-dev.data.alpha.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/stir.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.learnium.net-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sztaki.cloud.mta.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/terena.org-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml"/>
+<xi:include href="swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/testidp1v3.ntu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.j2e.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.napier.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.rpharms.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-sp.ihs.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ufit.onecampus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-public-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-tas-secure-login-verify.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.worktribe.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tierprogram.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/tkeystone.cloud.wigner.mta.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tophat.com-sso-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml"/>
+<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ua.ssbbartgroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucdavis.curricunet.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/udash-dev.data.alpha.jisc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ufit.onecampus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/uiowa.infoready4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukfed-sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uk.ihs.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch-.xml"/>
+<xi:include href="swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/unigepass.unige.it-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/univet.hu-simplesaml.xml"/>
+<xi:include href="swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.lifeportal.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
+<xi:include href="swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/usertest.sciquest.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/uthscsa.infoready4.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
+<xi:include href="swamid-interfederations-2.0/uwgb.edu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/va-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/vea-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml"/>
+<xi:include href="swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vph3.crous-caen.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wase.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/waseqa.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/wayf.ordbogen.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin.htw-berlin.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/websso.pomona.edu-.xml"/>
+<xi:include href="swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/webtut.fccn.pt.xml"/>
+<xi:include href="swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.osris.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
+<xi:include href="swamid-interfederations-2.0/wmich.brightspace.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wru.atsu.edu-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.123library.org-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www2.foodle.cz-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.2simple.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bioone.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cairn.info-.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.digicert.com-sso.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.digitaltheatreplus.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.future-science.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.gft.eng.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.hellou.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.j2e.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jospt.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jove.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.karger.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.k-int.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.mecenat.eu-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nejm.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nescolsa.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-ifaeidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-umidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-upvidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ripfadev.co.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.scl.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.service4mobility.com-europe.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sympa.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.upsu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.vho.de-idpvzg.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.wmsf.ac.uk.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/york.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/yorksso.simitive.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml"/>
+<xi:include href="swamid-interfederations-2.0/zed.bcu.ac.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml"/>
+</EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
index 13d6cd3e..2e49404a 100644
--- a/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://Shibboleth.uem.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uem.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uem.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uem.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uem.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uem.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.uem.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
 VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
 NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
@@ -40,26 +40,26 @@ g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
 rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
 TZVYQfUodulLy5CH0QkSH1Focl6MuA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://Shibboleth.uem.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://Shibboleth.uem.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uem.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://Shibboleth.uem.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://Shibboleth.uem.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uem.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
 VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
@@ -79,24 +79,24 @@ rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
 TZVYQfUodulLy5CH0QkSH1Focl6MuA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UEM - Universidade Estadual de Maringa</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uem.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.uem.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Helcio do Prado</md:SurName>
-      <md:EmailAddress>helcio@uem.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UEM - Universidade Estadual de Maringa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uem.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uem.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Helcio do Prado</md:SurName>
+    <md:EmailAddress>helcio@uem.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 89465472..4e7fe04d 100644
--- a/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.redclara.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
 http://cofre.reuna.cl/index.php/es/reglas-federacion
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Filesender - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Filesender - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Filesender Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio Filesender de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Filesender - RedCLARA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">Filesender - RedCLARA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RedCLARA's Filesender Service</mdui:Description>
-          <mdui:Description xml:lang="es">Servicio Filesender de RedCLARA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Filesender - RedCLARA</md:ServiceName>
-        <md:ServiceName xml:lang="es">Filesender - RedCLARA</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">RedCLARA Nrenadmin Service</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="es">RedCLARA Nrenadmin Service</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.37" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SEG</md:GivenName>
-      <md:SurName>RedCLARA</md:SurName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Filesender - RedCLARA</md:ServiceName>
+      <md:ServiceName xml:lang="es">Filesender - RedCLARA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">RedCLARA Nrenadmin Service</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="es">RedCLARA Nrenadmin Service</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.37" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SEG</md:GivenName>
+    <md:SurName>RedCLARA</md:SurName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml
index 5eb3ec63..5b9e4293 100644
--- a/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fim.temple.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">temple.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Temple University</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="en">http://policies.temple.edu/getdoc.asp?policy_no=04.72.11</mdui:PrivacyStatementURL>
+        <mdui:Logo height="67" width="310" xml:lang="en">https://temple.edu/sites/all/themes/edu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">temple.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Temple University</mdui:DisplayName>
-          <mdui:PrivacyStatementURL xml:lang="en">http://policies.temple.edu/getdoc.asp?policy_no=04.72.11</mdui:PrivacyStatementURL>
-          <mdui:Logo height="67" width="310" xml:lang="en">https://temple.edu/sites/all/themes/edu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBTCCAe2gAwIBAgIJAKA0GrgI0cTnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMMDmZpbS50ZW1wbGUuZWR1MB4XDTEzMDIyMjE4MDM1MloXDTIzMDIyMDE4MDM1
 MlowGTEXMBUGA1UEAwwOZmltLnRlbXBsZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -39,23 +39,23 @@ q+x6F/F9cOCo68SUYj73TTCdFncYkd1EeOTbwOMoEO96C1V+E+edJ7EREC1sCzDE
 /M1V7IZioBwr7hRVDResfOVZCtrjQKsOi6JoDv9GHpkOdfx6f3Pew+THZIbiTZW+
 9mp5houYXEyJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fim.temple.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fim.temple.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim.temple.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fim.temple.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim.temple.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">temple.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fim.temple.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fim.temple.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim.temple.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fim.temple.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim.temple.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">temple.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBTCCAe2gAwIBAgIJAKA0GrgI0cTnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMMDmZpbS50ZW1wbGUuZWR1MB4XDTEzMDIyMjE4MDM1MloXDTIzMDIyMDE4MDM1
 MlowGTEXMBUGA1UEAwwOZmltLnRlbXBsZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -74,38 +74,38 @@ q+x6F/F9cOCo68SUYj73TTCdFncYkd1EeOTbwOMoEO96C1V+E+edJ7EREC1sCzDE
 /M1V7IZioBwr7hRVDResfOVZCtrjQKsOi6JoDv9GHpkOdfx6f3Pew+THZIbiTZW+
 9mp5houYXEyJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fim.temple.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Temple University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Temple University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.temple.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computer Services HelpDesk</md:GivenName>
-      <md:EmailAddress>help@temple.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Office of Identity and Access Management</md:GivenName>
-      <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Office of Identity and Access Management</md:GivenName>
-      <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jorj Bauer</md:GivenName>
-      <md:EmailAddress>jorj@temple.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Jorj Bauer</md:GivenName>
-      <md:EmailAddress>jorj@temple.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Office of Identity and Access Management</md:GivenName>
-      <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fim.temple.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Temple University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Temple University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.temple.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computer Services HelpDesk</md:GivenName>
+    <md:EmailAddress>help@temple.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Office of Identity and Access Management</md:GivenName>
+    <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Office of Identity and Access Management</md:GivenName>
+    <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jorj Bauer</md:GivenName>
+    <md:EmailAddress>jorj@temple.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Jorj Bauer</md:GivenName>
+    <md:EmailAddress>jorj@temple.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Office of Identity and Access Management</md:GivenName>
+    <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
index 89032d63..579522d7 100644
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
-          <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEjTCCA3WgAwIBAgIRALMOFHysegGUCjSEYcftmJowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MTYwMDAwMDBaFw0xNzA0MTUyMzU5NTlaMEExITAfBgNV
@@ -47,46 +47,46 @@ n5E1tth8U9DKoCTXE3pKxiqfWXpJW5cFX2MZcVdo5GTqe9dvelwx93iAdmioJ3RZ
 b0FyxAbrdFq2jGEYvXtRAfJXs04jIpBoJ/0oJyllaZCH4pYM5icvdoQx6vPs53t7
 rzXp6dkn7WJjKlafzxTRso8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:sewi-id@unito.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:sewi-id@unito.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:sewi-id@unito.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:sewi-id@unito.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml
index 8d09d250..d6e65cdc 100644
--- a/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fiuidp.fiu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://it.fiu.edu/helpdesk/index.shtml" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fiu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Florida International University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://it.fiu.edu/index.shtlm</mdui:InformationURL>
+        <mdui:Logo height="85" width="64" xml:lang="en">https://fiuidp.fiu.edu/idp/images/fiulogo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://it.fiu.edu/helpdesk/index.shtml" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fiu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Florida International University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://it.fiu.edu/index.shtlm</mdui:InformationURL>
-          <mdui:Logo height="85" width="64" xml:lang="en">https://fiuidp.fiu.edu/idp/images/fiulogo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAM7rDFYiAD7ejQynyojPagGeGUuGMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmZpdWlkcC5maXUuZWR1MB4XDTEyMDMxMzEzNTEzNVoX
 DTMyMDMxMzE0NTEzNVowGTEXMBUGA1UEAxMOZml1aWRwLmZpdS5lZHUwggEiMA0G
@@ -42,24 +42,24 @@ H4Rqr8AkOIuUXRvDvlOj6PUP6J1luFFcQZl5v+uREv5Pih8W5NhKY+ENPrFX2g59
 iWZ7NojDxss/TtqsvGDbMHlt3PNg/FC6rHlcW9gH0qudXf1wLh8u+quX/7mGGvIv
 FfPU6B1stKoyNoo42HbUm+KOc8S3L3yaxGZfWtL8kNhY0hSXrYI13w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fiuidp.fiu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fiu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fiuidp.fiu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fiu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAM7rDFYiAD7ejQynyojPagGeGUuGMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmZpdWlkcC5maXUuZWR1MB4XDTEyMDMxMzEzNTEzNVoX
 DTMyMDMxMzE0NTEzNVowGTEXMBUGA1UEAxMOZml1aWRwLmZpdS5lZHUwggEiMA0G
@@ -78,27 +78,27 @@ H4Rqr8AkOIuUXRvDvlOj6PUP6J1luFFcQZl5v+uREv5Pih8W5NhKY+ENPrFX2g59
 iWZ7NojDxss/TtqsvGDbMHlt3PNg/FC6rHlcW9gH0qudXf1wLh8u+quX/7mGGvIv
 FfPU6B1stKoyNoo42HbUm+KOc8S3L3yaxGZfWtL8kNhY0hSXrYI13w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Florida International University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Florida International University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fiu.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>idpadmins@fiu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>anu chirinos</md:GivenName>
-      <md:EmailAddress>anu@fiu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>idpadmins@fiu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Florida International University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Florida International University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fiu.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>idpadmins@fiu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>anu chirinos</md:GivenName>
+    <md:EmailAddress>anu@fiu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>idpadmins@fiu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
index 7373147b..d88c2348 100644
--- a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
+++ b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://foodl.org/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
-          <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
-          <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://foodl.org/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-      <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UNINETT orakel</md:GivenName>
-      <md:EmailAddress>kontakt@uninett.no</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UNINETT orakel</md:GivenName>
+    <md:EmailAddress>kontakt@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
index 500bb65e..4da81e78 100644
--- a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forge.switch.ch/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-05-18T06:59:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>switch.ch</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>others</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-05-18T06:59:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>switch.ch</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>others</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Forge: Project Hosting Platform</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://forge.switch.ch/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Forge: Project Hosting Platform</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://forge.switch.ch/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIJAOvffXpI3IvwMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2ZvcmdlLnN3aXRjaC5jaDAeFw0xNjA1MTAxNTAzMDBaFw0xOTA1MTAxNTAz
 MDBaMBoxGDAWBgNVBAMTD2ZvcmdlLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEB
@@ -48,58 +48,58 @@ sMf8t4UfzUDfpEfPH5sdLHfOnNL9BD6XE9Csm4qec1/VKhIL+PDm8aFOOrUs68uT
 U1scSl3ArEosQpcMFqoCJe2mr1Ludu8cqymR4et0zqq0oAT4taFs7ENOLXuS2hkQ
 g/Tcw92UepVzvL7lfFj7m28DnoSAX4GnCOrUoQ==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/ECP" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge.switch.ch/Shibboleth.sso/SAML/POST" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge.switch.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Forge: Project Hosting Platform</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">switch.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">SWITCH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">SWITCH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">SWITCH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">SWITCH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.switch.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.switch.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.switch.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>forge</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:support@switch.ch</md:EmailAddress>
-      <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fergus</md:GivenName>
-      <md:SurName>Kerins</md:SurName>
-      <md:EmailAddress>mailto:fergus.kerins@switch.ch</md:EmailAddress>
-      <md:TelephoneNumber>+41 44 268 15 42</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge.switch.ch/Shibboleth.sso/SAML/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge.switch.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Forge: Project Hosting Platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">switch.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">SWITCH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SWITCH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">SWITCH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SWITCH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.switch.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.switch.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.switch.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>forge</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:support@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fergus</md:GivenName>
+    <md:SurName>Kerins</md:SurName>
+    <md:EmailAddress>mailto:fergus.kerins@switch.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 44 268 15 42</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml
index df11ea3e..96e8e6d1 100644
--- a/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://franklin-shib01.franklin.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">franklin.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">franklin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZTCCAk2gAwIBAgIUcOe08w8KtBXNXbH+PNNNyO51KrswDQYJKoZIhvcNAQEF
 						BQAwKTEnMCUGA1UEAxMeZnJhbmtsaW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMB4X
 						DTEwMDMwMjEzNDYxN1oXDTMwMDMwMjEzNDYxN1owKTEnMCUGA1UEAxMeZnJhbmts
@@ -31,26 +31,26 @@
 						vtssyMJTau2MHvDz6ms4FaiMY5L+vzXXMMQ2pkfqSuOAjEkhd0WEOPY54L/fpBFE
 						1tR0bsDdT1Yt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">franklin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">franklin.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZTCCAk2gAwIBAgIUcOe08w8KtBXNXbH+PNNNyO51KrswDQYJKoZIhvcNAQEF
 						BQAwKTEnMCUGA1UEAxMeZnJhbmtsaW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMB4X
 						DTEwMDMwMjEzNDYxN1oXDTMwMDMwMjEzNDYxN1owKTEnMCUGA1UEAxMeZnJhbmts
@@ -71,27 +71,27 @@
 						vtssyMJTau2MHvDz6ms4FaiMY5L+vzXXMMQ2pkfqSuOAjEkhd0WEOPY54L/fpBFE
 						1tR0bsDdT1Yt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Franklin Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Franklin College, Grimsby</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.franklin.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Baker</md:SurName>
-      <md:EmailAddress>mailto:john.e.baker@franklin.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Bottomley</md:SurName>
-      <md:EmailAddress>mailto:steve.bottomley@franklin.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Franklin Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Franklin College, Grimsby</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.franklin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Baker</md:SurName>
+    <md:EmailAddress>mailto:john.e.baker@franklin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Bottomley</md:SurName>
+    <md:EmailAddress>mailto:steve.bottomley@franklin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
index 74c508a4..a970a4cf 100644
--- a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
+++ b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
@@ -1,63 +1,63 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/metadata.php/discover">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RESTENA FileSender Service (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</mdui:Description>
+        <mdui:Description xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</mdui:Description>
+        <mdui:Description xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</mdui:Description>
+        <mdui:Description xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</mdui:Description>
+        <mdui:Keywords xml:lang="en">RESTENA FileSender large XXL file transfer</mdui:Keywords>
+        <mdui:Logo width="100" height="100" xml:lang="en">http://fs-test.restena.lu/filesender.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RESTENA FileSender Service (TEST)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</mdui:Description>
-          <mdui:Description xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</mdui:Description>
-          <mdui:Description xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</mdui:Description>
-          <mdui:Description xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</mdui:Description>
-          <mdui:Keywords xml:lang="en">RESTENA FileSender large XXL file transfer</mdui:Keywords>
-          <mdui:Logo width="100" height="100" xml:lang="en">http://fs-test.restena.lu/filesender.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-logout.php/discover"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">RESTENA FileSender Service (TEST)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.23735.100.0" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RESTENA Foundation asbl</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Fondation RESTENA asbl</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RESTENA Foundation</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Fondation RESTENA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>RESTENA</md:GivenName>
-      <md:SurName>NOC</md:SurName>
-      <md:EmailAddress>noc@restena.lu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-logout.php/discover"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">RESTENA FileSender Service (TEST)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.23735.100.0" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RESTENA Foundation asbl</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Fondation RESTENA asbl</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RESTENA Foundation</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Fondation RESTENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>RESTENA</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@restena.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.kienict.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.kienict.nl-adfs-services-trust.xml
index 91c26839..80917d0b 100644
--- a/swamid-interfederations-2.0/fs.kienict.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.kienict.nl-adfs-services-trust.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.kienict.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-05-11T17:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-05-11T17:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="nl">ROC Da Vinci</mdui:Description>
+        <mdui:Description xml:lang="en">ROC Da Vinci</mdui:Description>
+        <mdui:Logo height="160" width="200">https://static.surfconext.nl/media/idp/davinci-college.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">roc da vinci davinci college</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">roc da vinci davinci college</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="nl">ROC Da Vinci</mdui:Description>
-          <mdui:Description xml:lang="en">ROC Da Vinci</mdui:Description>
-          <mdui:Logo height="160" width="200">https://static.surfconext.nl/media/idp/davinci-college.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">roc da vinci davinci college</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">roc da vinci davinci college</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/f592733ef6f64079f100497a081a0ec3"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">ROC Da Vinci College</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ROC Da Vinci College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">ROC Da Vinci College</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ROC Da Vinci College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">https://www.davinci.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.davinci.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/f592733ef6f64079f100497a081a0ec3"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">ROC Da Vinci College</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ROC Da Vinci College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">ROC Da Vinci College</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ROC Da Vinci College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">https://www.davinci.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.davinci.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
index 2680e2e7..b564b9c2 100644
--- a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.liu.se/adfs/services/trust">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
@@ -37,131 +37,131 @@ wvZPVPjdC5v9ClN48/3jL2dybydaDHR9ZyB0EcNyuNb7zoFUTbI0UcoeFaDFDRf7
 CTysvjpvVhZwfef2ACrIVhof89+ZRz24odlm1AA/bteruiEKbKP3oTr50zKlj0YZ
 0qhwXGgRPhpnpQsZ6EZjdbYYVFs0Y0z+JLt2nv8pVqKvQjBS90urSMvppeHfPNO1
 G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:ClaimTypesRequested>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-        </auth:ClaimType>
-      </fed:ClaimTypesRequested>
-      <fed:TargetScopes>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/ls/</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>http://fs.liu.se/adfs/services/trust</Address>
-        </EndpointReference>
-      </fed:TargetScopes>
-      <fed:ApplicationServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-      </fed:ApplicationServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>http://fs.liu.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
@@ -189,124 +189,124 @@ WQMkGxJu3zLtQD4lJsJXAaGdm7nSwWS4NHHIf5yg0rWC5kQBJnWhAHhPedFzfgGR
 9lUohhvnLJJ/PFuvN0sCsYYpRraQT880RdTq1imsFB3wAUHjN9tQCS3Ss9Cf6MOv
 wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
 6NDQZG/9USNN1biuUCDxrhTBgSHIAeB3h7k6wue5C30EE8SCLfZ6Xxsmk1rn</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:TokenTypesOffered>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
-      </fed:TokenTypesOffered>
-      <fed:ClaimTypesOffered>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-        </auth:ClaimType>
-      </fed:ClaimTypesOffered>
-      <fed:SecurityTokenServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/services/trust/2005/certificatemixed</Address>
-          <Metadata>
-            <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
-              <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
-                <wsx:MetadataReference>
-                  <Address xmlns="http://www.w3.org/2005/08/addressing">https://fs.liu.se/adfs/services/trust/mex</Address>
-                </wsx:MetadataReference>
-              </wsx:MetadataSection>
-            </Metadata>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://fs.liu.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
           </Metadata>
-        </EndpointReference>
-      </fed:SecurityTokenServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://fs.liu.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
@@ -334,13 +334,13 @@ WQMkGxJu3zLtQD4lJsJXAaGdm7nSwWS4NHHIf5yg0rWC5kQBJnWhAHhPedFzfgGR
 9lUohhvnLJJ/PFuvN0sCsYYpRraQT880RdTq1imsFB3wAUHjN9tQCS3Ss9Cf6MOv
 wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
 6NDQZG/9USNN1biuUCDxrhTBgSHIAeB3h7k6wue5C30EE8SCLfZ6Xxsmk1rn</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
@@ -368,45 +368,45 @@ wvZPVPjdC5v9ClN48/3jL2dybydaDHR9ZyB0EcNyuNb7zoFUTbI0UcoeFaDFDRf7
 CTysvjpvVhZwfef2ACrIVhof89+ZRz24odlm1AA/bteruiEKbKP3oTr50zKlj0YZ
 0qhwXGgRPhpnpQsZ6EZjdbYYVFs0Y0z+JLt2nv8pVqKvQjBS90urSMvppeHfPNO1
 G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/" index="2"/>
-    </md:SPSSODescriptor>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
-          <mdui:Logo height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>liu.se</mdui:DomainHint>
-          <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:Logo height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>liu.se</mdui:DomainHint>
+        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
@@ -434,13 +434,13 @@ WQMkGxJu3zLtQD4lJsJXAaGdm7nSwWS4NHHIf5yg0rWC5kQBJnWhAHhPedFzfgGR
 9lUohhvnLJJ/PFuvN0sCsYYpRraQT880RdTq1imsFB3wAUHjN9tQCS3Ss9Cf6MOv
 wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
 6NDQZG/9USNN1biuUCDxrhTBgSHIAeB3h7k6wue5C30EE8SCLfZ6Xxsmk1rn</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
@@ -468,55 +468,55 @@ wvZPVPjdC5v9ClN48/3jL2dybydaDHR9ZyB0EcNyuNb7zoFUTbI0UcoeFaDFDRf7
 CTysvjpvVhZwfef2ACrIVhof89+ZRz24odlm1AA/bteruiEKbKP3oTr50zKlj0YZ
 0qhwXGgRPhpnpQsZ6EZjdbYYVFs0Y0z+JLt2nv8pVqKvQjBS90urSMvppeHfPNO1
 G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">Linköping University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.liu.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Linköping University (ADFS)</md:Company>
-      <md:SurName>Johan Peterson</md:SurName>
-      <md:EmailAddress>mailto:johan.peterson@liu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 13 28 5730</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Linköping University (ADFS)</md:Company>
-      <md:SurName>LiU-IT:s Kundcenter</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@student.liu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 13 28 5898</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Linköping University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.liu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Linköping University (ADFS)</md:Company>
+    <md:SurName>Johan Peterson</md:SurName>
+    <md:EmailAddress>mailto:johan.peterson@liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 28 5730</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Linköping University (ADFS)</md:Company>
+    <md:SurName>LiU-IT:s Kundcenter</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@student.liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 28 5898</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
index 1a67252d..566a8566 100644
--- a/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.multrix.com/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SURF</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURF</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURF</mdui:Description>
+        <mdui:Description xml:lang="en">SURF</mdui:Description>
+        <mdui:Logo height="86" width="44">https://static.surfconext.nl/logos/idp/surf.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">SURF</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">SURF</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">SURF</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SURF</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">SURF</mdui:Description>
-          <mdui:Description xml:lang="en">SURF</mdui:Description>
-          <mdui:Logo height="86" width="44">https://static.surfconext.nl/logos/idp/surf.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">SURF</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">SURF</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4498858efe20b0039f00a087d6923628"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SURF</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SURF</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.surf.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4498858efe20b0039f00a087d6923628"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SURF</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SURF</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surf.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
index 5dbb5779..d864b625 100644
--- a/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.myhz.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">HZ University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HZ University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">HZ University of Applied Sciences</mdui:Description>
+        <mdui:Description xml:lang="en">HZ University of Applied Sciences</mdui:Description>
+        <mdui:Logo height="30" width="108">https://static.surfconext.nl/logos/idp/hzeeland.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">HZ University of Applied Sciences</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">HZ University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">HZ University of Applied Sciences</mdui:Description>
-          <mdui:Description xml:lang="en">HZ University of Applied Sciences</mdui:Description>
-          <mdui:Logo height="30" width="108">https://static.surfconext.nl/logos/idp/hzeeland.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/26d7865258bce57e0558f6ec0c6b6c65"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HZ University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">HZ University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hz.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/26d7865258bce57e0558f6ec0c6b6c65"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HZ University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HZ University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hz.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
index 73a39cd4..11b5687c 100644
--- a/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fsa.rocmondriaan.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">ROC Mondriaan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ROC Mondriaan</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">ROC Mondriaan</mdui:Description>
+        <mdui:Description xml:lang="en">ROC Mondriaan</mdui:Description>
+        <mdui:Logo height="78" width="214">https://static.surfconext.nl/logos/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="en">ROC Mondriaan MBO Den Haag Zuid Holland</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">ROC Mondriaan International Business Hotel Management</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">ROC Mondriaan</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">ROC Mondriaan</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">ROC Mondriaan</mdui:Description>
-          <mdui:Description xml:lang="en">ROC Mondriaan</mdui:Description>
-          <mdui:Logo height="78" width="214">https://static.surfconext.nl/logos/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="en">ROC Mondriaan MBO Den Haag Zuid Holland</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">ROC Mondriaan International Business Hotel Management</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/5c809081b2d195aeef7614ef5986f937"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">ROC Mondriaan</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ROC Mondriaan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">ROC Mondriaan</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ROC Mondriaan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.rocmondriaan.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.rocmondriaan.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/5c809081b2d195aeef7614ef5986f937"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">ROC Mondriaan</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ROC Mondriaan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">ROC Mondriaan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ROC Mondriaan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.rocmondriaan.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.rocmondriaan.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml b/swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml
index 79cd138c..8acfa495 100644
--- a/swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fsdev.iceruganda.org/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NIAID ICER SharePoint 2013 Authentication Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NIAID ICER Microsoft Active Directory Federation Services (ADFS) deployment serving as the federated authentication gateway for a SharePoint 2013 deployment </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://spdev.iceruganda.org/spinfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://spdev.iceruganda.org/spinfo/SitePages/PrivacyPolicy.aspx</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NIAID ICER SharePoint 2013 Authentication Gateway</mdui:DisplayName>
-          <mdui:Description xml:lang="en">NIAID ICER Microsoft Active Directory Federation Services (ADFS) deployment serving as the federated authentication gateway for a SharePoint 2013 deployment </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://spdev.iceruganda.org/spinfo</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://spdev.iceruganda.org/spinfo/SitePages/PrivacyPolicy.aspx</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFaTCCA1GgAwIBAgIJAPlger1zZr9+MA0GCSqGSIb3DQEBDQUAMEsxHTAbBgNV
 BAMMFGZzZGV2LmljZXJ1Z2FuZGEub3JnMSowKAYJKoZIhvcNAQkBFhtpY2VyLXZy
 by1hZG1pbkBsaXN0Lm5paC5nb3YwHhcNMTYwMTExMTUzNjQxWhcNMjYwMTA4MTUz
@@ -51,35 +51,35 @@ QI82s3X0kXo/yc+0S4a2SR1bS9MI4Zfr/TmnJqgqiiO4FzlSt154T90439OaaH0R
 PfMuuqb4C6Oph/TbgYvSXjOeFKlxwCpxtJT1dRL2zVpzCtrX/AntAoQNJz5yb8M9
 9TXNd/TjvHllKjl27Wo9VDjaPsIkErxtiCU9eKE2xkhkFgNdvQqlPVOqEiyO
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsdev.iceruganda.org/adfs/ls/" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NIAID ICER SharePoint 2013 Authentication Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">NIAID ICER Microsoft Active Directory Federation Services (ADFS) deployment serving as the federated authentication gateway for a SharePoint 2013 deployment </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsdev.iceruganda.org/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NIAID ICER SharePoint 2013 Authentication Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NIAID ICER Microsoft Active Directory Federation Services (ADFS) deployment serving as the federated authentication gateway for a SharePoint 2013 deployment </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
index 7cb0e9dd..e025306a 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fse.eduuni.fi/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
+        <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
-          <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIHATCCBOmgAwIBAgIEC/N6MDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHATCCBOmgAwIBAgIEC/N6MDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJG
 STEhMB8GA1UEChMYVmFlc3RvcmVraXN0ZXJpa2Vza3VzIENBMRowGAYDVQQLExFQ
 YWx2ZWx1dmFybWVudGVldDEqMCgGA1UEAxMhVlJLIENBIGZvciBTZXJ2aWNlIFBy
 b3ZpZGVycyAtIEcyMB4XDTE1MDUxMzEzMDAwMFoXDTE3MDUxMzEyNTkwMFowVjEL
@@ -63,42 +63,42 @@ KNyAC32/WSFDJ+vxRlf5CZU0IP50gI80+8QYBXasxS+ZUfmnyITfzANNOS//TZFd
 bNTH2MBIP5baI6iGMz8NZeYCA541qMZypYChlqru2J+M+PrZvXz1FVZ7xYmiJbE9
 GnOAsA4k4hm77ypk6JszzOm9j2IWsEbJPmivrcNMiuyZUbSfeY0LeFyHOdCpkZXc
 xfA0vCqs9R2/KT1nyuxdYWxcutJx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">Eduuni</md:ServiceName>
-        <md:ServiceName xml:lang="en">Eduuni</md:ServiceName>
-        <md:ServiceName xml:lang="sv">Eduuni</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Eduuni is an environment for e-work and collaboration services</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sami</md:GivenName>
-      <md:SurName>Saarikoski</md:SurName>
-      <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Toni</md:GivenName>
-      <md:SurName>Sormunen</md:SurName>
-      <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Eduuni</md:ServiceName>
+      <md:ServiceName xml:lang="en">Eduuni</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Eduuni</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Eduuni is an environment for e-work and collaboration services</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Saarikoski</md:SurName>
+    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Toni</md:GivenName>
+    <md:SurName>Sormunen</md:SurName>
+    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsso-qa1.springer.com.xml b/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
index bcdf284b..846e580f 100644
--- a/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
+++ b/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fsso-qa1.springer.com">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T12:58:12Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T12:58:12Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo4CCQDEC3NoQurXpjANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRgwFgYDVQQKEw9T
 						cHJpbmdlciBOYXR1cmUxHjAcBgNVBAMTFWZzc28tcWExLnNwcmluZ2VyLmNvbTEp
@@ -29,40 +29,40 @@
 						pFbrFKC2mGsR1jg+BCJKDAK/7snX+2UMkI3CjlAiNO13XQF3FsyoVP2+CIKdNV/h
 						Gf4Gupnkh8oSSqO3d3brgXvHIeU5mlKOGVw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-          <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-        </md:EncryptionMethod>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa1.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa1.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa1.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa1.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso-qa1.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso-qa1.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (qa1)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Springer Support</md:GivenName>
-      <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Casper Support</md:GivenName>
-      <md:EmailAddress>mailto:caspersupport@springer.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+      </md:EncryptionMethod>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa1.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa1.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa1.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa1.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso-qa1.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso-qa1.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (qa1)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Springer Support</md:GivenName>
+    <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Casper Support</md:GivenName>
+    <md:EmailAddress>mailto:caspersupport@springer.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsso-qa2.springer.com.xml b/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
index fb7b38c7..cf30575d 100644
--- a/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
+++ b/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fsso-qa2.springer.com">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:00:18Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:00:18Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo4CCQDodcatn4m28TANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRgwFgYDVQQKEw9T
 						cHJpbmdlciBOYXR1cmUxHjAcBgNVBAMTFWZzc28tcWEyLnNwcmluZ2VyLmNvbTEp
@@ -29,40 +29,40 @@
 						awjtanXCJnZIRx9CjOJmHxcuDz8rndOJO241rcgEDbCW49DW3Y4A83NneEFY7TgM
 						bKn7aYeRME5SWDRw1DfPOy6qq8HgffKYLkg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-          <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-        </md:EncryptionMethod>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa2.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa2.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa2.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa2.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso-qa2.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso-qa2.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (qa2)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Springer Support</md:GivenName>
-      <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Casper Support</md:GivenName>
-      <md:EmailAddress>mailto:caspersupport@springer.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+      </md:EncryptionMethod>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa2.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa2.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa2.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa2.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso-qa2.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso-qa2.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (qa2)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Springer Support</md:GivenName>
+    <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Casper Support</md:GivenName>
+    <md:EmailAddress>mailto:caspersupport@springer.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsso.springer.com.xml b/swamid-interfederations-2.0/fsso.springer.com.xml
index 0df30c3c..879ee760 100644
--- a/swamid-interfederations-2.0/fsso.springer.com.xml
+++ b/swamid-interfederations-2.0/fsso.springer.com.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fsso.springer.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:02:11Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:02:11Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SpringerLink and Springer for R&amp;D</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SpringerLink and Springer for R&amp;D offer researchers access to millions of scientific documents.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SpringerLink and Springer for R&amp;D</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SpringerLink and Springer for R&amp;D offer researchers access to millions of scientific documents.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEzjCCA7agAwIBAgIQSTO10tc2CKePQdrj2ZokxTANBgkqhkiG9w0BAQsFADB+
 						MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAd
 						BgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVj
@@ -41,13 +41,13 @@
 						AJuPmZRf2W2QL2kucvpSlxn1zIAfFDQinyURkCtXd8yZ9d0LhN8umWK8fOxRW+YT
 						1ZrkxbhipuVE/md7awxhE4WdLxWJPMBuudS4k/7/VajXkQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEzjCCA7agAwIBAgIQSTO10tc2CKePQdrj2ZokxTANBgkqhkiG9w0BAQsFADB+
 						MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAd
 						BgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVj
@@ -75,41 +75,41 @@
 						AJuPmZRf2W2QL2kucvpSlxn1zIAfFDQinyURkCtXd8yZ9d0LhN8umWK8fOxRW+YT
 						1ZrkxbhipuVE/md7awxhE4WdLxWJPMBuudS4k/7/VajXkQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-          <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-        </md:EncryptionMethod>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (live)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Springer Support</md:GivenName>
-      <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Platform Support</md:GivenName>
-      <md:EmailAddress>mailto:platformsupport@macmillan.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+      </md:EncryptionMethod>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Springer-Verlag London Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (live)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://link.springer.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Springer Support</md:GivenName>
+    <md:EmailAddress>mailto:onlineservice@springer.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Platform Support</md:GivenName>
+    <md:EmailAddress>mailto:platformsupport@macmillan.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/g-shib.org-shibboleth.xml b/swamid-interfederations-2.0/g-shib.org-shibboleth.xml
index 3da5e741..12eb4c07 100644
--- a/swamid-interfederations-2.0/g-shib.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/g-shib.org-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://g-shib.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-14T13:07:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-14T13:07:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://g-shib.org/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Getech Web Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to the Getech web portal for your institution</mdui:Description>
+        <mdui:Logo height="116" width="350">https://g-shib.org/getech-logo-350x116.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://g-shib.org/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Getech Web Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access to the Getech web portal for your institution</mdui:Description>
-          <mdui:Logo height="116" width="350">https://g-shib.org/getech-logo-350x116.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJALy05c5DqQOEMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFGVsZWN0cmEuZ2V0ZWNoLmNvLnVrMB4XDTE1MDIxMDE2NTA0N1oXDTI1MDIw
 						NzE2NTA0N1owHzEdMBsGA1UEAxMUZWxlY3RyYS5nZXRlY2guY28udWswggEiMA0G
@@ -55,53 +55,53 @@
 						loqofKby5z252dPlaTkYkOawOOXdiTvslDqSwwnC5ht6btuMShzG8jyiMhrRs44y
 						Prf3a/9vGg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://g-shib.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://g-shib.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://g-shib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://g-shib.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://g-shib.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://g-shib.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML/Artifact" index="12"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Getech Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Getech Web Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.getech.co.uk/education.aspx/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adi</md:GivenName>
-      <md:SurName>Jacinto</md:SurName>
-      <md:EmailAddress>mailto:ajacinto@getech.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Baker</md:SurName>
-      <md:EmailAddress>mailto:rbaker@getech.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://g-shib.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://g-shib.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://g-shib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://g-shib.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://g-shib.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://g-shib.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Getech Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Getech Web Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.getech.co.uk/education.aspx/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adi</md:GivenName>
+    <md:SurName>Jacinto</md:SurName>
+    <md:EmailAddress>mailto:ajacinto@getech.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Baker</md:SurName>
+    <md:EmailAddress>mailto:rbaker@getech.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
index a6ed0aab..eaa3e287 100644
--- a/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://garr-idp-prod.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IDP in the Cloud Project (GARR)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Progetto IDP in the Cloud (GARR)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test IDP dedicated to GARR's "IDP in the Cloud" Project</mdui:Description>
+        <mdui:Description xml:lang="it">IDP di Test per il progetto "IDP in the Cloud" del GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="32" width="32" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IDP in the Cloud Project (GARR)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Progetto IDP in the Cloud (GARR)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test IDP dedicated to GARR's "IDP in the Cloud" Project</mdui:Description>
-          <mdui:Description xml:lang="it">IDP di Test per il progetto "IDP in the Cloud" del GARR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="32" width="32" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="32" width="32" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkCgAwIBAgIVAPZKMgdGcoQkXqZIfy0VDEQIQwOIMA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMTG2dhcnItaWRwLXByb2QuaXJjY3MuZ2Fyci5pdDAeFw0x
 MzA3MjYxMjI1MTRaFw0zMzA3MjYxMjI1MTRaMCYxJDAiBgNVBAMTG2dhcnItaWRw
@@ -46,26 +46,26 @@ aS6FPyIB0+6O6G+9e2T9N5w7GegZ6efHE4L5FqV/pmo1B6PIggQjwLdg2U5IQdbh
 yhRCuth3zwD/h8ugGBcivPvvI2MCU7rg/ylb5LyKPBg7m2sGeMVurm2iHnHGWGcY
 5PpfNjgfzle0x8qz7zUxVJN9yxVTPLkeCzCR68erStGXb3E1UalZJUC/6sQ=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkCgAwIBAgIVAPZKMgdGcoQkXqZIfy0VDEQIQwOIMA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMTG2dhcnItaWRwLXByb2QuaXJjY3MuZ2Fyci5pdDAeFw0x
 MzA3MjYxMjI1MTRaFw0zMzA3MjYxMjI1MTRaMCYxJDAiBgNVBAMTG2dhcnItaWRw
@@ -85,24 +85,24 @@ aS6FPyIB0+6O6G+9e2T9N5w7GegZ6efHE4L5FqV/pmo1B6PIggQjwLdg2U5IQdbh
 yhRCuth3zwD/h8ugGBcivPvvI2MCU7rg/ylb5LyKPBg7m2sGeMVurm2iHnHGWGcY
 5PpfNjgfzle0x8qz7zUxVJN9yxVTPLkeCzCR68erStGXb3E1UalZJUC/6sQ=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IDP in the Cloud Project (GARR)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Progetto IDP in the Cloud (GARR)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>System Support</md:GivenName>
-      <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDP in the Cloud Project (GARR)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Progetto IDP in the Cloud (GARR)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>System Support</md:GivenName>
+    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml b/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
index ae42d56d..4ef7c52a 100644
--- a/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
+++ b/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gatekeeper2.tudelft.nl/openaselect/profiles/saml2/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-31T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-31T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Technische Universiteit Delft (OpenASelect)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Delft University of Technology (OpenASelect)</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Technische Universiteit Delft</mdui:Description>
+        <mdui:Description xml:lang="en">Technische Universiteit Delft</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/tudelft.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">technische universiteit delft delft university of technology tud tudelft</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">technische universiteit delft  delft university of technology tud tudelft</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Technische Universiteit Delft (OpenASelect)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Delft University of Technology (OpenASelect)</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Technische Universiteit Delft</mdui:Description>
-          <mdui:Description xml:lang="en">Technische Universiteit Delft</mdui:Description>
-          <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/tudelft.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">technische universiteit delft delft university of technology tud tudelft</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">technische universiteit delft  delft university of technology tud tudelft</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/86d78b7ddf7216410b6724876ce1f75f"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technische Universiteit Delft</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Delft</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://tudelft.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/86d78b7ddf7216410b6724876ce1f75f"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technische Universiteit Delft</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Delft</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://tudelft.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml b/swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml
index ffde814a..228df5a1 100644
--- a/swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml
+++ b/swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">capella.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Capella University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">capella.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Capella University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDajCCAlKgAwIBAgIET7QbxjANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQGEwJVUzESMBAGA1UE
 CBMJTWlubmVzb3RhMRQwEgYDVQQHEwtNaW5uZWFwb2xpczEbMBkGA1UEChMSQ2FwZWxsYSBVbml2
 ZXJzaXR5MQswCQYDVQQLEwJJVDEUMBIGA1UEAxMLY2FwZWxsYS1pZHAwHhcNMTIwNTE2MjEyNzM0
@@ -36,19 +36,19 @@ C5gPAQfaQ9KxZ0vGkO/cd0r5XRF82GFcyFbU9e7B+IMTnplFjMBecy9O/L1GuptEkqbLlSy6I1iM
 8KhkknImHBoobn9fC6X2NbCbq2fFl7ToETDtOHyOfea/GjhqBLjIGdML/yslGrwX4AmSrwyclk4e
 Hh6Nd35KRm7+gqZhZXpHBm3kbX+mqUs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20/login"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20/login"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Capella University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Capella University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.capella.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Angie Shand</md:GivenName>
-      <md:EmailAddress>Angie.Shand@capella.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20/login"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20/login"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Capella University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Capella University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.capella.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Angie Shand</md:GivenName>
+    <md:EmailAddress>Angie.Shand@capella.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
index ca436ed1..7aa6e9e5 100644
--- a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gateway.ncl.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Newcastle University</mdui:DisplayName>
+        <mdui:Logo height="69" width="186">https://gateway.ncl.ac.uk/images/gateway_ncl_logo.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://gateway.ncl.ac.uk/images/gateway_ncl.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Newcastle University</mdui:DisplayName>
-          <mdui:Logo height="69" width="186">https://gateway.ncl.ac.uk/images/gateway_ncl_logo.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://gateway.ncl.ac.uk/images/gateway_ncl.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIULMVH+d794/0tHGBCoqe7TG75FeMwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRZ2F0ZXdheS5uY2wuYWMudWswHhcNMDkwMzMxMDgzNjQy
 						WhcNMjkwMzMxMDgzNjQyWjAcMRowGAYDVQQDExFnYXRld2F5Lm5jbC5hYy51azCC
@@ -35,26 +35,26 @@
 						EFniPxIMoZkVwLWNjfP2R2s2cg1B3LL3H3I72IGqFJegGqrgJgHuHbanWJwIMAtl
 						B8/r
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gateway.ncl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gateway.ncl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIULMVH+d794/0tHGBCoqe7TG75FeMwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRZ2F0ZXdheS5uY2wuYWMudWswHhcNMDkwMzMxMDgzNjQy
 						WhcNMjkwMzMxMDgzNjQyWjAcMRowGAYDVQQDExFnYXRld2F5Lm5jbC5hYy51azCC
@@ -74,26 +74,26 @@
 						EFniPxIMoZkVwLWNjfP2R2s2cg1B3LL3H3I72IGqFJegGqrgJgHuHbanWJwIMAtl
 						B8/r
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpline</md:GivenName>
-      <md:EmailAddress>mailto:webmaster@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Franks</md:SurName>
-      <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpline</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Franks</md:SurName>
+    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml
index 37d053dc..fde1b58f 100644
--- a/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gcidp.gloscol.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-14T15:23:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-14T15:23:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloscol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloscol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdDCCAlwCCQCFLFRZJoQD7DANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJH
 						QjEYMBYGA1UECBMPR2xvdWNlc3RlcnNoaXJlMRMwEQYDVQQHEwpHbG91Y2VzdGVy
 						MSAwHgYDVQQKExdHbG91Y2VzdGVyc2hpcmUgQ29sbGVnZTEcMBoGA1UEAxMTZ2Np
@@ -33,26 +33,26 @@
 						288Rsd2pEqK3MvTLrPlrHBqfCsYSvdeqNifmictbFNSM+r9MaGp0+tWHgiBc7tm8
 						q8cpQ2yjPF7ooQVX/ms9u9q6wa4Q4dit
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gcidp.gloscol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloscol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gcidp.gloscol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloscol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdDCCAlwCCQCFLFRZJoQD7DANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJH
 						QjEYMBYGA1UECBMPR2xvdWNlc3RlcnNoaXJlMRMwEQYDVQQHEwpHbG91Y2VzdGVy
 						MSAwHgYDVQQKExdHbG91Y2VzdGVyc2hpcmUgQ29sbGVnZTEcMBoGA1UEAxMTZ2Np
@@ -73,27 +73,27 @@
 						288Rsd2pEqK3MvTLrPlrHBqfCsYSvdeqNifmictbFNSM+r9MaGp0+tWHgiBc7tm8
 						q8cpQ2yjPF7ooQVX/ms9u9q6wa4Q4dit
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Gloucestershire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gloucestershire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gloscol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helen</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:Helen.Smith@gloscol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shane</md:GivenName>
-      <md:SurName>Elliot</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@gloscol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Gloucestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gloucestershire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gloscol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helen</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:Helen.Smith@gloscol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shane</md:GivenName>
+    <md:SurName>Elliot</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@gloscol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gcs.simitive.com.xml b/swamid-interfederations-2.0/gcs.simitive.com.xml
index 7a0d904d..98590248 100644
--- a/swamid-interfederations-2.0/gcs.simitive.com.xml
+++ b/swamid-interfederations-2.0/gcs.simitive.com.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gcs.simitive.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-22T11:11:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-22T11:11:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gcs.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gcs.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gcs.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gcs.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+TCCAeGgAwIBAgIJAJRQgVZWDd/zMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCElTLTI0ODMxMB4XDTE0MTIxNjExMTkyOFoXDTI0MTIxMzExMTkyOFowEzER
 						MA8GA1UEAxMISVMtMjQ4MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -42,40 +42,40 @@
 						LJRFvT+VJIoJphSZ92EKiMxg7wQQmJkLBLlcmBCDzlXIa0YDezgSES7aXaqnx3cr
 						derpKZtZARC+hGy1ZeUjiZGXXiGfEa23WC71DtIvJU8B8TbmgoKDWGeARwKK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcs.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gcs.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gcs.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GCS Simitive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Latham</md:SurName>
-      <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Latham</md:SurName>
-      <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcs.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gcs.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gcs.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GCS Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Latham</md:SurName>
+    <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Latham</md:SurName>
+    <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml
index 9f23d55e..7f65a2da 100644
--- a/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gcu.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-09T14:33:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-09T14:33:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMRswGQYDVQQDFBIqLmdj
 						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJ
 						KoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMB4XDTE0MDQwODA5
@@ -36,25 +36,25 @@
 						Nn3NCKYoSTvPu2dJGROCnlm3bnkTz4fW5hwlFImzA4tv+tsjZtnsQp/XfJ+5h7le
 						dfzIYdf+lychhwisBoYuI4TC5BOFBQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glasgow Caledonian University Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow Caledonian University Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml b/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
index 9e7b0eb0..28a7c792 100644
--- a/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
+++ b/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/metadata.php/rm1_mlib-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-03-17T12:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-03-17T12:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Federated Internet Access</mdui:Description>
+        <mdui:Description xml:lang="it">Accesso Federato ad Internet </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:PrivacyStatementURL>
+        <mdui:Logo height="57" width="103" xml:lang="it">https://gencap-area.mlib.cnr.it/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://gencap-area.mlib.cnr.it/logoRM1.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Federated Internet Access</mdui:Description>
-          <mdui:Description xml:lang="it">Accesso Federato ad Internet </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:PrivacyStatementURL>
-          <mdui:Logo height="57" width="103" xml:lang="it">https://gencap-area.mlib.cnr.it/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://gencap-area.mlib.cnr.it/logoRM1.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEIzCCAwugAwIBAgIJAKMLKso2OfmxMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBFJvbWUxDzANBgNVBAoM
 BkMuTi5SLjEhMB8GA1UECwwYSXN0aXR1dG8gQ3Jpc3RhbGxvZ3JhZmlhMSAwHgYD
@@ -48,13 +48,13 @@ x4ukmcpF4Ue/kgn8k0w9LUrrUA0pAOvoRtKQnDsfQ8vIlxRUOYTL6UP8LQJ0viNp
 UnrO911SW0m/dV9+xLqV1rf1vrPQDXk72mRl70KFcHd+4jh7+OJ4reGVsV6r8aC4
 shhU9uviPg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEIzCCAwugAwIBAgIJAKMLKso2OfmxMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBFJvbWUxDzANBgNVBAoM
 BkMuTi5SLjEhMB8GA1UECwwYSXN0aXR1dG8gQ3Jpc3RhbGxvZ3JhZmlhMSAwHgYD
@@ -79,56 +79,56 @@ x4ukmcpF4Ue/kgn8k0w9LUrrUA0pAOvoRtKQnDsfQ8vIlxRUOYTL6UP8LQJ0viNp
 UnrO911SW0m/dV9+xLqV1rf1vrPQDXk72mRl70KFcHd+4jh7+OJ4reGVsV6r8aC4
 shhU9uviPg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-logout.php/rm1_mlib-sp"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-acs.php/rm1_mlib-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml1-acs.php/rm1_mlib-sp/artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-acs.php/rm1_mlib-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml1-acs.php/rm1_mlib-sp" index="4"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</md:ServiceName>
-        <md:ServiceName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Federated Internet Access</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Accesso Federato ad Internet </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">C.N.R. Area della Ricerca - Roma  1</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">C.N.R. Research Area - Roma 1</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.mlib.cnr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.mlib.cnr.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Luca</md:GivenName>
-      <md:SurName>Ianniello</md:SurName>
-      <md:EmailAddress>mailto:luca.ianniello@cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Augusto</md:GivenName>
-      <md:SurName>Pifferi</md:SurName>
-      <md:EmailAddress>mailto:augusto.pifferi@cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Luca</md:GivenName>
-      <md:SurName>Ianniello</md:SurName>
-      <md:EmailAddress>mailto:luca.ianniello@cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Staff</md:GivenName>
-      <md:SurName>Mlib</md:SurName>
-      <md:EmailAddress>mailto:staff@sra.mlib.cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-logout.php/rm1_mlib-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-acs.php/rm1_mlib-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml1-acs.php/rm1_mlib-sp/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-acs.php/rm1_mlib-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml1-acs.php/rm1_mlib-sp" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</md:ServiceName>
+      <md:ServiceName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Federated Internet Access</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Accesso Federato ad Internet </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">C.N.R. Area della Ricerca - Roma  1</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">C.N.R. Research Area - Roma 1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.mlib.cnr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.mlib.cnr.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Luca</md:GivenName>
+    <md:SurName>Ianniello</md:SurName>
+    <md:EmailAddress>mailto:luca.ianniello@cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Augusto</md:GivenName>
+    <md:SurName>Pifferi</md:SurName>
+    <md:EmailAddress>mailto:augusto.pifferi@cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Luca</md:GivenName>
+    <md:SurName>Ianniello</md:SurName>
+    <md:EmailAddress>mailto:luca.ianniello@cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Staff</md:GivenName>
+    <md:SurName>Mlib</md:SurName>
+    <md:EmailAddress>mailto:staff@sra.mlib.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
index 980c5b80..8ebd015b 100644
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://geoshibb.edina.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-04-24T16:39:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-04-24T16:39:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Digimap Collections</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online maps and spatial data of Great Britain</mdui:Description>
+        <mdui:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Digimap Collections</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online maps and spatial data of Great Britain</mdui:Description>
-          <mdui:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -43,37 +43,37 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/ECP" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA: Digimap (live)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/digimap/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA: Digimap (live)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/giasso.univr.it-idp-idem.xml b/swamid-interfederations-2.0/giasso.univr.it-idp-idem.xml
index 252efef5..3d37db58 100644
--- a/swamid-interfederations-2.0/giasso.univr.it-idp-idem.xml
+++ b/swamid-interfederations-2.0/giasso.univr.it-idp-idem.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://giasso.univr.it/idp/idem">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-03-18T13:41:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-03-18T13:41:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Verona (nuovo)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' di Verona (nuovo)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Verona users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Universita' di Verona</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=it</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=it</mdui:PrivacyStatementURL>
+        <mdui:Logo height="75" width="310" xml:lang="it">https://www.univr.it/image/logo-univr.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Verona (nuovo)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Universita' di Verona (nuovo)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for University of Verona users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti della Universita' di Verona</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=it</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=en</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.univr.it/main?ent=servizioaol&amp;serv=285&amp;lang=it</mdui:PrivacyStatementURL>
-          <mdui:Logo height="75" width="310" xml:lang="it">https://www.univr.it/image/logo-univr.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID7jCCAtagAwIBAgIEVuvfvTANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
 SVQxDzANBgNVBAgTBlZlcm9uYTEPMA0GA1UEBxMGVmVyb25hMSowKAYDVQQKEyFV
 bml2ZXJzaXRhJyBkZWdsaSBTdHVkaSBkaSBWZXJvbmExOTA3BgNVBAsTMERpcmV6
@@ -47,30 +47,30 @@ rWFdtmj7JA3IYnZ7Oogt3xmsYFdzhW34Va5PX4N5cGNSo9R9/LXqS7Xs+Bsmf2v6
 XerQYIjqR4imMWrHd6nBCrW1i/OPIuaqhlr+0Za6w+I1327QamlbrJm4ZzoIB4Ku
 wEI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://giasso.univr.it:443/opensso/ArtifactResolver/metaAlias/idem/idp1" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://giasso.univr.it:443/opensso/IDPSloRedirect/metaAlias/idem/idp1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://giasso.univr.it:443/opensso/IDPSloPOST/metaAlias/idem/idp1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://giasso.univr.it:443/opensso/IDPSloSoap/metaAlias/idem/idp1"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://giasso.univr.it:443/opensso/SSORedirect/metaAlias/idem/idp1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://giasso.univr.it:443/opensso/SSOPOST/metaAlias/idem/idp1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://giasso.univr.it:443/opensso/SSOSoap/metaAlias/idem/idp1"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Universita' di Verona</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Verona</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Universita' di Verona (nuovo)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Verona (nuovo)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.univr.it/jsp/index.jsp?lang=it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.univr.it/jsp/index.jsp?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:sistemi@ateneo.univr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://giasso.univr.it:443/opensso/ArtifactResolver/metaAlias/idem/idp1" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://giasso.univr.it:443/opensso/IDPSloRedirect/metaAlias/idem/idp1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://giasso.univr.it:443/opensso/IDPSloPOST/metaAlias/idem/idp1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://giasso.univr.it:443/opensso/IDPSloSoap/metaAlias/idem/idp1"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://giasso.univr.it:443/opensso/SSORedirect/metaAlias/idem/idp1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://giasso.univr.it:443/opensso/SSOPOST/metaAlias/idem/idp1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://giasso.univr.it:443/opensso/SSOSoap/metaAlias/idem/idp1"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Universita' di Verona</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Verona</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' di Verona (nuovo)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Verona (nuovo)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.univr.it/jsp/index.jsp?lang=it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.univr.it/jsp/index.jsp?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:sistemi@ateneo.univr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gidp.federations.renam.md.xml b/swamid-interfederations-2.0/gidp.federations.renam.md.xml
index 6d83114d..a6b894dc 100644
--- a/swamid-interfederations-2.0/gidp.federations.renam.md.xml
+++ b/swamid-interfederations-2.0/gidp.federations.renam.md.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.federations.renam.md">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="ro">GIDP-RENAM</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">GIDP-RENAM</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ru">GIDP-RENAM</mdui:DisplayName>
+        <mdui:Description xml:lang="ro">GIDP-RENAM - prestator de servicii de identitate utilizat de RENAM</mdui:Description>
+        <mdui:Description xml:lang="en">GIDP-RENAM - identity provider used by RENAM</mdui:Description>
+        <mdui:Description xml:lang="ru">GIDP-RENAM - сервис для идентификации сотрудников RENAM</mdui:Description>
+        <mdui:InformationURL xml:lang="ro">https://gidp.federations.renam.md</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://gidp.federations.renam.md</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="ru">https://gidp.federations.renam.md</mdui:InformationURL>
+        <mdui:Logo height="121" width="205">https://gidp.federations.renam.md/renam.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="ro">GIDP-RENAM</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">GIDP-RENAM</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ru">GIDP-RENAM</mdui:DisplayName>
-          <mdui:Description xml:lang="ro">GIDP-RENAM - prestator de servicii de identitate utilizat de RENAM</mdui:Description>
-          <mdui:Description xml:lang="en">GIDP-RENAM - identity provider used by RENAM</mdui:Description>
-          <mdui:Description xml:lang="ru">GIDP-RENAM - сервис для идентификации сотрудников RENAM</mdui:Description>
-          <mdui:InformationURL xml:lang="ro">https://gidp.federations.renam.md</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://gidp.federations.renam.md</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="ru">https://gidp.federations.renam.md</mdui:InformationURL>
-          <mdui:Logo height="121" width="205">https://gidp.federations.renam.md/renam.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE7zCCA9egAwIBAgICAPAwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
 ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
 IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
@@ -52,13 +52,13 @@ AQEATlnDNLLCx2eiTYLDPeeS3IntyilM/ND90Coy8Ogb4+ZLfJzQBPdWUhv8+VUb
 +cHDef8L8nqolX1coNKIwJnd8jQalj7W5wvAlBIq47Uog2zWxyi5LS3R9UApI7Bp
 cOnlbkVFhq8dS6BrkwXGRrnBNg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE7zCCA9egAwIBAgICAPAwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
 ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
 IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
@@ -87,27 +87,27 @@ AQEATlnDNLLCx2eiTYLDPeeS3IntyilM/ND90Coy8Ogb4+ZLfJzQBPdWUhv8+VUb
 +cHDef8L8nqolX1coNKIwJnd8jQalj7W5wvAlBIq47Uog2zWxyi5LS3R9UApI7Bp
 cOnlbkVFhq8dS6BrkwXGRrnBNg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.federations.renam.md/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.federations.renam.md/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
-      <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Valentin</md:GivenName>
-      <md:SurName>Pocotilenco</md:SurName>
-      <md:EmailAddress>mailto:pvv@renam.md</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.federations.renam.md/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.federations.renam.md/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
+    <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Valentin</md:GivenName>
+    <md:SurName>Pocotilenco</md:SurName>
+    <md:EmailAddress>mailto:pvv@renam.md</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
index 3fbd521f..225f8050 100644
--- a/swamid-interfederations-2.0/gidp.geant.net.xml
+++ b/swamid-interfederations-2.0/gidp.geant.net.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:50:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:50:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gidp.geant.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Guest Identity Provider</mdui:DisplayName>
+        <mdui:Logo height="69" width="199">https://www.edugain.org/GIdP.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gidp.geant.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT Guest Identity Provider</mdui:DisplayName>
-          <mdui:Logo height="69" width="199">https://www.edugain.org/GIdP.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
@@ -43,13 +43,13 @@
 						ulsPPNORMXuSAaPbctgKJYdjK3D608c8SiZpm3hV/XBMYgDBb5NBTq3UZBbUsYRm
 						dDPF827oNvkbCcANbb1YmRBmFHWFe+E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
@@ -76,24 +76,24 @@
 						ulsPPNORMXuSAaPbctgKJYdjK3D608c8SiZpm3hV/XBMYgDBb5NBTq3UZBbUsYRm
 						dDPF827oNvkbCcANbb1YmRBmFHWFe+E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Guest Identity Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>eduGAIN OT</md:GivenName>
-      <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eduGAIN OT</md:GivenName>
-      <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Guest Identity Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduGAIN OT</md:GivenName>
+    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduGAIN OT</md:GivenName>
+    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 3127590b..b5d349e0 100644
--- a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gihidentity01.ihs.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gih.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="107" width="204">https://gihidentity01.ihs.se/idp/images/gihlogo.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>gih.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gih.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="107" width="204">https://gihidentity01.ihs.se/idp/images/gihlogo.gif</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>gih.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1
@@ -49,26 +49,26 @@ cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU
 icptKTpDxrRjfCXibBT1
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gihidentity01.ihs.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihs.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gihidentity01.ihs.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihs.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1
@@ -90,36 +90,36 @@ cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU
 icptKTpDxrRjfCXibBT1
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gih.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
-      <md:SurName>Fredrik Nilsson</md:SurName>
-      <md:EmailAddress>mailto:fredrik.nilsson@gih.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 12053734</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
-      <md:SurName>Michael Thunell</md:SurName>
-      <md:EmailAddress>mailto:michael.thunell@gih.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 12053807</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
-      <md:SurName>Charlie Skog</md:SurName>
-      <md:EmailAddress>mailto:charlie.skog@gih.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 12053792</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gih.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>Fredrik Nilsson</md:SurName>
+    <md:EmailAddress>mailto:fredrik.nilsson@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053734</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>Michael Thunell</md:SurName>
+    <md:EmailAddress>mailto:michael.thunell@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053807</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
+    <md:SurName>Charlie Skog</md:SurName>
+    <md:EmailAddress>mailto:charlie.skog@gih.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 12053792</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml b/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml
index 0bd082a1..45655808 100644
--- a/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml
+++ b/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gimb-idp-1.gimb.org/idp/20130521">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-04-07T09:04:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-04-07T09:04:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimb.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gimnazija Bežigrad high school</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Gimnazija Bežigrad</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Gimnazija Bežigrad high school</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Bežigrad</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization Gimnazija Bežigrad high school</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Bežigrad</mdui:Keywords>
+        <mdui:Logo height="253" width="300">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.gimb.org/index.php?id=29</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.gimb.org</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimb.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gimnazija Bežigrad high school</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Gimnazija Bežigrad</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization Gimnazija Bežigrad high school</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Bežigrad</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization Gimnazija Bežigrad high school</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Bežigrad</mdui:Keywords>
-          <mdui:Logo height="253" width="300">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.gimb.org/index.php?id=29</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.gimb.org</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gimb.org/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gimb.org/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gimb.org/index.php?id=29</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.gimb.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Janez</md:GivenName>
-      <md:SurName>Šušteršič</md:SurName>
-      <md:EmailAddress>mailto:janez.sustersic@gimb.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gregor</md:GivenName>
-      <md:SurName>Anželj</md:SurName>
-      <md:EmailAddress>mailto:gregor.anzelj@gimb.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Samo</md:GivenName>
-      <md:SurName>Matjan</md:SurName>
-      <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Samo</md:GivenName>
-      <md:SurName>Matjan</md:SurName>
-      <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gimb.org/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gimb.org/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gimb.org/index.php?id=29</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.gimb.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Janez</md:GivenName>
+    <md:SurName>Šušteršič</md:SurName>
+    <md:EmailAddress>mailto:janez.sustersic@gimb.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gregor</md:GivenName>
+    <md:SurName>Anželj</md:SurName>
+    <md:EmailAddress>mailto:gregor.anzelj@gimb.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Samo</md:GivenName>
+    <md:SurName>Matjan</md:SurName>
+    <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Samo</md:GivenName>
+    <md:SurName>Matjan</md:SurName>
+    <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
index 1d24a719..676b7451 100644
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gisela-gw.ct.infn.it/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-30T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
                         This service provides information for Grid users, Application developers and
                         Grid site administrators. It is mainly devoted to the people involved in the
                         GISELA project but many pages are of general interest
                     </mdui:Description>
-          <mdui:Description xml:lang="it">
+        <mdui:Description xml:lang="it">
                         Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
                         di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
                         GISELA ma molte informazioni sono di interesse generale
                     </mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
@@ -60,57 +60,57 @@ JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
 W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">GISELA Science Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GISELA Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
                     Grid site administrators. It is mainly devoted to the people involved in the
                     GISELA project but many pages are of general interest
                 </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Riccardo</md:GivenName>
-      <md:SurName>Rotondo</md:SurName>
-      <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Diego</md:GivenName>
-      <md:SurName>Scardaci</md:SurName>
-      <md:EmailAddress>mailto:diego.scardaci@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Diego</md:GivenName>
+    <md:SurName>Scardaci</md:SurName>
+    <md:EmailAddress>mailto:diego.scardaci@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
index e366530b..73801b5b 100644
--- a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
+++ b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gitlab-dev.in2p3.fr/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-08T17:43:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/preprod</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-08T17:43:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/preprod</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab dev</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://gitlab-dev.in2p3.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab dev</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab-dev.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab dev</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://gitlab-dev.in2p3.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab dev</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gitlab-dev.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
 MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
@@ -46,13 +46,13 @@ f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
 BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
 MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
@@ -72,32 +72,28 @@ f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
 BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">IN2P3 - Gitlab dev</md:ServiceName>
-        <md:ServiceName xml:lang="en">IN2P3 - Gitlab dev</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>webmaster@in2p3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">IN2P3 - Gitlab dev</md:ServiceName>
+      <md:ServiceName xml:lang="en">IN2P3 - Gitlab dev</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>webmaster@in2p3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
index 789e56a1..9fba1d9f 100644
--- a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
+++ b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gitlab.in2p3.fr/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T17:38:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T17:38:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://gitlab.in2p3.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://gitlab.in2p3.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gitlab.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
 MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
@@ -46,13 +46,13 @@ nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
 iFJVpavS2JG8mIKKAznQiZvqphE=
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
 MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
@@ -72,30 +72,27 @@ nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
 iFJVpavS2JG8mIKKAznQiZvqphE=
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">IN2P3 - Gitlab</md:ServiceName>
-        <md:ServiceName xml:lang="en">IN2P3 - Gitlab</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>webmaster@in2p3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">IN2P3 - Gitlab</md:ServiceName>
+      <md:ServiceName xml:lang="en">IN2P3 - Gitlab</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>webmaster@in2p3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
index 32acb69a..149e3d02 100644
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gn-vho.grnet.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gn-vho.grnet.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:Description>
+        <mdui:Description xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.noc.grnet.gr/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gn-vho.grnet.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:Description>
-          <mdui:Description xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.noc.grnet.gr/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
                             BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
                             MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
@@ -39,26 +39,26 @@
                             ytc1mR50M3dyL1uT7lpfSyTJ8fdzjSuw0xknlCY2rmOGq9RVPZwoz8ZP2xrVdcNW
                             8Y/HvCvcXUMu/2w1Xei++WItO1eyS80x8+/VjQ7h+50=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gn-vho.grnet.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gn-vho.grnet.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gn-vho.grnet.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gn-vho.grnet.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
                             BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
                             MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
@@ -77,30 +77,30 @@
                             ytc1mR50M3dyL1uT7lpfSyTJ8fdzjSuw0xknlCY2rmOGq9RVPZwoz8ZP2xrVdcNW
                             8Y/HvCvcXUMu/2w1Xei++WItO1eyS80x8+/VjQ7h+50=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.noc.grnet.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Greek Research and Technology Network</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-      <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Greek Research and Technology Network</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.noc.grnet.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
index 9492f6ad..46e9d55a 100644
--- a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gracedb.ligo.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gracedb.ligo.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational-wave Candidate Event Database</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gracedb.ligo.org/SPInfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gracedb.ligo.org/SPPrivacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gracedb.ligo.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gravitational-wave Candidate Event Database</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://gracedb.ligo.org/SPInfo</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gracedb.ligo.org/SPPrivacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIJAPkWkyNL3l8nMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEGdyYWNlZGIubGlnby5vcmcwHhcNMTQxMDIwMTUyODQ2WhcNMjQxMDE3MTUy
 ODQ2WjAbMRkwFwYDVQQDExBncmFjZWRiLmxpZ28ub3JnMIIBIjANBgkqhkiG9w0B
@@ -41,42 +41,42 @@ RmuXgPAZEv19nTEdQKEFyx9iFmdOFc7/IKQdPQWVriSBzJRdc7dl1+RnUzZ2hsY3
 1BLiz9m09Au4/VVc1Sc4h8k5rs2+SWmAOk1Zob2yKKzdLwxuiCExg6XHgWSR/xgs
 2K9d1rqY3G7AQFM+zmhbRzIA18x4oVi4gTckD5Uxq1e0pdw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/ECP" index="8"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Gravitational-wave Candidate Event Database</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Branson Stephens</md:GivenName>
-      <md:EmailAddress>branson.stephens@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-      <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Gravitational-wave Candidate Event Database</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Branson Stephens</md:GivenName>
+    <md:EmailAddress>branson.stephens@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
+    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
index 33094e4b..130765be 100644
--- a/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grnetbox.duth.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duth.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Democritus University of Thrace</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.duth.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.duth.gr/</mdui:InformationURL>
+        <mdui:Logo height="69" width="156">https://utopia.duth.gr/images/duth_logo_156x69.png</mdui:Logo>
+        <mdui:Logo height="64" width="64">https://utopia.duth.gr/images/duth_logo_64x64.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>duth.gr</mdui:DomainHint>
+        <mdui:IPHint>192.108.114.0/24</mdui:IPHint>
+        <mdui:IPHint>83.212.128.0/19</mdui:IPHint>
+        <mdui:IPHint>83.212.160.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:648:2e80::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:41.136504, 25.372488</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duth.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Democritus University of Thrace</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.duth.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.duth.gr/</mdui:InformationURL>
-          <mdui:Logo height="69" width="156">https://utopia.duth.gr/images/duth_logo_156x69.png</mdui:Logo>
-          <mdui:Logo height="64" width="64">https://utopia.duth.gr/images/duth_logo_64x64.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>duth.gr</mdui:DomainHint>
-          <mdui:IPHint>192.108.114.0/24</mdui:IPHint>
-          <mdui:IPHint>83.212.128.0/19</mdui:IPHint>
-          <mdui:IPHint>83.212.160.0/21</mdui:IPHint>
-          <mdui:IPHint>2001:648:2e80::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:41.136504, 25.372488</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIF/TCCBWagAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCR1Ix
                             LjAsBgNVBAoTJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsx
                             LzAtBgNVBAMTJkdSTkVUIEdybmV0Ym94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
@@ -64,26 +64,26 @@
                             pNBpS87jQzgaOP0J4JXKd+lcLNN+FYoA+PZX8zaPELVWTG1DYBK//D4qe0/GCAQt
                             zg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.duth.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.duth.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.duth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.duth.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duth.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.duth.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.duth.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.duth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.duth.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duth.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIF/TCCBWagAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCR1Ix
                             LjAsBgNVBAoTJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsx
                             LzAtBgNVBAMTJkdSTkVUIEdybmV0Ym94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
@@ -118,30 +118,30 @@
                             pNBpS87jQzgaOP0J4JXKd+lcLNN+FYoA+PZX8zaPELVWTG1DYBK//D4qe0/GCAQt
                             zg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Democritus University of Thrace</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Democritus University of Thrace</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.duth.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.duth.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Democritus University of Thrace NOC</md:Company>
-      <md:EmailAddress>noc@duth.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Democritus University of Thrace NOC</md:Company>
-      <md:EmailAddress>noc@duth.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Democritus University of Thrace</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Democritus University of Thrace</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.duth.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.duth.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Democritus University of Thrace NOC</md:Company>
+    <md:EmailAddress>noc@duth.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Democritus University of Thrace NOC</md:Company>
+    <md:EmailAddress>noc@duth.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
index ecfd361b..bbfaa609 100644
--- a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T14:30:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T14:30:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
     </md:Extensions>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUYTvnXW3b3991IXgqQUMkP+nhKqkwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAwwUZ3JvdXBlci5pZGVtLmdhcnIuaXQwHhcNMTUwMzMwMjIx
 MzAwWhcNMzUwMzMwMjIxMzAwWjAfMR0wGwYDVQQDDBRncm91cGVyLmlkZW0uZ2Fy
@@ -32,25 +32,25 @@ N34CsdueAafyNMLr+BdNqmDpbLUncKxGU0z56M5r1xD/oYpWzm3asUHqPuojtFlb
 KwS+Xn3HU5Hd928ljFR+l+62LhqN8zb5SaNCJkfDkGlZU0RZEAYAWq7v5mk3A5oh
 KYJMKvnMhrAnlcxegh90
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Attribute Authority per IDEM by Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Attribute Authority for IDEM by Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDEM</md:GivenName>
-      <md:SurName>Help</md:SurName>
-      <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Attribute Authority per IDEM by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Attribute Authority for IDEM by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Help</md:SurName>
+    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
index d80a7c2c..82326a8b 100644
--- a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T11:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T11:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IDEM Grouper SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IDEM Grouper SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Grouper SP for IDEM provided by GARR</mdui:Description>
+        <mdui:Description xml:lang="it">Grouper SP per IDEM fornito da GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="120" width="180">https://grouper.idem.garr.it/grouper-sp/grouper_logo_180x120.png</mdui:Logo>
+        <mdui:Logo height="32" width="32">https://grouper.idem.garr.it/grouper-sp/grouper_logo_32x32.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IDEM Grouper SP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IDEM Grouper SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Grouper SP for IDEM provided by GARR</mdui:Description>
-          <mdui:Description xml:lang="it">Grouper SP per IDEM fornito da GARR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="120" width="180">https://grouper.idem.garr.it/grouper-sp/grouper_logo_180x120.png</mdui:Logo>
-          <mdui:Logo height="32" width="32">https://grouper.idem.garr.it/grouper-sp/grouper_logo_32x32.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAIJNTw7flL9uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 BAMTFGdyb3VwZXIuaWRlbS5nYXJyLml0MB4XDTE1MDMxODE0NDg0OVoXDTI1MDMx
 NTE0NDg0OVowHzEdMBsGA1UEAxMUZ3JvdXBlci5pZGVtLmdhcnIuaXQwggEiMA0G
@@ -44,52 +44,52 @@ EMA/9OGny/lSYy2Ihh97+m2w8lZPskio9dnC9BbWbiyGY5hjd1W50c6HVmR+b0fe
 ujg8dxgduViYDlu51BFyleoAxHhnauOlpFNzJuHMakCKv0riztIH3gAun7RPnFYF
 0Man4StZKw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">IDEM Grouper SP</md:ServiceName>
-        <md:ServiceName xml:lang="it">IDEM Grouper SP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Grouper SP for IDEM provided by GARR</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Grouper SP per IDEM erogato da GARR</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Grouper erogato da Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Grouper provided by Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDEM</md:GivenName>
-      <md:SurName>Help</md:SurName>
-      <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">IDEM Grouper SP</md:ServiceName>
+      <md:ServiceName xml:lang="it">IDEM Grouper SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Grouper SP for IDEM provided by GARR</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Grouper SP per IDEM erogato da GARR</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Grouper erogato da Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Grouper provided by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Help</md:SurName>
+    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes-aa.renater.fr.xml b/swamid-interfederations-2.0/groupes-aa.renater.fr.xml
index bd16bb92..d2332dfd 100644
--- a/swamid-interfederations-2.0/groupes-aa.renater.fr.xml
+++ b/swamid-interfederations-2.0/groupes-aa.renater.fr.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groupes-aa.renater.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T15:11:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T15:11:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RENATER - Validation of the Authorization Service</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://groupes-aa.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Authorization service based on Sympa group manager (Universalistes) and SAML Attributes Authorities.
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - Validation of the Authorization Service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://groupes-aa.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Authorization service based on Sympa group manager (Universalistes) and SAML Attributes Authorities.
 It allows virtual organizations (e.g. research communities) composed by people belonging to different institutions (i.e. managed by different referentials) to access to common resources (if authorization was granted) after having been authenticated by their respective institutions.
 This service will be in charge of authentication and provide accurate access control on a community's web resource (group defined in Sympa). This resource can therefore be hosted anywhere.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">RENATER - Validation du Service d'autorisation</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Service d'autorisation basé sur le gestionnaire de groupes Sympa (Universalistes) et les Attributes Authorities SAML.
+        <mdui:DisplayName xml:lang="fr">RENATER - Validation du Service d'autorisation</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service d'autorisation basé sur le gestionnaire de groupes Sympa (Universalistes) et les Attributes Authorities SAML.
 Il permet à des organisations virtuelles (VO, communautés de chercheurs) appartenant à des établissements différents (donc gérés dans des référentiels différents) d'accéder à des ressources communes (sur autorisation) après authentification auprès de leurs établissements respectifs.
 Ce service se chargera de l'authentification et permettra un contrôle d'accès fin sur une ressource Web d'une communauté (groupe défini dans Sympa) qui peut donc être hébergée n'importe où.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+jCCAeKgAwIBAgIJALBSjVtKCuQcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEWRhbW9uYS5yZW5hdGVyLmZyMB4XDTE0MDkyMjE0NDgxMVoXDTI0MDkxOTE0
 NDgxMVowHDEaMBgGA1UEAxMRZGFtb25hLnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
@@ -47,13 +47,13 @@ B2xZ41JS1unwqh1+azyjNCYMn9P8UYanAOTDdycZqCOFASXGSkd+aCHWrHz1lVGo
 bGESZR7Tv0Rg476ex/x+VHEXmJZurlD9Sf7UAMbErhorRKPsfrReAuWpaqSJyw==
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+jCCAeKgAwIBAgIJALBSjVtKCuQcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEWRhbW9uYS5yZW5hdGVyLmZyMB4XDTE0MDkyMjE0NDgxMVoXDTI0MDkxOTE0
 NDgxMVowHDEaMBgGA1UEAxMRZGFtb25hLnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
@@ -72,30 +72,29 @@ B2xZ41JS1unwqh1+azyjNCYMn9P8UYanAOTDdycZqCOFASXGSkd+aCHWrHz1lVGo
 bGESZR7Tv0Rg476ex/x+VHEXmJZurlD9Sf7UAMbErhorRKPsfrReAuWpaqSJyw==
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes-aa.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes-aa.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">RENATER - Validation du Service d'autorisation</md:ServiceName>
-        <md:ServiceName xml:lang="en">RENATER - Validation of the Authorization Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Service d'autorisation basé sur le gestionnaire de groupes Sympa (Universalistes) et les Attributes Authorities SAML.
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes-aa.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes-aa.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">RENATER - Validation du Service d'autorisation</md:ServiceName>
+      <md:ServiceName xml:lang="en">RENATER - Validation of the Authorization Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Service d'autorisation basé sur le gestionnaire de groupes Sympa (Universalistes) et les Attributes Authorities SAML.
 Il permet à des organisations virtuelles (VO, communautés de chercheurs) appartenant à des établissements différents (donc gérés dans des référentiels différents) d'accéder à des ressources communes (sur autorisation) après authentification auprès de leurs établissements respectifs.
 Ce service se chargera de l'authentification et permettra un contrôle d'accès fin sur une ressource Web d'une communauté (groupe défini dans Sympa) qui peut donc être hébergée n'importe où.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Authorization service based on Sympa group manager (Universalistes) and SAML Attributes Authorities.
+      <md:ServiceDescription xml:lang="en">Authorization service based on Sympa group manager (Universalistes) and SAML Attributes Authorities.
 It allows virtual organizations (e.g. research communities) composed by people belonging to different institutions (i.e. managed by different referentials) to access to common resources (if authorization was granted) after having been authenticated by their respective institutions.
 This service will be in charge of authentication and provide accurate access control on a community's web resource (group defined in Sympa). This resource can therefore be hosted anywhere.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
index 788a6833..2840887f 100644
--- a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
+++ b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groupes.france-bioinformatique.fr/sympa">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-20T12:00:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-20T12:00:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Group service for the French Institute of BioInformatics</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://groupes.france-bioinformatique.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Group service for the French Institute of BioInformatics :
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Group service for the French Institute of BioInformatics</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://groupes.france-bioinformatique.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Group service for the French Institute of BioInformatics :
 -mailing lists
 -wikis
 -surveys
 -meeting scheduler</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
+        <mdui:DisplayName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
 -listes de diffusions
 -wikis
 -sondages
 -planification de réunion</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
 cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
@@ -58,13 +58,13 @@ oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
 SoGk3gs42M20S05utsA=
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
 cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
@@ -90,34 +90,33 @@ oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
 SoGk3gs42M20S05utsA=
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</md:ServiceName>
-        <md:ServiceName xml:lang="en">Group service for the French Institute of BioInformatics</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</md:ServiceName>
+      <md:ServiceName xml:lang="en">Group service for the French Institute of BioInformatics</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
 -listes de diffusions
 -wikis
 -sondages
 -planification de réunion</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Group service for the French Institute of BioInformatics :
+      <md:ServiceDescription xml:lang="en">Group service for the French Institute of BioInformatics :
 -mailing lists
 -wikis
 -surveys
 -meeting scheduler</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml b/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml
index 3208a1b7..996ec832 100644
--- a/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml
+++ b/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groupes.renater.fr/sympa">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-01T11:45:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-01T11:45:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RENATER - Universalistes</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://groupes.renater.fr/sympa</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">RENATER - Universalistes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Universalistes est le service de groupware de RENATER.
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - Universalistes</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://groupes.renater.fr/sympa</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">RENATER - Universalistes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Universalistes est le service de groupware de RENATER.
 
 Il permet aux utilisateurs de créer des groupes disposant des outils suivants :
 - liste de diffusion
 - wiki
 - prise de rendez-vous
 - sondage</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICoTCCAgqgAwIBAgIJAPdDY8XfnR75MA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
 BAYTAkZSMRQwEgYDVQQKEwtHSVAgUkVOQVRFUjEbMBkGA1UEAxMSZ3JvdXBlcy5y
 ZW5hdGVyLmZyMB4XDTEyMDQwNDE1MTc1MloXDTMyMDMzMDE1MTc1MlowQDELMAkG
@@ -46,13 +46,13 @@ BixcuiH/bClNPNA0Rr3gNOlzl5uMxz0s1Dfp+M0mjf1+AgQ5i7Vu3vG2bh10xR9t
 slMraAvScqJOYoi798luASiH/LBBFUXHbPx4zk+JxNDTfXhat6OmWzi/Xld6nRry
 tRX99iQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICoTCCAgqgAwIBAgIJAPdDY8XfnR75MA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
 BAYTAkZSMRQwEgYDVQQKEwtHSVAgUkVOQVRFUjEbMBkGA1UEAxMSZ3JvdXBlcy5y
 ZW5hdGVyLmZyMB4XDTEyMDQwNDE1MTc1MloXDTMyMDMzMDE1MTc1MlowQDELMAkG
@@ -69,13 +69,13 @@ BixcuiH/bClNPNA0Rr3gNOlzl5uMxz0s1Dfp+M0mjf1+AgQ5i7Vu3vG2bh10xR9t
 slMraAvScqJOYoi798luASiH/LBBFUXHbPx4zk+JxNDTfXhat6OmWzi/Xld6nRry
 tRX99iQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICjzCCAfigAwIBAgIJANzMu0IV83S0MA0GCSqGSIb3DQEBBQUAMDoxCzAJBgNV
 BAYTAkZSMRAwDgYDVQQKEwdSRU5BVEVSMRkwFwYDVQQDExBiYWJlbC5yZW5hdGVy
 LmZyMB4XDTEyMDEzMTEwNDY1M1oXDTMyMDEyNjEwNDY1M1owOjELMAkGA1UEBhMC
@@ -91,30 +91,29 @@ gYEAbA8HBZTvGmi1mANKgPKlknYAT9olC6wHuCZI5UHYxaoRv6lY6LA8BjeyFPWy
 xQ9lTeD31gYHQRlu9NxaKFTnay58By/PAkdRzZfpohXFCj2gTX2Vnd/of0F5+4mS
 OcnzyMjo+f3ngAPx/LMg/pxM21R1GzpaZeyz9ErgUvc8MJs=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">RENATER - Universalistes</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Universalistes est le service de groupware de RENATER.
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">RENATER - Universalistes</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Universalistes est le service de groupware de RENATER.
 
 Il permet aux utilisateurs de créer des groupes disposant des outils suivants :
 - liste de diffusion
 - wiki
 - prise de rendez-vous
 - sondage</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>listmaster@groupes.renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>listmaster@groupes.renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gryf.mlp.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/gryf.mlp.cz-idp-shibboleth.xml
index 78a16c74..4b1df87f 100644
--- a/swamid-interfederations-2.0/gryf.mlp.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/gryf.mlp.cz-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gryf.mlp.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-05-12T09:25:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-05-12T09:25:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlp.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Municipal Library of Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Městská knihovna v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Municipal Library of Prague registered users.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro registrované uživatele Městské knihovny v Praze.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mlp.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mlp.cz/</mdui:InformationURL>
+        <mdui:Logo height="300" width="200">https://web2.mlp.cz/logo/200.png</mdui:Logo>
+        <mdui:Logo height="600" width="400">https://web2.mlp.cz/logo/400.png</mdui:Logo>
+        <mdui:Logo height="1200" width="800">https://web2.mlp.cz/logo/800.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlp.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Municipal Library of Prague</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Městská knihovna v Praze</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Municipal Library of Prague registered users.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro registrované uživatele Městské knihovny v Praze.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mlp.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.mlp.cz/</mdui:InformationURL>
-          <mdui:Logo height="300" width="200">https://web2.mlp.cz/logo/200.png</mdui:Logo>
-          <mdui:Logo height="600" width="400">https://web2.mlp.cz/logo/400.png</mdui:Logo>
-          <mdui:Logo height="1200" width="800">https://web2.mlp.cz/logo/800.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIULkD4pR5Gq0GQDpB++bsqdTilisgwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZ3J5Zi5tbHAuY3owHhcNMTUxMDA4MDk1NzIxWhcNMzUx
 MDA4MDk1NzIxWjAWMRQwEgYDVQQDDAtncnlmLm1scC5jejCCASIwDQYJKoZIhvcN
@@ -51,13 +51,13 @@ rQx8mcPJ8nPk0XZl3I/ZiP5xX13qjmyCWI9TzHvuV9UZaqZ34WI6NZwk1wOhKXQF
 KsAWjrHJLaHzVd3ZTGkoBw3ZWBj1mCjdwvdT/i3XellpenuehJHHrQgB7rsHXnz2
 C97YJ5BLyrdA6vxThKJNUtNg/cd7PglWBqFs
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUaAb2SqEwW/Y/eN503hQxIslbDG8wDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZ3J5Zi5tbHAuY3owHhcNMTUxMDA4MDk1NzE5WhcNMzUx
 MDA4MDk1NzE5WjAWMRQwEgYDVQQDDAtncnlmLm1scC5jejCCASIwDQYJKoZIhvcN
@@ -76,13 +76,13 @@ MyiD99jV3UaujsiD8s/1rfMzhB1oJicLD6YvuwtJ8G+m8Jaq1E3ZEd6ITvUw0SCk
 bziSz8fz4BqTH4WJrHUQcJ0YR5P6gBLYM/74QXNjIQfsJ/eLHIZca+hv/XvBbJwW
 NA4hwb+zDImzHcZWYUWQXwjkaoAgTKr0HxKr
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPMLzE5J6rFDrO+XYbHk0xhU1UVpMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2dyeWYubWxwLmN6MB4XDTE1MTAwODA5NTcyMFoXDTM1
 MTAwODA5NTcyMFowFjEUMBIGA1UEAwwLZ3J5Zi5tbHAuY3owggEiMA0GCSqGSIb3
@@ -101,27 +101,27 @@ go7Lz/4mZSdEv1aYfUufj6ZgGhSHVV0CGbPJb/DQZ1IDGEs3uMvFuwBXwJW747wK
 dEJo3NfnYEq1mm7NJTrrweoGWle3If4szwZarBlxhkd2iItON4XVPqlxosEk8iWQ
 /1jwKYmxWO+XglXhRkofet5BHeLMEook7msLoQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gryf.mlp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gryf.mlp.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gryf.mlp.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gryf.mlp.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gryf.mlp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gryf.mlp.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlp.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gryf.mlp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gryf.mlp.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gryf.mlp.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gryf.mlp.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gryf.mlp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gryf.mlp.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlp.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIULkD4pR5Gq0GQDpB++bsqdTilisgwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZ3J5Zi5tbHAuY3owHhcNMTUxMDA4MDk1NzIxWhcNMzUx
 MDA4MDk1NzIxWjAWMRQwEgYDVQQDDAtncnlmLm1scC5jejCCASIwDQYJKoZIhvcN
@@ -140,13 +140,13 @@ rQx8mcPJ8nPk0XZl3I/ZiP5xX13qjmyCWI9TzHvuV9UZaqZ34WI6NZwk1wOhKXQF
 KsAWjrHJLaHzVd3ZTGkoBw3ZWBj1mCjdwvdT/i3XellpenuehJHHrQgB7rsHXnz2
 C97YJ5BLyrdA6vxThKJNUtNg/cd7PglWBqFs
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUaAb2SqEwW/Y/eN503hQxIslbDG8wDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLZ3J5Zi5tbHAuY3owHhcNMTUxMDA4MDk1NzE5WhcNMzUx
 MDA4MDk1NzE5WjAWMRQwEgYDVQQDDAtncnlmLm1scC5jejCCASIwDQYJKoZIhvcN
@@ -165,13 +165,13 @@ MyiD99jV3UaujsiD8s/1rfMzhB1oJicLD6YvuwtJ8G+m8Jaq1E3ZEd6ITvUw0SCk
 bziSz8fz4BqTH4WJrHUQcJ0YR5P6gBLYM/74QXNjIQfsJ/eLHIZca+hv/XvBbJwW
 NA4hwb+zDImzHcZWYUWQXwjkaoAgTKr0HxKr
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPMLzE5J6rFDrO+XYbHk0xhU1UVpMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2dyeWYubWxwLmN6MB4XDTE1MTAwODA5NTcyMFoXDTM1
 MTAwODA5NTcyMFowFjEUMBIGA1UEAwwLZ3J5Zi5tbHAuY3owggEiMA0GCSqGSIb3
@@ -190,22 +190,22 @@ go7Lz/4mZSdEv1aYfUufj6ZgGhSHVV0CGbPJb/DQZ1IDGEs3uMvFuwBXwJW747wK
 dEJo3NfnYEq1mm7NJTrrweoGWle3If4szwZarBlxhkd2iItON4XVPqlxosEk8iWQ
 /1jwKYmxWO+XglXhRkofet5BHeLMEook7msLoQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gryf.mlp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Municipal Library of Prague</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Městská knihovna v Praze</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Municipal Library of Prague</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Městská knihovna v Praze</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mlp.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.mlp.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vojtěch</md:GivenName>
-      <md:SurName>Vojtíšek</md:SurName>
-      <md:EmailAddress>vojtech.vojtisek@mlp.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gryf.mlp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Municipal Library of Prague</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Městská knihovna v Praze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Municipal Library of Prague</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Městská knihovna v Praze</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mlp.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mlp.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vojtěch</md:GivenName>
+    <md:SurName>Vojtíšek</md:SurName>
+    <md:EmailAddress>vojtech.vojtisek@mlp.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gteavirtual.org.xml b/swamid-interfederations-2.0/gteavirtual.org.xml
index d48c08f4..9aa43c3b 100644
--- a/swamid-interfederations-2.0/gteavirtual.org.xml
+++ b/swamid-interfederations-2.0/gteavirtual.org.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gteavirtual.org">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
               6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
               6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTEA - University of Malaga</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">GTEA - Universidad de Málaga</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTEA tools</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">Herramientas GTEA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://gtea.uma.es/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://gtea.uma.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Cebrián Robles</md:SurName>
-      <md:EmailAddress>danielcebrianr@gmail.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTEA - University of Malaga</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">GTEA - Universidad de Málaga</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTEA tools</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Herramientas GTEA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://gtea.uma.es/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://gtea.uma.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Cebrián Robles</md:SurName>
+    <md:EmailAddress>danielcebrianr@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml b/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml
index 1b89a946..f4556f4a 100644
--- a/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://guardian.otl.lstest.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-14T11:30:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-14T11:30:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MyConcern Demo Site</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The MyConcern Demo Site is used for demonstrations and IDP testing</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MyConcern Demo Site</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The MyConcern Demo Site is used for demonstrations and IDP testing</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/TCCAeWgAwIBAgIJAIC+mVqksujcMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEmphY2tzb24ubHNkbC5sb2NhbDAeFw0xNDA2MTMwOTEyMTRaFw0yNDA2MTAw
 						OTEyMTRaMB0xGzAZBgNVBAMTEmphY2tzb24ubHNkbC5sb2NhbDCCASIwDQYJKoZI
@@ -51,43 +51,43 @@
 						4LEDRGJXQIZvDkZioAwbvaqw4PfoGxlNv6COk+V829HOptvHV1a9va1bYRLA25eZ
 						1g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">One Team Logic Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MyConcern Demo Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Tucker</md:SurName>
-      <md:EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">One Team Logic Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MyConcern Demo Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Tucker</md:SurName>
+    <md:EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
index c1971c81..f7cb9e8f 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/lists/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/lists/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community List Server</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/lists/sp-info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/lists/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/lists/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community List Server</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/lists/sp-info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/lists/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -48,39 +48,39 @@ XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
 y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
 xWUYS9G3JfMMW9UY
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community List Server</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UWM CGCA Help</md:GivenName>
-      <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Branson Stephens</md:GivenName>
-      <md:EmailAddress>stephenb@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community List Server</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWM CGCA Help</md:GivenName>
+    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Branson Stephens</md:GivenName>
+    <md:EmailAddress>stephenb@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
index fe7cf4be..80c6bc9a 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/sp_info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/privacy_info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Registry</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/sp_info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/privacy_info</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -48,47 +48,47 @@ XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
 y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
 xWUYS9G3JfMMW9UY
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UWM CGCA Help</md:GivenName>
-      <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Branson Stephens</md:GivenName>
-      <md:EmailAddress>stephenb@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWM CGCA Help</md:GivenName>
+    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Branson Stephens</md:GivenName>
+    <md:EmailAddress>stephenb@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
index d630d3ae..b74d98f1 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/wiki/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPInfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPInfo</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -48,38 +48,38 @@ XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
 y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
 xWUYS9G3JfMMW9UY
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UWM CGCA Help</md:GivenName>
-      <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Branson Stephens</md:GivenName>
-      <md:EmailAddress>stephanb@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWM CGCA Help</md:GivenName>
+    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Branson Stephens</md:GivenName>
+    <md:EmailAddress>stephanb@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
index d4ca28e1..13030d35 100644
--- a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw.ct.infn.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-03T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
-          <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
@@ -51,59 +51,59 @@ JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
 W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Science Gateway to IGI </md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Riccardo</md:GivenName>
-      <md:SurName>Rotondo</md:SurName>
-      <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Giuseppe</md:GivenName>
-      <md:SurName>Platania</md:SurName>
-      <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Carlo</md:GivenName>
-      <md:SurName>Rocca</md:SurName>
-      <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Science Gateway to IGI </md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
index 4a7a25f6..8a5d3593 100644
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
+++ b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halfback.cnaf.infn.it/casshib/app2">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-04T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-04T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
@@ -46,44 +46,44 @@ icFWqRortYglbk+s6VO0hcYN6ORR5UBgOR6VULrT9r6mDQykItMVhBgt4peAeOss
 +6acaFTdJZHMD+Z3KkvA7yfD4IWulPnTaT+o1n7X1V6oAEVHn6SfpuBeP+wXeu+f
 yVxNpwv+OOJLtns=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">IGI Grid Portal provided by INFN</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:igi-portal-admin@lists.italiangrid.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">IGI Grid Portal provided by INFN</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:igi-portal-admin@lists.italiangrid.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml
index aa9d841a..962115af 100644
--- a/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://harper-adams.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-13T13:06:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-13T13:06:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">harper-adams.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">harper-adams.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEAjCCAuoCCQDNHBk2GcsHfjANBgkqhkiG9w0BAQUFADCBwjELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
 						BAoTF0hhcnBlciBBZGFtcyBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlv
@@ -36,24 +36,24 @@
 						GhSMUg8KVy3+6yjCxLtd0T1O0Lz2AEfwD7I867d+Sj5jiy1R11reQZojvEW5PVmV
 						Fwo9FhtsbeJO4cy9AuY7t9MOXGA4/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.harper-adams.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.harper-adams.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Harper Adams University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Harper Adams University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.harper-adams.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Curwen</md:GivenName>
-      <md:SurName>Thomas</md:SurName>
-      <md:EmailAddress>mailto:cthomas@harper-adams.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@harper-adams.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.harper-adams.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.harper-adams.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Harper Adams University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Harper Adams University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.harper-adams.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Curwen</md:GivenName>
+    <md:SurName>Thomas</md:SurName>
+    <md:EmailAddress>mailto:cthomas@harper-adams.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@harper-adams.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml
index ff10ee3d..25d49a8d 100644
--- a/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hau.idm.oclc.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-20T14:51:18Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-20T14:51:18Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMRswGQYDVQQDFBIqLmhh
 						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJ
 						KoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMB4XDTEzMDYxOTEz
@@ -31,24 +31,24 @@
 						KwXsAjQzn0TR9ccTAc0le+5wVW8BEqvJZOsF3ZJBB3G3zoss1E1y6bXkO5UOWRhz
 						MWGYa0Oj1hdjm0Tf2O/qQdfY6+X6Fw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Harper Adams University Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Harper Adams University Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
index d22b923a..5cd28e2b 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hbidp.hb.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hb.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-          <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>hb.se</mdui:DomainHint>
-          <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
@@ -77,26 +77,26 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
 9Ks=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
@@ -124,36 +124,36 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
 9Ks=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HB</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>University of Borås</md:Company>
-      <md:SurName>IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Borås</md:Company>
-      <md:SurName>Per-Olof Axelsson</md:SurName>
-      <md:EmailAddress>mailto:Per-Olof.Axelsson@hb.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 33 435 4697</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Borås</md:Company>
-      <md:SurName>IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>Per-Olof Axelsson</md:SurName>
+    <md:EmailAddress>mailto:Per-Olof.Axelsson@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4697</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml
index a168e88e..a65acb82 100644
--- a/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hefce-shib.hefce.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hefce.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hefce.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDQzCCAiugAwIBAgIUd3eeqMwn7Gk2wcl0ANILseGZbTMwDQYJKoZIhvcNAQEL
 					BQAwITEfMB0GA1UEAwwWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0xNjAxMDcw
 					ODUzMTlaFw0zNjAxMDcwODUzMTlaMCExHzAdBgNVBAMMFmhlZmNlLXNoaWIuaGVm
@@ -30,13 +30,13 @@
 					L6XzHSDH7nJz+f8/6m7VLr6SEevybOPiuF31oMi9+nPcdevTK1jijAwbmV7YAvg5
 					tf7o9r1RncMSSHP6t48r1PTmuB+r02I=
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDRDCCAiygAwIBAgIVAKdUokAt0edGYQbZGpn+Z0fBlMChMA0GCSqGSIb3DQEB
 					CwUAMCExHzAdBgNVBAMMFmhlZmNlLXNoaWIuaGVmY2UuYWMudWswHhcNMTYwMTA3
 					MDg1MzE2WhcNMzYwMTA3MDg1MzE2WjAhMR8wHQYDVQQDDBZoZWZjZS1zaGliLmhl
@@ -56,13 +56,13 @@
 					Q4sCx2jJ0fwyL7PpqrrL1WzXwtU1Q7L7IFyJp638LgkKrQdI0WE1yAoDTSkh++8K
 					FZtFNtmBVBWov5MSfrY7Jgim7u1VS2fq
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDQzCCAiugAwIBAgIURtGpLnxwX0+8kXuklWDHCYd82wowDQYJKoZIhvcNAQEL
 					BQAwITEfMB0GA1UEAwwWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0xNjAxMDcw
 					ODUzMTdaFw0zNjAxMDcwODUzMTdaMCExHzAdBgNVBAMMFmhlZmNlLXNoaWIuaGVm
@@ -82,26 +82,26 @@
 					vWpIynhpAzqFl+TPKTr+WVVk6ckMTDIh3vDqM5jMwPwedMDF1x+Et3Vgq5OdcvNb
 					ivVwIqHl7GlENvD8by7jEZVCZIPVuaY=
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hefce-shib.hefce.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hefce.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hefce-shib.hefce.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hefce.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDQzCCAiugAwIBAgIUd3eeqMwn7Gk2wcl0ANILseGZbTMwDQYJKoZIhvcNAQEL
 					BQAwITEfMB0GA1UEAwwWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0xNjAxMDcw
 					ODUzMTlaFw0zNjAxMDcwODUzMTlaMCExHzAdBgNVBAMMFmhlZmNlLXNoaWIuaGVm
@@ -121,13 +121,13 @@
 					L6XzHSDH7nJz+f8/6m7VLr6SEevybOPiuF31oMi9+nPcdevTK1jijAwbmV7YAvg5
 					tf7o9r1RncMSSHP6t48r1PTmuB+r02I=
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDRDCCAiygAwIBAgIVAKdUokAt0edGYQbZGpn+Z0fBlMChMA0GCSqGSIb3DQEB
 					CwUAMCExHzAdBgNVBAMMFmhlZmNlLXNoaWIuaGVmY2UuYWMudWswHhcNMTYwMTA3
 					MDg1MzE2WhcNMzYwMTA3MDg1MzE2WjAhMR8wHQYDVQQDDBZoZWZjZS1zaGliLmhl
@@ -147,13 +147,13 @@
 					Q4sCx2jJ0fwyL7PpqrrL1WzXwtU1Q7L7IFyJp638LgkKrQdI0WE1yAoDTSkh++8K
 					FZtFNtmBVBWov5MSfrY7Jgim7u1VS2fq
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDQzCCAiugAwIBAgIURtGpLnxwX0+8kXuklWDHCYd82wowDQYJKoZIhvcNAQEL
 					BQAwITEfMB0GA1UEAwwWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0xNjAxMDcw
 					ODUzMTdaFw0zNjAxMDcwODUzMTdaMCExHzAdBgNVBAMMFmhlZmNlLXNoaWIuaGVm
@@ -173,26 +173,26 @@
 					vWpIynhpAzqFl+TPKTr+WVVk6ckMTDIh3vDqM5jMwPwedMDF1x+Et3Vgq5OdcvNb
 					ivVwIqHl7GlENvD8by7jEZVCZIPVuaY=
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Higher Education Funding Council for England</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Higher Education Funding Council for England</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hefce.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:g.edwards@hefce.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:g.edwards@hefce.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Higher Education Funding Council for England</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Higher Education Funding Council for England</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hefce.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:g.edwards@hefce.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:g.edwards@hefce.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml b/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml
index 87e9d757..f328b2ca 100644
--- a/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://heimdall.comodo.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">comodo.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Comodo CA Ltd.</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">comodo.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Comodo CA Ltd.</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUeoauRjtUFtyGeW8GAiurwge2vzswDQYJKoZIhvcNAQEL
 BQAwHjEcMBoGA1UEAwwTaGVpbWRhbGwuY29tb2RvLm5ldDAeFw0xNTA3MTQxMzQy
 MzBaFw0zNTA3MTQxMzQyMzBaMB4xHDAaBgNVBAMME2hlaW1kYWxsLmNvbW9kby5u
@@ -38,23 +38,23 @@ Efw+g0ff7sNi8dyUW2ZiCndGXag4E7O04cqCpJln0ngTpfQkULA9D8tE5BkYUpid
 1FzEexQmwIXLUTmlL9NdxGlhKhi6mZXqEYqoubwN3xfzQQhApYzNrNVaQ2UJ4qzP
 3PIcpg44PgkUh1w=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heimdall.comodo.net/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heimdall.comodo.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Comodo CA Ltd.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Comodo CA Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.comodo.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vladimir Markevich</md:GivenName>
-      <md:EmailAddress>vladimir.markevich@comodo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Grigoriy Sandu</md:GivenName>
-      <md:EmailAddress>grigoriy.sandu@comodo.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heimdall.comodo.net/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heimdall.comodo.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Comodo CA Ltd.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Comodo CA Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.comodo.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vladimir Markevich</md:GivenName>
+    <md:EmailAddress>vladimir.markevich@comodo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Grigoriy Sandu</md:GivenName>
+    <md:EmailAddress>grigoriy.sandu@comodo.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/heinonline.org-entity.xml b/swamid-interfederations-2.0/heinonline.org-entity.xml
index b3618b4b..13fce878 100644
--- a/swamid-interfederations-2.0/heinonline.org-entity.xml
+++ b/swamid-interfederations-2.0/heinonline.org-entity.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://heinonline.org/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T15:27:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T15:27:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HeinOnline</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The World's Largest Image-based Legal Research Database</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">HeinOnline</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The World's Largest Image-based Legal Research Database</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID1jCCAr6gAwIBAgIJAKKIx7G8Se2XMA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
 						BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGSXRoYWNhMSAwHgYD
 						VQQKExdXUyBIZWluIGFuZCBDb21wYW55IEluYzEXMBUGA1UEAxMOaGVpbm9ubGlu
@@ -38,13 +38,13 @@
 						wCfR0ocvN3eEaulmUByr3AB7NwgjLjLHplwRPBz8O/cRJfCM1PzP6updCHhQX3em
 						ut67QhF+oJkUpBvydg21h7fQUnuSK9KlI9k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID1jCCAr6gAwIBAgIJAKKIx7G8Se2XMA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
 						BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGSXRoYWNhMSAwHgYD
 						VQQKExdXUyBIZWluIGFuZCBDb21wYW55IEluYzEXMBUGA1UEAxMOaGVpbm9ubGlu
@@ -67,34 +67,34 @@
 						wCfR0ocvN3eEaulmUByr3AB7NwgjLjLHplwRPBz8O/cRJfCM1PzP6updCHhQX3em
 						ut67QhF+oJkUpBvydg21h7fQUnuSK9KlI9k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heinonline.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heinonline.org/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">William S. Hein &amp; Co., Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">William S. Hein &amp; Co., Inc.: HeinOnline</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wshein.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@wshein.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Marisa</md:SurName>
-      <md:EmailAddress>mailto:rjm2@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Tramp</md:SurName>
-      <md:EmailAddress>mailto:atramp@wshein.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kyle</md:GivenName>
-      <md:SurName>Daving</md:SurName>
-      <md:EmailAddress>mailto:kdaving@wshein.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heinonline.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heinonline.org/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">William S. Hein &amp; Co., Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">William S. Hein &amp; Co., Inc.: HeinOnline</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wshein.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@wshein.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Marisa</md:SurName>
+    <md:EmailAddress>mailto:rjm2@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Tramp</md:SurName>
+    <md:EmailAddress>mailto:atramp@wshein.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kyle</md:GivenName>
+    <md:SurName>Daving</md:SurName>
+    <md:EmailAddress>mailto:kdaving@wshein.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml
index 945c22b6..2a0d7b1a 100644
--- a/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://helium.jcu.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:40:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:40:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jcu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of South Bohemia in Ceske Budejovice</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Jihočeská univerzita v Českých Budějovicích</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for SBU in Ceské Budejovice</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro JČU v Českých Budějovicích</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.jcu.cz/?set_language=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.jcu.cz</mdui:InformationURL>
+        <mdui:Logo height="40" width="38">http://helium.jcu.cz/logo-ju-40.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jcu.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of South Bohemia in Ceske Budejovice</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Jihočeská univerzita v Českých Budějovicích</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for SBU in Ceské Budejovice</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro JČU v Českých Budějovicích</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.jcu.cz/?set_language=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.jcu.cz</mdui:InformationURL>
-          <mdui:Logo height="40" width="38">http://helium.jcu.cz/logo-ju-40.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUT352/cuSCyIoBXXvytfYj0l2xeAwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaGVsaXVtLmpjdS5jejAeFw0xMDA1MDMwOTQ1MDZaFw0z
 MDA1MDMwOTQ1MDZaMBgxFjAUBgNVBAMTDWhlbGl1bS5qY3UuY3owggEiMA0GCSqG
@@ -50,29 +50,29 @@ Qm2JkTDk/UKsYKYDrHoZ4vk71XTFLAgsCfBE2/2VJpIkOutXtqz78E07C4y2+4O3
 FcCuzEOMSqDr2DwNtwLU1t+o7IUndlfTGRBD+LfXQBWxuEo=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://helium.jcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://helium.jcu.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://helium.jcu.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://helium.jcu.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://helium.jcu.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://helium.jcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://helium.jcu.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jcu.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://helium.jcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://helium.jcu.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://helium.jcu.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://helium.jcu.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://helium.jcu.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://helium.jcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://helium.jcu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jcu.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUT352/cuSCyIoBXXvytfYj0l2xeAwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaGVsaXVtLmpjdS5jejAeFw0xMDA1MDMwOTQ1MDZaFw0z
 MDA1MDMwOTQ1MDZaMBgxFjAUBgNVBAMTDWhlbGl1bS5qY3UuY3owggEiMA0GCSqG
@@ -92,23 +92,23 @@ Qm2JkTDk/UKsYKYDrHoZ4vk71XTFLAgsCfBE2/2VJpIkOutXtqz78E07C4y2+4O3
 FcCuzEOMSqDr2DwNtwLU1t+o7IUndlfTGRBD+LfXQBWxuEo=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://helium.jcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of South Bohemia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of South Bohemia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Jihočeská univerzita v Českých Budějovicích</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jcu.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Marek</md:SurName>
-      <md:EmailAddress>jmarek@jcu.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://helium.jcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of South Bohemia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of South Bohemia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Jihočeská univerzita v Českých Budějovicích</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jcu.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Marek</md:SurName>
+    <md:EmailAddress>jmarek@jcu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml
index 87aecdf4..96e09fb2 100644
--- a/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hereford.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-23T09:59:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-23T09:59:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hereford.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hereford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIILT4zd54jo/wwDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
 						CgwbSGVyZWZvcmQgU2l4dGggRm9ybSBDb2xsZWdlMRswGQYDVQQDDBJpZHAuaGVy
 						ZWZvcmQuYWMudWswHhcNMTMwNjE5MTAzNTM2WhcNMjMwNjE5MTAzNTM2WjBDMSQw
@@ -32,13 +32,13 @@
 						/QfZ2h67XMQyd8Jdu0oxB1XgXPgzqI/LbokdqnHCLEjOyqJ/dNwf/CACNKxFPZTM
 						rpEhJNmmPFKIi9lPEv6R3hzNVPsfyxYFHsVL+hA5xx6Ak8t96zdGWMA9RCY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIILT4zd54jo/wwDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
 						CgwbSGVyZWZvcmQgU2l4dGggRm9ybSBDb2xsZWdlMRswGQYDVQQDDBJpZHAuaGVy
 						ZWZvcmQuYWMudWswHhcNMTMwNjE5MTAzNTM2WhcNMjMwNjE5MTAzNTM2WjBDMSQw
@@ -58,25 +58,25 @@
 						/QfZ2h67XMQyd8Jdu0oxB1XgXPgzqI/LbokdqnHCLEjOyqJ/dNwf/CACNKxFPZTM
 						rpEhJNmmPFKIi9lPEv6R3hzNVPsfyxYFHsVL+hA5xx6Ak8t96zdGWMA9RCY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hereford.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hereford.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hereford Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hereford Sixth Form College OALA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hereford.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Saville</md:SurName>
-      <md:EmailAddress>mailto:tbs@hereford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Saville</md:SurName>
-      <md:EmailAddress>mailto:tbs@hereford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hereford.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hereford.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hereford Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hereford Sixth Form College OALA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hereford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Saville</md:SurName>
+    <md:EmailAddress>mailto:tbs@hereford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Saville</md:SurName>
+    <md:EmailAddress>mailto:tbs@hereford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml
index ba42a202..cf8bcd00 100644
--- a/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hermes.kendal.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-06T16:19:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-06T16:19:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kendal.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kendal.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJjCCAg4CCQCftH7JV+1i/jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGS2VuZGFsMRcwFQYDVQQKEw5LZW5kYWwgQ29sbGVnZTEcMBoG
 						A1UEAxMTaGVybWVzLmtlbmRhbC5hYy51azAeFw0xNDA0MDkwNzQ1MjZaFw0zNDA0
@@ -31,26 +31,26 @@
 						wKjIrfioxNzLdB35vkRFWWUDw1PdFn1kUq1VgjuEqbD38eUA4iNd6F6m3SvcQAqE
 						0D/QX0C9pKDMUOwrgNQfQOdQBE6gPCqk5zaD8tc/WOKE8wia27HWDmH2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hermes.kendal.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kendal.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hermes.kendal.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kendal.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJjCCAg4CCQCftH7JV+1i/jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGS2VuZGFsMRcwFQYDVQQKEw5LZW5kYWwgQ29sbGVnZTEcMBoG
 						A1UEAxMTaGVybWVzLmtlbmRhbC5hYy51azAeFw0xNDA0MDkwNzQ1MjZaFw0zNDA0
@@ -69,27 +69,27 @@
 						wKjIrfioxNzLdB35vkRFWWUDw1PdFn1kUq1VgjuEqbD38eUA4iNd6F6m3SvcQAqE
 						0D/QX0C9pKDMUOwrgNQfQOdQBE6gPCqk5zaD8tc/WOKE8wia27HWDmH2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kendal College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kendal College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kendal.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Donna</md:GivenName>
-      <md:SurName>Clarke</md:SurName>
-      <md:EmailAddress>mailto:donna.clarke@kendal.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Donna</md:GivenName>
-      <md:SurName>Clarke</md:SurName>
-      <md:EmailAddress>mailto:donna.clarke@kendal.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kendal College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kendal College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kendal.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Donna</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>mailto:donna.clarke@kendal.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Donna</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>mailto:donna.clarke@kendal.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml
index add31cc9..c9f7738f 100644
--- a/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml
+++ b/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hexaa.eduid.hu/hexaa">
-    <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>niifi</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>hexaa</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAOSPjcyD6TerMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MQ0wCwYDVQQKDAROSUlGMQwwCgYDVQQLDANBQUkxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA3MjUwOTEwMTNaFw0yNDA3MjQwOTEwMTNaMIGFMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MQ0wCwYDVQQKDAROSUlGMQwwCgYDVQQLDANBQUkxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKi1DVFU8Ga62OqleMLg6zHXEmuqRgFt5+3JhKo+/OdZW0MofJguzFusTj/EMwb8uq8ty/rerb3GoYptgiz5UOQ6xv+7xAgwn4ED0soj34vutl8s3CxYHTBSNKyMHh7WQaAUNB7iVCoQLhia0/VFT2JNJ7ZUs/H/da96pvwTCMVwUlPn7ajaotRjmEUbDhYopkxRGV9lFvPWSPaEAycUWMCf4WR1QZ6KdeWJ5+Aju+8R0+h4MeH/IG7KfWvIoSH3TW6UlfkNbIrxRUaVo4T5PgNEGX//tQgLb2ghDLOBIaSPD3MiovQOz44n+yhGs29jb9ldBZ5Fuqsx+/H2oi7NJzMCAwEAAaNQME4wHQYDVR0OBBYEFKqg4P+UsMvBcN8y/nDTbG4lCRn1MB8GA1UdIwQYMBaAFKqg4P+UsMvBcN8y/nDTbG4lCRn1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIXoj/th9jwTHaFR1zRamEgM4DC5cIAWgy2gdrZIV1J/KZFDLQVZgP76xc4nBk8ulP5iBOx33RmODNj6mu+/OB8W39Zvg+eYes474x4P5M/HAP52hZFR6IUW8MyiMw/Kb+VZ8+5wQ2OZ8BnuKIogMVrI4fE4gvAxUkZMCDP4Fmdf8WcFhPVFRQLAG3UjgsErJ5a95M16upPM8bFnDh5XES3TR/fwKiU2CHnx45v+ajvLOmtQWu+Lb/HX4RL4N3PmERrBuAG0lMcwR33i/uf21jbeLH2u+qPemRIOhUv+h2MIpocW+Io92B+v/JCPIfrg+RE6QVnNXD3XGn1LQ8Wi3Xg=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>hexaa.eduid.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hexaa.eduid.hu:8443/simplesaml/module.php/aa/attributeserver.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>niifi</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>hexaa</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAOSPjcyD6TerMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MQ0wCwYDVQQKDAROSUlGMQwwCgYDVQQLDANBQUkxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA3MjUwOTEwMTNaFw0yNDA3MjQwOTEwMTNaMIGFMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MQ0wCwYDVQQKDAROSUlGMQwwCgYDVQQLDANBQUkxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKi1DVFU8Ga62OqleMLg6zHXEmuqRgFt5+3JhKo+/OdZW0MofJguzFusTj/EMwb8uq8ty/rerb3GoYptgiz5UOQ6xv+7xAgwn4ED0soj34vutl8s3CxYHTBSNKyMHh7WQaAUNB7iVCoQLhia0/VFT2JNJ7ZUs/H/da96pvwTCMVwUlPn7ajaotRjmEUbDhYopkxRGV9lFvPWSPaEAycUWMCf4WR1QZ6KdeWJ5+Aju+8R0+h4MeH/IG7KfWvIoSH3TW6UlfkNbIrxRUaVo4T5PgNEGX//tQgLb2ghDLOBIaSPD3MiovQOz44n+yhGs29jb9ldBZ5Fuqsx+/H2oi7NJzMCAwEAAaNQME4wHQYDVR0OBBYEFKqg4P+UsMvBcN8y/nDTbG4lCRn1MB8GA1UdIwQYMBaAFKqg4P+UsMvBcN8y/nDTbG4lCRn1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIXoj/th9jwTHaFR1zRamEgM4DC5cIAWgy2gdrZIV1J/KZFDLQVZgP76xc4nBk8ulP5iBOx33RmODNj6mu+/OB8W39Zvg+eYes474x4P5M/HAP52hZFR6IUW8MyiMw/Kb+VZ8+5wQ2OZ8BnuKIogMVrI4fE4gvAxUkZMCDP4Fmdf8WcFhPVFRQLAG3UjgsErJ5a95M16upPM8bFnDh5XES3TR/fwKiU2CHnx45v+ajvLOmtQWu+Lb/HX4RL4N3PmERrBuAG0lMcwR33i/uf21jbeLH2u+qPemRIOhUv+h2MIpocW+Io92B+v/JCPIfrg+RE6QVnNXD3XGn1LQ8Wi3Xg=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>hexaa.eduid.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hexaa.eduid.hu:8443/simplesaml/module.php/aa/attributeserver.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
index 74f84702..a501fbb7 100644
--- a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hexaa.eduid.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>hexaa</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>hexaa</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">HEXAA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HEXAA</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">A HEXAA egy külső attribútum szolgáltatás. A szolgáltatás célja az, hogy felhasználói adatokat rögzíthessenek bele, amelyet megoszthatnak tartalomszolgáltatókkal. A HEXAA-ban nyilvántarthatóak csoportok, virtuális szervezetek, jogosultsági információk, valamint a felhasználóra jellemző egyéb információk is.</mdui:Description>
+        <mdui:Description xml:lang="en">HEXAA is an External Attribute Authority.  It can store user attributes that can be shared with Service Providers. Virtual organizations and groups can also be managed with HEXAA as well as access control infromation and profile information.</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://hexaa.eduid.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://www.eduid.hu/hu/hexaa-adatkezelesi-szabalyzat/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">HEXAA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">HEXAA</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">A HEXAA egy külső attribútum szolgáltatás. A szolgáltatás célja az, hogy felhasználói adatokat rögzíthessenek bele, amelyet megoszthatnak tartalomszolgáltatókkal. A HEXAA-ban nyilvántarthatóak csoportok, virtuális szervezetek, jogosultsági információk, valamint a felhasználóra jellemző egyéb információk is.</mdui:Description>
-          <mdui:Description xml:lang="en">HEXAA is an External Attribute Authority.  It can store user attributes that can be shared with Service Providers. Virtual organizations and groups can also be managed with HEXAA as well as access control infromation and profile information.</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://hexaa.eduid.hu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://www.eduid.hu/hu/hexaa-adatkezelesi-szabalyzat/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDXDCCAkQCCQCFm32D8C9qujANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MRMwEQYDVQQKDApNVEEgU1pUQUtJMQ0wCwYDVQQLDARIQklUMRcwFQYDVQQDDA5oZXhhYS5lZHVpZC5odTAeFw0xNDA3MjExMjUxMTJaFw0yNDA3MTgxMjUxMTJaMHAxCzAJBgNVBAYTAkhVMREwDwYDVQQIDAhCdWRhcGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTWlRBS0kxDTALBgNVBAsMBEhCSVQxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlgn1/34g4IAzPjQeLtKEF4EsTrKyEYiRrUstWzyGUkZ0WbNzisXUvjY0yuxeWiJmv2XiMF/Y80TpR/buFptCOxZBIsc+gPPfqHlaR4zYhe+bBNUDzetXrKuuuQYOlZnABLaMnSbUYMEjXev4fxJdNhwBGaGxZMnfDGvTRZY9nbj3RU7ziVrQcYP95SI2xUyMmugpTVQknHDsR7/ipqjrrS1Hwsx3MwitHrfr5GMgdCdz/d0mA8kqla8pXCvCrniKteMmoQFUiQ4Fv74PqFxEpYISUYQ6JUjd+j1oOKo+RmCGaQfRdPIR8GVojYMFUyRiINaFs+7WpHC5GbwLq2SEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3+3pXTc2rXs0D7uZkMpIKDJbYoBDwmXjt8rw4aTsEqrABQqWfyIZvQj1kPwEd9644ZMeEL53ajMeATjeovtfhGXiofCiP1HNfpAUD4DrNYTA57f6hVRBE/ec3hQ5x2uCwD4kLvbA9LVjP3OImG0PaOHWCz+7AmXAEkO+M5lhJJ7DkKpsfTu8tP/xucCDT5kwtp9IgV8PIM9tbUX3wDyAmsOE4Vy6ZPNra3+wXfSAuNigP9vqrpvqVXJkwTm2kmoMy+nOlxS6mQCQXj5TRwwztQBM9H0zNDwQEJNc27lOCiTIZ92uBxhghsW5tZJVmEHXqFp1uBKdiICgBSgNhaQkr</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>hexaa.eduid.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hexaa.eduid.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">HEXAA</md:ServiceName>
-        <md:ServiceName xml:lang="en">HEXAA</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>aai@niif.hu</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>aai@niif.hu</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>aai@niif.hu</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDXDCCAkQCCQCFm32D8C9qujANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MRMwEQYDVQQKDApNVEEgU1pUQUtJMQ0wCwYDVQQLDARIQklUMRcwFQYDVQQDDA5oZXhhYS5lZHVpZC5odTAeFw0xNDA3MjExMjUxMTJaFw0yNDA3MTgxMjUxMTJaMHAxCzAJBgNVBAYTAkhVMREwDwYDVQQIDAhCdWRhcGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTWlRBS0kxDTALBgNVBAsMBEhCSVQxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlgn1/34g4IAzPjQeLtKEF4EsTrKyEYiRrUstWzyGUkZ0WbNzisXUvjY0yuxeWiJmv2XiMF/Y80TpR/buFptCOxZBIsc+gPPfqHlaR4zYhe+bBNUDzetXrKuuuQYOlZnABLaMnSbUYMEjXev4fxJdNhwBGaGxZMnfDGvTRZY9nbj3RU7ziVrQcYP95SI2xUyMmugpTVQknHDsR7/ipqjrrS1Hwsx3MwitHrfr5GMgdCdz/d0mA8kqla8pXCvCrniKteMmoQFUiQ4Fv74PqFxEpYISUYQ6JUjd+j1oOKo+RmCGaQfRdPIR8GVojYMFUyRiINaFs+7WpHC5GbwLq2SEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3+3pXTc2rXs0D7uZkMpIKDJbYoBDwmXjt8rw4aTsEqrABQqWfyIZvQj1kPwEd9644ZMeEL53ajMeATjeovtfhGXiofCiP1HNfpAUD4DrNYTA57f6hVRBE/ec3hQ5x2uCwD4kLvbA9LVjP3OImG0PaOHWCz+7AmXAEkO+M5lhJJ7DkKpsfTu8tP/xucCDT5kwtp9IgV8PIM9tbUX3wDyAmsOE4Vy6ZPNra3+wXfSAuNigP9vqrpvqVXJkwTm2kmoMy+nOlxS6mQCQXj5TRwwztQBM9H0zNDwQEJNc27lOCiTIZ92uBxhghsW5tZJVmEHXqFp1uBKdiICgBSgNhaQkr</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>hexaa.eduid.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hexaa.eduid.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">HEXAA</md:ServiceName>
+      <md:ServiceName xml:lang="en">HEXAA</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>aai@niif.hu</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>aai@niif.hu</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>aai@niif.hu</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
index ab78cabd..e7fdb341 100644
--- a/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hidp.ucc.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-25T00:00:00Z"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-25T00:00:00Z"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University College Cork</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Coláiste na hOllscoile Corcaigh</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ucc.ie/en/sit/</mdui:InformationURL>
+        <mdui:Logo height="71" width="200">https://edugate.heanet.ie/rr3/logos/ucc.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:51.893285131676606,-8.492431640625</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University College Cork</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Coláiste na hOllscoile Corcaigh</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ucc.ie/en/sit/</mdui:InformationURL>
-          <mdui:Logo height="71" width="200">https://edugate.heanet.ie/rr3/logos/ucc.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:51.893285131676606,-8.492431640625</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUJ3jATJ9q82dE+ma0p9zSXbsubOUwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQbWFlbHN0cm9tLnVjYy5pZTAeFw0xMDEyMjAxMTQ0MDRa
 Fw0zMDEyMjAxMTQ0MDRaMBsxGTAXBgNVBAMTEG1hZWxzdHJvbS51Y2MuaWUwggEi
@@ -44,37 +44,37 @@ sCOjwT0V8PGx79b88ZJp1Na/QBrsl3UWpCDtQCxgCu/PWDE23tWc9s29XIOIUEO1
 sUm5ezY/tfP6H2REvnOkBZ4Y1zDFoEjJojHOQQgRHOagmeItT/XhBP1bVOPKoyMd
 jtlb4YINkQ8aWIF5en7doTGXzvLeD5H1Oj8gm9iB2J+5eSzcj0g3ONNkBjSscoE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hidp.ucc.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College Cork</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College Cork</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucc.ie/en/sit/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Denis</md:GivenName>
-      <md:SurName>O'Sullivan</md:SurName>
-      <md:EmailAddress>mailto:denis@ucc.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hostmaster</md:GivenName>
-      <md:SurName>UCC</md:SurName>
-      <md:EmailAddress>mailto:Hostmaster@ucc.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>sne@ucc.ie</md:SurName>
-      <md:EmailAddress>mailto:sne@ucc.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hidp.ucc.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College Cork</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College Cork</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucc.ie/en/sit/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Denis</md:GivenName>
+    <md:SurName>O'Sullivan</md:SurName>
+    <md:EmailAddress>mailto:denis@ucc.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hostmaster</md:GivenName>
+    <md:SurName>UCC</md:SurName>
+    <md:EmailAddress>mailto:Hostmaster@ucc.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>sne@ucc.ie</md:SurName>
+    <md:EmailAddress>mailto:sne@ucc.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml
index 55175575..7dc0252a 100644
--- a/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://historicaltexts.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-13T15:26:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-13T15:26:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Historical Texts</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Collections of texts from the late fifteenth to long nineteenth century</mdui:Description>
+        <mdui:Logo height="81" width="300">https://historicaltexts.jisc.ac.uk/Login/historicaltexts.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Historical Texts</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Collections of texts from the late fifteenth to long nineteenth century</mdui:Description>
-          <mdui:Logo height="81" width="300">https://historicaltexts.jisc.ac.uk/Login/historicaltexts.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEETCCAvmgAwIBAgIJAOP4YayhAdK+MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
 						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMaaGlzdG9y
@@ -58,41 +58,41 @@
 						cN0OP7gQMBvefAqfEp4UDUNVGJaiMDsGvsIRLCuvkqJJnSDsJz+atC9D7aU8oSrP
 						nbpSNtZzDlQj2Ow1DZqEMXQEHhXkjN6qTEt9VMLRBSjNNcb8Bw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Historical Texts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Historical Texts Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:historicaltexts@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Historical Texts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Historical Texts Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:historicaltexts@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
index 7156a490..d85468d4 100644
--- a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
+++ b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hls.uwe.ac.uk/athens">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-15T16:34:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-15T16:34:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIJAIF9qCDnlp/PMA0GCSqGSIb3DQEBBQUAMCYxDDAKBgNV
 						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51azAeFw0xMzExMTIxMTAxNTJa
 						Fw0yMzExMTAxMTAxNTJaMCYxDDAKBgNVBAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3
@@ -29,13 +29,13 @@
 						wBMgfMJKeD0m1I9uREqMO1eg5feDEqfn+rrk88x8e/Pkz2njekPMadJNd9HE/tQi
 						WiII6YDODMbcjfRCAJxuFOADibLPnWl0Zx22X2AZKgQEgqBY4ch6WKCaTZQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIJAIF9qCDnlp/PMA0GCSqGSIb3DQEBBQUAMCYxDDAKBgNV
 						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51azAeFw0xMzExMTIxMTAxNTJa
 						Fw0yMzExMTAxMTAxNTJaMCYxDDAKBgNVBAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3
@@ -55,25 +55,25 @@
 						wBMgfMJKeD0m1I9uREqMO1eg5feDEqfn+rrk88x8e/Pkz2njekPMadJNd9HE/tQi
 						WiII6YDODMbcjfRCAJxuFOADibLPnWl0Zx22X2AZKgQEgqBY4ch6WKCaTZQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the West of England, Bristol</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the West of England (UWE) - HLS SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library IT Team</md:GivenName>
-      <md:EmailAddress>mailto:lib.it@uwe.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Library IT Team</md:GivenName>
-      <md:EmailAddress>mailto:lib.it@uwe.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the West of England, Bristol</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the West of England (UWE) - HLS SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library IT Team</md:GivenName>
+    <md:EmailAddress>mailto:lib.it@uwe.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Library IT Team</md:GivenName>
+    <md:EmailAddress>mailto:lib.it@uwe.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hood.accessiblelearning.com-sp.xml b/swamid-interfederations-2.0/hood.accessiblelearning.com-sp.xml
index db637635..e5558df2 100644
--- a/swamid-interfederations-2.0/hood.accessiblelearning.com-sp.xml
+++ b/swamid-interfederations-2.0/hood.accessiblelearning.com-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hood.accessiblelearning.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hood.accessiblelearning.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Accessible Information Management, LLC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.accessiblelearning.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.accessiblelearning.com/Policies.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://www.accessiblelearning.com/Shibboleth/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hood.accessiblelearning.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Accessible Information Management, LLC</mdui:DisplayName>
-          <mdui:Description xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences. </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.accessiblelearning.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.accessiblelearning.com/Policies.aspx</mdui:PrivacyStatementURL>
-          <mdui:Logo height="64" width="350" xml:lang="en">https://www.accessiblelearning.com/Shibboleth/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFUzCCBDugAwIBAgIJAO7LODGH3QVDMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
 MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
@@ -53,37 +53,37 @@ Gqkj5bjzyMgj8MTpTtA6BRJAUtslFW8vubeGdUva7cBV0YuZ+p3TX2D+SvE/v6Gq
 RcirgtTkER95xUT+lJ+0VLVOYxYG7/vHDpTFK4/uP7C/vD+NHAp3xHWzO26mCETe
 knTYMKwSgln2Tp5R4/PMslPvgZnilQc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Accessible Information Management, LLC</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences. </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Accessible Information Management, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Accessible Information Management, LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://accessiblelearning.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert Armas</md:GivenName>
-      <md:EmailAddress>rob.armas@dsaim.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Haris Gunadi</md:GivenName>
-      <md:EmailAddress>haris.gunadi@dsaim.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hood.accessiblelearning.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Accessible Information Management, LLC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences. </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Accessible Information Management, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Accessible Information Management, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://accessiblelearning.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert Armas</md:GivenName>
+    <md:EmailAddress>rob.armas@dsaim.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Haris Gunadi</md:GivenName>
+    <md:EmailAddress>haris.gunadi@dsaim.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml
index 4e9ba613..1df61652 100644
--- a/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hornet.stars.manchester.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/STARSDS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/STARSDS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
 						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -28,13 +28,13 @@
 						2vtfZ+CtpWQteMiXFGEfEL/3U5OtjBxt7JaQxaJJ6iRTk5jdl+EI4NxHzmITf3+O
 						EId1IbbmDWSHoeSw5za0bFOJcg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
 						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -52,35 +52,35 @@
 						2vtfZ+CtpWQteMiXFGEfEL/3U5OtjBxt7JaQxaJJ6iRTk5jdl+EI4NxHzmITf3+O
 						EId1IbbmDWSHoeSw5za0bFOJcg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Manchester: Hornet (Halls of Residence Network)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stars Authentication Support</md:GivenName>
-      <md:EmailAddress>mailto:pssauth.support@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stars Authentication Support</md:GivenName>
-      <md:EmailAddress>mailto:pssauth.support@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Manchester: Hornet (Halls of Residence Network)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stars Authentication Support</md:GivenName>
+    <md:EmailAddress>mailto:pssauth.support@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stars Authentication Support</md:GivenName>
+    <md:EmailAddress>mailto:pssauth.support@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml b/swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml
index bfd7b5d7..a3f5d1df 100644
--- a/swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml
+++ b/swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://hotfixpub1.imodules.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">iModules Hotfix Test</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">iModules Hotfix Test</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
 MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
 MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
@@ -36,18 +36,18 @@ pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
 6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
 MJlfQnuceWY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hotfixpubsecure.imodules.com/controls/login/AssertionConsumerService.aspx?sid=6&amp;gid=2" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Wicoff</md:GivenName>
-      <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hotfixpubsecure.imodules.com/controls/login/AssertionConsumerService.aspx?sid=6&amp;gid=2" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Wicoff</md:GivenName>
+    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
index e711b3f3..626005fc 100644
--- a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hpc-wayf.sdu.dk/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-27T10:41:03Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-27T10:41:03Z" registrationAuthority="https://www.wayf.dk">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to manage user access to the HPC centre.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">DeIC Nationale HPC-Center, SDU</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DeIC National HPC Centre, SDU</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</mdui:Description>
-          <mdui:Description xml:lang="en">The purpose is to manage user access to the HPC centre.</mdui:Description>
-          <mdui:DisplayName xml:lang="da">DeIC Nationale HPC-Center, SDU</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DeIC National HPC Centre, SDU</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQB39SLNLwoqeoeeq8If/1ITANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xNTA5MDMwMDAwMDBaFw0xODA5MDcxMjAwMDBaMIGBMQswCQYDVQQG EwJESzEaMBgGA1UECBMRUmVnaW9uIFN5ZGRhbm1hcmsxDzANBgNVBAcTBk9kZW5z ZTEdMBsGA1UEChMUU3lkZGFuc2sgVW5pdmVyc2l0ZXQxEzARBgNVBAsTCklULVNl cnZpY2UxETAPBgNVBAMMCCouc2R1LmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A MIIBCgKCAQEAzVQFqrhdUdkursHSLNBKUiPfkiKA1O1zSd7h0sUR0qrbzc2zKCkt ipe30W5lSuPZm1uJIsA1RzyQ5B1ER32kQRQBXctmTRVPKgem+J2wiQV7jkauDbsC TrfSeWesFfKyV7dKo0iKD4A0SASRMhoRCPxPI3/k4GqXFhJeySEK61YNWP80zaXg UMhMIdCXp0M2ZHFXC0thCul0/c5zUIxalN4i4wFCXl1cFt/9xb4qcu4IdAswghus Lbvs2LAMOGkKRp7PMX5uUE3Sln25EhvUJiGQFhqCPhhTNnjUwDUzPkFkYjFNF591 Go6MqWG/2xmNlovSWp4c3CJtwOit2JSn1wIDAQABo4IByTCCAcUwHwYDVR0jBBgw FoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFI2NVtdB0beyq/m/Ptty DLz2BW2XMBsGA1UdEQQUMBKCCCouc2R1LmRrggZzZHUuZGswDgYDVR0PAQH/BAQD AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+g LaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAv oC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmww TAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93 d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQG CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKG LGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwG A1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACwyOmcd3i6MYbah+i/MzZWi yUWsG/FOJmdG0krY+RtiBlLQ8UKDyJMjaeg/NNriwq7z3WZGpciSLRgEWPeoSsYT YQlR50Qn9CXIGWq6AOpIHFA3nMsicPjw7uZzSKRMWUS7DcQghBFZTXd2e1Ad5lBY 1hBjnsaVNJTLPhw0sGbJps2yzlm/ea3YnsmjdeOjXf1H1qA+3JgSJrSQlUkbrSyk DujmhIyKT/QZ9t/a3z8meNCiZogGDtehtmbPlPXWz6Tk6qif1dR4wF4t8/YwEjsr gKZxbMEVH0NYQf+3t4TiQyY1eJWbb70ALhio4HgYEpTy+6nPBP8kuDsl69X4esw=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="da">DeIC Nationale HPC-Center, SDU</md:ServiceName>
-        <md:ServiceName xml:lang="en">DeIC National HPC Centre, SDU</md:ServiceName>
-        <md:ServiceDescription xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">The purpose is to manage user access to the HPC centre.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="da">http://sdu.dk</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.sdu.dk/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lasse</md:GivenName>
-      <md:SurName>Birnbaum Jensen</md:SurName>
-      <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQB39SLNLwoqeoeeq8If/1ITANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xNTA5MDMwMDAwMDBaFw0xODA5MDcxMjAwMDBaMIGBMQswCQYDVQQG EwJESzEaMBgGA1UECBMRUmVnaW9uIFN5ZGRhbm1hcmsxDzANBgNVBAcTBk9kZW5z ZTEdMBsGA1UEChMUU3lkZGFuc2sgVW5pdmVyc2l0ZXQxEzARBgNVBAsTCklULVNl cnZpY2UxETAPBgNVBAMMCCouc2R1LmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A MIIBCgKCAQEAzVQFqrhdUdkursHSLNBKUiPfkiKA1O1zSd7h0sUR0qrbzc2zKCkt ipe30W5lSuPZm1uJIsA1RzyQ5B1ER32kQRQBXctmTRVPKgem+J2wiQV7jkauDbsC TrfSeWesFfKyV7dKo0iKD4A0SASRMhoRCPxPI3/k4GqXFhJeySEK61YNWP80zaXg UMhMIdCXp0M2ZHFXC0thCul0/c5zUIxalN4i4wFCXl1cFt/9xb4qcu4IdAswghus Lbvs2LAMOGkKRp7PMX5uUE3Sln25EhvUJiGQFhqCPhhTNnjUwDUzPkFkYjFNF591 Go6MqWG/2xmNlovSWp4c3CJtwOit2JSn1wIDAQABo4IByTCCAcUwHwYDVR0jBBgw FoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFI2NVtdB0beyq/m/Ptty DLz2BW2XMBsGA1UdEQQUMBKCCCouc2R1LmRrggZzZHUuZGswDgYDVR0PAQH/BAQD AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+g LaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAv oC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmww TAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93 d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQG CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKG LGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwG A1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACwyOmcd3i6MYbah+i/MzZWi yUWsG/FOJmdG0krY+RtiBlLQ8UKDyJMjaeg/NNriwq7z3WZGpciSLRgEWPeoSsYT YQlR50Qn9CXIGWq6AOpIHFA3nMsicPjw7uZzSKRMWUS7DcQghBFZTXd2e1Ad5lBY 1hBjnsaVNJTLPhw0sGbJps2yzlm/ea3YnsmjdeOjXf1H1qA+3JgSJrSQlUkbrSyk DujmhIyKT/QZ9t/a3z8meNCiZogGDtehtmbPlPXWz6Tk6qif1dR4wF4t8/YwEjsr gKZxbMEVH0NYQf+3t4TiQyY1eJWbb70ALhio4HgYEpTy+6nPBP8kuDsl69X4esw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">DeIC Nationale HPC-Center, SDU</md:ServiceName>
+      <md:ServiceName xml:lang="en">DeIC National HPC Centre, SDU</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to manage user access to the HPC centre.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://sdu.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.sdu.dk/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lasse</md:GivenName>
+    <md:SurName>Birnbaum Jensen</md:SurName>
+    <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
index 922e8025..b20dab34 100644
--- a/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hscshib1.qub.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-04T11:59:59Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-04T11:59:59Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">honni.qub.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">honni.qub.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUZayvO9xYY8CR1y0pwTGPs9KIzC0wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVrMB4XDTE1MTExMDA4MTk0
 						M1oXDTM1MTExMDA4MTk0M1owHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVr
@@ -30,26 +30,26 @@
 						xD/wWsUwD8KQDwanJormGA7fh42ZkmnnQAEjgVmUxMFv0eTrald6mZ78fWQqBC5A
 						tzZmZKhhgA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hsc-shib.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">honni.qub.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hsc-shib.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">honni.qub.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUZayvO9xYY8CR1y0pwTGPs9KIzC0wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVrMB4XDTE1MTExMDA4MTk0
 						M1oXDTM1MTExMDA4MTk0M1owHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVr
@@ -69,26 +69,26 @@
 						xD/wWsUwD8KQDwanJormGA7fh42ZkmnnQAEjgVmUxMFv0eTrald6mZ78fWQqBC5A
 						tzZmZKhhgA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Queen's University of Belfast</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DHSSPS: honni-HSC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.honni.qub.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>E-Resouces Team</md:GivenName>
-      <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Goodall</md:SurName>
-      <md:EmailAddress>mailto:m.goodall@qub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Queen's University of Belfast</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DHSSPS: honni-HSC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.honni.qub.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Resouces Team</md:GivenName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Goodall</md:SurName>
+    <md:EmailAddress>mailto:m.goodall@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hstalks.com-shibboleth.xml b/swamid-interfederations-2.0/hstalks.com-shibboleth.xml
index 7b4164ac..71ff994c 100644
--- a/swamid-interfederations-2.0/hstalks.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/hstalks.com-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hstalks.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T08:48:02Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T08:48:02Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Henry Stewart Talks</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online presentations by leading world experts in biomedicine, life sciences, management &amp; marketing.</mdui:Description>
+        <mdui:Logo height="78" width="96">https://hstalks.com/shibboleth/img/logo.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hstalks.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hstalks.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Henry Stewart Talks</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online presentations by leading world experts in biomedicine, life sciences, management &amp; marketing.</mdui:Description>
-          <mdui:Logo height="78" width="96">https://hstalks.com/shibboleth/img/logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hstalks.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hstalks.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAPOoQOYTDcolMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTFzIxMTA0Ni13d3cxLmhzdGFsa3MuY29tMB4XDTEzMDgxOTA4NDIzNVoXDTIz
 						MDgxNzA4NDIzNVowIjEgMB4GA1UEAxMXMjExMDQ2LXd3dzEuaHN0YWxrcy5jb20w
@@ -46,39 +46,39 @@
 						/SLLOwRq3tC3sJSqLJKeYl1AJrhenhReOXXMuk+CNGpag/HRtsObyEpV8upRF3wy
 						5KwSB/UVbWmCLme4qlhnRQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hstalks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hstalks.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hstalks.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hstalks.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hstalks.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hstalks.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hstalks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hstalks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hstalks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hstalks.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hstalks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Henry Stewart Talks Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Henry Stewart Talks</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://hstalks.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>HST - Support Team</md:GivenName>
-      <md:EmailAddress>mailto:support@hstalks.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barak</md:GivenName>
-      <md:SurName>Shohat</md:SurName>
-      <md:EmailAddress>mailto:barak@bazzisoft.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hstalks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hstalks.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hstalks.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hstalks.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hstalks.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hstalks.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hstalks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hstalks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hstalks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hstalks.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hstalks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Henry Stewart Talks Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Henry Stewart Talks</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://hstalks.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HST - Support Team</md:GivenName>
+    <md:EmailAddress>mailto:support@hstalks.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barak</md:GivenName>
+    <md:SurName>Shohat</md:SurName>
+    <md:EmailAddress>mailto:barak@bazzisoft.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml b/swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml
index 07bf4365..be1af0b2 100644
--- a/swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.atypon.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-08T13:39:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-08T13:39:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Atypon SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Atypon Service Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.atypon.com</mdui:InformationURL>
+        <mdui:Logo height="75" width="241">https://iam.atypon.com/sda/1004/atypon_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Atypon SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Atypon Service Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.atypon.com</mdui:InformationURL>
-          <mdui:Logo height="75" width="241">https://iam.atypon.com/sda/1004/atypon_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFDCCAfygAwIBAgIJAO6CoIEi6CasMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmlhbS5hdHlwb24uY29tMB4XDTE1MDMyMDE1NDE0OFoXDTE4MDMxOTE1NDE0
 						OFowGTEXMBUGA1UEAxMOaWFtLmF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUA
@@ -36,24 +36,24 @@
 						ZFCNuvYP54V/cy2/QhB/1TvFTRqVlL0KzuoqChjuw3XJI+6PYfnjfMHkTKcnqQk+
 						bqny/aV5srItkU3iMCsXEbaV5Rf0xBcr
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.atypon.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.atypon.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.atypon.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.atypon.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.atypon.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.atypon.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.atypon.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.atypon.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
index df818f58..ce5d44a6 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.cf.ac.uk/sp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://iam.cf.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://iam.cf.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAMuQ3vgWPWjiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDGlhbS5jZi5hYy51azAeFw0xMzAyMTUxMDM1MjBaFw0zMzAyMTAxMDM1MjBa
 						MBcxFTATBgNVBAMTDGlhbS5jZi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -31,54 +31,54 @@
 						COS3qN36Vz4ifhyel26f9yBxKvPZaJtwoSBEJHntaS5nbC301TYIRohm2hsmFMnE
 						VwKYG1nWV+7ql4LLn3dcdr+5sw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Cardiff University IAM Team's Site</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Cardiff University IAM Team's Site</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				This is the website of the Identity and Access Management team at Cardiff University, including the trac for RAPTOR and WUGEN.
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University: IAM@Cardiff's Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://iam.cf.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>INSRV Connect</md:GivenName>
-      <md:EmailAddress>mailto:insrvConnect@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University: IAM@Cardiff's Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://iam.cf.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>INSRV Connect</md:GivenName>
+    <md:EmailAddress>mailto:insrvConnect@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml b/swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml
index ecd5b8ee..1e1c369b 100644
--- a/swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iamlearning.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://iamlearning.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://iamlearning.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC2TCCAcGgAwIBAgIJAMokAyU3GHytMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 						BAMTBmlkNjMxOTAeFw0xMDAxMTkwOTU0MDZaFw0yMDAxMTcwOTU0MDZaMBExDzAN
 						BgNVBAMTBmlkNjMxOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
@@ -28,13 +28,13 @@
 						QdYt8st5T7TLnAVqn9pXqrKSHdHjrxfyfCgJOzSPQklYcPeTsnD5M5saEQhIo7WD
 						PIDUzYqlDKOVDtrCmA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC2TCCAcGgAwIBAgIJAMokAyU3GHytMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 						BAMTBmlkNjMxOTAeFw0xMDAxMTkwOTU0MDZaFw0yMDAxMTcwOTU0MDZaMBExDzAN
 						BgNVBAMTBmlkNjMxOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
@@ -52,37 +52,37 @@
 						QdYt8st5T7TLnAVqn9pXqrKSHdHjrxfyfCgJOzSPQklYcPeTsnD5M5saEQhIo7WD
 						PIDUzYqlDKOVDtrCmA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">I Education Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">I am learning: Games based revision and assessment for KS1, KS2, KS3, GCSE, Diplomas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iamlearning.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Wilkinson</md:SurName>
-      <md:EmailAddress>mailto:michael@i-ed.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Wilkinson</md:SurName>
-      <md:EmailAddress>mailto:michael@i-ed.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">I Education Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">I am learning: Games based revision and assessment for KS1, KS2, KS3, GCSE, Diplomas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iamlearning.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Wilkinson</md:SurName>
+    <md:EmailAddress>mailto:michael@i-ed.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Wilkinson</md:SurName>
+    <md:EmailAddress>mailto:michael@i-ed.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml
index 0e6f22e7..42cf9e37 100644
--- a/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ibook.conel.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-04T14:33:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-04T14:33:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">conel.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">conel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CCQC2GrtEWJa7ZDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMT8wPQYDVQQKEzZU
 						aGUgQ29sbGVnZSBvZiBIYXJpbmdleSwgRW5maWVsZCBhbmQgTm9ydGggRWFzdCBM
@@ -34,26 +34,26 @@
 						SPr9fTvqh5qQ+fx10Op5B8aMQFNCPFs4ZWRYKelBhsvpVTSv4VFTIL4dNs/io6EV
 						7JTb12wkv7+BIg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ibook.conel.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">conel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ibook.conel.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">conel.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CCQC2GrtEWJa7ZDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMT8wPQYDVQQKEzZU
 						aGUgQ29sbGVnZSBvZiBIYXJpbmdleSwgRW5maWVsZCBhbmQgTm9ydGggRWFzdCBM
@@ -75,27 +75,27 @@
 						SPr9fTvqh5qQ+fx10Op5B8aMQFNCPFs4ZWRYKelBhsvpVTSv4VFTIL4dNs/io6EV
 						7JTb12wkv7+BIg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The College of Haringey, Enfield and North East London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The College of Haringey, Enfield and North East London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.conel.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Varley</md:SurName>
-      <md:EmailAddress>mailto:jvarley@staff.conel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Varley</md:SurName>
-      <md:EmailAddress>mailto:jvarley@staff.conel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The College of Haringey, Enfield and North East London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The College of Haringey, Enfield and North East London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.conel.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Varley</md:SurName>
+    <md:EmailAddress>mailto:jvarley@staff.conel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Varley</md:SurName>
+    <md:EmailAddress>mailto:jvarley@staff.conel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml
index bb35aa15..ca4fe2af 100644
--- a/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://icarus.sdstate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://icarus.sdstate.edu/error.html/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">South Dakota State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://icarus.sdstate.edu/error.html/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">South Dakota State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUKA/N5InEM8Fk3MEN5e7UAQ9cOzcwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWNhcnVzLnNkc3RhdGUuZWR1MB4XDTEyMDUzMTIwMTg0
 NloXDTMyMDUzMTIwMTg0NlowHTEbMBkGA1UEAxMSaWNhcnVzLnNkc3RhdGUuZWR1
@@ -38,35 +38,35 @@ KY8D/vt7ACNjpqMMsbBxDlB/wqcy655OeW4Ek1u0GzbmButiwjbsQ1V1wI7jdj52
 yUueGe5EjM8yKE0EhGTpcsf+7p7sbEJMFNZbOiJWKKIMlGD9NQnOKVesZCjrhsuA
 eDYD2tg4hg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://icarus.sdstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://icarus.sdstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://icarus.sdstate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://icarus.sdstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://icarus.sdstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://icarus.sdstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Dakota State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Dakota State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www3.sdstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary Christensen</md:GivenName>
-      <md:EmailAddress>Gary.Christensen@sdstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy Kanuch</md:GivenName>
-      <md:EmailAddress>Andy.Kanuch@sdstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kevin Brandt</md:GivenName>
-      <md:EmailAddress>Kevin.Brandt@sdstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ryan Knutson</md:GivenName>
-      <md:EmailAddress>Ryan.Knutson@sdstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://icarus.sdstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://icarus.sdstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://icarus.sdstate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://icarus.sdstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://icarus.sdstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://icarus.sdstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Dakota State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Dakota State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www3.sdstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary Christensen</md:GivenName>
+    <md:EmailAddress>Gary.Christensen@sdstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy Kanuch</md:GivenName>
+    <md:EmailAddress>Andy.Kanuch@sdstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kevin Brandt</md:GivenName>
+    <md:EmailAddress>Kevin.Brandt@sdstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ryan Knutson</md:GivenName>
+    <md:EmailAddress>Ryan.Knutson@sdstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
index 2b6bae8c..b6652dae 100644
--- a/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.auf.org/idp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-10T15:57:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-10T15:57:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auf.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Agence Universitaire de la Francophonie (AUF)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGFBMVEX///+zs7PY2Ngdndn/1QCNviNwIoPlJyeeATQOAAAAkklEQVQ4y2P8////fwYKAAsDAwPDli1b4AI+Pj4MyGI+Pj4o7Js3bzLcvn0bzmdC1oxuGDYA0wwDTOg2EwNUVVXh6pnI8fft27fhLmVioBAwEet3dIDhBVLCAKsLKPYCLkDIa0z4ogofHwYYKU7KcvNuwTmPLNTh7L6XynD245QEOLuUdQmcLXXjBh0CkRCgOAwAGl44oeCo9bsAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.auf.org</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Employees of the Agence universitaire de la Francophonie</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Employés de l'Agence universitaire de la Francophonie</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auf.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Agence Universitaire de la Francophonie (AUF)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGFBMVEX///+zs7PY2Ngdndn/1QCNviNwIoPlJyeeATQOAAAAkklEQVQ4y2P8////fwYKAAsDAwPDli1b4AI+Pj4MyGI+Pj4o7Js3bzLcvn0bzmdC1oxuGDYA0wwDTOg2EwNUVVXh6pnI8fft27fhLmVioBAwEet3dIDhBVLCAKsLKPYCLkDIa0z4ogofHwYYKU7KcvNuwTmPLNTh7L6XynD245QEOLuUdQmcLXXjBh0CkRCgOAwAGl44oeCo9bsAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.auf.org</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Employees of the Agence universitaire de la Francophonie</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Employés de l'Agence universitaire de la Francophonie</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIzCCAgugAwIBAgIJAMD4vAdNkHSQMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 BAMTCmlkLmF1Zi5vcmcwHhcNMTIwNDE3MjEyNTE5WhcNMjIwNDE1MjEyNTE5WjAV
 MRMwEQYDVQQDEwppZC5hdWYub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -39,24 +39,24 @@ D9kMcuFHcLbJOXb8PgVDZv6v2zSHVd16RJKlzmZYaS5/7Aiv8jUZ7EM6dpcXScfF
 q1HyzPKSsmoqmMtetxB2F6w+m9mTyhqeNue//NZuqHXlv/J3F4qkPUHc0Zlydb5j
 flcTH2tpneZeVm9kXovpBSKYeQ7AUu8asTwVXKY2JopEvxOOo76T
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/slo"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/slo"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.auf.org/idp/saml2/slo/soap"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/slo/soap"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.auf.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>ressources-informatiques@auf.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/slo"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/slo"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.auf.org/idp/saml2/slo/soap"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/slo/soap"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.auf.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ressources-informatiques@auf.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml
index 6fdc8940..379785c4 100644
--- a/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.nps.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://id.nps.edu/idp/help.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nps.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Naval Postgraduate School</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Naval Postgraduate School Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.nps.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://my.nps.edu/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="69" width="100" xml:lang="en">https://id.nps.edu/idp/images/nps_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://id.nps.edu/idp/help.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nps.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Naval Postgraduate School</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Naval Postgraduate School Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.nps.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://my.nps.edu/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="69" width="100" xml:lang="en">https://id.nps.edu/idp/images/nps_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAM2gN4tPKNZOEipQHfXFdM1sxWfzMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkLm5wcy5lZHUwHhcNMTUxMjA0MTkzMTE3WhcNMzUx
 MjA0MTkzMTE3WjAVMRMwEQYDVQQDDAppZC5ucHMuZWR1MIIBIjANBgkqhkiG9w0B
@@ -41,33 +41,33 @@ jrQk4BB+3mECgvZw9Z1ejXIwif6LK+y1ErY0e6xQ0PyMOp39lS2ZpWf0IFqyKdV9
 vdTNeb8Pauw8SObWRJ91C0Hn5eajfmm4iaCOh5nkAyexSrOzdI/deoKfAVOOyBvl
 ccPVb6WCA68tlf2YbL2E57QkuO8lV1TL
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.nps.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.nps.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.nps.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.nps.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Naval Postgraduate School</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Naval Postgraduate School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nps.navy.mil/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NPS Webmaster</md:GivenName>
-      <md:EmailAddress>webmaster@nps.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NPS Webmaster</md:GivenName>
-      <md:EmailAddress>webmaster@nps.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NPS TAC</md:GivenName>
-      <md:EmailAddress>tac@nps.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NPS Cybersecurity</md:GivenName>
-      <md:EmailAddress>ia-support@nps.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.nps.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.nps.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.nps.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.nps.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Naval Postgraduate School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Naval Postgraduate School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nps.navy.mil/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NPS Webmaster</md:GivenName>
+    <md:EmailAddress>webmaster@nps.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NPS Webmaster</md:GivenName>
+    <md:EmailAddress>webmaster@nps.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NPS TAC</md:GivenName>
+    <md:EmailAddress>tac@nps.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NPS Cybersecurity</md:GivenName>
+    <md:EmailAddress>ia-support@nps.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
index 02ffb705..27a3a0b8 100644
--- a/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.uakron.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://auth.uakron.edu/zid/app/info_shibboleth.cgi" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uakron.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Akron, Main Campus, The</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://auth.uakron.edu/zid/app/info_shibboleth.cgi" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uakron.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Akron, Main Campus, The</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUWqlhIDDhtbdTxv8PudiQyd/lZz8wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWQudWFrcm9uLmVkdTAeFw0wOTA3MzExODUxMzFaFw0y
 OTA3MzExODUxMzFaMBgxFjAUBgNVBAMTDWlkLnVha3Jvbi5lZHUwggEiMA0GCSqG
@@ -37,23 +37,23 @@ be/YWBIuiufRvSSJBF+bLJDosEGW5c/Q2fugkeTEogZxkg6bYLSyUE847ZSECvDT
 JxjcvM9YQU0Yo4B1G3Z2r9ffCvOilvF8WOJdsJ6RtlSGaekP6lmvY0fM5bGg/RET
 yKK0Tva8sW6/o1lASk+4Xe+Gj9fkQ8TdonS43+5kgepXP0U=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.uakron.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.uakron.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.uakron.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uakron.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uakron.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uakron.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.uakron.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.uakron.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.uakron.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uakron.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uakron.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uakron.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUWqlhIDDhtbdTxv8PudiQyd/lZz8wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWQudWFrcm9uLmVkdTAeFw0wOTA3MzExODUxMzFaFw0y
 OTA3MzExODUxMzFaMBgxFjAUBgNVBAMTDWlkLnVha3Jvbi5lZHUwggEiMA0GCSqG
@@ -72,23 +72,23 @@ be/YWBIuiufRvSSJBF+bLJDosEGW5c/Q2fugkeTEogZxkg6bYLSyUE847ZSECvDT
 JxjcvM9YQU0Yo4B1G3Z2r9ffCvOilvF8WOJdsJ6RtlSGaekP6lmvY0fM5bGg/RET
 yKK0Tva8sW6/o1lASk+4Xe+Gj9fkQ8TdonS43+5kgepXP0U=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.uakron.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.uakron.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Akron, Main Campus, The</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Akron, Main Campus, The</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uakron.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shib Admin</md:GivenName>
-      <md:EmailAddress>shibadmin@uakron.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shib Tech</md:GivenName>
-      <md:EmailAddress>shibtech@uakron.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.uakron.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.uakron.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Akron, Main Campus, The</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Akron, Main Campus, The</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uakron.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shib Admin</md:GivenName>
+    <md:EmailAddress>shibadmin@uakron.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shib Tech</md:GivenName>
+    <md:EmailAddress>shibtech@uakron.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
index 858dd530..d08788dc 100644
--- a/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.ucly.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-06-25T16:52:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-06-25T16:52:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucly.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Catholique de Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACr0lEQVQ4y3WSW4jUZRjGf+/3ff/TjLsz4+q2ajSVK7pGyxbShhdqemO0mFCIF4E3ddGNd+KFIIoRsd2kFAgWXkmwUIQhXWwKVkgHSvEAbdHJPCCpjO7M/Gfmf3i9mF3dWnvgg5fv4sfzvs8j3+8Z33/x8LFdfqk36tTuAhBUSrRrd8k6HQRh8ZqnAbh1YQpNUwCM77W9KDpoR89dm/RLPcGGI+9w+cQpxBo2fDjOlcmvyTsJ6z44QHnFE/RUH6U29RudO9OItWiWuTSOn3eoOrGWsFIGERAhXFgmi9us2vEqLgqZfG0nzg9xxQhxDgBEEGutQQSAPMuYVZ5lqCqPjI5w5ctvsM7HFSMeJjM7yJxPQREjuEJE2owRI/yfTNdN17qmKZpm3TlXOtN1wr4KeSdB8xxU5wPECEm9gQ0DykODVFYPYgOf9u0afx6fZPm2MYrLBggrJWwYzIPYlwsD+9Jmi/jGTQa3jbFoZDW/fnwczXNqv/yBGMPKHa/Qv2aYmz9eIJluIMY8WPejyrCKCEkzxjhH2mwxsPZZtn41wU9vvc+ZvW9TKC8mjVtY30dVyZMEF4Ug0r2BquKiEOM5jHN4xcJMTAYrPoUl/Ty2eT02DOipLqP60sbuOrni5l1FusBZcK4pYV+FzZ8d4fTru6mObWLRM08xMfIiwEMAc5QnKUrOjW/Pcv30d4zsfpPi0n5+2PceyXQDr3fBgx78y8RM7uWVT1Ld+AJBuYfzh45SWvE4eZrx+ydf4ArhTA/+E4uIkMVt6n9fY8m659h07CB9w0NcPXWGLG7x1+cnqV++er/SjlwVg8xW2kYBty5O8eno1vudb9+uMbh9CzYK+fnoBMbzQBVVxQy9sf1doDXXiWYZSaPZffUGiGADn3Pjh/nn7CVs4GM8r+OXeg/dAz0dAW3p/6VRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-catholyon.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Catholique de Lyon</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucly.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Catholique de Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACr0lEQVQ4y3WSW4jUZRjGf+/3ff/TjLsz4+q2ajSVK7pGyxbShhdqemO0mFCIF4E3ddGNd+KFIIoRsd2kFAgWXkmwUIQhXWwKVkgHSvEAbdHJPCCpjO7M/Gfmf3i9mF3dWnvgg5fv4sfzvs8j3+8Z33/x8LFdfqk36tTuAhBUSrRrd8k6HQRh8ZqnAbh1YQpNUwCM77W9KDpoR89dm/RLPcGGI+9w+cQpxBo2fDjOlcmvyTsJ6z44QHnFE/RUH6U29RudO9OItWiWuTSOn3eoOrGWsFIGERAhXFgmi9us2vEqLgqZfG0nzg9xxQhxDgBEEGutQQSAPMuYVZ5lqCqPjI5w5ctvsM7HFSMeJjM7yJxPQREjuEJE2owRI/yfTNdN17qmKZpm3TlXOtN1wr4KeSdB8xxU5wPECEm9gQ0DykODVFYPYgOf9u0afx6fZPm2MYrLBggrJWwYzIPYlwsD+9Jmi/jGTQa3jbFoZDW/fnwczXNqv/yBGMPKHa/Qv2aYmz9eIJluIMY8WPejyrCKCEkzxjhH2mwxsPZZtn41wU9vvc+ZvW9TKC8mjVtY30dVyZMEF4Ug0r2BquKiEOM5jHN4xcJMTAYrPoUl/Ty2eT02DOipLqP60sbuOrni5l1FusBZcK4pYV+FzZ8d4fTru6mObWLRM08xMfIiwEMAc5QnKUrOjW/Pcv30d4zsfpPi0n5+2PceyXQDr3fBgx78y8RM7uWVT1Ld+AJBuYfzh45SWvE4eZrx+ydf4ArhTA/+E4uIkMVt6n9fY8m659h07CB9w0NcPXWGLG7x1+cnqV++er/SjlwVg8xW2kYBty5O8eno1vudb9+uMbh9CzYK+fnoBMbzQBVVxQy9sf1doDXXiWYZSaPZffUGiGADn3Pjh/nn7CVs4GM8r+OXeg/dAz0dAW3p/6VRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-catholyon.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Catholique de Lyon</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFDCCAfygAwIBAgIVALIQSKLiYZiTtbhSIn/FqoqHWb/ZMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkLnVjbHkuZnIwHhcNMTIwNTA5MTQ0MzU3WhcNMzIw
 NTA5MTQ0MzU3WjAVMRMwEQYDVQQDEwppZC51Y2x5LmZyMIIBIjANBgkqhkiG9w0B
@@ -37,21 +37,21 @@ icWlXaDm7uvJrZSAQbZky/A9Bgyv0oJK+UHfvtIa2tNo5gjEcc92rRPwoWPDW6Yy
 n/OTAPlhjqHKZtxHYzJu4AfZBp3arPgA0KW/Mt/HG8bpwymTxUyzxKzgT57qGXPF
 Nux35LKdonFdnt+x6OlpMgxGu0NaExZW
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.ucly.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.ucly.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.ucly.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Catholique de Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Catholique de Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-catholyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support.informatique@univ-catholyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.ucly.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.ucly.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.ucly.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Catholique de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Catholique de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-catholyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support.informatique@univ-catholyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
index ec7d901e..af8752df 100644
--- a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.uni.lu/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-12-07T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-12-07T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Luxembourg</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for members of the University of Luxembourg</mdui:Description>
+        <mdui:Keywords xml:lang="en">Uni.lu+login</mdui:Keywords>
+        <mdui:Logo width="73" height="78" xml:lang="en">https://id.uni.lu/uni.lu.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.64.76.0/16</mdui:IPHint>
+        <mdui:IPHint>158.64.77.0/16</mdui:IPHint>
+        <mdui:IPHint>158.64.79.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:a18:a/48</mdui:IPHint>
+        <mdui:DomainHint>uni.lu</mdui:DomainHint>
+        <mdui:DomainHint>www.uni.lu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:49.507027, 5.997479</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Luxembourg</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for members of the University of Luxembourg</mdui:Description>
-          <mdui:Keywords xml:lang="en">Uni.lu+login</mdui:Keywords>
-          <mdui:Logo width="73" height="78" xml:lang="en">https://id.uni.lu/uni.lu.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>158.64.76.0/16</mdui:IPHint>
-          <mdui:IPHint>158.64.77.0/16</mdui:IPHint>
-          <mdui:IPHint>158.64.79.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:a18:a/48</mdui:IPHint>
-          <mdui:DomainHint>uni.lu</mdui:DomainHint>
-          <mdui:DomainHint>www.uni.lu</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:49.507027, 5.997479</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Luxembourg</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Université du Luxembourg</md:OrganizationName>
-      <md:OrganizationName xml:lang="de">Universität  Luxemburg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Luxembourg (Uni.lu)  Users</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uni.lu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.uni.lu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIU</md:GivenName>
-      <md:SurName>SNS</md:SurName>
-      <md:EmailAddress>eduid@uni.lu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Luxembourg</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Université du Luxembourg</md:OrganizationName>
+    <md:OrganizationName xml:lang="de">Universität  Luxemburg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Luxembourg (Uni.lu)  Users</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uni.lu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.uni.lu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIU</md:GivenName>
+    <md:SurName>SNS</md:SurName>
+    <md:EmailAddress>eduid@uni.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
index c9258aa0..25aa4b40 100644
--- a/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.vse.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-01-18T18:57:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-01-18T18:57:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vse.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Economics, Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Economics, Prague.</mdui:Description>
+        <mdui:Description xml:lang="cs">Poskytovatel identit (IdP) pro Vysokou školu ekonomickou v Praze.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vse.cz/english/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vse.cz/</mdui:InformationURL>
+        <mdui:Logo height="132" width="132">https://www2.eduid.cz/idp-loga/vse.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vse.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Economics, Prague</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Economics, Prague.</mdui:Description>
-          <mdui:Description xml:lang="cs">Poskytovatel identit (IdP) pro Vysokou školu ekonomickou v Praze.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vse.cz/english/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.vse.cz/</mdui:InformationURL>
-          <mdui:Logo height="132" width="132">https://www2.eduid.cz/idp-loga/vse.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
 ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
 VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
@@ -57,27 +57,27 @@ l01SPOCJFlWu0nvMeKsy1uhscAnniafoWL+SLUzJRv4ee4ylw9K5aumIoPp5P1np
 Zp153289Ap8h0heOCVxDY/rtRdtlQRqo1C2KOxcU/qplUQnkibJGM4Vys29QxTqt
 YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.vse.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.vse.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.vse.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.vse.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vse.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.vse.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.vse.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.vse.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.vse.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vse.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
 ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
 VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
@@ -104,26 +104,26 @@ l01SPOCJFlWu0nvMeKsy1uhscAnniafoWL+SLUzJRv4ee4ylw9K5aumIoPp5P1np
 Zp153289Ap8h0heOCVxDY/rtRdtlQRqo1C2KOxcU/qplUQnkibJGM4Vys29QxTqt
 YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">Vysoká škola ekonomická v Praze</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Economics, Prague</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Economics, Prague</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="cs">http://www.vse.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.vse.cz/english/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>František</md:GivenName>
-      <md:SurName>Kučera</md:SurName>
-      <md:EmailAddress>frantisek.kucera@vse.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">Vysoká škola ekonomická v Praze</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Economics, Prague</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Economics, Prague</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.vse.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vse.cz/english/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>František</md:GivenName>
+    <md:SurName>Kučera</md:SurName>
+    <md:EmailAddress>frantisek.kucera@vse.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
index 9ad42d79..c4ef8622 100644
--- a/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idea.ifc.cnr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifc.cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNR Institute of Clinical Physiology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CNR Istituto di Fisiologia Clinica</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CNR Institute of Clinical Physiology users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Fisiologia Clinica</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://faq.ifc.cnr.it/index.php?sid=51484&amp;lang=it&amp;action=show&amp;cat=3</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.ifc.cnr.it/index.php/en</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifc.cnr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNR Institute of Clinical Physiology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">CNR Istituto di Fisiologia Clinica</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for CNR Institute of Clinical Physiology users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Fisiologia Clinica</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://faq.ifc.cnr.it/index.php?sid=51484&amp;lang=it&amp;action=show&amp;cat=3</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.ifc.cnr.it/index.php/en</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAPXQh7YfSjXSWrkZLXYT1bUm2Vj+MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDAeFw0wODExMjYxNjA0MTBa
 Fw0yODExMjYxNjA0MTBaMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDCCASIw
@@ -39,26 +39,26 @@ SkvwMpHeTlORAfPh3RByRH9MD4rum56xY4CMP0HzcXg3iLvlBgxp63VnT216xKfR
 eI8m4D0Jiu4VLtvkSAfUOcBpXPjW7KSsp6O+GMCHG+DHBcYfv8/FaP80IBenVNfd
 nvu7cp9h/xfMf1OV7tsIADMKQAeFLnIKyd74JxiM9rBSHLqWmcK2jklOHCc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idea.ifc.cnr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifc.cnr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idea.ifc.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifc.cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAPXQh7YfSjXSWrkZLXYT1bUm2Vj+MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDAeFw0wODExMjYxNjA0MTBa
 Fw0yODExMjYxNjA0MTBaMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDCCASIw
@@ -77,24 +77,24 @@ SkvwMpHeTlORAfPh3RByRH9MD4rum56xY4CMP0HzcXg3iLvlBgxp63VnT216xKfR
 eI8m4D0Jiu4VLtvkSAfUOcBpXPjW7KSsp6O+GMCHG+DHBcYfv8/FaP80IBenVNfd
 nvu7cp9h/xfMf1OV7tsIADMKQAeFLnIKyd74JxiM9rBSHLqWmcK2jklOHCc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Fisiologia Clinica</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CNR Institute of Clinical Physiology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">https://www.ifc.cnr.it/index.php/it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.ifc.cnr.it/index.php/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Raffaele Conte</md:SurName>
-      <md:EmailAddress>mailto:idem@ifc.cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Fisiologia Clinica</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CNR Institute of Clinical Physiology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">https://www.ifc.cnr.it/index.php/it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.ifc.cnr.it/index.php/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Raffaele Conte</md:SurName>
+    <md:EmailAddress>mailto:idem@ifc.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
index 40d05649..39263637 100644
--- a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.ilc.cnr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-13T13:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-13T13:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CNR Institute for Computational Linguistics "Antonio Zampolli" users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.ilc.cnr.it/it/content/federazione-idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.ilc.cnr.it/it/content/privacy-federazione-idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:43.718450,10.421310</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for CNR Institute for Computational Linguistics "Antonio Zampolli" users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.ilc.cnr.it/it/content/federazione-idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation-privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.ilc.cnr.it/it/content/privacy-federazione-idem</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:43.718450,10.421310</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
 MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
@@ -49,26 +49,26 @@ VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
 KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
 4oS/xrwwW80e7RU=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.ilc.cnr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.ilc.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
 MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
@@ -88,33 +88,33 @@ VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
 KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
 4oS/xrwwW80e7RU=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.ilc.cnr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.ilc.cnr.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alessandro</md:GivenName>
-      <md:SurName>Enea</md:SurName>
-      <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Riccardo</md:GivenName>
-      <md:SurName>Del Gratta</md:SurName>
-      <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.ilc.cnr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ilc.cnr.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alessandro</md:GivenName>
+    <md:SurName>Enea</md:SurName>
+    <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Del Gratta</md:SurName>
+    <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
index d1d231a0..45ee2cd3 100644
--- a/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.imtlucca.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-09T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-09T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imtlucca.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IMT Lucca - Identity Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IMT Lucca - Identity Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for IMT Lucca users. This IdP permits to access services presents in the IDEM GARR Federation</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti di IMT Lucca. Questo IdP permette di accedere a servizi disponibili nella federazione GARR IDEM</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.imtlucca.it/campus/idem.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.imtlucca.it/campus/idem.php</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://www.imtlucca.it/_img/logo/new/logo_imt_16x16_square_blueback.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://www.imtlucca.it/_img/logo/new/logo_imt_16x16_square_blueback.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://www.imtlucca.it/_img/logo/new/logo_imt_80x80_square_blueback.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://www.imtlucca.it/_img/logo/new/logo_imt_80x80_square_blueback.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.imtlucca.it/campus/idem.php</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.imtlucca.it/campus/idem.php</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imtlucca.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IMT Lucca - Identity Provider</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IMT Lucca - Identity Provider</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for IMT Lucca users. This IdP permits to access services presents in the IDEM GARR Federation</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti di IMT Lucca. Questo IdP permette di accedere a servizi disponibili nella federazione GARR IDEM</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.imtlucca.it/campus/idem.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.imtlucca.it/campus/idem.php</mdui:InformationURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://www.imtlucca.it/_img/logo/new/logo_imt_16x16_square_blueback.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://www.imtlucca.it/_img/logo/new/logo_imt_16x16_square_blueback.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://www.imtlucca.it/_img/logo/new/logo_imt_80x80_square_blueback.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://www.imtlucca.it/_img/logo/new/logo_imt_80x80_square_blueback.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.imtlucca.it/campus/idem.php</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.imtlucca.it/campus/idem.php</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAIF5g404xBT9pz/2nuMWOQA6KHj6MA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFGlkZW0taWRwLmltdGx1Y2NhLml0MB4XDTEzMDkxMDE2
 MTEyNVoXDTMzMDkxMDE2MTEyNVowHzEdMBsGA1UEAxMUaWRlbS1pZHAuaW10bHVj
@@ -46,29 +46,29 @@ YM5NpKde4RG0tQJvDuzN3xFLCtTUZe9EnOV0tniikwk4ZGDFy7F14POhmYvq+V+W
 PMrXoG08C30q+20nepBYJz2JoY9nQlmGor4yK6Ft8RvgmYq1BuwEkAHYnWf4B26l
 BgRrAVj5NpDfLOfRZq+LOg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.imtlucca.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imtlucca.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.imtlucca.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imtlucca.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAIF5g404xBT9pz/2nuMWOQA6KHj6MA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFGlkZW0taWRwLmltdGx1Y2NhLml0MB4XDTEzMDkxMDE2
 MTEyNVoXDTMzMDkxMDE2MTEyNVowHzEdMBsGA1UEAxMUaWRlbS1pZHAuaW10bHVj
@@ -88,23 +88,23 @@ YM5NpKde4RG0tQJvDuzN3xFLCtTUZe9EnOV0tniikwk4ZGDFy7F14POhmYvq+V+W
 PMrXoG08C30q+20nepBYJz2JoY9nQlmGor4yK6Ft8RvgmYq1BuwEkAHYnWf4B26l
 BgRrAVj5NpDfLOfRZq+LOg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IMT Institute for Advanced Studies Lucca</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IMT Institute for Advanced Studies Lucca</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IMT Institute for Advanced Studies Lucca</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IMT Institute for Advanced Studies Lucca</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imtlucca.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.imtlucca.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:webmaster@imtlucca.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IMT Institute for Advanced Studies Lucca</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IMT Institute for Advanced Studies Lucca</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IMT Institute for Advanced Studies Lucca</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IMT Institute for Advanced Studies Lucca</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imtlucca.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.imtlucca.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:webmaster@imtlucca.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
index 392c27e0..f64f3e23 100644
--- a/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.ced.inaf.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-03-22T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-03-22T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inaf.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Institute for Astrophysics - INAF</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:DisplayName>
+        <mdui:Description xml:lang="en">National Institute for Astrophysics - INAF</mdui:Description>
+        <mdui:Description xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://www.ced.inaf.it/idem-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.ced.inaf.it/idem-info/idp-privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="60" xml:lang="it">https://idem.ced.inaf.it/LogoINAF60.png</mdui:Logo>
+        <mdui:Logo height="100" width="100" xml:lang="it">https://idem.ced.inaf.it/LogoINAF100.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inaf.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Institute for Astrophysics - INAF</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:DisplayName>
-          <mdui:Description xml:lang="en">National Institute for Astrophysics - INAF</mdui:Description>
-          <mdui:Description xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://www.ced.inaf.it/idem-info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://www.ced.inaf.it/idem-info/idp-privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="60" xml:lang="it">https://idem.ced.inaf.it/LogoINAF60.png</mdui:Logo>
-          <mdui:Logo height="100" width="100" xml:lang="it">https://idem.ced.inaf.it/LogoINAF100.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
 Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
@@ -43,28 +43,28 @@ E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
 V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
 S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.ced.inaf.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.ced.inaf.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inaf.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.ced.inaf.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.ced.inaf.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inaf.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
 Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
@@ -83,33 +83,33 @@ E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
 V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
 S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Istituto Nazionale di Astrofisica (INAF)</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Institute for Astrophysics (INAF)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">National Institute for Astrophysics - INAF</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">https://www.inaf.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.inaf.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mauro</md:GivenName>
-      <md:SurName>Nanni</md:SurName>
-      <md:EmailAddress>mailto:m.nanni@ira.inaf.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Franco</md:GivenName>
-      <md:SurName>Tinarelli</md:SurName>
-      <md:EmailAddress>mailto:f.tinarelli@ira.inaf.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:inaf-idem@ced.inaf.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Istituto Nazionale di Astrofisica (INAF)</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Institute for Astrophysics (INAF)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute for Astrophysics - INAF</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">https://www.inaf.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.inaf.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mauro</md:GivenName>
+    <md:SurName>Nanni</md:SurName>
+    <md:EmailAddress>mailto:m.nanni@ira.inaf.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franco</md:GivenName>
+    <md:SurName>Tinarelli</md:SurName>
+    <md:EmailAddress>mailto:f.tinarelli@ira.inaf.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:inaf-idem@ced.inaf.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml b/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml
index f0144d46..5b3a9934 100644
--- a/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml
+++ b/swamid-interfederations-2.0/idem.mulino.it-module.php-saml-sp-metadata.php-mulino-sp.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.mulino.it/module.php/saml/sp/metadata.php/mulino-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-01-27T15:36:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-01-27T15:36:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Società editrice il Mulino SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Società editrice il Mulino SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Società editrice il Mulino SP</mdui:Description>
+        <mdui:Description xml:lang="it">Società editrice il Mulino SP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.mulino.it/en/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://www.mulino.it/it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.mulino.it/en/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.mulino.it/it/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://www.mulino.it/images/Main/idem/sp_16x16</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://www.mulino.it/images/Main/idem/sp_16x16</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.mulino.it/logo-mul.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.mulino.it/logo-mul.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Società editrice il Mulino SP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Società editrice il Mulino SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Società editrice il Mulino SP</mdui:Description>
-          <mdui:Description xml:lang="it">Società editrice il Mulino SP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.mulino.it/en/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://www.mulino.it/it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.mulino.it/en/privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://www.mulino.it/it/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://www.mulino.it/images/Main/idem/sp_16x16</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://www.mulino.it/images/Main/idem/sp_16x16</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idem.mulino.it/logo-mul.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idem.mulino.it/logo-mul.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID8zCCAtugAwIBAgIJAMkbEmZqjeSbMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxEDAOBgNVBAcMB0JvbG9nbmExJjAkBgNV
 BAoMHVNvY2lldMODwqAgZWRpdHJpY2UgaWwgTXVsaW5vMQ0wCwYDVQQDDARJZGVt
@@ -49,13 +49,13 @@ jqlRwwFEinIYD/GeIp298yaTDWoX4zRZKZScvuNKY/XhYTZB5h+TZIYopI6fHOAd
 j8NeTmS08jATxXA+WqAVswLYUA5LZQOWUl8Ue04T5p7lN72KuR0Had7K5DjaUV8r
 gDj9yuSzmw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID8zCCAtugAwIBAgIJAMkbEmZqjeSbMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxEDAOBgNVBAcMB0JvbG9nbmExJjAkBgNV
 BAoMHVNvY2lldMODwqAgZWRpdHJpY2UgaWwgTXVsaW5vMQ0wCwYDVQQDDARJZGVt
@@ -79,40 +79,40 @@ jqlRwwFEinIYD/GeIp298yaTDWoX4zRZKZScvuNKY/XhYTZB5h+TZIYopI6fHOAd
 j8NeTmS08jATxXA+WqAVswLYUA5LZQOWUl8Ue04T5p7lN72KuR0Had7K5DjaUV8r
 gDj9yuSzmw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.mulino.it/module.php/saml/sp/saml2-logout.php/mulino-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.mulino.it/module.php/saml/sp/saml2-acs.php/mulino-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idem.mulino.it/module.php/saml/sp/saml1-acs.php/mulino-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idem.mulino.it/module.php/saml/sp/saml2-acs.php/mulino-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idem.mulino.it/module.php/saml/sp/saml1-acs.php/mulino-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Società editrice il Mulino SP</md:ServiceName>
-        <md:ServiceName xml:lang="it">Società editrice il Mulino SP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Società editrice il Mulino SP</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Società editrice il Mulino SP</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Società editrice il Mulino</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Società editrice il Mulino</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Società editrice il Mulino</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Società editrice il Mulino</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">https://www.mulino.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.mulino.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paolo</md:GivenName>
-      <md:SurName>Casarini</md:SurName>
-      <md:EmailAddress>mailto:paolo.casarini@mulino.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.mulino.it/module.php/saml/sp/saml2-logout.php/mulino-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.mulino.it/module.php/saml/sp/saml2-acs.php/mulino-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idem.mulino.it/module.php/saml/sp/saml1-acs.php/mulino-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idem.mulino.it/module.php/saml/sp/saml2-acs.php/mulino-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idem.mulino.it/module.php/saml/sp/saml1-acs.php/mulino-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Società editrice il Mulino SP</md:ServiceName>
+      <md:ServiceName xml:lang="it">Società editrice il Mulino SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Società editrice il Mulino SP</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Società editrice il Mulino SP</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Società editrice il Mulino</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Società editrice il Mulino</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Società editrice il Mulino</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Società editrice il Mulino</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">https://www.mulino.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.mulino.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paolo</md:GivenName>
+    <md:SurName>Casarini</md:SurName>
+    <md:EmailAddress>mailto:paolo.casarini@mulino.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
index f3515e8d..e83c7011 100644
--- a/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unina2.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-07T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-07T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina2.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Second University of Naples</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Seconda Università degli Studi di Napoli</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Second University of Naples users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Seconda Università degli Studi di Napoli</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://idem.unina2.it/info/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://idem.unina2.it/info_en/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://idem.unina2.it/info/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://idem.unina2.it/info_en/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina2.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Second University of Naples</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Seconda Università degli Studi di Napoli</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Second University of Naples users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti della Seconda Università degli Studi di Napoli</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://idem.unina2.it/info/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://idem.unina2.it/info_en/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://idem.unina2.it/info/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://idem.unina2.it/info_en/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMeHVbcMgkiyi7G8YIyVSk6/OsAEMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pbmEyLml0MB4XDTEwMDkyNDEyNTcxNFoX
 DTMwMDkyNDEyNTcxNFowGTEXMBUGA1UEAxMOaWRlbS51bmluYTIuaXQwggEiMA0G
@@ -41,26 +41,26 @@ kO/ERSlXHZ1X2JM/1mEfBQvyYONbf/8EaYQkuhu/niLB3arnftrOoWNFpGfVttgw
 kGo9S0UZfQNFVe9/H0TZ6CMUeSAFWsycyaAvApoOUbPD7qqTlfacQgB2MEhPSLq7
 Q1xivizsXOeSZk/Q9/DJDN5TzuB1vxSPpGwc5ghEtOnpUr+lMfdesw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unina2.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unina2.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unina2.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unina2.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unina2.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unina2.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina2.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unina2.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unina2.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unina2.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unina2.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unina2.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unina2.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina2.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMeHVbcMgkiyi7G8YIyVSk6/OsAEMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pbmEyLml0MB4XDTEwMDkyNDEyNTcxNFoX
 DTMwMDkyNDEyNTcxNFowGTEXMBUGA1UEAxMOaWRlbS51bmluYTIuaXQwggEiMA0G
@@ -79,24 +79,24 @@ kO/ERSlXHZ1X2JM/1mEfBQvyYONbf/8EaYQkuhu/niLB3arnftrOoWNFpGfVttgw
 kGo9S0UZfQNFVe9/H0TZ6CMUeSAFWsycyaAvApoOUbPD7qqTlfacQgB2MEhPSLq7
 Q1xivizsXOeSZk/Q9/DJDN5TzuB1vxSPpGwc5ghEtOnpUr+lMfdesw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unina2.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unina2.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Seconda Università degli Studi di Napoli</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Second University of Naples</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Seconda Università di Napoli</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Second University of Naplesi</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://idem.unina2.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://idem.unina2.it/index.php/international</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>CSI</md:SurName>
-      <md:EmailAddress>mailto:csi@unina2.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unina2.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unina2.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Seconda Università degli Studi di Napoli</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Second University of Naples</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Seconda Università di Napoli</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Second University of Naplesi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://idem.unina2.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://idem.unina2.it/index.php/international</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>CSI</md:SurName>
+    <md:EmailAddress>mailto:csi@unina2.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
index 0ca29f4f..2cc9669c 100644
--- a/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.uniroma2.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-17T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-17T10:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma2.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.uniroma2.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma2.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cloud.uniroma2.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cloudsa.uniroma2.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Rome Tor Vergata</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Roma Tor Vergata</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Roma Tor Vergata</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for University of Rome Tor Vergata users</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idem.uniroma2.eu/idem/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idem.uniroma2.eu/idem/info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idem.uniroma2.eu/idem/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idem.uniroma2.eu/idem/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="150" xml:lang="it">https://idem.uniroma2.eu/idp/images/logo_TV.png</mdui:Logo>
+        <mdui:Logo height="150" width="150" xml:lang="en">https://idem.uniroma2.eu/idp/images/logo_TV.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:41.849584,12.597735</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma2.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.uniroma2.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma2.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cloud.uniroma2.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cloudsa.uniroma2.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Rome Tor Vergata</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Roma Tor Vergata</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Roma Tor Vergata</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for University of Rome Tor Vergata users</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idem.uniroma2.eu/idem/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idem.uniroma2.eu/idem/info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idem.uniroma2.eu/idem/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idem.uniroma2.eu/idem/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="150" xml:lang="it">https://idem.uniroma2.eu/idp/images/logo_TV.png</mdui:Logo>
-          <mdui:Logo height="150" width="150" xml:lang="en">https://idem.uniroma2.eu/idp/images/logo_TV.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:41.849584,12.597735</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMT3ZP1vXP9LkRyZyvz9Od+bd1LcMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkZW0udW5pcm9tYTIuZXUwHhcNMTQwNTA3MDkyODUz
 WhcNMzQwNTA3MDkyODUzWjAbMRkwFwYDVQQDExBpZGVtLnVuaXJvbWEyLmV1MIIB
@@ -50,13 +50,13 @@ aUB5M/tyb+68hQLqJe5PJgKBseaB5uonphJ59lnfJCo9uaVLNo2FMbsHAC+0Ww8u
 e7eM2DsQ6gf26KQ9LRoHh/8cnmZQobvhjSgcA01AsrpGFCLBEx2Y5ifLRhDbhhxt
 14LaFQskrKfMFDS2at9c7lcwTEcf1sZaBNT6i0LiAFvT+hG0Lug3KGgMbQ24TEp+
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMT3ZP1vXP9LkRyZyvz9Od+bd1LcMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkZW0udW5pcm9tYTIuZXUwHhcNMTQwNTA3MDkyODUz
 WhcNMzQwNTA3MDkyODUzWjAbMRkwFwYDVQQDExBpZGVtLnVuaXJvbWEyLmV1MIIB
@@ -75,31 +75,31 @@ aUB5M/tyb+68hQLqJe5PJgKBseaB5uonphJ59lnfJCo9uaVLNo2FMbsHAC+0Ww8u
 e7eM2DsQ6gf26KQ9LRoHh/8cnmZQobvhjSgcA01AsrpGFCLBEx2Y5ifLRhDbhhxt
 14LaFQskrKfMFDS2at9c7lcwTEcf1sZaBNT6i0LiAFvT+hG0Lug3KGgMbQ24TEp+
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.uniroma2.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.uniroma2.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.uniroma2.eu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Roma Tor Vergata</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Rome Tor Vergata</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Roma Tor Vergata</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Rome Tor Vergata</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.uniroma2.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uniroma2.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Orazi</md:SurName>
-      <md:EmailAddress>mailto:marco.orazi@uniroma2.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDEM</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:idem-support@ccd.uniroma2.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.uniroma2.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.uniroma2.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.uniroma2.eu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Roma Tor Vergata</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Rome Tor Vergata</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Roma Tor Vergata</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Rome Tor Vergata</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.uniroma2.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uniroma2.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Orazi</md:SurName>
+    <md:EmailAddress>mailto:marco.orazi@uniroma2.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:idem-support@ccd.uniroma2.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
index 63176ea8..ccc63bc0 100644
--- a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisa.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-03T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisa.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Salerno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Salerno</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Salerno users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Salerno</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idem.unisa.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idem.unisa.it/idem</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisa.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Salerno</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Salerno</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Salerno users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Salerno</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idem.unisa.it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idem.unisa.it/idem</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC7jCCAdagAwIBAgIJAK9AYb5yf3pVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWlkZW0udW5pc2EuaXQwHhcNMTIwNjE0MDk1ODA3WhcNMjIwNjEyMDk1ODA3
 WjAYMRYwFAYDVQQDEw1pZGVtLnVuaXNhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -38,26 +38,26 @@ kJPg082WdRTF5EQWgmhuthZ72bwWf5xsYQMxir6TNKGXH0OUPW5krreqEGuyiwfm
 rcVfFMnm/X2nD7kZLxU2HmQRExPpk1dvBltxADIpvu5TkKYG9xeehwRsIX2C0dcG
 1wv94P/hAfJya3Wttvz8Hui7i6pnarj9UtiAU0AtsA5uQA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisa.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisa.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisa.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisa.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisa.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisa.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisa.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisa.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC7jCCAdagAwIBAgIJAK9AYb5yf3pVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWlkZW0udW5pc2EuaXQwHhcNMTIwNjE0MDk1ODA3WhcNMjIwNjEyMDk1ODA3
 WjAYMRYwFAYDVQQDEw1pZGVtLnVuaXNhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -75,25 +75,25 @@ kJPg082WdRTF5EQWgmhuthZ72bwWf5xsYQMxir6TNKGXH0OUPW5krreqEGuyiwfm
 rcVfFMnm/X2nD7kZLxU2HmQRExPpk1dvBltxADIpvu5TkKYG9xeehwRsIX2C0dcG
 1wv94P/hAfJya3Wttvz8Hui7i6pnarj9UtiAU0AtsA5uQA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Salerno</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Salerno</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Salerno</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Salerno</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unisa.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unisa.it/english/index</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alfonso</md:GivenName>
-      <md:SurName>Sparano</md:SurName>
-      <md:EmailAddress>mailto:idem@unisa.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Salerno</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Salerno</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Salerno</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salerno</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unisa.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unisa.it/english/index</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alfonso</md:GivenName>
+    <md:SurName>Sparano</md:SurName>
+    <md:EmailAddress>mailto:idem@unisa.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
index a9977d4e..896d5df9 100644
--- a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisalento.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Salento</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università del Salento</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the users of University of Salento</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università del Salento</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Salento</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università del Salento</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for the users of University of Salento</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università del Salento</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://idem-idp.unisalento.it/infoeng/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
 NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
@@ -42,26 +42,26 @@ t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
 TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
 cwGgvFbTug==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisalento.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisalento.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisalento.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisalento.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisalento.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisalento.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisalento.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisalento.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
 NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
@@ -81,24 +81,24 @@ t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
 TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
 cwGgvFbTug==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università del Salento</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Salento</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università del Salento</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Salento</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unisalento.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://international.unisalento.it/about</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Antonio Campa</md:SurName>
-      <md:EmailAddress>mailto:dorsale@unisalento.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università del Salento</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Salento</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università del Salento</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salento</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unisalento.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://international.unisalento.it/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Antonio Campa</md:SurName>
+    <md:EmailAddress>mailto:dorsale@unisalento.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
index f435dbca..4e83bfc0 100644
--- a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.univpm.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
 DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
@@ -45,26 +45,26 @@ Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
 5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
 ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
 DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
@@ -83,23 +83,23 @@ Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
 5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
 ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.univpm.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem-help@univpm.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.univpm.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem-help@univpm.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
index 353b34cb..b498370b 100644
--- a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T13:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T13:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Trieste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Trieste</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:45.659111,13.793918</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.654776,13.774515</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.644968,13.763675</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.645326,13.761110</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.643376,13.758256</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.625536,13.794341</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.939804,13.631546</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.774583,12.835801</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.952193,12.680840</mdui:GeolocationHint>
+        <mdui:DomainHint>units.it</mdui:DomainHint>
+        <mdui:DomainHint>univ.trieste.it</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Trieste</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Trieste</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:45.659111,13.793918</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.654776,13.774515</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.644968,13.763675</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.645326,13.761110</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.643376,13.758256</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.625536,13.794341</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.939804,13.631546</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.774583,12.835801</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.952193,12.680840</mdui:GeolocationHint>
-          <mdui:DomainHint>units.it</mdui:DomainHint>
-          <mdui:DomainHint>univ.trieste.it</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
 NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
@@ -58,27 +58,27 @@ Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
 LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
 aQYbJQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemfero.units.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemfero.units.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemfero.units.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemfero.units.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemfero.units.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemfero.units.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemfero.units.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemfero.units.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
 NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
@@ -98,24 +98,24 @@ Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
 LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
 aQYbJQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Trieste</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Trieste</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Trieste</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Trieste</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.units.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://international.units.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Staff Tecnico</md:GivenName>
-      <md:EmailAddress>mailto:idem@units.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Trieste</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Trieste</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Trieste</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Trieste</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.units.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://international.units.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Staff Tecnico</md:GivenName>
+    <md:EmailAddress>mailto:idem@units.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
index 938dfe29..0ab34693 100644
--- a/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemidp.unipmn.it/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-20T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-20T14:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipmn.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Piemonte Orientale</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita degli studi del Piemonte Orientale</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Piemonte Orientale university users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell Universita degli studi del Piemonte orientale</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="129">https://idemidp.unipmn.it/simplesaml/logobaseupo129x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="34">https://idemidp.unipmn.it/simplesaml/logobaseupo34x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipmn.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Piemonte Orientale</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Universita degli studi del Piemonte Orientale</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for Piemonte Orientale university users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell Universita degli studi del Piemonte orientale</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="129">https://idemidp.unipmn.it/simplesaml/logobaseupo129x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="34">https://idemidp.unipmn.it/simplesaml/logobaseupo34x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEOTCCAyGgAwIBAgIJAPHensWnKvc4MA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDASBgNVBAcMC0FsZXNzYW5kcmlhMSow
 KAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVtb250ZSBvcmllbnRhbGUxFjAUBgNV
@@ -49,13 +49,13 @@ BjwLPcfjJenFfLGcer9rguP1ca5QD10FPr3gFUBJl77E2ii1LfIRZ1+Ch+h3t8b8
 XzIpMr9KOQzrPy5rn5TVW66UWusGJZB9pHVK6mJroUQ2snSghcGWLczvgNcIWjW9
 YcakJXMzsLy+YtFi6nau47S1TJCnJPCFoWvElYQ=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEOTCCAyGgAwIBAgIJAPHensWnKvc4MA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDASBgNVBAcMC0FsZXNzYW5kcmlhMSow
 KAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVtb250ZSBvcmllbnRhbGUxFjAUBgNV
@@ -80,23 +80,23 @@ BjwLPcfjJenFfLGcer9rguP1ca5QD10FPr3gFUBJl77E2ii1LfIRZ1+Ch+h3t8b8
 XzIpMr9KOQzrPy5rn5TVW66UWusGJZB9pHVK6mJroUQ2snSghcGWLczvgNcIWjW9
 YcakJXMzsLy+YtFi6nau47S1TJCnJPCFoWvElYQ=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemidp.unipmn.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemidp.unipmn.it/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Universita degli studi del Piemonte Orientale</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Piemonte Orientale</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Universita degli studi del Piemonte Orientale</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Piemonte Orientale</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">https://www.unipmn.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.unipmn.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>FulvioScorza</md:SurName>
-      <md:EmailAddress>mailto:rete@unipmn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemidp.unipmn.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemidp.unipmn.it/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Universita degli studi del Piemonte Orientale</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Piemonte Orientale</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Universita degli studi del Piemonte Orientale</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Piemonte Orientale</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">https://www.unipmn.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.unipmn.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>FulvioScorza</md:SurName>
+    <md:EmailAddress>mailto:rete@unipmn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
index c38819a0..292d03c2 100644
--- a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemshibb.unina.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-12-22T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-12-22T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Naples Federico II</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Napoli Federico II</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Naples Federico II users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Napoli Federico II</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idemshibb.unina.it/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idemshibb.unina.it/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Naples Federico II</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Napoli Federico II</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Naples Federico II users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Napoli Federico II</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idemshibb.unina.it/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idemshibb.unina.it/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVALEKMVRz1NfaMCKF5EPhGe+47TRvMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5pdDAeFw0xMDA1MjgxMDQ0
 MjdaFw0zMDA1MjgxMDQ0MjdaMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5p
@@ -40,26 +40,26 @@ lNbtoSVzFkyF8GC+4otLRQs5b6jMxjNj99gXcrf8v0dcWSt4P7HUqNKJe2YAkh5L
 rsb9FCAbsY9KMtPcpExwaAFgeX2eZ5Z6JGAQLP3AWZ1NyqtN+ol41o2X5SxiJL1w
 0avB9R6fGjI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemshibb.unina.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemshibb.unina.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemshibb.unina.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemshibb.unina.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemshibb.unina.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemshibb.unina.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemshibb.unina.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemshibb.unina.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemshibb.unina.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemshibb.unina.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemshibb.unina.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemshibb.unina.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVALEKMVRz1NfaMCKF5EPhGe+47TRvMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5pdDAeFw0xMDA1MjgxMDQ0
 MjdaFw0zMDA1MjgxMDQ0MjdaMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5p
@@ -79,27 +79,27 @@ lNbtoSVzFkyF8GC+4otLRQs5b6jMxjNj99gXcrf8v0dcWSt4P7HUqNKJe2YAkh5L
 rsb9FCAbsY9KMtPcpExwaAFgeX2eZ5Z6JGAQLP3AWZ1NyqtN+ol41o2X5SxiJL1w
 0avB9R6fGjI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemshibb.unina.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemshibb.unina.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Napoli Federico II</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Naples Federico II</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Napoli Federico II</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Naples Federico II</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unina.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.international.unina.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Giuseppe Vitagliano</md:SurName>
-      <md:EmailAddress>mailto:giuseppe.vitagliano@unina.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:contactcenter@unina.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemshibb.unina.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemshibb.unina.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Napoli Federico II</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Naples Federico II</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Napoli Federico II</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Naples Federico II</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unina.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.international.unina.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Giuseppe Vitagliano</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.vitagliano@unina.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:contactcenter@unina.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
index e903b980..58809db5 100644
--- a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.ensc-rennes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T18:17:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T18:17:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensc-rennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students and members of Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Étudiants, doctorants et personnels de l'Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensc-rennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students and members of Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Étudiants, doctorants et personnels de l'Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUDCCAjigAwIBAgIVAJzCGVHITFdUQZHToPMuBqK1RWD4MA0GCSqGSIb3DQEB
 BQUAMCQxIjAgBgNVBAMTGWlkZW50LXNoaWIuZW5zYy1yZW5uZXMuZnIwHhcNMTQw
 MjAzMTYxODExWhcNMzQwMjAzMTYxODExWjAkMSIwIAYDVQQDExlpZGVudC1zaGli
@@ -39,21 +39,21 @@ ycCAtaEV09m6h4P3nzLYrXqAi4GvnLYrdNCPD+2ubiMS2PM10A5riMhYoAXWVIno
 yYXfk+ahSEIh7MdvQtGawI728jaLbr4873IHc1Fo7M1rapKh+QgLeMusOmWXhNSP
 k4wuv1TSugU8yiGa4BGVGS3k4ez0ksS2iWlU4SiAdPE9cT2t
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.ensc-rennes.fr/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.ensc-rennes.fr/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
index 063797cd..379eba46 100644
--- a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.sciencespo-rennes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-05T16:47:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-05T16:47:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-rennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sciences Po Rennes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACxklEQVQ4y3WTzWuTSQDGf/N+xCS1JjVJG0Pr1kabralRq4Jfdd0VEXG7yrruwupBBBU8ePCgtMWL4kVPHi3oH6D25AeoCNtdtOqqjYrgVpJu+rHRsElja5r0Td53PKQEa/GBYQ4zz28eZp4R+eR7mR14gSyW+Fx6jas8u924I2HBVySSt+/K54ePY+bzsxY8G9czNTyCZRgE9vzIxJIAm44emQNSAMx8AXMqXxmyZAKQG0rw8W2MwQsXqXmX4creffJLgPZldADFZkNKibM+QFVTI7YaNwJB87YfoPfabIDQNWAGrCjIYhF7wE/joQNY7moy4xkK4+OUfD5CrWGi13vl7c5uut6+EbMTzJirW0KEL5whNfmB+ydP8mFsDONjjvq2NpxeDw1r2jjYe5WuSOTzBAIsC93lornzBK+ePOa/aJTxxDClQgHb/CqcPi+Jh/3E+/4k9eYf8sn30rGoTlQSSNPE9307eVcVTy5foW55C7WhZoxcjoXBIJlYDCOXQ9E0xqJREgPPKUxMSAVFKb+nruNp38DIwAB14eVoDgfHH/wlnB4Po0+fko4PAWCVSmSG/uVmVzeTqRRa5eY1DZvPS+rvfmJ/9AHQs6tDmtPTTKUziJmDAISikPs/zWTyXbkH0rIQWplVMgwUVUVRVYYfPUadN49AJIK0rApAWhaKpqHqOorqsONcXM/o6mUMxgfxt7ZWNprFIqPPnmGvcRNYGUHVdaRlIaXEE2yi2u9HSWbTbH/5UBy7f080tW9mxe4OvMuWouo6AEZuikT/IzS7naat3+FdGsThchHZ+zMLG78Rc7p95+w5ueN0tzjfulKm43GEqlZi2xcsoGHdWtbs/53Vv/0qKBdgrh5c6pH+lm95feMWsb4+siOjuBvqqQ2FCP/Uwap9v1R8X/2mPTt3yW2dp5hfW4dpTAOQz2YJbtkyy/MJFfAaZK23CdUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MzYrMDI6MDA5Z/DvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjM2KzAyOjAwSDpIUwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students and members of Institut d'Etudes Politiques de Rennes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Sciences Po Rennes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Étudiants et personnels de l'Institut d'Etudes Politiques de Rennes</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-rennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sciences Po Rennes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACxklEQVQ4y3WTzWuTSQDGf/N+xCS1JjVJG0Pr1kabralRq4Jfdd0VEXG7yrruwupBBBU8ePCgtMWL4kVPHi3oH6D25AeoCNtdtOqqjYrgVpJu+rHRsElja5r0Td53PKQEa/GBYQ4zz28eZp4R+eR7mR14gSyW+Fx6jas8u924I2HBVySSt+/K54ePY+bzsxY8G9czNTyCZRgE9vzIxJIAm44emQNSAMx8AXMqXxmyZAKQG0rw8W2MwQsXqXmX4creffJLgPZldADFZkNKibM+QFVTI7YaNwJB87YfoPfabIDQNWAGrCjIYhF7wE/joQNY7moy4xkK4+OUfD5CrWGi13vl7c5uut6+EbMTzJirW0KEL5whNfmB+ydP8mFsDONjjvq2NpxeDw1r2jjYe5WuSOTzBAIsC93lornzBK+ePOa/aJTxxDClQgHb/CqcPi+Jh/3E+/4k9eYf8sn30rGoTlQSSNPE9307eVcVTy5foW55C7WhZoxcjoXBIJlYDCOXQ9E0xqJREgPPKUxMSAVFKb+nruNp38DIwAB14eVoDgfHH/wlnB4Po0+fko4PAWCVSmSG/uVmVzeTqRRa5eY1DZvPS+rvfmJ/9AHQs6tDmtPTTKUziJmDAISikPs/zWTyXbkH0rIQWplVMgwUVUVRVYYfPUadN49AJIK0rApAWhaKpqHqOorqsONcXM/o6mUMxgfxt7ZWNprFIqPPnmGvcRNYGUHVdaRlIaXEE2yi2u9HSWbTbH/5UBy7f080tW9mxe4OvMuWouo6AEZuikT/IzS7naat3+FdGsThchHZ+zMLG78Rc7p95+w5ueN0tzjfulKm43GEqlZi2xcsoGHdWtbs/53Vv/0qKBdgrh5c6pH+lm95feMWsb4+siOjuBvqqQ2FCP/Uwap9v1R8X/2mPTt3yW2dp5hfW4dpTAOQz2YJbtkyy/MJFfAaZK23CdUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MzYrMDI6MDA5Z/DvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjM2KzAyOjAwSDpIUwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students and members of Institut d'Etudes Politiques de Rennes</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Sciences Po Rennes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Étudiants et personnels de l'Institut d'Etudes Politiques de Rennes</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDajCCAlKgAwIBAgIVAPG2ptbp0UjCApRyqdnLPcwZfygNMA0GCSqGSIb3DQEB
 BQUAMCoxKDAmBgNVBAMTH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnIw
 HhcNMTQwMzA1MDk0NjQxWhcNMzQwMzA1MDk0NjQxWjAqMSgwJgYDVQQDEx9pZGVu
@@ -41,21 +41,21 @@ iVAdnJJ16ocCmt0N88D7p2ZIJI7bIbPt/WGDoyCNZRfULibmnQLi4S8/gxgdIkTO
 BztWG5dSG8X4uDpNKGFlecW3B4zqa3fGpLv9cwhNaDXlJIw2vgusD7Vtg+HagP5y
 7Av7UaH4E10urfrI2n0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.sciencespo-rennes.fr/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sciences Po Rennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sciences Po Rennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.sciencespo-rennes.fr/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sciences Po Rennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sciences Po Rennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
index d2e84cf4..1921aafc 100644
--- a/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.ensta-bretagne.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-25T13:42:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-25T13:42:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensta-bretagne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACrUlEQVQoz2WSW0jTcRzFz2///25/dc6pyymmLvPavCWCJpZKUokPyRCHJs2SAgnDQKl8WERSpJVpCuJLGJVGYhcoSLFEkURz0MTQVEpted10bm5zf/89KGF23r6cz5fzcA7hOA7/amrBNGlcJoQE+3mHyqV7XHr3Ufem/3LLhw5dYW5FC9xFcLHw9nhSnFWQFveXIdsJHBBe2Tyhn4a7yPT0upfmFtwEALDFwbJxLF7ZpdNSZFeC5l67Nv6AMC1GKBKs2+yRYf5j47MQCkAAAT9V6fdi4Gt+imrn4cHrvrb3I21iPjZZVVSgmE9XHI+zpse+GzAsbzgenT81uEr6TYhYccXJaMJxXEB5oy4j1rjupPm8IH+5r49swcaOm1mxu7R73iGnt57NOpoS3UY/99eX5NCGuaVfozOdUiZfnVOk38w2EQX4UhdVM2YBtYQtLmUf8yzGobnzGIvW6qITPOOSGQL6TFZS0ZXaOu8ZdZinxckyPIACgNxgyc1w+88fs7C7IObPrVh4ACCgKYqae16l6+hbGOrNDfZkOYDDfolQ7fE7s+RhcpRSKvfEFgeADpTL4HDl6Vo1GapPVQU0xRuaMAT5hMG2WpPO5JU3QiI2mdcOK7y7pxYDfTzpCIUMjFCdGKqQSGNutGvjgnKSQrNDaEG2Ilq01nDhJGGYiXlz95fJhPgQNz5FOI6re9WvUkqOHOxxsr7rDkXHsO/g2HjDpdOSi/dhc8DuBAGszq7bxZkq5U7TXqUNZxMCarWR49NlvrJko+Vc08eJxs5eMEIQwOooPHqotUwNgLfd9Hx96Uv9XHW7We6TZbPb3Ujl1WwPMB5gWZis+anR2zQAcLvU3KW3bYzMGK+NTWmGDegxTEF79+3Qt90M+X/eLtayZv1u31zxk6XwiHiP+wf18yywx7+vAwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowML+wp/IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDArMDI6MDDO7R9OAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ensta-bretagne.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensta-bretagne.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACrUlEQVQoz2WSW0jTcRzFz2///25/dc6pyymmLvPavCWCJpZKUokPyRCHJs2SAgnDQKl8WERSpJVpCuJLGJVGYhcoSLFEkURz0MTQVEpted10bm5zf/89KGF23r6cz5fzcA7hOA7/amrBNGlcJoQE+3mHyqV7XHr3Ufem/3LLhw5dYW5FC9xFcLHw9nhSnFWQFveXIdsJHBBe2Tyhn4a7yPT0upfmFtwEALDFwbJxLF7ZpdNSZFeC5l67Nv6AMC1GKBKs2+yRYf5j47MQCkAAAT9V6fdi4Gt+imrn4cHrvrb3I21iPjZZVVSgmE9XHI+zpse+GzAsbzgenT81uEr6TYhYccXJaMJxXEB5oy4j1rjupPm8IH+5r49swcaOm1mxu7R73iGnt57NOpoS3UY/99eX5NCGuaVfozOdUiZfnVOk38w2EQX4UhdVM2YBtYQtLmUf8yzGobnzGIvW6qITPOOSGQL6TFZS0ZXaOu8ZdZinxckyPIACgNxgyc1w+88fs7C7IObPrVh4ACCgKYqae16l6+hbGOrNDfZkOYDDfolQ7fE7s+RhcpRSKvfEFgeADpTL4HDl6Vo1GapPVQU0xRuaMAT5hMG2WpPO5JU3QiI2mdcOK7y7pxYDfTzpCIUMjFCdGKqQSGNutGvjgnKSQrNDaEG2Ilq01nDhJGGYiXlz95fJhPgQNz5FOI6re9WvUkqOHOxxsr7rDkXHsO/g2HjDpdOSi/dhc8DuBAGszq7bxZkq5U7TXqUNZxMCarWR49NlvrJko+Vc08eJxs5eMEIQwOooPHqotUwNgLfd9Hx96Uv9XHW7We6TZbPb3Ujl1WwPMB5gWZis+anR2zQAcLvU3KW3bYzMGK+NTWmGDegxTEF79+3Qt90M+X/eLtayZv1u31zxk6XwiHiP+wf18yywx7+vAwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowML+wp/IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDArMDI6MDDO7R9OAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ensta-bretagne.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPDCCAiSgAwIBAgIVAIEsfLZbOVKR5umlzQTdFNcppbAhMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFGR1bmRlZS5lbnNpZXRhLmVjb2xlMB4XDTEzMDIxNTEy
 MjY1NVoXDTMzMDIxNTEyMjY1NVowHzEdMBsGA1UEAxMUZHVuZGVlLmVuc2lldGEu
@@ -38,22 +38,22 @@ M+YJV34AexxYJ5Trev/8iit0Ihmo0yLPakEvlPil/UOiNPjQMluHliAaBQpGI4xF
 gbARW97y4+lEEDGKeDw/vhHIExaTI59muRL9UZY7hr2CRpCzC/DLU6ldzFdDxuvO
 fcIaXtfvCTHeM5bB7Ao7aw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta-bretagne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensta-bretagne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Paul KIRKBRIDE</md:SurName>
-      <md:EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta-bretagne.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensta-bretagne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Paul KIRKBRIDE</md:SurName>
+    <md:EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
index 77bf86dc..60a5aa24 100644
--- a/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.ensta.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-26T13:19:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-26T13:19:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensta.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5UlEQVQoz5WST0gUYRjGn3edXXfMWh0Fw7KNDiuikh0CS7AgD6F1KDaS/ihsWIIX9aKQXTRQ6BIEZQc7SAUeqkMQeZIM9FCHOtTB2N0UFRV3pp1Z3Wl29ns7jA2rsEHP6ft4nwe+9/l+xMz4H0nuKSuYiNwrMwo8+QOzc1/PNN0ASl0/oE29ftRQHxKCg0cqZL93VyAejaEsqJTLANTENjaN5taWq9dGYToPtgAen+i9E7m8E1jZSMJLatrC0ub4s/7bNy+R5CE6qwQD7PcRIJi7bz2J/VwlZ+nq010L84vXI43PJ4YBTH7+0fnmU9VBxf723ZyepUIvMxORqpk7ey3Mzwzdv+K4AXS++1IZkIVpSrU1nEoDICLDsi+eq5MAqJpxvKl55G6XW0WoRFbTtr/Ag4ztlCUEZ+Krjz8+JWZ++35uK6W3h8+7gcT279qRlwBlZj5wQtdSFta2ovHJY0cPSwBWlhZLlNLcssuKCtfHXqDcB5OR0oeGO+4NRHw+r/NB3Df4EDgVjS3zX2m/DKCyNTww9WrasrKcI2JmT6idN3Qk18IdF9paTuzbf6DqUEXjybq8aDzoaSsulgHYdjappxOqoQSK8rFEQohchHJY2gUlAQwQgfYMGEwg5NdeIP/tBvAHTRnd7UvROpAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ensta-paristech.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensta.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5UlEQVQoz5WST0gUYRjGn3edXXfMWh0Fw7KNDiuikh0CS7AgD6F1KDaS/ihsWIIX9aKQXTRQ6BIEZQc7SAUeqkMQeZIM9FCHOtTB2N0UFRV3pp1Z3Wl29ns7jA2rsEHP6ft4nwe+9/l+xMz4H0nuKSuYiNwrMwo8+QOzc1/PNN0ASl0/oE29ftRQHxKCg0cqZL93VyAejaEsqJTLANTENjaN5taWq9dGYToPtgAen+i9E7m8E1jZSMJLatrC0ub4s/7bNy+R5CE6qwQD7PcRIJi7bz2J/VwlZ+nq010L84vXI43PJ4YBTH7+0fnmU9VBxf723ZyepUIvMxORqpk7ey3Mzwzdv+K4AXS++1IZkIVpSrU1nEoDICLDsi+eq5MAqJpxvKl55G6XW0WoRFbTtr/Ag4ztlCUEZ+Krjz8+JWZ++35uK6W3h8+7gcT279qRlwBlZj5wQtdSFta2ovHJY0cPSwBWlhZLlNLcssuKCtfHXqDcB5OR0oeGO+4NRHw+r/NB3Df4EDgVjS3zX2m/DKCyNTww9WrasrKcI2JmT6idN3Qk18IdF9paTuzbf6DqUEXjybq8aDzoaSsulgHYdjappxOqoQSK8rFEQohchHJY2gUlAQwQgfYMGEwg5NdeIP/tBvAHTRnd7UvROpAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ensta-paristech.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAIE5ZcyxZPjFLm75fbkW0LiVO5fRMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkZW50LmVuc3RhLmZyMB4XDTExMDgyMjE2MDc0MVoX
 DTMxMDgyMjE2MDc0MVowGTEXMBUGA1UEAxMOaWRlbnQuZW5zdGEuZnIwggEiMA0G
@@ -37,26 +37,26 @@ kOXIGlJgDo5hv/WcX374GnMQkUfyT1J9t9ZQecfdlpm4bPTDBkdcATUa/l1YU5zb
 Ym/NOwwHDAo6tnYIm9/t75h/vzsBus+mpzTdC8MDvqlKyvEIM1RLZFhbS8T3lp8u
 90sfMSml1fBmXcLWIQ8d6B0WUCbbEzfGmbj1C7bGbhz1eYRHwLzgew==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident.ensta.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensta-paristech.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alain Paris</md:SurName>
-      <md:EmailAddress>alain.paris@ensta-paristech.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Arnaud Peron</md:SurName>
-      <md:EmailAddress>arnaud.peron@ensta-paristech.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident.ensta.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensta-paristech.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alain Paris</md:SurName>
+    <md:EmailAddress>alain.paris@ensta-paristech.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Arnaud Peron</md:SurName>
+    <md:EmailAddress>arnaud.peron@ensta-paristech.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
index 5cd56e57..3c3a1b77 100644
--- a/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.groupe-esa.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-11T10:07:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-11T10:07:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Higher School of Agriculture of Angers - France</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.groupe-esa.com/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Identity Federation server for employees and students at ESA</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Serveur de Fédération d'identités pour le personnel et les étudiants du Groupe ESA</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.com</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Higher School of Agriculture of Angers - France</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.groupe-esa.com/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Identity Federation server for employees and students at ESA</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Serveur de Fédération d'identités pour le personnel et les étudiants du Groupe ESA</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPDCCAiSgAwIBAgIVAIrbDRCxNtaYnhNe0Q7DpuLVmgMHMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFGlkZW50Lmdyb3VwZS1lc2EuY29tMB4XDTEzMDkxMDA5
 MTI1M1oXDTMzMDkxMDA5MTI1M1owHzEdMBsGA1UEAxMUaWRlbnQuZ3JvdXBlLWVz
@@ -41,21 +41,21 @@ Wmsgnk/M+A+wwiooVjl81aYlOx/kMDa9t+7/AN3V4BC8e2hdii9UdGzZsWrjTngt
 6+HBk4Fq2MNRK6dEwV9yPazjsuEqwoZHKihAGaINwVnBNdM/9eUfmCAE9MLo83lN
 R1luRGQHNbRzg1OZtwrsHw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident.groupe-esa.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.groupe-esa.com/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.groupe-esa.com/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupe-esa.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>info@groupe-esa.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident.groupe-esa.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.groupe-esa.com/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.groupe-esa.com/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupe-esa.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>info@groupe-esa.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
index 0cfd47f7..38395535 100644
--- a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identite.intranet.univ-lille.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-15T14:45:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-15T14:45:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://identite.univ-lille.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://identite.univ-lille.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFTCCAf2gAwIBAgIJALIbtMdZhxM2MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 BAMTGmRydXBhbC13ZWIxLnVuaXYtbGlsbGUxLmZyMB4XDTE0MDgwMTA3NDM1NloX
 DTI0MDcyOTA3NDM1NlowJTEjMCEGA1UEAxMaZHJ1cGFsLXdlYjEudW5pdi1saWxs
@@ -43,13 +43,13 @@ FwPWP4omGY8/MYNYuW5oU/HtpkdLWUed9DqGQSJDodBVdJHyjWEzNwf+mxBlwSXa
 4VEJouPfrQAD6PqFhsz9qQpx8gYuNN3iUVSL0CIjthzBGp/B2d+813Haio+5qsOL
 Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFTCCAf2gAwIBAgIJALIbtMdZhxM2MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 BAMTGmRydXBhbC13ZWIxLnVuaXYtbGlsbGUxLmZyMB4XDTE0MDgwMTA3NDM1NloX
 DTI0MDcyOTA3NDM1NlowJTEjMCEGA1UEAxMaZHJ1cGFsLXdlYjEudW5pdi1saWxs
@@ -68,35 +68,32 @@ FwPWP4omGY8/MYNYuW5oU/HtpkdLWUed9DqGQSJDodBVdJHyjWEzNwf+mxBlwSXa
 4VEJouPfrQAD6PqFhsz9qQpx8gYuNN3iUVSL0CIjthzBGp/B2d+813Haio+5qsOL
 Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
-        <md:ServiceName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>VIEVILLE CLAUDE</md:SurName>
-      <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>WALLON ANTOINE</md:SurName>
-      <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>VIEVILLE CLAUDE</md:SurName>
+    <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>WALLON ANTOINE</md:SurName>
+    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
index 3c6336bc..4149520a 100644
--- a/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ec-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-14T15:44:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-14T15:44:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Centrale de Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98KBw0LB42T+3kAAAITSURBVDjLdZNBaBNREIa/3QatJeoeBL0UUxFKUEJQKejBxj0JElvFq1hyeCAqih6VHgpexaIi+w6lLfXioQ3koocuwYi0QuretBfNIqFgBTcRaiyh8eBseUYdeCwz+7//zfwzY3U6HQvDtNZZIAJSgC9hF6gBKaVU2cRbJoHWegoYi8H8aXFsWilViIOJLlB8yQEeAq/EPy3EANm/MpCXs3KmgdtKqairNAd4IEQBECilCpbneWeMWstKKdfvG9wauHuDqLIMQDKT5vPjGdyNVVtr7QO5WJuefD5vASOSdqparYZH9h0YGbh3Hbu3l2Qmzf5L52g3miysfQyBm4YmkwmpOwUUhXl8bW6Bb5W3tKPvv4VydtMK63Dizrh0qAyMAinbSH8WOAYEyUyaU+99hpaKZJ4/of/alViKQDCz4vuW53kdcS4qpYoAft/g1tBSkWQmDUArrPMm7eJurNoi6CgwD2DLkMSt2rb10iIA7UaTT/cfkdi7x/wdY92EiFEDxrTWE8DUoV07t19uN5qslxbZ3PyJ1noeKBjDVjNFBFgBitHwcbeun40DuaiyjL0jUY5OHp0AzgvGibvWUyqVwmq1elDUzQIffhzun7kw99R7d/ZyoxXWXw5/Da6+bnyJpN05EfOFUmqyexdWhCSSieweZScetv/tQmAQ3JJjLpMj339vo2SRMzave50dpVRg4n8Bxo3SMex00ZQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ec-lyon.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Lyon</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lyon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Centrale de Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98KBw0LB42T+3kAAAITSURBVDjLdZNBaBNREIa/3QatJeoeBL0UUxFKUEJQKejBxj0JElvFq1hyeCAqih6VHgpexaIi+w6lLfXioQ3koocuwYi0QuretBfNIqFgBTcRaiyh8eBseUYdeCwz+7//zfwzY3U6HQvDtNZZIAJSgC9hF6gBKaVU2cRbJoHWegoYi8H8aXFsWilViIOJLlB8yQEeAq/EPy3EANm/MpCXs3KmgdtKqairNAd4IEQBECilCpbneWeMWstKKdfvG9wauHuDqLIMQDKT5vPjGdyNVVtr7QO5WJuefD5vASOSdqparYZH9h0YGbh3Hbu3l2Qmzf5L52g3miysfQyBm4YmkwmpOwUUhXl8bW6Bb5W3tKPvv4VydtMK63Dizrh0qAyMAinbSH8WOAYEyUyaU+99hpaKZJ4/of/alViKQDCz4vuW53kdcS4qpYoAft/g1tBSkWQmDUArrPMm7eJurNoi6CgwD2DLkMSt2rb10iIA7UaTT/cfkdi7x/wdY92EiFEDxrTWE8DUoV07t19uN5qslxbZ3PyJ1noeKBjDVjNFBFgBitHwcbeun40DuaiyjL0jUY5OHp0AzgvGibvWUyqVwmq1elDUzQIffhzun7kw99R7d/ZyoxXWXw5/Da6+bnyJpN05EfOFUmqyexdWhCSSieweZScetv/tQmAQ3JJjLpMj339vo2SRMzave50dpVRg4n8Bxo3SMex00ZQAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ec-lyon.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole Centrale de Lyon</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUSm/Wj1DZCfEcT7FIWcoKwltkNiYwDQYJKoZIhvcNAQEL
 BQAwIDEeMBwGA1UEAwwVaWRlbnRpdGVzMi5lYy1seW9uLmZyMB4XDTE2MDQxNDE1
 MzIyNVoXDTM2MDQxNDE1MzIyNVowIDEeMBwGA1UEAwwVaWRlbnRpdGVzMi5lYy1s
@@ -38,21 +38,21 @@ aouo/N3qan+6ZZSz1VS+satUQwlY6xE2AfWxM9ujrC7QJft09TzvcB4MXREwCBX3
 txGF6gHTIP7IRrFnc6tSppQPvNZk+wQZJkjmF2ukE4OnLaZti+qwlaoEK2AnObC5
 ofJ3yn5PLy1c1OPmgmtCtyKUeA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Centrale de Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ec-lyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri.support@ec-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Centrale de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ec-lyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri.support@ec-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.enim.fr-idp-.xml b/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
index 299b6d1f..fa49303e 100644
--- a/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
+++ b/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.enim.fr/idp/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-10T10:41:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-10T10:41:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enim.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENIM</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB/ElEQVQ4y92Sv2tTURiGn3PvPfmlRUutVm1jA4XgoMEsgrg4iCBCqVihTiL+Ax0EXQq6iGgnByelBdFR6VZBKGIHKdqCaazVptFqkyYNbRJzU3Nzz3EI3rSiLm6+08fD4eX9zvvBP0r8CsbGnuql9ALZwlfepTN8W8qTqxR482pa/NXg2fMXeuTRCB8T83Ttbqfuusynsty4dY3+3j7xpwQWQPzoEX3l6iCmoeho3YeWgkK5SMXO8vnLBwB0dkJTnGR9uUbZHyN87KzwEty5fVPv7z7E/dFhpGihbgZIJd8T3VHh0qkSse6D9HRaUEqi7SKF7w4zdpSTgwlh/Ywy0H9G3L3epykqkgUwIh0cP2zTG13AkkEyy35er7cQ1AHibRli8hNPhuLa2rzP5RMamZ3i4ZTLvdEVMT4OFx/E9N5QiYnZNBeGawIg9fi0DstpjLU5jM0GAenDrNTZE2r32K6eTpTaYBs+jx3oasP0aaRlbzVQSPA7FMl5TNZNlAFVqxl2Q1g4hCgrs2EQjnQ3OnWqOIaJ2fwalKiBkphaeSzoaqy6iSHdhsH5cwONShRIx8Xn+L3Hhghh4OKTbc3jUSWEofD5I1tX+K1UGYCaWvGQDmxvDLVFtrTwciaPvbjGaqDVY5OJHJXFDPnqTsAG4O3sKqtzy6TXLf4D/QATVME3IBx2pQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMISdtHYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDD1wAzKAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enim.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENIM</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enim.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENIM</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB/ElEQVQ4y92Sv2tTURiGn3PvPfmlRUutVm1jA4XgoMEsgrg4iCBCqVihTiL+Ax0EXQq6iGgnByelBdFR6VZBKGIHKdqCaazVptFqkyYNbRJzU3Nzz3EI3rSiLm6+08fD4eX9zvvBP0r8CsbGnuql9ALZwlfepTN8W8qTqxR482pa/NXg2fMXeuTRCB8T83Ttbqfuusynsty4dY3+3j7xpwQWQPzoEX3l6iCmoeho3YeWgkK5SMXO8vnLBwB0dkJTnGR9uUbZHyN87KzwEty5fVPv7z7E/dFhpGihbgZIJd8T3VHh0qkSse6D9HRaUEqi7SKF7w4zdpSTgwlh/Ywy0H9G3L3epykqkgUwIh0cP2zTG13AkkEyy35er7cQ1AHibRli8hNPhuLa2rzP5RMamZ3i4ZTLvdEVMT4OFx/E9N5QiYnZNBeGawIg9fi0DstpjLU5jM0GAenDrNTZE2r32K6eTpTaYBs+jx3oasP0aaRlbzVQSPA7FMl5TNZNlAFVqxl2Q1g4hCgrs2EQjnQ3OnWqOIaJ2fwalKiBkphaeSzoaqy6iSHdhsH5cwONShRIx8Xn+L3Hhghh4OKTbc3jUSWEofD5I1tX+K1UGYCaWvGQDmxvDLVFtrTwciaPvbjGaqDVY5OJHJXFDPnqTsAG4O3sKqtzy6TXLf4D/QATVME3IBx2pQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMISdtHYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDD1wAzKAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enim.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENIM</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFzCCAf+gAwIBAgIUXFUXeBlCuUekINLHfPFZiIPUrsAwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmVuaW0uZnIwHhcNMTIxMTE0MTMzODMyWhcNMzIx
 MTE0MTMzODMyWjAWMRQwEgYDVQQDEwtpZHAuZW5pbS5mcjCCASIwDQYJKoZIhvcN
@@ -37,21 +37,21 @@ IJgOBe5S+60ftF+69kjdQquJLlbpk9nhZTrhJnjcxppDJhXskc2pE1zplKAl98q6
 1yBtIBFoXawK3loQMMGbW+qWhm4+WWATRl3a25GnYmq4+EgUMocSshp/dwVFB6hl
 P69qvJb0PazcY4DgIwXlIliGgHdjRIiFAYNA
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authshib.enim.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authshib.enim.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authshib.enim.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENIM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENIM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enim.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admininfo@enim.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authshib.enim.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authshib.enim.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authshib.enim.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENIM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENIM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enim.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admininfo@enim.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
index 7cd8f2d2..25b09599 100644
--- a/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ensea.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-11T08:50:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-11T08:50:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensea.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSEA</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbUlEQVQoz12STUhUYRSG3++795s7P14ddVSU0ZkYGk3DTINAKgsi2wT9LdoJtSxaCNaiRQjSSkRo0a8tQkhLpDKLkkyQwjRMRCLUxaQzjpo6js517sz9+VpMqc27POd9znkPHBL5OK4OTaowsSNuYMvq8TrKvBufJ8xYAqCphhVUXO0fYW39UST/esENxF1nTtCwHmp+qgXXCKfbkygsouCwrhEtCj1V0qEUXT4fi2tLHV0EjIJxYgAgIAA4CN2VBDoUV/1xlp8TftZLYaNgBlQOE+A6FA5OAHEnODglrKChfvZquwlNR4zDkP3lks+dDC459nkj70b4pi7uvhUQ5Oq9pY+bFrsHjITqOlWbe+5Y5MOYHokuvxg0lC1A2gEIqMGVwO0npR03XGePAFCm5xbu9qwNjG5++wkYAmwEZPcGiHAsdr9def+lsq81/KAv1NlDQCgkConAksrwH5CS83CVtaQg3PlGRAb9Z+DgJlQOMx0woWXU+C15TmaVVXVBhB0gJjQC5qw9lF1UmA4IYOvDk1Ri1WP3Qw97lR8hQnjGAZ+zrlqPqxt3utIBCnt0eGz25r2Sxkv+9sZ4aCURWFCmAsG27sjQqBMWcft5AErBOAwC4VdrR7D1OZUkGGZSXzURZ8giYARU5OCEiZn7q8yklgwuC7JdjyqiIRNJtPmKlKlApqdCzJZj32cE2WaVs4Trdafp/IbvZbO2tQ6NVLxqkXyFeiS2p+WKzV+8OTFd+qjJXuH9/fqT51aD79pFaihqrsXuSHDLzHyO1UG/zhZfOJlNLcbguPtgubuyzGkKbHKuIN/tOVpD83L/AGvaAbP3x8gPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjM4KzAyOjAwhprgjAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozOCswMjowMPfHWDAAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ensea.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSEA</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensea.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSEA</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbUlEQVQoz12STUhUYRSG3++795s7P14ddVSU0ZkYGk3DTINAKgsi2wT9LdoJtSxaCNaiRQjSSkRo0a8tQkhLpDKLkkyQwjRMRCLUxaQzjpo6js517sz9+VpMqc27POd9znkPHBL5OK4OTaowsSNuYMvq8TrKvBufJ8xYAqCphhVUXO0fYW39UST/esENxF1nTtCwHmp+qgXXCKfbkygsouCwrhEtCj1V0qEUXT4fi2tLHV0EjIJxYgAgIAA4CN2VBDoUV/1xlp8TftZLYaNgBlQOE+A6FA5OAHEnODglrKChfvZquwlNR4zDkP3lks+dDC459nkj70b4pi7uvhUQ5Oq9pY+bFrsHjITqOlWbe+5Y5MOYHokuvxg0lC1A2gEIqMGVwO0npR03XGePAFCm5xbu9qwNjG5++wkYAmwEZPcGiHAsdr9def+lsq81/KAv1NlDQCgkConAksrwH5CS83CVtaQg3PlGRAb9Z+DgJlQOMx0woWXU+C15TmaVVXVBhB0gJjQC5qw9lF1UmA4IYOvDk1Ri1WP3Qw97lR8hQnjGAZ+zrlqPqxt3utIBCnt0eGz25r2Sxkv+9sZ4aCURWFCmAsG27sjQqBMWcft5AErBOAwC4VdrR7D1OZUkGGZSXzURZ8giYARU5OCEiZn7q8yklgwuC7JdjyqiIRNJtPmKlKlApqdCzJZj32cE2WaVs4Trdafp/IbvZbO2tQ6NVLxqkXyFeiS2p+WKzV+8OTFd+qjJXuH9/fqT51aD79pFaihqrsXuSHDLzHyO1UG/zhZfOJlNLcbguPtgubuyzGkKbHKuIN/tOVpD83L/AGvaAbP3x8gPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjM4KzAyOjAwhprgjAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozOCswMjowMPfHWDAAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ensea.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSEA</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
@@ -44,13 +44,13 @@ wKvG/2aZDxc5DdjeTq32zVxO9KE8QDfMA14cHTimjnOhSV8MNIp5uLHv8827pLeT
 SP1F5eWtaNyrocG8x1mL3qMePnZl92Fuj0F4FhHkAnhWCxWjCou9sQa8KeBcCO9W
 QK1LMEX5HeO8HKnIkLfCYBO3LiMoZmq45EvpF/kWQqI9WQacXQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
@@ -76,23 +76,23 @@ HMl1RBtfEkwVl+vESzYk/sSOQ+CXJoi6spKXV0tpBS8Lf/I9IRjayHALjWwklb8l
 fbatPd5QbO8MzMD3Oak05pvHRKvtI7ZWxsbQIg/40sT4KmWDxmkLIDLY/2E8hUDN
 aWAcMmjEoKVXB6St7+El4x83Ul04VV3UNYrTOdDO64mVnp8j2A==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identites.ensea.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ensea.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ensea.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensea.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identites.ensea.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ensea.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ensea.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensea.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
@@ -118,13 +118,13 @@ wKvG/2aZDxc5DdjeTq32zVxO9KE8QDfMA14cHTimjnOhSV8MNIp5uLHv8827pLeT
 SP1F5eWtaNyrocG8x1mL3qMePnZl92Fuj0F4FhHkAnhWCxWjCou9sQa8KeBcCO9W
 QK1LMEX5HeO8HKnIkLfCYBO3LiMoZmq45EvpF/kWQqI9WQacXQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
@@ -150,19 +150,19 @@ HMl1RBtfEkwVl+vESzYk/sSOQ+CXJoi6spKXV0tpBS8Lf/I9IRjayHALjWwklb8l
 fbatPd5QbO8MzMD3Oak05pvHRKvtI7ZWxsbQIg/40sT4KmWDxmkLIDLY/2E8hUDN
 aWAcMmjEoKVXB6St7+El4x83Ul04VV3UNYrTOdDO64mVnp8j2A==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identites.ensea.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSEA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSEA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensea.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>federation@ensea.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identites.ensea.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSEA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSEA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensea.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation@ensea.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml b/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
index 2cae989a..7406d283 100644
--- a/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
+++ b/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identities.univ-jfc.fr/idp/prod">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-10T15:01:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-10T15:01:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-jfc.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CUFR Jean-François Champollion</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABLUlEQVQ4y5WSP0vDQBjGf5c/NbVN3ZycdamL6OC3cHLRzbWLJIu4iUM1CQhuRXBxd/MzCA5uIv0Qgklp7aWXcwhIMWmbvNu9PL/nnuc4qDHfIU9JyO38zqgKxxEPnXVOgO783qoCJxGX7TXOplPQkNRO0G5ynfyAZcJwyGnlBHHAAPiQEhomTCQv+wPSeY25EA7x3BYXcsaWgM1ZBq7P9n9daYVRwHGrQZiMwTToOjZkGb0yrSjcfMOOZfOpNGidR08Vr67PYZlBIYEwedPksCFAKsaL4ILBV5/dtoOrsvzs2KAVR8seulAhCZEI7KYNk5Q71+N8mUGhQqa5bzVgLHlfBZcaKHgcSVTHZ28VDCUfyRY8G3BQBS5MHHAVh3h1mL8Kus+GIRAdn6iOwS+GaFo8eiBYWAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-jfc.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CUFR Jean-François Champollion</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-jfc.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CUFR Jean-François Champollion</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABLUlEQVQ4y5WSP0vDQBjGf5c/NbVN3ZycdamL6OC3cHLRzbWLJIu4iUM1CQhuRXBxd/MzCA5uIv0Qgklp7aWXcwhIMWmbvNu9PL/nnuc4qDHfIU9JyO38zqgKxxEPnXVOgO783qoCJxGX7TXOplPQkNRO0G5ynfyAZcJwyGnlBHHAAPiQEhomTCQv+wPSeY25EA7x3BYXcsaWgM1ZBq7P9n9daYVRwHGrQZiMwTToOjZkGb0yrSjcfMOOZfOpNGidR08Vr67PYZlBIYEwedPksCFAKsaL4ILBV5/dtoOrsvzs2KAVR8seulAhCZEI7KYNk5Q71+N8mUGhQqa5bzVgLHlfBZcaKHgcSVTHZ28VDCUfyRY8G3BQBS5MHHAVh3h1mL8Kus+GIRAdn6iOwS+GaFo8eiBYWAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-jfc.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CUFR Jean-François Champollion</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEnjCCA4agAwIBAgIQKfC7PoBqgitD7hgMJJZhtzANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -45,13 +45,13 @@ tmdx8n8rj2sNTl89FnNemEJYWQwF0nKuywnhLip82VqJCkWfL7lp9bdC+WU03DzF
 zr2zHMbf8Bks0RPLRRjYiGdyfU2+4JqdaCDsJqVRfSYWN0MLNazWWnmuUZ8aXNCm
 rZ7HQsIozzk8IpYy1UKXZtaGL3Rr/EyYfKsSeYGTGTX6Zw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEmjCCA4KgAwIBAgIRAJUDuJkaRvWHyWeev34/8hgwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMTExMjkwMDAwMDBaFw0xNDExMjgyMzU5NTlaMHIxCzAJBgNV
@@ -78,22 +78,22 @@ NL+Wg4nuXkz1Uk/2f7r0BvSfkVisZMPlTTEpeuAtrosSd6B2RiCR0qiCPQ0SoaqS
 +jyx9pIRcGIlOqogM0g4sPTu7HMo0YnTQMOBEnbsW28spqIS2YwFqhy1g5Ym0f9s
 hCYLgINEWub/bwGC6PX0gJc70qPAaHGV7JYa/Dgd
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cabrel.univ-jfc.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CUFR Jean-François Champollion</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CUFR Jean-François Champollion</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-jfc.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>J.-M. Kubek</md:SurName>
-      <md:EmailAddress>jean-marie.kubek@univ-jfc.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cabrel.univ-jfc.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CUFR Jean-François Champollion</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CUFR Jean-François Champollion</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-jfc.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>J.-M. Kubek</md:SurName>
+    <md:EmailAddress>jean-marie.kubek@univ-jfc.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml
index ab605364..f7064f1b 100644
--- a/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.andrew.cmu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://identity.andrew.cmu.edu/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">affiliates.cmu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Carnegie Mellon University Tartan-ConnectID for Guests</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Carnegie Mellon University Social Identity Gateway</mdui:Description>
+        <mdui:Logo height="125" width="200" xml:lang="en">https://identity.andrew.cmu.edu/incommon/connectid-200x125.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://identity.andrew.cmu.edu/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">affiliates.cmu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Carnegie Mellon University Tartan-ConnectID for Guests</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Carnegie Mellon University Social Identity Gateway</mdui:Description>
-          <mdui:Logo height="125" width="200" xml:lang="en">https://identity.andrew.cmu.edu/incommon/connectid-200x125.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDuDCCAqACCQDIvSXrEZve3TANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
 VVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDEj
 MCEGA1UEChMaQ2FybmVnaWUgTWVsbG9uIFVuaXZlcnNpdHkxGzAZBgNVBAsTEkNv
@@ -42,24 +42,24 @@ R0ysGS+bQIz2sVx/R+zfPbCEqUdELzRCUg+SnEdgIo2ODzpsCVK1y7t4lz2eyKYC
 8emMX99xUeAxCWjkCfjLHjnt99qn2HH6m5e/5A2y9/++CxpCQHUhDwbO0xUt2SKI
 JS1Wnyp2ix95wfTeksnSAxcWuXoPcfc1y96uW5M+7MbCwbqmkd18C9aXHEs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.andrew.cmu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">affiliates.cmu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.andrew.cmu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">affiliates.cmu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDuDCCAqACCQDIvSXrEZve3TANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
 VVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDEj
 MCEGA1UEChMaQ2FybmVnaWUgTWVsbG9uIFVuaXZlcnNpdHkxGzAZBgNVBAsTEkNv
@@ -81,31 +81,31 @@ R0ysGS+bQIz2sVx/R+zfPbCEqUdELzRCUg+SnEdgIo2ODzpsCVK1y7t4lz2eyKYC
 8emMX99xUeAxCWjkCfjLHjnt99qn2HH6m5e/5A2y9/++CxpCQHUhDwbO0xUt2SKI
 JS1Wnyp2ix95wfTeksnSAxcWuXoPcfc1y96uW5M+7MbCwbqmkd18C9aXHEs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Carnegie Mellon University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Carnegie Mellon University Tartan-ConnectID for Guests</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cmu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Support Team</md:GivenName>
-      <md:EmailAddress>shibboleth-team@andrew.cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Deborah Schill</md:GivenName>
-      <md:EmailAddress>dschill@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeffrey Eaton</md:GivenName>
-      <md:EmailAddress>jeaton@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computing Services Help Center</md:GivenName>
-      <md:EmailAddress>it-help@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Carnegie Mellon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carnegie Mellon University Tartan-ConnectID for Guests</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cmu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Support Team</md:GivenName>
+    <md:EmailAddress>shibboleth-team@andrew.cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Deborah Schill</md:GivenName>
+    <md:EmailAddress>dschill@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeffrey Eaton</md:GivenName>
+    <md:EmailAddress>jeaton@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computing Services Help Center</md:GivenName>
+    <md:EmailAddress>it-help@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml
index 5d9ade66..02fc8f20 100644
--- a/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.gettysburg.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gettysburg.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gettysburg College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Single Sign On system for Gettysburg College students, faculty, staff, administrators and affiliates.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.gettysburg.edu/global/privacy_statement.dot</mdui:PrivacyStatementURL>
+        <mdui:Logo height="33" width="125" xml:lang="en">https://www.gettysburg.edu/global2/images/template/logo2.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gettysburg.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gettysburg College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Single Sign On system for Gettysburg College students, faculty, staff, administrators and affiliates.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.gettysburg.edu/global/privacy_statement.dot</mdui:PrivacyStatementURL>
-          <mdui:Logo height="33" width="125" xml:lang="en">https://www.gettysburg.edu/global2/images/template/logo2.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRzCCAi+gAwIBAgIUa3MGMc8uaB4aTTQas66uRLYPddMwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXaWRlbnRpdHkuZ2V0dHlzYnVyZy5lZHUwHhcNMTQwNTAy
 MjAxODIzWhcNMzQwNTAyMjAxODIzWjAiMSAwHgYDVQQDExdpZGVudGl0eS5nZXR0
@@ -44,23 +44,23 @@ gcSrWUynbwYsBwNVPprtFIDzt0ZUD6A1Gw6FYMW6gapHaNkZu0Nbw/5r/F8JrX8s
 2OfeRMA7g+yi6cFxonAIXYiwtkFqunjgM+GVtj3RkfA7AkYiOgKGAW+FSvqgGWdw
 qxNBz1YaAbi+ryPrCrHRrXZViELMLbf1WkK3
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.gettysburg.edu:8444/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.gettysburg.edu:8444/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.gettysburg.edu:8444/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gettysburg.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.gettysburg.edu:8444/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.gettysburg.edu:8444/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.gettysburg.edu:8444/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gettysburg.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRzCCAi+gAwIBAgIUa3MGMc8uaB4aTTQas66uRLYPddMwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXaWRlbnRpdHkuZ2V0dHlzYnVyZy5lZHUwHhcNMTQwNTAy
 MjAxODIzWhcNMzQwNTAyMjAxODIzWjAiMSAwHgYDVQQDExdpZGVudGl0eS5nZXR0
@@ -80,27 +80,27 @@ gcSrWUynbwYsBwNVPprtFIDzt0ZUD6A1Gw6FYMW6gapHaNkZu0Nbw/5r/F8JrX8s
 2OfeRMA7g+yi6cFxonAIXYiwtkFqunjgM+GVtj3RkfA7AkYiOgKGAW+FSvqgGWdw
 qxNBz1YaAbi+ryPrCrHRrXZViELMLbf1WkK3
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Gettysburg College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gettysburg College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gettysburg.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eric Yurick</md:GivenName>
-      <md:EmailAddress>netmaint@gettysburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>ITHelpdesk@gettysburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Hayden</md:GivenName>
-      <md:EmailAddress>netmaint@gettysburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Gettysburg College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gettysburg College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gettysburg.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric Yurick</md:GivenName>
+    <md:EmailAddress>netmaint@gettysburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>ITHelpdesk@gettysburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Hayden</md:GivenName>
+    <md:EmailAddress>netmaint@gettysburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
index 37acb830..615acbd1 100644
--- a/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.istat.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istat.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ISTAT - Italian National Institute of Statistics</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">ISTAT - Istituto Nazionale di Statistica</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for ISTAT users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti ISTAT</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.istat.it/it/informazioni/per-i-ricercatori/accesso-ai-servizi-web</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.istat.it/en/information/researchers</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://identity.istat.it/idp/informativa.jsp</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="207" xml:lang="en">https://identity-ext.istat.it/img/Logo_Istat80.png</mdui:Logo>
+        <mdui:Logo height="16" width="55" xml:lang="en">https://identity-ext.istat.it/img/Logo_Istat16.png</mdui:Logo>
+        <mdui:Logo height="16" width="55" xml:lang="it">https://identity-ext.istat.it/img/Logo_Istat16.png</mdui:Logo>
+        <mdui:Logo height="60" width="207" xml:lang="it">https://identity-ext.istat.it/img/Logo_Istat80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istat.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ISTAT - Italian National Institute of Statistics</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">ISTAT - Istituto Nazionale di Statistica</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for ISTAT users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti ISTAT</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.istat.it/it/informazioni/per-i-ricercatori/accesso-ai-servizi-web</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.istat.it/en/information/researchers</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://identity.istat.it/idp/informativa.jsp</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="207" xml:lang="en">https://identity-ext.istat.it/img/Logo_Istat80.png</mdui:Logo>
-          <mdui:Logo height="16" width="55" xml:lang="en">https://identity-ext.istat.it/img/Logo_Istat16.png</mdui:Logo>
-          <mdui:Logo height="16" width="55" xml:lang="it">https://identity-ext.istat.it/img/Logo_Istat16.png</mdui:Logo>
-          <mdui:Logo height="60" width="207" xml:lang="it">https://identity-ext.istat.it/img/Logo_Istat80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUGtRU3zo/2OMlhNaUyGcCUcx93HowDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkuaXN0YXQuaXQwHhcNMTEwMjI0MTEyMTIx
 WhcNMzEwMjI0MTEyMTIxWjAcMRowGAYDVQQDExFpZGVudGl0eS5pc3RhdC5pdDCC
@@ -45,26 +45,26 @@ v430rOfzsqysrxY0NvApAJe4ioA0/kgeJYYPg48F8Tykda2xgBNXaB9gdTR4FyB6
 3t2yL9i9sqXCq4uRlQqUXGzVQuFUX/BxU+Coph5YPhkn3snHBJWKTzpA0ZMwbq1X
 Tly+
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.istat.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.istat.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.istat.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.istat.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.istat.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.istat.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istat.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.istat.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.istat.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.istat.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.istat.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.istat.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.istat.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istat.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUGtRU3zo/2OMlhNaUyGcCUcx93HowDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkuaXN0YXQuaXQwHhcNMTEwMjI0MTEyMTIx
 WhcNMzEwMjI0MTEyMTIxWjAcMRowGAYDVQQDExFpZGVudGl0eS5pc3RhdC5pdDCC
@@ -84,24 +84,24 @@ v430rOfzsqysrxY0NvApAJe4ioA0/kgeJYYPg48F8Tykda2xgBNXaB9gdTR4FyB6
 3t2yL9i9sqXCq4uRlQqUXGzVQuFUX/BxU+Coph5YPhkn3snHBJWKTzpA0ZMwbq1X
 Tly+
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.istat.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.istat.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">ISTAT - Istituto Nazionale di Statistica</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ISTAT - Italian National Institute of Statistics</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">ISTAT</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ISTAT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.istat.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.istat.it/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Supporto Tecnico</md:SurName>
-      <md:EmailAddress>mailto:idem@istat.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.istat.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.istat.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">ISTAT - Istituto Nazionale di Statistica</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ISTAT - Italian National Institute of Statistics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">ISTAT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ISTAT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.istat.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.istat.it/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Supporto Tecnico</md:SurName>
+    <md:EmailAddress>mailto:idem@istat.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.lbl.gov-prod-identitylinking.xml b/swamid-interfederations-2.0/identity.lbl.gov-prod-identitylinking.xml
index be5072b1..6d31d06e 100644
--- a/swamid-interfederations-2.0/identity.lbl.gov-prod-identitylinking.xml
+++ b/swamid-interfederations-2.0/identity.lbl.gov-prod-identitylinking.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.lbl.gov/prod/identitylinking">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://identity.lbl.gov/linking/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LBL Identity Linking Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service is used to link LBL identities to federated identities, including InCommon entities and social providers.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/WRmiBw</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://identity.lbl.gov/linking/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LBL Identity Linking Service</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This service is used to link LBL identities to federated identities, including InCommon entities and social providers.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/WRmiBw</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC+jCCAeKgAwIBAgIJAKAg4/SISobvMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEWlkZW50aXR5MS5sYmwuZ292MB4XDTA5MDUxMjEyMTgzNVoXDTE5MDUxMDEy
 MTgzNVowHDEaMBgGA1UEAxMRaWRlbnRpdHkxLmxibC5nb3YwggEiMA0GCSqGSIb3
@@ -39,38 +39,38 @@ xMqHf7MMh0kLtrR+c9QmkXOReA7fAbIoph/VXOxJS5pMaNsTPU4GNVrRaoU7qPnJ
 2YvTYchSZd/s9jOu6pO2JQq+IAvIP3TJgRWrOtcnVcwOjQTgLL/UM4AjvuJjHO/J
 9ev0oCCxihWi4Dz5kwN+A/A9VZ1rYlx2hEwOG6LwCnJip6sDCV2KW4N6GSFPsw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.lbl.gov/linking/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LBL Identity Linking Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This service is used to link LBL identities to federated identities, including InCommon entities and social providers.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LBL Identity Management Team</md:GivenName>
-      <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Help Desk</md:GivenName>
-      <md:EmailAddress>help@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LBL Cybersecurity Group</md:GivenName>
-      <md:EmailAddress>security@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>LBL Identity Management Team</md:GivenName>
-      <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.lbl.gov/linking/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LBL Identity Linking Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service is used to link LBL identities to federated identities, including InCommon entities and social providers.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LBL Identity Management Team</md:GivenName>
+    <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>help@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LBL Cybersecurity Group</md:GivenName>
+    <md:EmailAddress>security@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>LBL Identity Management Team</md:GivenName>
+    <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.lbl.gov-prod-tokenmanagement.xml b/swamid-interfederations-2.0/identity.lbl.gov-prod-tokenmanagement.xml
index 2e3d0807..9a183814 100644
--- a/swamid-interfederations-2.0/identity.lbl.gov-prod-tokenmanagement.xml
+++ b/swamid-interfederations-2.0/identity.lbl.gov-prod-tokenmanagement.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.lbl.gov/prod/tokenmanagement">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://identity.lbl.gov/otptokens/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LBL MFA Token Management Application</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Users of LBL's systems that require multifactor authentication use this application to manage their MFA tokens.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/8ARmBQ</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://identity.lbl.gov/otptokens/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LBL MFA Token Management Application</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Users of LBL's systems that require multifactor authentication use this application to manage their MFA tokens.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/8ARmBQ</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC+jCCAeKgAwIBAgIJAKAg4/SISobvMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEWlkZW50aXR5MS5sYmwuZ292MB4XDTA5MDUxMjEyMTgzNVoXDTE5MDUxMDEy
 MTgzNVowHDEaMBgGA1UEAxMRaWRlbnRpdHkxLmxibC5nb3YwggEiMA0GCSqGSIb3
@@ -39,35 +39,35 @@ xMqHf7MMh0kLtrR+c9QmkXOReA7fAbIoph/VXOxJS5pMaNsTPU4GNVrRaoU7qPnJ
 2YvTYchSZd/s9jOu6pO2JQq+IAvIP3TJgRWrOtcnVcwOjQTgLL/UM4AjvuJjHO/J
 9ev0oCCxihWi4Dz5kwN+A/A9VZ1rYlx2hEwOG6LwCnJip6sDCV2KW4N6GSFPsw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.lbl.gov/otptokens/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LBL MFA Token Management Application</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Users of LBL's systems that require multifactor authentication use this application to manage their MFA tokens.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LBL Identity Management Team</md:GivenName>
-      <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LBL IT Help Desk</md:GivenName>
-      <md:EmailAddress>help@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LBL Cybersecurity Group</md:GivenName>
-      <md:EmailAddress>security@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>LBL Identity Management Team</md:GivenName>
-      <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.lbl.gov/otptokens/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LBL MFA Token Management Application</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Users of LBL's systems that require multifactor authentication use this application to manage their MFA tokens.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LBL Identity Management Team</md:GivenName>
+    <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LBL IT Help Desk</md:GivenName>
+    <md:EmailAddress>help@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LBL Cybersecurity Group</md:GivenName>
+    <md:EmailAddress>security@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>LBL Identity Management Team</md:GivenName>
+    <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
index a91f7a14..cc6885f0 100644
--- a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.mdh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.mdh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mdh.se</mdui:InformationURL>
+        <mdui:Logo height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="117" width="216">https://identity.mdh.se/img/logo-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>mdh.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
-          <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.mdh.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.mdh.se</mdui:InformationURL>
-          <mdui:Logo height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="117" width="216">https://identity.mdh.se/img/logo-en.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>mdh.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
 Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
@@ -50,26 +50,26 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
 0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
 Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
@@ -89,36 +89,36 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
 0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MDH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mdh.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Mälardalen University</md:Company>
-      <md:SurName>Peter Falck</md:SurName>
-      <md:EmailAddress>mailto:peter.falck@mdh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Mälardalen University</md:Company>
-      <md:SurName>MDH Drift</md:SurName>
-      <md:EmailAddress>mailto:drift.ita@mdh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Mälardalen University</md:Company>
-      <md:SurName>Helpdesk MDH</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 16 101550</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MDH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mdh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Mälardalen University</md:Company>
+    <md:SurName>Peter Falck</md:SurName>
+    <md:EmailAddress>mailto:peter.falck@mdh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Mälardalen University</md:Company>
+    <md:SurName>MDH Drift</md:SurName>
+    <md:EmailAddress>mailto:drift.ita@mdh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Mälardalen University</md:Company>
+    <md:SurName>Helpdesk MDH</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 16 101550</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml
index bee49781..1e4974da 100644
--- a/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.merthyr.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.merthyr.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T12:55:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T12:55:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The College Merthyr Tydfil</mdui:DisplayName>
+        <mdui:Logo height="80" width="60">https://identity.merthyr.ac.uk/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The College Merthyr Tydfil</mdui:DisplayName>
-          <mdui:Logo height="80" width="60">https://identity.merthyr.ac.uk/idp/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAPD1e21Xbsbc/ewgYYj9T3jdllMqMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE3WhcNMzYwMjE4MDkxNTE3WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -41,13 +41,13 @@
 						h6tZW61OSImXh4vVx25jBaSeil94bu4eTHX8NPGRSPWsJHjkSSMyj//E/Hb0nvUT
 						o4sOxqCOINYHaIz5vc4Hg+Cabyout4Zg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUT3wLwUQdjtdrHC5Eh49xQf4S89AwDQYJKoZIhvcNAQEL
 						BQAwITEfMB0GA1UEAwwWaWRlbnRpdHkubWVydGh5ci5hYy51azAeFw0xNjAyMTgw
 						OTE1MTZaFw0zNjAyMTgwOTE1MTZaMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRo
@@ -67,13 +67,13 @@
 						rSjxVr67J+DjF3pC14TahR8ZsrDMw6w/Iz3Za0YQz7P/ZzdHsLmEEhHH3Bk1KXvY
 						kPLAK20Qa90x4UjhW2sgzMV/s/7W1f8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVALriBK2Djfe+kurUI1ykFZQSYOVKMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE2WhcNMzYwMjE4MDkxNTE2WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -93,26 +93,26 @@
 						wT1q733K59v8dHfRH77nQXgY92yKaFUyqdtoqALMqgtUiKmjMA5Q8zLDg5beDStM
 						+GnV89LwIOI1mWeY2qsFeA8oFXy+49hn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.merthyr.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAPD1e21Xbsbc/ewgYYj9T3jdllMqMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE3WhcNMzYwMjE4MDkxNTE3WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -132,13 +132,13 @@
 						h6tZW61OSImXh4vVx25jBaSeil94bu4eTHX8NPGRSPWsJHjkSSMyj//E/Hb0nvUT
 						o4sOxqCOINYHaIz5vc4Hg+Cabyout4Zg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUT3wLwUQdjtdrHC5Eh49xQf4S89AwDQYJKoZIhvcNAQEL
 						BQAwITEfMB0GA1UEAwwWaWRlbnRpdHkubWVydGh5ci5hYy51azAeFw0xNjAyMTgw
 						OTE1MTZaFw0zNjAyMTgwOTE1MTZaMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRo
@@ -158,13 +158,13 @@
 						rSjxVr67J+DjF3pC14TahR8ZsrDMw6w/Iz3Za0YQz7P/ZzdHsLmEEhHH3Bk1KXvY
 						kPLAK20Qa90x4UjhW2sgzMV/s/7W1f8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVALriBK2Djfe+kurUI1ykFZQSYOVKMA0GCSqGSIb3DQEB
 						CwUAMCExHzAdBgNVBAMMFmlkZW50aXR5Lm1lcnRoeXIuYWMudWswHhcNMTYwMjE4
 						MDkxNTE2WhcNMzYwMjE4MDkxNTE2WjAhMR8wHQYDVQQDDBZpZGVudGl0eS5tZXJ0
@@ -184,28 +184,28 @@
 						wT1q733K59v8dHfRH77nQXgY92yKaFUyqdtoqALMqgtUiKmjMA5Q8zLDg5beDStM
 						+GnV89LwIOI1mWeY2qsFeA8oFXy+49hn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Merthyr Tydfil College Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The College Merthyr Tydfil</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:IT.Servicedesk@merthyr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Jackson</md:SurName>
-      <md:EmailAddress>mailto:J.Jackson1@merthyr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Watkins</md:SurName>
-      <md:EmailAddress>mailto:A.Watkins@merthyr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Merthyr Tydfil College Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The College Merthyr Tydfil</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:IT.Servicedesk@merthyr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Jackson</md:SurName>
+    <md:EmailAddress>mailto:J.Jackson1@merthyr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Watkins</md:SurName>
+    <md:EmailAddress>mailto:A.Watkins@merthyr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml
index 14f9d962..5662e308 100644
--- a/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.ugent.be/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ghent University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nl">Universiteit Gent</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Ghent University is a top 100 university founded in 1817. As one of the major universities in Belgium, our 11 faculties offer a wide range of courses and conduct in-depth research in both exact and social sciences.</mdui:Description>
+        <mdui:Description xml:lang="nl">De Universiteit Gent (UGent) werd opgericht in 1817 door koning Willem I van Oranje. Vandaag is de UGent een top 100 universiteit een van de grootste universiteiten in het Nederlandse taalgebied. Meer dan 100 vakgroepen bieden ruim 230 opleidingen aan. Disciplines als biotechnologie, aquacultuur, micro-elektronica en geschiedenis genieten wereldfaam. De UGent is een creatieve gemeenschap van medewerkers, studenten en alumni, verbonden door engagement, openheid en pluralisme.</mdui:Description>
+        <mdui:Logo height="68" width="95" xml:lang="en">https://identity.ugent.be/images/universiteit_gent.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>157.193.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>ugent.be</mdui:DomainHint>
+        <mdui:DomainHint>www.ugent.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.0473100,3.7281500</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ghent University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="nl">Universiteit Gent</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Ghent University is a top 100 university founded in 1817. As one of the major universities in Belgium, our 11 faculties offer a wide range of courses and conduct in-depth research in both exact and social sciences.</mdui:Description>
-          <mdui:Description xml:lang="nl">De Universiteit Gent (UGent) werd opgericht in 1817 door koning Willem I van Oranje. Vandaag is de UGent een top 100 universiteit een van de grootste universiteiten in het Nederlandse taalgebied. Meer dan 100 vakgroepen bieden ruim 230 opleidingen aan. Disciplines als biotechnologie, aquacultuur, micro-elektronica en geschiedenis genieten wereldfaam. De UGent is een creatieve gemeenschap van medewerkers, studenten en alumni, verbonden door engagement, openheid en pluralisme.</mdui:Description>
-          <mdui:Logo height="68" width="95" xml:lang="en">https://identity.ugent.be/images/universiteit_gent.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>157.193.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>ugent.be</mdui:DomainHint>
-          <mdui:DomainHint>www.ugent.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.0473100,3.7281500</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.ugent.be/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UGent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UGent</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ugent.be</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Meisschaert</md:SurName>
-      <md:EmailAddress>Frank.Meisschaert@UGent.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.ugent.be/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UGent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UGent</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ugent.be</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Meisschaert</md:SurName>
+    <md:EmailAddress>Frank.Meisschaert@UGent.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
index d250f2dc..106aecc6 100644
--- a/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.unamur.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unamur.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Universite de Namur</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Namur</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Le personnel et les etudiants de l'Universite de Namur - Belgique</mdui:Description>
+        <mdui:Description xml:lang="en">Staff and students from the University of Namur - Belgium</mdui:Description>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>138.48.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6a8:3900::/64</mdui:IPHint>
+        <mdui:DomainHint>unamur.be</mdui:DomainHint>
+        <mdui:GeolocationHint>50.466101,4.860253</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unamur.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fr">Universite de Namur</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Namur</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Le personnel et les etudiants de l'Universite de Namur - Belgique</mdui:Description>
-          <mdui:Description xml:lang="en">Staff and students from the University of Namur - Belgium</mdui:Description>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>138.48.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:6a8:3900::/64</mdui:IPHint>
-          <mdui:DomainHint>unamur.be</mdui:DomainHint>
-          <mdui:GeolocationHint>50.466101,4.860253</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
 MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
@@ -45,29 +45,29 @@ bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
 sAFHfgCexQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.unamur.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unamur.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unamur.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.unamur.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unamur.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unamur.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
 MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
@@ -88,28 +88,28 @@ bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
 sAFHfgCexQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
 	UNamur
 	</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
 	Universite de Namur
 	</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
 	http://www.unamur.be
 	</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>siu-serveurs@unamur.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>siu-serveurs@unamur.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
index d864e779..794b5f10 100644
--- a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.unife.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-03-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-03-05T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unife.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università di Ferrara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Ferrara</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti UniFe</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for UniFe users</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://www.unife.it/areainformatica/idem</mdui:InformationURL>
+        <mdui:Logo height="16" width="16">https://identity.unife.it/idp/images/unife_logo_16x16.png</mdui:Logo>
+        <mdui:Logo height="50" width="50">https://identity.unife.it/idp/images/unife_logo_50x50.png</mdui:Logo>
+        <mdui:Logo height="80" width="80">https://identity.unife.it/idp/images/unife_logo_80x80.png</mdui:Logo>
+        <mdui:Logo height="240" width="320">https://identity.unife.it/idp/images/unife_logo_320x240.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unife.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università di Ferrara</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Ferrara</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti UniFe</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for UniFe users</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://www.unife.it/areainformatica/idem</mdui:InformationURL>
-          <mdui:Logo height="16" width="16">https://identity.unife.it/idp/images/unife_logo_16x16.png</mdui:Logo>
-          <mdui:Logo height="50" width="50">https://identity.unife.it/idp/images/unife_logo_50x50.png</mdui:Logo>
-          <mdui:Logo height="80" width="80">https://identity.unife.it/idp/images/unife_logo_80x80.png</mdui:Logo>
-          <mdui:Logo height="240" width="320">https://identity.unife.it/idp/images/unife_logo_320x240.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUDWEaqSaZUTmDi7c3RlBaYiGftv0wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkudW5pZmUuaXQwHhcNMDkwNzI5MTEwNTIw
 WhcNMjkwNzI5MTEwNTIwWjAcMRowGAYDVQQDExFpZGVudGl0eS51bmlmZS5pdDCC
@@ -43,26 +43,26 @@ NBtU+t32f6cR3HVdjUqH3LCigvGsh/viXYXYg7QRoj3fNM93EAIwakh4784E6plK
 N1yMa0xze5ryRX4S7pHiaSQRiKNb8xIPgzOaaAQFTm8O9UcdF7xPuoWePXE1lvUR
 VgF8
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unife.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unife.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.unife.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unife.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unife.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unife.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unife.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unife.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unife.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.unife.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unife.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unife.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unife.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unife.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUDWEaqSaZUTmDi7c3RlBaYiGftv0wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkudW5pZmUuaXQwHhcNMDkwNzI5MTEwNTIw
 WhcNMjkwNzI5MTEwNTIwWjAcMRowGAYDVQQDExFpZGVudGl0eS51bmlmZS5pdDCC
@@ -82,33 +82,33 @@ NBtU+t32f6cR3HVdjUqH3LCigvGsh/viXYXYg7QRoj3fNM93EAIwakh4784E6plK
 N1yMa0xze5ryRX4S7pHiaSQRiKNb8xIPgzOaaAQFTm8O9UcdF7xPuoWePXE1lvUR
 VgF8
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unife.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unife.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Ferrara</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Ferrara</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Ferrara</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Ferrara</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unife.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unife.it/unife-en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michele</md:GivenName>
-      <md:SurName>Lugli</md:SurName>
-      <md:EmailAddress>mailto:michele.lugli@unife.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Enrico</md:GivenName>
-      <md:SurName>Ardizzoni</md:SurName>
-      <md:EmailAddress>mailto:enrico.ardizzoni@unife.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:reti.sistemi@unife.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unife.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unife.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Ferrara</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Ferrara</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Ferrara</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Ferrara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unife.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unife.it/unife-en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michele</md:GivenName>
+    <md:SurName>Lugli</md:SurName>
+    <md:EmailAddress>mailto:michele.lugli@unife.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Enrico</md:GivenName>
+    <md:SurName>Ardizzoni</md:SurName>
+    <md:EmailAddress>mailto:enrico.ardizzoni@unife.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:reti.sistemi@unife.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml b/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml
index 19c8811d..9deebc40 100644
--- a/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identityprovider.anl.gov/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.anl.gov/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anl.gov</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Argonne National Laboratory</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.anl.gov</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.anl.gov/notice.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="227" xml:lang="en">https://login.anl.gov/idp/images/argonne_header_logo_white.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.anl.gov/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anl.gov</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Argonne National Laboratory</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.anl.gov</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.anl.gov/notice.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="227" xml:lang="en">https://login.anl.gov/idp/images/argonne_header_logo_white.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSzCCAjOgAwIBAgIUd1lQByK+80eHKNHL1oZcQacjU9EwDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92aWRlci5hbmwuZ292MB4XDTExMDYw
 MzE0Mjk1N1oXDTMxMDYwMzE0Mjk1N1owIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92
@@ -41,23 +41,23 @@ mMoA4tvGzp293Lo3UoNpvdRtr6+GRTdOKggPQjKqu3V2jzOELGq7CIxn59/XasoU
 p0zxTYpUGhmHWBe5HmeezrYkX34iEAvmHaTN9Fbji9HnfdlWGDvzDjK9T3jgdyuV
 mftOvQo7MiSZrcQLClWSbNfouzKanesq48qbGPLLXg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.anl.gov:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.anl.gov:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.anl.gov/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.anl.gov/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.anl.gov/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anl.gov</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.anl.gov:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.anl.gov:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.anl.gov/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.anl.gov/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.anl.gov/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anl.gov</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSzCCAjOgAwIBAgIUd1lQByK+80eHKNHL1oZcQacjU9EwDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92aWRlci5hbmwuZ292MB4XDTExMDYw
 MzE0Mjk1N1oXDTMxMDYwMzE0Mjk1N1owIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92
@@ -77,26 +77,26 @@ mMoA4tvGzp293Lo3UoNpvdRtr6+GRTdOKggPQjKqu3V2jzOELGq7CIxn59/XasoU
 p0zxTYpUGhmHWBe5HmeezrYkX34iEAvmHaTN9Fbji9HnfdlWGDvzDjK9T3jgdyuV
 mftOvQo7MiSZrcQLClWSbNfouzKanesq48qbGPLLXg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.anl.gov:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Argonne National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Argonne National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.anl.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk - Shibboleth</md:GivenName>
-      <md:EmailAddress>help@anl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Volmer</md:GivenName>
-      <md:EmailAddress>volmer@anl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Doug Engert</md:GivenName>
-      <md:EmailAddress>deengert@anl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.anl.gov:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Argonne National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Argonne National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.anl.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk - Shibboleth</md:GivenName>
+    <md:EmailAddress>help@anl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Volmer</md:GivenName>
+    <md:EmailAddress>volmer@anl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Doug Engert</md:GivenName>
+    <md:EmailAddress>deengert@anl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml
index e57a978f..e9ba0be7 100644
--- a/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idf.pucsp.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucsp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.pucsp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.pucsp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucsp.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:Description>
-          <mdui:Description xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.pucsp.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.pucsp.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIGqDCCBZCgAwIBAgIQBvjtk3/wFt3MCgKdqTU41DANBgkqhkiG9w0BAQUFADBm
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
@@ -60,26 +60,26 @@ glcuYmRh9QQdBBx45IGNa+TdrA+hhV2wNMytAOn0CwnOi5bPf1vTYBzdSbRc5wup
 FhXfpisK4LMHDM8JFdlZVXOxZfAGqQ59hiDpXMXYedj3F+0pJvh2+dh6IG0l35LL
 AY+3V4U1qNrpwyazvjVrqVVzY2LjNW9gbC+zzg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idf.pucsp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idf.pucsp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idf.pucsp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idf.pucsp.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idf.pucsp.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idf.pucsp.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucsp.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idf.pucsp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idf.pucsp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idf.pucsp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idf.pucsp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idf.pucsp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idf.pucsp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucsp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIGqDCCBZCgAwIBAgIQBvjTK3/wFt3MCgKdqTU41DANBgkqhkiG9w0BAQUFADBm
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
@@ -119,24 +119,24 @@ FhXfpisK4LMHDM8JFdlZVXOxZfAGqQ59hiDpXMXYedj3F+0pJvh2+dh6IG0l35LL
 AY+3V4U1qNrpwyazvjVrqVVzY2LjNW9gbC+zzg==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idf.pucsp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idf.pucsp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PUC-SP- Pontificia Universidade Catolica de Sao Paulo</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">PUC-SP- Pontificia Universidade Catolica de Sao Paulo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pucsp.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.pucsp.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Victor Emmanuel J.S. Vicente</md:SurName>
-      <md:EmailAddress>dti@pucsp.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idf.pucsp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idf.pucsp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PUC-SP- Pontificia Universidade Catolica de Sao Paulo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">PUC-SP- Pontificia Universidade Catolica de Sao Paulo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pucsp.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.pucsp.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Victor Emmanuel J.S. Vicente</md:SurName>
+    <md:EmailAddress>dti@pucsp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
index eec10e4d..a0db635c 100644
--- a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
+++ b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.ics.muni.cz/shibboleth">
+  <md:Extensions>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
+    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DisplayName xml:lang="en">Perun - Masaryk University</mdui:DisplayName>
+      <mdui:DisplayName xml:lang="cs">Perun - Masarykova univerzita</mdui:DisplayName>
+      <mdui:Description xml:lang="en">Perun - Identity and access management system for Masaryk University</mdui:Description>
+      <mdui:Description xml:lang="cs">Perun - Systém pro správu uživatelů a přístupů na Masarykově univerzitě</mdui:Description>
+      <mdui:InformationURL xml:lang="en">http://idm.ics.muni.cz/</mdui:InformationURL>
+      <mdui:InformationURL xml:lang="cs">http://idm.ics.muni.cz/</mdui:InformationURL>
+    </mdui:UIInfo>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-21T14:42:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Perun - Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Perun - Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun - Identity and access management system for Masaryk University</mdui:Description>
-        <mdui:Description xml:lang="cs">Perun - Systém pro správu uživatelů a přístupů na Masarykově univerzitě</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://idm.ics.muni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://idm.ics.muni.cz/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-21T14:42:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <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://idm.ics.muni.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idm.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://idm.ics.muni.cz/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idm.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idm.ics.muni.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idm.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-            <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAKRhaOceRup4iuzxkYsqJbowDQYJKoZIhvcNAQELBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idm.ics.muni.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idm.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAKRhaOceRup4iuzxkYsqJbowDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
 IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjA9MSEwHwYDVQQL
@@ -54,31 +54,31 @@ s4Q5EE0iIZw3KARUqSb0PG3gCtiYeV+SXsnehxvUvaYNNyR8mZ0zUUd+WcHWvazN
 ZiAG5ldQnA9iQom961Uf1+ltceQpYFkfdgfrmsHMUDyC1Jv25LvFpmZoC7B4Q7cA
 lcxWfmThtT8p0FyfFUzHnFRAn89yyXWWZEhNpe4=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">Masarykova univerzita</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Masaryk University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">Masarykova univerzita</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Masaryk University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="cs">http://www.muni.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Slávek</md:GivenName>
-      <md:SurName>Licehammer</md:SurName>
-      <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michal</md:GivenName>
-      <md:SurName>Prochazka</md:SurName>
-      <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">Masarykova univerzita</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Masaryk University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Masarykova univerzita</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Masaryk University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.muni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Slávek</md:GivenName>
+    <md:SurName>Licehammer</md:SurName>
+    <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Prochazka</md:SurName>
+    <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
index dd9ef604..c2af193d 100644
--- a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-cafe.ifrr.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrr.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrr.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifrr.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifrr.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
 VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
 NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
@@ -40,26 +40,26 @@ CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
 DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
 NMSiiw==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
 VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
@@ -79,24 +79,24 @@ DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
 NMSiiw==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFRR - Instituto Federal de Roraima</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifrr.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifrr.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Francisco Cavalcante Filho</md:SurName>
-      <md:EmailAddress>francisco.filho@ifrr.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFRR - Instituto Federal de Roraima</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifrr.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifrr.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Francisco Cavalcante Filho</md:SurName>
+    <md:EmailAddress>francisco.filho@ifrr.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.unifal-mg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-cafe.unifal-mg.edu.br-idp-shibboleth.xml
index 0bb51b23..66bd034e 100644
--- a/swamid-interfederations-2.0/idp-cafe.unifal-mg.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-cafe.unifal-mg.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-cafe.unifal-mg.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifal-mg.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifal-mg.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unifal-mg.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unifal-mg.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExNDAyBgNVBAoTK1VOSUZBTC1N
 RyAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIEFsZmVuYXMxDDAKBgNVBAsTA05U
 STExMC8GCSqGSIb3DQEJARYidml0b3JyZW5hdG8uYnJpdG9AdW5pZmFsLW1nLmVk
@@ -46,26 +46,26 @@ V1DGt2Af2VDRny+NiGqjihJmP1hJA8kTE86VlS6dOU91EU99od1mzJdGaaRXg9wz
 7ni2jUR59dSzUWfKKEyYc44UOjRFNws6mK/3/Avjb8WpF4YC4JRzDFOj03WcT1a3
 McxgODrwkCJuUli5WfbD8W2H7cFcjk11QDnZ0nSJLw4xciRMLvZs0yIUtc4=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unifal-mg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExNDAyBgNVBAoTK1VOSUZBTC1N
 RyAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIEFsZmVuYXMxDDAKBgNVBAsTA05U
@@ -91,24 +91,24 @@ V1DGt2Af2VDRny+NiGqjihJmP1hJA8kTE86VlS6dOU91EU99od1mzJdGaaRXg9wz
 McxgODrwkCJuUli5WfbD8W2H7cFcjk11QDnZ0nSJLw4xciRMLvZs0yIUtc4=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unifal-mg.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unifal-mg.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Vitor Renato Alves de Brito</md:SurName>
-      <md:EmailAddress>vitorrenato.brito@unifal-mg.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unifal-mg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIFAL-MG - Universidade Federal de Alfenas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifal-mg.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unifal-mg.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Vitor Renato Alves de Brito</md:SurName>
+    <md:EmailAddress>vitorrenato.brito@unifal-mg.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
index 983bb659..238dbe28 100644
--- a/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-cafe.unir.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unir.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unir.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unir.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unir.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unir.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unir.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
 IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
@@ -47,26 +47,26 @@ WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
 /GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
 S/VP03ihbZgT9/Pt
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unir.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unir.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
@@ -93,24 +93,24 @@ WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
 S/VP03ihbZgT9/Pt
                   
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIR - Universidade Federal de Rondonia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unir.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unir.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Fabio Leite Dias</md:SurName>
-      <md:EmailAddress>fabioleite@unir.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIR - Universidade Federal de Rondonia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unir.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unir.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Fabio Leite Dias</md:SurName>
+    <md:EmailAddress>fabioleite@unir.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
index 18be2905..922a40aa 100644
--- a/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-campus-condorcet.renater.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-01T12:05:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-01T12:05:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CAMPUS CONDORCET</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAACESURBVDhPY7jGIPufEkw9A25JGv8nBWAY8MAhDCpFHMAwgFj8uqEPuwHEuACk7uuB43A2dQ2AOQ1Ew8SwYZxeQDcARCNjkM0wDAIgF+M1gBCA6cPrApAt6BimHobhBsCcBqJhikGGYDMIZgmKASBBUgBOA5Bdgg3DXIVhALmYQgNk/wMAQ2Cys1X73UcAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Utilisateurs Campus Condorcet</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CAMPUS CONDORCET</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Utilisateurs Campus Condorcet</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CAMPUS CONDORCET</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAACESURBVDhPY7jGIPufEkw9A25JGv8nBWAY8MAhDCpFHMAwgFj8uqEPuwHEuACk7uuB43A2dQ2AOQ1Ew8SwYZxeQDcARCNjkM0wDAIgF+M1gBCA6cPrApAt6BimHobhBsCcBqJhikGGYDMIZgmKASBBUgBOA5Bdgg3DXIVhALmYQgNk/wMAQ2Cys1X73UcAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Utilisateurs Campus Condorcet</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CAMPUS CONDORCET</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Utilisateurs Campus Condorcet</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDaTCCAlGgAwIBAgIUUbskQm6flzcLwm00UebURsVlOqowDQYJKoZIhvcNAQELBQAwKjEoMCYGA1UEAwwfaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mcjAeFw0xNTEyMDExMDQ2MDRaFw0zNTEyMDExMDQ2MDRaMCoxKDAmBgNVBAMMH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVdtz5q49daXITC5ulby/+ec+hxd3z24LWZwMkGJuPo1toKdEAmzKfRvwV5jiWMlj2AVTRB20qA0YfhcB8DOdeWdcOn+ioyumjzgEyIu5CpFhQEk47C+t/PsHAhz4W+gPKjz/FLXMNHzb9gqWB4X3twaCywFbwp0pazvnXFPNCps1hpQZg91HgmUeKuG7D5ph2hWNeZsafeSTAuOUfI6K3mBuqyX5gooUjkmC2yChehI8M4vOrCDbpduNHSpIvcyh1lWQYgOFOsrvmPxcvX6FS6D332fr5pk8rH/n/ZVTjhXJQGjhXsE66D7Prl9G0u0fyxjo1wk3hbzZ6SNT2cMT/AgMBAAGjgYYwgYMwHQYDVR0OBBYEFOAGUo52UE2qpWvbFZUrCS9fBRECMGIGA1UdEQRbMFmCH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnKGNmh0dHBzOi8vaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATuf7qRpXVm9OPx4ZktinHIJI+YHlCUCbl+t28Nb2sJqqv/hSHKnm9DClLp8/ewlVY1Mb/vYtJz6byHuHzwzTf1POsVoV8WZwgg4loAarIIAO5nS9pwhAr86uK40bD0L2y+YIw+ltXxL5+YTwxkdYYyAEnin0lCclr8NQDSP3cYRPbCgAdTHBsX1o4yatgcC0Yf9nmIrrgpa7HYksjZNLiasjWjQeKsra1b/ifjrSFLwXgWkXSkjo7xWUIRfwvbBMFvbQc1NuZa4egPeyraK5ImrrhjaX9+jJrgw84aIrvkyaEClGMtH4nmc/LJAZexmwDgYutes8KufHfDLKAKmSvw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-campus-condorcet.renater.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-campus-condorcet.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDaTCCAlGgAwIBAgIUUbskQm6flzcLwm00UebURsVlOqowDQYJKoZIhvcNAQELBQAwKjEoMCYGA1UEAwwfaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mcjAeFw0xNTEyMDExMDQ2MDRaFw0zNTEyMDExMDQ2MDRaMCoxKDAmBgNVBAMMH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVdtz5q49daXITC5ulby/+ec+hxd3z24LWZwMkGJuPo1toKdEAmzKfRvwV5jiWMlj2AVTRB20qA0YfhcB8DOdeWdcOn+ioyumjzgEyIu5CpFhQEk47C+t/PsHAhz4W+gPKjz/FLXMNHzb9gqWB4X3twaCywFbwp0pazvnXFPNCps1hpQZg91HgmUeKuG7D5ph2hWNeZsafeSTAuOUfI6K3mBuqyX5gooUjkmC2yChehI8M4vOrCDbpduNHSpIvcyh1lWQYgOFOsrvmPxcvX6FS6D332fr5pk8rH/n/ZVTjhXJQGjhXsE66D7Prl9G0u0fyxjo1wk3hbzZ6SNT2cMT/AgMBAAGjgYYwgYMwHQYDVR0OBBYEFOAGUo52UE2qpWvbFZUrCS9fBRECMGIGA1UdEQRbMFmCH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnKGNmh0dHBzOi8vaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATuf7qRpXVm9OPx4ZktinHIJI+YHlCUCbl+t28Nb2sJqqv/hSHKnm9DClLp8/ewlVY1Mb/vYtJz6byHuHzwzTf1POsVoV8WZwgg4loAarIIAO5nS9pwhAr86uK40bD0L2y+YIw+ltXxL5+YTwxkdYYyAEnin0lCclr8NQDSP3cYRPbCgAdTHBsX1o4yatgcC0Yf9nmIrrgpa7HYksjZNLiasjWjQeKsra1b/ifjrSFLwXgWkXSkjo7xWUIRfwvbBMFvbQc1NuZa4egPeyraK5ImrrhjaX9+jJrgw84aIrvkyaEClGMtH4nmc/LJAZexmwDgYutes8KufHfDLKAKmSvw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CAMPUS CONDORCET</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CAMPUS CONDORCET</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Anass Chabli</md:SurName>
-      <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Johann Holland</md:SurName>
-      <md:EmailAddress>johann.holland@campus-condorcet.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CAMPUS CONDORCET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CAMPUS CONDORCET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Anass Chabli</md:SurName>
+    <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Johann Holland</md:SurName>
+    <md:EmailAddress>johann.holland@campus-condorcet.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml
index bc826f14..f2bf4a34 100644
--- a/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-co.calstate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">co.calstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Office of the Chancellor</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">co.calstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Office of the Chancellor</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJAPBOOrypT78oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2lkcC1jby5jYWxzdGF0ZS5lZHUwHhcNMTEwMzIxMTYwMTIzWhcNMjEwMzE4
 MTYwMTIzWjAeMRwwGgYDVQQDExNpZHAtY28uY2Fsc3RhdGUuZWR1MIIBIjANBgkq
@@ -38,22 +38,22 @@ HXtAk5cK81Wle/tZBD5tNgeMgE6GzoVsmzaNS9/qW6tirp8Zy5rXj8mqIKmH5wHo
 omaVi3Po04oaAqKFo9NnTmwoMRtoqm1kWFf27pah+JkibTMLoiHKe5F94v9Sbm7s
 gDk7zgM8NwgZL2Yr9kJ/Yhr5
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-co.calstate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-co.calstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-co.calstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-co.calstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">co.calstate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-co.calstate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-co.calstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-co.calstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-co.calstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">co.calstate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJAPBOOrypT78oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2lkcC1jby5jYWxzdGF0ZS5lZHUwHhcNMTEwMzIxMTYwMTIzWhcNMjEwMzE4
 MTYwMTIzWjAeMRwwGgYDVQQDExNpZHAtY28uY2Fsc3RhdGUuZWR1MIIBIjANBgkq
@@ -73,23 +73,23 @@ HXtAk5cK81Wle/tZBD5tNgeMgE6GzoVsmzaNS9/qW6tirp8Zy5rXj8mqIKmH5wHo
 omaVi3Po04oaAqKFo9NnTmwoMRtoqm1kWFf27pah+JkibTMLoiHKe5F94v9Sbm7s
 gDk7zgM8NwgZL2Yr9kJ/Yhr5
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-co.calstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-co.calstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Office of the Chancellor</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Office of the Chancellor</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.calstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marcus Mizushima</md:GivenName>
-      <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eli Pham</md:GivenName>
-      <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-co.calstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-co.calstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Office of the Chancellor</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Office of the Chancellor</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.calstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marcus Mizushima</md:GivenName>
+    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eli Pham</md:GivenName>
+    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
index 5ea59498..0afd0741 100644
--- a/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-couperin.renater.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-01T17:29:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-01T17:29:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">COUPERIN</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAA3NCSVQICAjb4U/gAAABKUlEQVQokWM0Nk5jIAWwoPFl1L6pGX/m4v0L4V44IPDkFheyAka4DZw8fzJ776obf0Ez4sIB/gUNCt+/QI1mlpIyhrAq5t9Q0v327TPz0na5Vb2ye5eLvXnOpqT7VVb9u6Lu1+NbRFCcpGb8WVb9OwMDw4IGhYsHBSCC+5aLP7nFVTzzlrrxF2HJn2+fs2PxA1w1BNw6y3vzLA8DAwMn71+G59g8jQn60tWRuUwENaCBAdfAyfNn5pmzM8+cVTP+jKLh7TM2CMMp8iWyBueoVwwMDN8+M986ywsRgYbS2+fsxzYLW/m+DS9+YuDwASKtZvwZEvGremXgRjAiJz6nyJe+ac/hCYmBgeHNM7ZVvbLIkcOImVpl1L5B9Hz7zIyW8hiwRhymImQAABoAaLnD7wajAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Service d'authentification de Couperin</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">COUPERIN</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service d'authentification de Couperin</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">COUPERIN</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAA3NCSVQICAjb4U/gAAABKUlEQVQokWM0Nk5jIAWwoPFl1L6pGX/m4v0L4V44IPDkFheyAka4DZw8fzJ776obf0Ez4sIB/gUNCt+/QI1mlpIyhrAq5t9Q0v327TPz0na5Vb2ye5eLvXnOpqT7VVb9u6Lu1+NbRFCcpGb8WVb9OwMDw4IGhYsHBSCC+5aLP7nFVTzzlrrxF2HJn2+fs2PxA1w1BNw6y3vzLA8DAwMn71+G59g8jQn60tWRuUwENaCBAdfAyfNn5pmzM8+cVTP+jKLh7TM2CMMp8iWyBueoVwwMDN8+M986ywsRgYbS2+fsxzYLW/m+DS9+YuDwASKtZvwZEvGremXgRjAiJz6nyJe+ac/hCYmBgeHNM7ZVvbLIkcOImVpl1L5B9Hz7zIyW8hiwRhymImQAABoAaLnD7wajAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Service d'authentification de Couperin</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">COUPERIN</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Service d'authentification de Couperin</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAMULo4bCEwXQpVzPDquvwEPmzkVrMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC1jb3VwZXJpbi5yZW5hdGVyLmZyMB4XDTE1MDYw
 MjEzMjc1M1oXDTM1MDYwMjEzMjc1M1owIjEgMB4GA1UEAwwXaWRwLWNvdXBlcmlu
@@ -40,26 +40,26 @@ STfAd9a90JZmO862Q8BMTdHHF4Buy+eROTL1w0VXkuP423sJvqlpQ2PhiZAf0Eyf
 9uO1aL0aX8uJvW1pBzHLduUpoGEKoaTf4JxRereiuuKCCiMcI3ETSpq7QpmChzt9
 t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-couperin.renater.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-couperin.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAMULo4bCEwXQpVzPDquvwEPmzkVrMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC1jb3VwZXJpbi5yZW5hdGVyLmZyMB4XDTE1MDYw
 MjEzMjc1M1oXDTM1MDYwMjEzMjc1M1owIjEgMB4GA1UEAwwXaWRwLWNvdXBlcmlu
@@ -79,20 +79,20 @@ STfAd9a90JZmO862Q8BMTdHHF4Buy+eROTL1w0VXkuP423sJvqlpQ2PhiZAf0Eyf
 9uO1aL0aX8uJvW1pBzHLduUpoGEKoaTf4JxRereiuuKCCiMcI3ETSpq7QpmChzt9
 t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-couperin.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">COUPERIN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">COUPERIN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>chabli Anass</md:SurName>
-      <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-couperin.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">COUPERIN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COUPERIN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>chabli Anass</md:SurName>
+    <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
index c879596a..54a88042 100644
--- a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/97-news-ricerca-scientifica/3719.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/109-generali/3759.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.operapadrepio.it/it/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.operapadrepio.it/en/109-generali/3760.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/97-news-ricerca-scientifica/3719.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/109-generali/3759.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.operapadrepio.it/it/privacy-policy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.operapadrepio.it/en/109-generali/3760.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="32" width="32" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="32" width="32" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
 NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
@@ -45,26 +45,26 @@ f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
 YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
 PeaxmS3Lw5E/7cnXkOo1qLnfhg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
 NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
@@ -84,23 +84,23 @@ f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
 YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
 PeaxmS3Lw5E/7cnXkOo1qLnfhg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.operapadrepio.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.operapadrepio.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.operapadrepio.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.operapadrepio.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml
index 6a76b4d5..cf4e484d 100644
--- a/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.bangor.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-10T13:00:11Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-10T13:00:11Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bangor University: Development</mdui:DisplayName>
+        <mdui:Logo height="73" width="59">https://www.bangor.ac.uk/shibboleth-logos/bangor-73x59.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.bangor.ac.uk/shibboleth-logos/bangor-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bangor University: Development</mdui:DisplayName>
-          <mdui:Logo height="73" width="59">https://www.bangor.ac.uk/shibboleth-logos/bangor-73x59.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.bangor.ac.uk/shibboleth-logos/bangor-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAKmysGQnotgkz47fU4wbfPvxaTf1MA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC1kZXYuYmFuZ29yLmFjLnVrMB4XDTEzMDEwOTE2
 						MzY0NVoXDTMzMDEwOTE2MzY0NVowHzEdMBsGA1UEAxMUaWRwLWRldi5iYW5nb3Iu
@@ -40,29 +40,29 @@
 						3eN5JibS7UcufNOYFglCndMKbf1xVAJzk8+HIy6qmiRkRuyQu4sbkW5UKUVhZt/N
 						8GDE235W9a6OGG3Ho/qA3g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.bangor.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.bangor.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAKmysGQnotgkz47fU4wbfPvxaTf1MA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC1kZXYuYmFuZ29yLmFjLnVrMB4XDTEzMDEwOTE2
 						MzY0NVoXDTMzMDEwOTE2MzY0NVowHzEdMBsGA1UEAxMUaWRwLWRldi5iYW5nb3Iu
@@ -82,27 +82,27 @@
 						3eN5JibS7UcufNOYFglCndMKbf1xVAJzk8+HIy6qmiRkRuyQu4sbkW5UKUVhZt/N
 						8GDE235W9a6OGG3Ho/qA3g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bangor University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bangor University: Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bangor.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:matthew.williams@bangor.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:matthew.williams@bangor.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bangor University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bangor University: Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bangor.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:matthew.williams@bangor.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:matthew.williams@bangor.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
index ec7fa7a3..877eb40f 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.cardiff.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University (Test - Dev)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cardiff University (Test - Dev)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIVALPBj+mIv2yR8UAKD/i7vqdumwAGMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU2
 						WhcNMzUwNzE3MTUwOTU2WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
@@ -45,13 +45,13 @@
 						+z6Cc6ob6jVxV/i8CWr8OMGqwGPpZ4gsMTt9h9p0m4J2ZeWLTw5M4hv8Poodx3q7
 						nqVb/BQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIVAO09ALr3KSIWq/Qs0c6n8L+5X4QfMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
 						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
@@ -71,13 +71,13 @@
 						j7tYiMu6aOeGGOPvaHfWJKuUZaVcyYy1/3P1f5s+qBmx2Qip/lMoyRlp2koQtq0i
 						C6/ezjY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIVAL6YvjNSscjvYb9Vqel/0PQDF0u1MA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
 						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
@@ -97,31 +97,31 @@
 						2nfE9xwWXO3lIWCeJ/cM3+1wAZoD1CZpMLele8bMNve5aU1K3NPSozCTCHu9CeaP
 						j6UiIXk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIVALPBj+mIv2yR8UAKD/i7vqdumwAGMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU2
 						WhcNMzUwNzE3MTUwOTU2WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
@@ -141,13 +141,13 @@
 						+z6Cc6ob6jVxV/i8CWr8OMGqwGPpZ4gsMTt9h9p0m4J2ZeWLTw5M4hv8Poodx3q7
 						nqVb/BQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIVAO09ALr3KSIWq/Qs0c6n8L+5X4QfMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
 						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
@@ -167,13 +167,13 @@
 						j7tYiMu6aOeGGOPvaHfWJKuUZaVcyYy1/3P1f5s+qBmx2Qip/lMoyRlp2koQtq0i
 						C6/ezjY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIVAL6YvjNSscjvYb9Vqel/0PQDF0u1MA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
 						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
@@ -193,24 +193,24 @@
 						2nfE9xwWXO3lIWCeJ/cM3+1wAZoD1CZpMLele8bMNve5aU1K3NPSozCTCHu9CeaP
 						j6UiIXk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University (Test - Dev)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/insrv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University (Test - Dev)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/insrv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml
index f83f4db1..3d6c4aaf 100644
--- a/swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.rcpch.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-25T14:30:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-25T14:30:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Royal College of Paediatrics and Child Health [test]</mdui:DisplayName>
+        <mdui:Logo height="168" width="238">https://www.rcpch.ac.uk/sites/default/themes/rcpch/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.rcpch.ac.uk/sites/default/themes/rcpch/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Royal College of Paediatrics and Child Health [test]</mdui:DisplayName>
-          <mdui:Logo height="168" width="238">https://www.rcpch.ac.uk/sites/default/themes/rcpch/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.rcpch.ac.uk/sites/default/themes/rcpch/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUUwvZSbWLgYhL1zmD7JfQa6+QIrAwDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTaWRwLWRldi5yY3BjaC5hYy51azAeFw0xNTAxMjYxMzEx
 						MzFaFw0zNTAxMjYxMzExMzFaMB4xHDAaBgNVBAMME2lkcC1kZXYucmNwY2guYWMu
@@ -42,29 +42,29 @@
 						gfjzLnyVmzTZMLzIwV+IztQoakTC3YOkcDQbXXbAPYlris23WcxuLYhU3C4/w+SN
 						wwvpWerUYSmTk8k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.rcpch.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.rcpch.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUUwvZSbWLgYhL1zmD7JfQa6+QIrAwDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTaWRwLWRldi5yY3BjaC5hYy51azAeFw0xNTAxMjYxMzEx
 						MzFaFw0zNTAxMjYxMzExMzFaMB4xHDAaBgNVBAMME2lkcC1kZXYucmNwY2guYWMu
@@ -84,25 +84,25 @@
 						gfjzLnyVmzTZMLzIwV+IztQoakTC3YOkcDQbXXbAPYlris23WcxuLYhU3C4/w+SN
 						wwvpWerUYSmTk8k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal College of Paediatrics and Child Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Paediatrics and Child Health [test]</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcpch.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Overt Software</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal College of Paediatrics and Child Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Paediatrics and Child Health [test]</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcpch.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Overt Software</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml
index d424acda..96d3daef 100644
--- a/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.sussex.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Sussex (development)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Sussex (development)</mdui:Description>
+        <mdui:Logo height="60" width="147">https://www.sussex.ac.uk/includes/images/external/logo.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.sussex.ac.uk/includes/images/external/favicon.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Sussex (development)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Sussex (development)</mdui:Description>
-          <mdui:Logo height="60" width="147">https://www.sussex.ac.uk/includes/images/external/logo.jpg</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.sussex.ac.uk/includes/images/external/favicon.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUaXHTQJ0iHL7M96NNUnD8cG38agowDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLWRldi5zdXNzZXguYWMudWswHhcNMTMwODAyMTMy
 						MjI3WhcNMzMwODAyMTMyMjI3WjAfMR0wGwYDVQQDExRpZHAtZGV2LnN1c3NleC5h
@@ -41,27 +41,27 @@
 						rWyVSAMwo1dTlw0V7i05upCRLj6pDHJwq8dX5iHO1Gt8JSFfY6aNdIz+kfVgM321
 						YV5CgHdLYfAq+Bcvp9eq
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.sussex.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.sussex.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUaXHTQJ0iHL7M96NNUnD8cG38agowDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLWRldi5zdXNzZXguYWMudWswHhcNMTMwODAyMTMy
 						MjI3WhcNMzMwODAyMTMyMjI3WjAfMR0wGwYDVQQDExRpZHAtZGV2LnN1c3NleC5h
@@ -81,28 +81,28 @@
 						rWyVSAMwo1dTlw0V7i05upCRLj6pDHJwq8dX5iHO1Gt8JSFfY6aNdIz+kfVgM321
 						YV5CgHdLYfAq+Bcvp9eq
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Sussex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sussex (development)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sussex.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dave</md:GivenName>
-      <md:SurName>Lewney</md:SurName>
-      <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dave</md:GivenName>
-      <md:SurName>Lewney</md:SurName>
-      <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Sussex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sussex (development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sussex.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Lewney</md:SurName>
+    <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Lewney</md:SurName>
+    <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
index 2f90b542..e6a348c2 100644
--- a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="32" width="32" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="32" width="32" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
 MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
@@ -46,26 +46,26 @@ hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
 fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
 MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
 MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
@@ -85,23 +85,23 @@ hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
 fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
 MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.dongnocchi.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.dongnocchi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
index a2cf50ff..f12a819e 100644
--- a/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-emedea.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T08:30:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T08:30:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emedea.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Eugenio Medea</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Eugenio Medea</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for IRCCS "Eugenio Medea" users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'IRCCS "Eugenio Medea"</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.emedea.it/ricerca/idem-garr-en.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.emedea.it/ricerca/idem-garr.php</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.emedea.it/ricerca/idem-garr-en.php</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.emedea.it/ricerca/idem-garr.php</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emedea.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRCCS Eugenio Medea</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IRCCS Eugenio Medea</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for IRCCS "Eugenio Medea" users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'IRCCS "Eugenio Medea"</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.emedea.it/ricerca/idem-garr-en.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.emedea.it/ricerca/idem-garr.php</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.emedea.it/ricerca/idem-garr-en.php</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.emedea.it/ricerca/idem-garr.php</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSzCCAjOgAwIBAgIUJ4fNWGX5+08debnn/nkHiEjdar8wDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5pcmNjcy5nYXJyLml0MB4XDTE0MTIw
 MzE0NTI1MFoXDTM0MTIwMzE0NTI1MFowIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5p
@@ -46,26 +46,26 @@ puDKQAij1jLb7WuFJDThpxZoqlh/5K9pC8zvupkflSB3ryDiD238MEG0XeJP4lrd
 71LUNetzMHi2RIWXjBtFyQrtWHEhkZRDLy5tTVgnRWbj7fW5LsUDSg7IXhTXlvGd
 K9UQVp9FsBNJgDA7bdiWsS8s4kOuhwB7w52dprEQ+w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-emedea.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emedea.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-emedea.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emedea.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSzCCAjOgAwIBAgIUJ4fNWGX5+08debnn/nkHiEjdar8wDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5pcmNjcy5nYXJyLml0MB4XDTE0MTIw
 MzE0NTI1MFoXDTM0MTIwMzE0NTI1MFowIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5p
@@ -85,23 +85,23 @@ puDKQAij1jLb7WuFJDThpxZoqlh/5K9pC8zvupkflSB3ryDiD238MEG0XeJP4lrd
 71LUNetzMHi2RIWXjBtFyQrtWHEhkZRDLy5tTVgnRWbj7fW5LsUDSg7IXhTXlvGd
 K9UQVp9FsBNJgDA7bdiWsS8s4kOuhwB7w52dprEQ+w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">IRCCS Eugenio Medea</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">IRCCS Eugenio Medea</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">IRCCS Eugenio Medea</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">IRCCS Eugenio Medea</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.emedea.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.emedea.it/english_medea/index.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">IRCCS Eugenio Medea</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IRCCS Eugenio Medea</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Eugenio Medea</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Eugenio Medea</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.emedea.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.emedea.it/english_medea/index.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
index 2d4d9701..fde8df21 100644
--- a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ensr.ens-rennes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T13:55:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T13:55:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-rennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENS Rennes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACpUlEQVQoz5XSy29MbRwH8O/v9zznnOk4HZTqq42QCtWmQ9SCkgaxQFzjUhGXhDZWdiI2wso1Lu/mjZC8NlILCRYWxMJCXKKvpihqlN50qKlpp1MzZ3rOc57nXcxf4Lv8fDffxZcad7UBICJjTGFSObYUgrQ2RQSMV1COLYTgIjIAIvh+qJRZVD2DiXL5gIiIEASh7+ua6jLBXEQAkghK6bJpkXPHm9yoBdDZa6/efx6xJE8tdc4db4q5NhFduN7e+TFVEpHMTL/zQeue+JeBzMbD9+4/7lnZUAkgX1AtzfGBZHZTy/17j3pWLatSSgOQAIxBzHVedw1rbe4+/BworbROpfOOJfqGxnN5/987XbFSx51iaW3EnLqdIPQPZS+eWK2N6fjw869y9+iBpZvXVj/v+L5/e936pnkV5dHur2lmAsAghKGeU1maSud7B8ctyWeOrSqJyIlc0NIcP3X1+ZOXg1vWzW/ZHZ/I+YKJieAHetOa6n9udd5+0L1wXpltiZNXnp3++8WvUW/2LPf89faTl56taKi0LaGNkQCY6eOX9L5ttYnesdY98UTfmG2JivLof13Drc31vd8yR/YuGUxm/SCMRqSoqt3h2KLzQ2p2uXtwR92PVO7ijXYhyBi8T/yaOb3k0O7676nfl292CCYiUOOuNmMgBbtRK+Y6/cnxugUzBpLZuVWx5PCEFCLU2pYiCHUmW2AmyUxeQS2umblu5VytjVdQb7pT+7bWvvs00rihprJiSv9QNp3xevoy6TFPCJYwkILSmcKjp32TfhgoPZL2mOlt94hXUE5CJHpHG+orRsc9ZgIMLd/ZRoAKtdaGmYrzJoPQsYXvhwBsS6hQE0EKNoB0JAA4kkGAAQADlNhCG0QsUfxBxGaYYgnq/zaGP8n/Wtk90FXUG3sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzcrMDI6MDBw0pBlAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM3KzAyOjAwAY8o2QAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ens-rennes.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENS Rennes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ensemble des utilisateurs de l'ENS Rennes</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-rennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENS Rennes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACpUlEQVQoz5XSy29MbRwH8O/v9zznnOk4HZTqq42QCtWmQ9SCkgaxQFzjUhGXhDZWdiI2wso1Lu/mjZC8NlILCRYWxMJCXKKvpihqlN50qKlpp1MzZ3rOc57nXcxf4Lv8fDffxZcad7UBICJjTGFSObYUgrQ2RQSMV1COLYTgIjIAIvh+qJRZVD2DiXL5gIiIEASh7+ua6jLBXEQAkghK6bJpkXPHm9yoBdDZa6/efx6xJE8tdc4db4q5NhFduN7e+TFVEpHMTL/zQeue+JeBzMbD9+4/7lnZUAkgX1AtzfGBZHZTy/17j3pWLatSSgOQAIxBzHVedw1rbe4+/BworbROpfOOJfqGxnN5/987XbFSx51iaW3EnLqdIPQPZS+eWK2N6fjw869y9+iBpZvXVj/v+L5/e936pnkV5dHur2lmAsAghKGeU1maSud7B8ctyWeOrSqJyIlc0NIcP3X1+ZOXg1vWzW/ZHZ/I+YKJieAHetOa6n9udd5+0L1wXpltiZNXnp3++8WvUW/2LPf89faTl56taKi0LaGNkQCY6eOX9L5ttYnesdY98UTfmG2JivLof13Drc31vd8yR/YuGUxm/SCMRqSoqt3h2KLzQ2p2uXtwR92PVO7ijXYhyBi8T/yaOb3k0O7676nfl292CCYiUOOuNmMgBbtRK+Y6/cnxugUzBpLZuVWx5PCEFCLU2pYiCHUmW2AmyUxeQS2umblu5VytjVdQb7pT+7bWvvs00rihprJiSv9QNp3xevoy6TFPCJYwkILSmcKjp32TfhgoPZL2mOlt94hXUE5CJHpHG+orRsc9ZgIMLd/ZRoAKtdaGmYrzJoPQsYXvhwBsS6hQE0EKNoB0JAA4kkGAAQADlNhCG0QsUfxBxGaYYgnq/zaGP8n/Wtk90FXUG3sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzcrMDI6MDBw0pBlAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM3KzAyOjAwAY8o2QAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ens-rennes.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENS Rennes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Ensemble des utilisateurs de l'ENS Rennes</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRDCCAiygAwIBAgIVAMWqxLx7lYiNhlTPapEholL2ajx8MA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmlkcC1lbnNyLmVucy1yZW5uZXMuZnIwHhcNMTQwMjI1
 MTgzNDE1WhcNMzQwMjI1MTgzNDE1WjAhMR8wHQYDVQQDExZpZHAtZW5zci5lbnMt
@@ -39,21 +39,21 @@ rU56Bc4TlmzKTAcgt6N/Wmwb7jubtPpeoZ3oQuuMjl5SD5kabufWGeLRR3blN2Fc
 067E4nErVpBw181gQpQMwpin/OjW+lbqa+ayBIRJfng4G2t5KcnvpJzfmlJS/Nus
 rfl6FRk/WmuNV0iaMjHeIz48Vet1SQLF
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ensr.ens-rennes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENS Rennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENS Rennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ens-rennes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>postmaster@ens-rennes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ensr.ens-rennes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENS Rennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENS Rennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ens-rennes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>postmaster@ens-rennes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
index f4dfc11f..3c2b6529 100644
--- a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-etu.crous-grenoble.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-04T16:10:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-04T16:10:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-grenoble.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Grenoble - étudiants</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-grenoble.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - étudiants</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-grenoble.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Grenoble - étudiants</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-grenoble.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Grenoble - étudiants</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTzCCAjegAwIBAgIUa/WpAhPdXKjK1Y6xsR36dWY2AtEwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZaWRwLWV0dS5jcm91cy1ncmVub2JsZS5mcjAeFw0xMjA5
 MDIwNzAzMDFaFw0zMjA5MDIwNzAzMDFaMCQxIjAgBgNVBAMTGWlkcC1ldHUuY3Jv
@@ -38,21 +38,21 @@ WrU7dAr/V3AtILCrLi6DimBM26rPSsVhjYNcCpvv9Wrqv/j/PcIq/O9AHYTGvNcY
 9ETYn7cWEBKXzgKBfSHJfdsyXuJVrnWC/aRS5TFFdwdfiLKPcsZkOm91NMNCPbgz
 XKhZB5QMwDW1nFHiHsXElQy2l4lLGZGvyCwpjqaqmXBwVvU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-etu.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Grenoble - étudiants</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Grenoble - étudiants</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-grenoble.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@crous-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-etu.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Grenoble - étudiants</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Grenoble - étudiants</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-grenoble.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
index 70ba489c..9614dbd9 100644
--- a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-hosting.renater.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-17T17:56:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-17T17:56:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER Connect</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">IdP Hosting</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">RENATER Connect</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">IdP Hosting</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RENATER Connect</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">IdP Hosting</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">RENATER Connect</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">IdP Hosting</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUZRhn1oG2f7FG4yfsnI73Z2W/5jswDQYJKoZIhvcNAQEL
 BQAwITEfMB0GA1UEAwwWaWRwLWhvc3RpbmcucmVuYXRlci5mcjAeFw0xNTExMTcx
 NjM4NDVaFw0zNTExMTcxNjM4NDVaMCExHzAdBgNVBAMMFmlkcC1ob3N0aW5nLnJl
@@ -39,23 +39,23 @@ dSqzvGLJpKzSnmgITqMT/RBPbgJUsETAr/5gOnfkJ1RQfbKjl/QzuQTKYPu4XeKJ
 z7+v1Ag9m2btxCUdJMaMDn/FUJKSzxOogW3vJ1ZIAXFMnEgSuhrM5/GoyiEqyCfj
 eTynT1A7tmOPmxyMyv76cficIt0xGao=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-hosting.renater.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-hosting.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUZRhn1oG2f7FG4yfsnI73Z2W/5jswDQYJKoZIhvcNAQEL
 BQAwITEfMB0GA1UEAwwWaWRwLWhvc3RpbmcucmVuYXRlci5mcjAeFw0xNTExMTcx
 NjM4NDVaFw0zNTExMTcxNjM4NDVaMCExHzAdBgNVBAMMFmlkcC1ob3N0aW5nLnJl
@@ -75,20 +75,20 @@ dSqzvGLJpKzSnmgITqMT/RBPbgJUsETAr/5gOnfkJ1RQfbKjl/QzuQTKYPu4XeKJ
 z7+v1Ag9m2btxCUdJMaMDn/FUJKSzxOogW3vJ1ZIAXFMnEgSuhrM5/GoyiEqyCfj
 eTynT1A7tmOPmxyMyv76cficIt0xGao=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-hosting.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RENATER Connect</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RENATER Connect</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Anass Chabli</md:SurName>
-      <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-hosting.renater.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RENATER Connect</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RENATER Connect</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Anass Chabli</md:SurName>
+    <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
index 6e36da2f..502c5cb4 100644
--- a/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iccu.beniculturali.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-05-16T09:30:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-05-16T09:30:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iccu.sbn.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ICCU - Central Institute for the Union Catalogue</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider of ICCU - Central Institute for the Union Catalogue</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider di ICCU - Istituto Centrale per il Catalogo Unico</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0015.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0015.html</mdui:InformationURL>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0016.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0016.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iccu.sbn.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ICCU - Central Institute for the Union Catalogue</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider of ICCU - Central Institute for the Union Catalogue</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider di ICCU - Istituto Centrale per il Catalogo Unico</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0015.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0015.html</mdui:InformationURL>
-          <mdui:Logo height="32" width="32" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="32" width="32" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0016.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0016.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDZTCCAk2gAwIBAgIUIBwjXMe2oAvEscwSyDPZ2w15rKAwDQYJKoZIhvcNAQEF
 BQAwKTEnMCUGA1UEAxMeaWRwLWljY3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MB4X
 DTE0MDMzMTE0MDMyMloXDTM0MDMzMTE0MDMyMlowKTEnMCUGA1UEAxMeaWRwLWlj
@@ -47,26 +47,26 @@ loIyp3aV/yzb9FOpDKSQfdowClVBDPVGnjjVcq4A2aHjxAJmMu9DFr3qNH3r2DVZ
 YEnhjJ7l96aa+WFWqg2KWh4eulWpQrg6eGEw/yWuKU3gc4x7BPVDP7goKnbHqNbR
 kwEmPrzpV6W3
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iccu.sbn.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iccu.sbn.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDZTCCAk2gAwIBAgIUIBwjXMe2oAvEscwSyDPZ2w15rKAwDQYJKoZIhvcNAQEF
 BQAwKTEnMCUGA1UEAxMeaWRwLWljY3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MB4X
 DTE0MDMzMTE0MDMyMloXDTM0MDMzMTE0MDMyMlowKTEnMCUGA1UEAxMeaWRwLWlj
@@ -87,23 +87,23 @@ loIyp3aV/yzb9FOpDKSQfdowClVBDPVGnjjVcq4A2aHjxAJmMu9DFr3qNH3r2DVZ
 YEnhjJ7l96aa+WFWqg2KWh4eulWpQrg6eGEw/yWuKU3gc4x7BPVDP7goKnbHqNbR
 kwEmPrzpV6W3
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ICCU - Central Institute for the Union Catalogue</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ICCU - Central Institute for the Union Catalogue</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.iccu.sbn.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:ic-cu.idem@beniculturali.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ICCU - Central Institute for the Union Catalogue</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ICCU - Central Institute for the Union Catalogue</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.iccu.sbn.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:ic-cu.idem@beniculturali.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
index c53a5c63..e7a4548d 100644
--- a/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iov.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-30T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioveneto.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider of Istituto Oncologico Veneto - IOV IRCCS</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider di Istituto Oncologico Veneto - IOV IRCCS</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-iov.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-iov.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ioveneto.it/index.php?page=privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.ioveneto.it/index.php?page=privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioveneto.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider of Istituto Oncologico Veneto - IOV IRCCS</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider di Istituto Oncologico Veneto - IOV IRCCS</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp-iov.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idp-iov.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ioveneto.it/index.php?page=privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.ioveneto.it/index.php?page=privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAKZ6hm3VBBJOouu37feeqiHLQhlAMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3MuZ2Fyci5pdDAeFw0xMzA3MjQx
 MzIzMzNaFw0zMzA3MjQxMzIzMzNaMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3Mu
@@ -46,26 +46,26 @@ Audn0iIIkzUxpLnNr8MZhRGXyX+zjsePxg4BfPtaLi0fA3aQg84Quf9E0mcnTcAo
 gd3FYweSWBnbIC1TQgBYoCexPPkeKLunXiZDnOV7JW4lysMfm87YERWJjjpJuqj6
 2V5Vl5f33hs+jOp95tFlpm+RzwU=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-iov.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioveneto.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-iov.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioveneto.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAKZ6hm3VBBJOouu37feeqiHLQhlAMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3MuZ2Fyci5pdDAeFw0xMzA3MjQx
 MzIzMzNaFw0zMzA3MjQxMzIzMzNaMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3Mu
@@ -85,24 +85,24 @@ Audn0iIIkzUxpLnNr8MZhRGXyX+zjsePxg4BfPtaLi0fA3aQg84Quf9E0mcnTcAo
 gd3FYweSWBnbIC1TQgBYoCexPPkeKLunXiZDnOV7JW4lysMfm87YERWJjjpJuqj6
 2V5Vl5f33hs+jOp95tFlpm+RzwU=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ioveneto.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.ioveneto.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Admin IdP IOV Veneto</md:GivenName>
-      <md:EmailAddress>mailto:idem@ioveneto.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ioveneto.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ioveneto.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Admin IdP IOV Veneto</md:GivenName>
+    <md:EmailAddress>mailto:idem@ioveneto.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-manage.dev.ja.net-shibboleth.xml b/swamid-interfederations-2.0/idp-manage.dev.ja.net-shibboleth.xml
index 908f17c2..3a293a13 100644
--- a/swamid-interfederations-2.0/idp-manage.dev.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-manage.dev.ja.net-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-manage.dev.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-13T15:21:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-13T15:21:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Managed Federation Services Management Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The management portal for customers of Jisc's Managed Federation Services, allowing you to configure your managed services.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Managed Federation Services Management Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The management portal for customers of Jisc's Managed Federation Services, allowing you to configure your managed services.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWjCCAkICCQDOHlUJNPwmhzANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECAwHQnJpc3RvbDEQMA4GA1UEBwwHQnJpc3RvbDENMAsGA1UECgwE
 						SklTQzENMAsGA1UECwwESklTQzEeMBwGA1UEAwwVaWRwLW1hbmFnZS5kZXYuamEu
@@ -53,43 +53,43 @@
 						X+EP0gi5aL/w6LO1Caf/5b0DHbDfAVmOVZo6ehc5U013wXddNGn3sTupjWKZLf8N
 						DewWUSzNy4072Zd3eSsG374NubCwlD+xRDo1cd4g4f4pypdXlXVePAN9wR4KKw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc Managed Federation Services Management Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rhys</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:rhys.smith@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rhys</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:rhys.smith@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp-manage.dev.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc Managed Federation Services Management Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:rhys.smith@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:rhys.smith@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
index 6ef38b95..215132e3 100644
--- a/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-oasi.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-26T09:11:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-26T09:11:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oasi.en.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider of IRCCS Associazione Oasi Maria SS. Onlus</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider di IRCCS Associazione Oasi Maria SS. Onlus</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-oasi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-oasi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.oasi.en.it/notelegali.asp?lingua=eng</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.oasi.en.it/notelegali.asp?lingua=ita</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oasi.en.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider of IRCCS Associazione Oasi Maria SS. Onlus</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider di IRCCS Associazione Oasi Maria SS. Onlus</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp-oasi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idp-oasi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:Logo height="32" width="32" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="32" width="32" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.oasi.en.it/notelegali.asp?lingua=eng</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.oasi.en.it/notelegali.asp?lingua=ita</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAItYUuNAsLYinqdB4KXgk7MQhAUoMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmlkcC1vYXNpLmlyY2NzLmdhcnIuaXQwHhcNMTQwNDA5
 MTQxMDI0WhcNMzQwNDA5MTQxMDI0WjAhMR8wHQYDVQQDExZpZHAtb2FzaS5pcmNj
@@ -46,26 +46,26 @@ g8NZtk5jC9hKCG0MQPN4anGR8P07DelxBa1S15gDweHa3p6n2c83u8pbEmbODRP3
 NlHngiNNaUEs+F+l2daLy1p0uxYqAMp4Z6mgwqg7R6S0GRcH6GXaL2PnMNEvBbLF
 RJOqpoMO/5mjCebxoT9AWqFmjVIlFwkv
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-oasi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oasi.en.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-oasi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oasi.en.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAItYUuNAsLYinqdB4KXgk7MQhAUoMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmlkcC1vYXNpLmlyY2NzLmdhcnIuaXQwHhcNMTQwNDA5
 MTQxMDI0WhcNMzQwNDA5MTQxMDI0WjAhMR8wHQYDVQQDExZpZHAtb2FzaS5pcmNj
@@ -85,23 +85,23 @@ g8NZtk5jC9hKCG0MQPN4anGR8P07DelxBa1S15gDweHa3p6n2c83u8pbEmbODRP3
 NlHngiNNaUEs+F+l2daLy1p0uxYqAMp4Z6mgwqg7R6S0GRcH6GXaL2PnMNEvBbLF
 RJOqpoMO/5mjCebxoT9AWqFmjVIlFwkv
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oasi.en.it/?lingua=eng</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.oasi.en.it/?lingua=ita</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@oasi.en.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oasi.en.it/?lingua=eng</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.oasi.en.it/?lingua=ita</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@oasi.en.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
index 3c4e95c3..fca12354 100644
--- a/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-portici.izs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-06T12:28:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-06T12:28:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izsmportici.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IZS del Mezzogiorno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IZS del Mezzogiorno</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for IZS del Mezzogiorno users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell\"IZS del Mezzogiorno</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-portici.izs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-portici.izs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-portici.izs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-portici.izs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izsmportici.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IZS del Mezzogiorno</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IZS del Mezzogiorno</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for IZS del Mezzogiorno users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell\"IZS del Mezzogiorno</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp-portici.izs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp-portici.izs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp-portici.izs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp-portici.izs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRzCCAi+gAwIBAgIUcbihemtvbR0F1l3UeGO6+md4QscwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXaWRwLXBvcnRpY2kuaXpzLmdhcnIuaXQwHhcNMTUwNDE2
 MTQ0NDA4WhcNMzUwNDE2MTQ0NDA4WjAiMSAwHgYDVQQDExdpZHAtcG9ydGljaS5p
@@ -46,26 +46,26 @@ QLhlUCOqabh4svEAremqhpa7r6+9MwlP26PDs9ehE2jTh759lg8tf19xxtFe7/vA
 f+/Pp4yPPKhWxwSKUI452MKUZf4J4KCW5p3mQ3Ba3cQjzryTL7yhbe74n2D4Z+eW
 sqq9jO4cSh8lUmsCNuyWD99IFy1Y7mSMt+L8
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-portici.izs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izsmportici.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-portici.izs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izsmportici.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRzCCAi+gAwIBAgIUcbihemtvbR0F1l3UeGO6+md4QscwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXaWRwLXBvcnRpY2kuaXpzLmdhcnIuaXQwHhcNMTUwNDE2
 MTQ0NDA4WhcNMzUwNDE2MTQ0NDA4WjAiMSAwHgYDVQQDExdpZHAtcG9ydGljaS5p
@@ -85,23 +85,23 @@ QLhlUCOqabh4svEAremqhpa7r6+9MwlP26PDs9ehE2jTh759lg8tf19xxtFe7/vA
 f+/Pp4yPPKhWxwSKUI452MKUZf4J4KCW5p3mQ3Ba3cQjzryTL7yhbe74n2D4Z+eW
 sqq9jO4cSh8lUmsCNuyWD99IFy1Y7mSMt+L8
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">IZS del Mezzogiorno</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">IZS del Mezzogiorno</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">IZS del Mezzogiorno</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">IZS del Mezzogiorno</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.izsmportici.it/portale/index.php</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.izsmportici.it/portale/index.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">IZS del Mezzogiorno</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IZS del Mezzogiorno</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">IZS del Mezzogiorno</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">IZS del Mezzogiorno</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.izsmportici.it/portale/index.php</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.izsmportici.it/portale/index.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
index 09530a10..52c8618c 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-25T18:02:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-25T18:02:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University (Test - Preprod)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cardiff University (Test - Preprod)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
@@ -52,32 +52,32 @@
 						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
 						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-preprod.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-preprod.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
@@ -104,27 +104,27 @@
 						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
 						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University (Test - Preprod)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University (Test - Preprod)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
index dc03e1c3..99fc1912 100644
--- a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-prod.cc.ucf.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucf.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Central Florida</mdui:DisplayName>
+        <mdui:Logo height="75" width="150" xml:lang="en">https://idp-prod.cc.ucf.edu/idp/ucflogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucf.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Central Florida</mdui:DisplayName>
-          <mdui:Logo height="75" width="150" xml:lang="en">https://idp-prod.cc.ucf.edu/idp/ucflogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAMvE2hm/0pdXtouxqrRuMPJtXmUzMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC1wcm9kLmNjLnVjZi5lZHUwHhcNMTEwNTE5MjEx
 MDQzWhcNMzEwNTE5MjExMDQzWjAeMRwwGgYDVQQDExNpZHAtcHJvZC5jYy51Y2Yu
@@ -42,13 +42,13 @@ gQFQHIvnPTccKgoZts0CMVqPD2rzOuK2excw5D1s5hxIiZ5Bi6pG9FfYWybR2SQ8
 u9ZyOOyULacfY5dN4/BJ293av9Xmq7skS0DcikqAJ/ZQlEV/NDexFGpABUmfQo37
 0q3VVc70nXU1d7cV
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFMjCCBBqgAwIBAgIQXAU976ByHakHmxGdYsAfRzANBgkqhkiG9w0BAQUFADBR
 MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
 bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTExMDUwOTAwMDAw
@@ -78,24 +78,24 @@ tQ2H8SS7hUbzmD/NTO6cEsYjU1nxz28ibqYXxarPm52u4JsM6BTpoNT/Oghfs3gZ
 iQtMxythgcIG+srpD7je26DK05H3d4qgjOzNogepc0Z1rCUxc1xOP/5QdoJ7dOhK
 iVr4j+vsHmoBJB+J5VAC8/SAzG/s4VDMBZ2yqMvzeEXkmaOTrso=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucf.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucf.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAMvE2hm/0pdXtouxqrRuMPJtXmUzMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC1wcm9kLmNjLnVjZi5lZHUwHhcNMTEwNTE5MjEx
 MDQzWhcNMzEwNTE5MjExMDQzWjAeMRwwGgYDVQQDExNpZHAtcHJvZC5jYy51Y2Yu
@@ -115,30 +115,30 @@ gQFQHIvnPTccKgoZts0CMVqPD2rzOuK2excw5D1s5hxIiZ5Bi6pG9FfYWybR2SQ8
 u9ZyOOyULacfY5dN4/BJ293av9Xmq7skS0DcikqAJ/ZQlEV/NDexFGpABUmfQo37
 0q3VVc70nXU1d7cV
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Central Florida</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Central Florida</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucf.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim Larson</md:GivenName>
-      <md:EmailAddress>tim@ucf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jim Ennis</md:GivenName>
-      <md:EmailAddress>jim@ucf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Laurence Siew</md:GivenName>
-      <md:EmailAddress>ls@ucf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Tim Larson</md:GivenName>
-      <md:EmailAddress>tim@ucf.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Central Florida</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Central Florida</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucf.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim Larson</md:GivenName>
+    <md:EmailAddress>tim@ucf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jim Ennis</md:GivenName>
+    <md:EmailAddress>jim@ucf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Laurence Siew</md:GivenName>
+    <md:EmailAddress>ls@ucf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Tim Larson</md:GivenName>
+    <md:EmailAddress>tim@ucf.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-qa.shef.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-qa.shef.ac.uk-idp-shibboleth.xml
index 62f49ef2..9960ab17 100644
--- a/swamid-interfederations-2.0/idp-qa.shef.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-qa.shef.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-qa.shef.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-09T14:10:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-09T14:10:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUZTwXL644lhHIY1OZNFWf6eyd8oAwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLXFhLnNoZWYuYWMudWswHhcNMTYwNDIyMTU1MDU3
 						WhcNMzYwNDIyMTU1MDU3WjAcMRowGAYDVQQDDBFpZHAtcWEuc2hlZi5hYy51azCC
@@ -37,13 +37,13 @@
 						gr5GhuPRbre5Yk4Ocgo+c3zH0OnuLtteT/xqjA8+h9iGz+XZrNnzj/dOhjbu0wJO
 						HpqK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUfbfP//LPHQr5Tb4wf2jYN7jqKRMwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLXFhLnNoZWYuYWMudWswHhcNMTYwNDIyMTU1MDU1
 						WhcNMzYwNDIyMTU1MDU1WjAcMRowGAYDVQQDDBFpZHAtcWEuc2hlZi5hYy51azCC
@@ -63,13 +63,13 @@
 						FLYSNloWcoGh6yyk9xqLHwEE8apCPs8wbuAVumFxgNPfq11MuNG24vK5i2Dayawv
 						htoN
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVALrpRvPMJI0nTThgAwX7/0MxrdLwMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcC1xYS5zaGVmLmFjLnVrMB4XDTE2MDQyMjE1NTA1
 						NloXDTM2MDQyMjE1NTA1NlowHDEaMBgGA1UEAwwRaWRwLXFhLnNoZWYuYWMudWsw
@@ -89,26 +89,26 @@
 						sNIbz0wPVP2bcnVRZovqbpiQ54WtzjqifJoigfJ2nNgxVX+UbEVpc3gd3ThCk1C+
 						OnHRXA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-qa.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-qa.shef.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-qa.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-qa.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-qa.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-qa.shef.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-qa.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-qa.shef.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-qa.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-qa.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-qa.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-qa.shef.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUZTwXL644lhHIY1OZNFWf6eyd8oAwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLXFhLnNoZWYuYWMudWswHhcNMTYwNDIyMTU1MDU3
 						WhcNMzYwNDIyMTU1MDU3WjAcMRowGAYDVQQDDBFpZHAtcWEuc2hlZi5hYy51azCC
@@ -128,13 +128,13 @@
 						gr5GhuPRbre5Yk4Ocgo+c3zH0OnuLtteT/xqjA8+h9iGz+XZrNnzj/dOhjbu0wJO
 						HpqK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUfbfP//LPHQr5Tb4wf2jYN7jqKRMwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLXFhLnNoZWYuYWMudWswHhcNMTYwNDIyMTU1MDU1
 						WhcNMzYwNDIyMTU1MDU1WjAcMRowGAYDVQQDDBFpZHAtcWEuc2hlZi5hYy51azCC
@@ -154,13 +154,13 @@
 						FLYSNloWcoGh6yyk9xqLHwEE8apCPs8wbuAVumFxgNPfq11MuNG24vK5i2Dayawv
 						htoN
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVALrpRvPMJI0nTThgAwX7/0MxrdLwMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcC1xYS5zaGVmLmFjLnVrMB4XDTE2MDQyMjE1NTA1
 						NloXDTM2MDQyMjE1NTA1NlowHDEaMBgGA1UEAwwRaWRwLXFhLnNoZWYuYWMudWsw
@@ -180,33 +180,33 @@
 						sNIbz0wPVP2bcnVRZovqbpiQ54WtzjqifJoigfJ2nNgxVX+UbEVpc3gd3ThCk1C+
 						OnHRXA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-qa.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Sheffield</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sheffield QA IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Web Team</md:GivenName>
-      <md:EmailAddress>mailto:webteam@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nomit</md:GivenName>
-      <md:SurName>Babraa</md:SurName>
-      <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Wilkins</md:SurName>
-      <md:EmailAddress>mailto:s.wilkins@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Barrett-Small</md:SurName>
-      <md:EmailAddress>mailto:r.barrett-small@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-qa.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Sheffield</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sheffield QA IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Web Team</md:GivenName>
+    <md:EmailAddress>mailto:webteam@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nomit</md:GivenName>
+    <md:SurName>Babraa</md:SurName>
+    <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Wilkins</md:SurName>
+    <md:EmailAddress>mailto:s.wilkins@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Barrett-Small</md:SurName>
+    <md:EmailAddress>mailto:r.barrett-small@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml
index d5dbc149..fda7926c 100644
--- a/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-renater.pulsalys.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-11T09:55:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-11T09:55:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pulsalys.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PULSALYS - SATT Lyon Saint-Etienne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADIGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEZEREU2MTA0RTM3MTFFNEIyRDI5MjEwNTlDQTM3M0UiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEZEREU2MTE0RTM3MTFFNEIyRDI5MjEwNTlDQTM3M0UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRkRERTYwRTRFMzcxMUU0QjJEMjkyMTA1OUNBMzczRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRkRERTYwRjRFMzcxMUU0QjJEMjkyMTA1OUNBMzczRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgXnGU8AAAIpSURBVDhPpVM7aFRBFD133tvdty/uJpLE9RNJlhiQEFCipLHQwl8jWFsIKxYpUsQitYWFWNmkEEypFmktBD+FjYVYRJsUKoiCIoIm2ay7+37jue+9LGKIhR4Y7sydued+R5rzMxb/AZPLf4axUQgbBbDdNmWYKm0cwdok21ubntO93v8eL++M2VuHUz+CwqlLMMMHYdubcPaNQ4pl2CSmC0P9KGzQgTM6SbKcRIm7P2GKZxow+ycgfVX4C/cBv4LC2QZkaARgZGbwAIqnL8OufYU3uwjQSBnUuHTxGmsQxwhfPkT3wQ20F2dRmLkA29oA1LuC92B6KdrNTCoYiRmbUoIA7uQJFM9fhXflFqLXzwDXzV8Rkq8/4ZYQrTwhAXMRvz9No3PvOpIv7yG87EWQsJiyvVlSKiN8vkwCPg5XnqK7fBPx21eQcgW2+R2mOgTbaUEqg0xpvUdiwy4LmnfMcWCk5LHiHuD1QQr0zBU8uovy3B2448fgzy8heLxEPd84Ltzpc9DCa0ecieOQ1u2GjT+8IbeBSJasejAjh2FqdSSfVpF8+0itwDk0DcPumNoYotUXEHW6MXfUwin0jLeQDU2ePz2n+y2dLkMdTYy4xW3GCtFO8JG4JOcwSf8wi12l3ENC2uzazZSZ/k6fSafQDNTgTJ1E8vkd9yzq5g/IAAm0M4xKi7szgbaXVUbJzwzSSGiUDhNNGLnir99ZSXRO8lMuma5mnB6BX43W3MOLAiGEAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://satt.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Users coming from Pulsalys (SATT Lyon Saint-Etienne)</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">PULSALYS - SATT Lyon Saint-Etienne</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Utilisateurs en provenance de Pulsalys (SATT Lyon Saint-Etienne)</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pulsalys.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PULSALYS - SATT Lyon Saint-Etienne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADIGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEZEREU2MTA0RTM3MTFFNEIyRDI5MjEwNTlDQTM3M0UiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEZEREU2MTE0RTM3MTFFNEIyRDI5MjEwNTlDQTM3M0UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRkRERTYwRTRFMzcxMUU0QjJEMjkyMTA1OUNBMzczRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRkRERTYwRjRFMzcxMUU0QjJEMjkyMTA1OUNBMzczRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgXnGU8AAAIpSURBVDhPpVM7aFRBFD133tvdty/uJpLE9RNJlhiQEFCipLHQwl8jWFsIKxYpUsQitYWFWNmkEEypFmktBD+FjYVYRJsUKoiCIoIm2ay7+37jue+9LGKIhR4Y7sydued+R5rzMxb/AZPLf4axUQgbBbDdNmWYKm0cwdok21ubntO93v8eL++M2VuHUz+CwqlLMMMHYdubcPaNQ4pl2CSmC0P9KGzQgTM6SbKcRIm7P2GKZxow+ycgfVX4C/cBv4LC2QZkaARgZGbwAIqnL8OufYU3uwjQSBnUuHTxGmsQxwhfPkT3wQ20F2dRmLkA29oA1LuC92B6KdrNTCoYiRmbUoIA7uQJFM9fhXflFqLXzwDXzV8Rkq8/4ZYQrTwhAXMRvz9No3PvOpIv7yG87EWQsJiyvVlSKiN8vkwCPg5XnqK7fBPx21eQcgW2+R2mOgTbaUEqg0xpvUdiwy4LmnfMcWCk5LHiHuD1QQr0zBU8uovy3B2448fgzy8heLxEPd84Ltzpc9DCa0ecieOQ1u2GjT+8IbeBSJasejAjh2FqdSSfVpF8+0itwDk0DcPumNoYotUXEHW6MXfUwin0jLeQDU2ePz2n+y2dLkMdTYy4xW3GCtFO8JG4JOcwSf8wi12l3ENC2uzazZSZ/k6fSafQDNTgTJ1E8vkd9yzq5g/IAAm0M4xKi7szgbaXVUbJzwzSSGiUDhNNGLnir99ZSXRO8lMuma5mnB6BX43W3MOLAiGEAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://satt.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Users coming from Pulsalys (SATT Lyon Saint-Etienne)</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">PULSALYS - SATT Lyon Saint-Etienne</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Utilisateurs en provenance de Pulsalys (SATT Lyon Saint-Etienne)</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVANyXdn2kcABS19rWW4TdzwbFNVoOMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC1wdWxzYWx5cy5pbnRlZ3JhLmZyMB4XDTE2MDEx
 NDA4NDczMVoXDTM2MDExNDA4NDczMVowIjEgMB4GA1UEAwwXaWRwLXB1bHNhbHlz
@@ -40,22 +40,22 @@ hJoLqJfPPGTTyE4tXJDJVOxN8Wa4TrtiHV9SKWV9Ely/QlNUxD/Q5Uw+S84nXGW9
 z61yeVT6XIKGKlhhCVZkkxWzU6qNfsVYg4VIFUeWmwmDK0moFxicPlzlnFs8mbzf
 PntJFpzykWk0h7PG5jwH+NLa0T+A/0P8bZuBzQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-renater.pulsalys.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-renater.pulsalys.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-renater.pulsalys.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PULSALYS - SATT Lyon Saint-Etienne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PULSALYS - SATT Lyon Saint-Etienne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://satt.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Julien Simbola</md:SurName>
-      <md:EmailAddress>jsimbola@integra.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-renater.pulsalys.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-renater.pulsalys.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-renater.pulsalys.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PULSALYS - SATT Lyon Saint-Etienne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PULSALYS - SATT Lyon Saint-Etienne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://satt.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Julien Simbola</md:SurName>
+    <md:EmailAddress>jsimbola@integra.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
index bbdda6f9..8cab4816 100644
--- a/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-sicilia.izs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-31T10:02:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-31T10:02:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izssicilia.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IZS Sicilia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IZS Sicilia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Istituto Zooprofilattico Sperimentale della Sicilia users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Istituto Zooprofilattico Sperimentale della Sicilia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-sicilia.izs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-sicilia.izs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="33" width="32" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="164" width="160" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="33" width="32" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="164" width="160" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-sicilia.izs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-sicilia.izs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izssicilia.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IZS Sicilia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IZS Sicilia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Istituto Zooprofilattico Sperimentale della Sicilia users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Istituto Zooprofilattico Sperimentale della Sicilia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp-sicilia.izs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idp-sicilia.izs.garr.it/idp/info.html</mdui:InformationURL>
-          <mdui:Logo height="33" width="32" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="164" width="160" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="33" width="32" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="164" width="160" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp-sicilia.izs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp-sicilia.izs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAPEWcrJjf1McdVn5rw3nQ6Gim4w8MA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF2lkcC1zaWNpbGlhLml6cy5nYXJyLml0MB4XDTE0MDIw
 NTE2MDMyM1oXDTM0MDIwNTE2MDMyM1owIjEgMB4GA1UEAxMXaWRwLXNpY2lsaWEu
@@ -46,26 +46,26 @@ ConqGhfg/9loGA83A69/axkSZIyaKBCIMq+lhBcuSJ0ug26WSDU4ujh3rfabFpyg
 poPD+5Yg0WJ+wYjoy4BNVeCpElAPujBOSpd47amEWkGr13k6vtIy+9WLFEIlmJKD
 DXuwjmwjokkHQaTBMi+WlFlUWfdpPOQVT9f/Iw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-sicilia.izs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izssicilia.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-sicilia.izs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izssicilia.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAPEWcrJjf1McdVn5rw3nQ6Gim4w8MA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF2lkcC1zaWNpbGlhLml6cy5nYXJyLml0MB4XDTE0MDIw
 NTE2MDMyM1oXDTM0MDIwNTE2MDMyM1owIjEgMB4GA1UEAxMXaWRwLXNpY2lsaWEu
@@ -85,23 +85,23 @@ ConqGhfg/9loGA83A69/axkSZIyaKBCIMq+lhBcuSJ0ug26WSDU4ujh3rfabFpyg
 poPD+5Yg0WJ+wYjoy4BNVeCpElAPujBOSpd47amEWkGr13k6vtIy+9WLFEIlmJKD
 DXuwjmwjokkHQaTBMi+WlFlUWfdpPOQVT9f/Iw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IZS Sicilia</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IZS Sicilia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IZS Sicilia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IZS Sicilia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.izssicilia.it/idem/idem-info-en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.izssicilia.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IZS Sicilia</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IZS Sicilia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IZS Sicilia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IZS Sicilia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.izssicilia.it/idem/idem-info-en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.izssicilia.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
index 6dacacd2..f3e85b86 100644
--- a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-23T06:04:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-23T06:04:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per il Colosseo</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per il Colosseo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://archeoroma.beniculturali.it/en/privacy-0</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://archeoroma.beniculturali.it/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per il Colosseo</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per il Colosseo</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL>
-          <mdui:Logo height="32" width="32" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="32" width="32" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://archeoroma.beniculturali.it/en/privacy-0</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://archeoroma.beniculturali.it/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
 BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
 HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
@@ -47,26 +47,26 @@ EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
 D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
 1UGZpgRi7oyzxW0d230=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
 BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
 HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
@@ -87,23 +87,23 @@ EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
 D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
 1UGZpgRi7oyzxW0d230=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
index dad995c6..2ad85b7d 100644
--- a/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-staf-prod.cineca.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-05-25T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-05-25T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cineca.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CINECA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CINECA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for CINECA users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti CINECA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cineca.it/content/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.cineca.it/content/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.cineca.it/content/idem</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.cineca.it/content/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-is.cineca.it/idp/images/cineca-logo-16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-is.cineca.it/idp/images/cineca-logo-16.png</mdui:Logo>
+        <mdui:Logo height="60" width="60" xml:lang="en">https://idp-is.cineca.it/idp/images/cineca-logo-60.png</mdui:Logo>
+        <mdui:Logo height="60" width="60" xml:lang="it">https://idp-is.cineca.it/idp/images/cineca-logo-60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cineca.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CINECA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">CINECA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for CINECA users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti CINECA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.cineca.it/content/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.cineca.it/content/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.cineca.it/content/idem</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.cineca.it/content/idem</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp-is.cineca.it/idp/images/cineca-logo-16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp-is.cineca.it/idp/images/cineca-logo-16.png</mdui:Logo>
-          <mdui:Logo height="60" width="60" xml:lang="en">https://idp-is.cineca.it/idp/images/cineca-logo-60.png</mdui:Logo>
-          <mdui:Logo height="60" width="60" xml:lang="it">https://idp-is.cineca.it/idp/images/cineca-logo-60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEezCCA2OgAwIBAgIQHvkLjPc6sKc/y3ML5fDtCjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDgyOTAwMDAwMFoXDTE2MDgyODIzNTk1OVowRTEhMB8GA1UE
@@ -52,26 +52,26 @@ N26ippAsHEIFeKPqHFiWH+qaKdxLDN/rY86QSmJiv8k03qJc8kFE7mGL42ZPxmB2
 U4h397kwgoSX2U9JmMp9IMdhI3osgFEX02Hfjiqb31kjwF/H8jNIdSbkJvWOdGL+
 PXnuP6cpOu/jRJmIlE28j4zIeBBNNB86tTBwAVYaJSM4QdcGW9JaNO6WNZC7rUw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-is.cineca.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-is.cineca.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-is.cineca.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-is.cineca.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-is.cineca.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-is.cineca.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cineca.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-is.cineca.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-is.cineca.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-is.cineca.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-is.cineca.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-is.cineca.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-is.cineca.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cineca.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEezCCA2OgAwIBAgIQHvkLjPc6sKc/y3ML5fDtCjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDgyOTAwMDAwMFoXDTE2MDgyODIzNTk1OVowRTEhMB8GA1UE
@@ -97,24 +97,24 @@ N26ippAsHEIFeKPqHFiWH+qaKdxLDN/rY86QSmJiv8k03qJc8kFE7mGL42ZPxmB2
 U4h397kwgoSX2U9JmMp9IMdhI3osgFEX02Hfjiqb31kjwF/H8jNIdSbkJvWOdGL+
 PXnuP6cpOu/jRJmIlE28j4zIeBBNNB86tTBwAVYaJSM4QdcGW9JaNO6WNZC7rUw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-is.cineca.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-is.cineca.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">CINECA</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CINECA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">CINECA Consorzio Interuniversitario</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CINECA Inter-University Consortium</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.cineca.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.cineca.it/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Tecnical Staff</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@cineca.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-is.cineca.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-is.cineca.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">CINECA</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CINECA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">CINECA Consorzio Interuniversitario</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CINECA Inter-University Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.cineca.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.cineca.it/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Tecnical Staff</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@cineca.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml
index 5a9395f8..332e0c7a 100644
--- a/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml
+++ b/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-staging.shibboleth.ox.ac.uk/shibboleth-idp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-20T09:42:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-20T09:42:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAIAtmK4I7O7bvf0RPA0ZNHo2hkSAMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
 						HhcNMTYwMTE0MTczMTAyWhcNMzYwMTE0MTczMTAyWjAqMSgwJgYDVQQDDB9pZHAt
@@ -38,13 +38,13 @@
 						sfemgQTqBY1Rk1/XM+fn4aKWfsbmvAJilAD46sUZtiBvUNlMLwAb9j49t0aITeNz
 						CjMKBIk+697oQF/5Zhw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgITekZgmzIaNoFuS/6wcr6UR9MwiDANBgkqhkiG9w0BAQsF
 						ADAqMSgwJgYDVQQDDB9pZHAtc3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMB4X
 						DTE2MDExNDE3MzA1NFoXDTM2MDExNDE3MzA1NFowKjEoMCYGA1UEAwwfaWRwLXN0
@@ -65,13 +65,13 @@
 						sqFWVybrxsBpkuXMazAh7vzbszSc5PRDllivVZCEVzzj3+uNR6s1GwBcDvOQzvJs
 						xMLJFJJld3a0yB22
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAPRlUe+MIjGNcHPwwfonzqdE0uphMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
 						HhcNMTYwMTE0MTczMDU0WhcNMzYwMTE0MTczMDU0WjAqMSgwJgYDVQQDDB9pZHAt
@@ -92,26 +92,26 @@
 						lOakNEYy9WRL8/SBEMSQdlAs5vKh6nvlOdX9cYLGJEQ/BpRPB40O6eqbcFbIhJSk
 						Uf13ppG6F4RF0QOHD3Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAIAtmK4I7O7bvf0RPA0ZNHo2hkSAMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
 						HhcNMTYwMTE0MTczMTAyWhcNMzYwMTE0MTczMTAyWjAqMSgwJgYDVQQDDB9pZHAt
@@ -132,13 +132,13 @@
 						sfemgQTqBY1Rk1/XM+fn4aKWfsbmvAJilAD46sUZtiBvUNlMLwAb9j49t0aITeNz
 						CjMKBIk+697oQF/5Zhw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgITekZgmzIaNoFuS/6wcr6UR9MwiDANBgkqhkiG9w0BAQsF
 						ADAqMSgwJgYDVQQDDB9pZHAtc3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMB4X
 						DTE2MDExNDE3MzA1NFoXDTM2MDExNDE3MzA1NFowKjEoMCYGA1UEAwwfaWRwLXN0
@@ -159,13 +159,13 @@
 						sqFWVybrxsBpkuXMazAh7vzbszSc5PRDllivVZCEVzzj3+uNR6s1GwBcDvOQzvJs
 						xMLJFJJld3a0yB22
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAPRlUe+MIjGNcHPwwfonzqdE0uphMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
 						HhcNMTYwMTE0MTczMDU0WhcNMzYwMTE0MTczMDU0WjAqMSgwJgYDVQQDDB9pZHAt
@@ -186,22 +186,22 @@
 						lOakNEYy9WRL8/SBEMSQdlAs5vKh6nvlOdX9cYLGJEQ/BpRPB40O6eqbcFbIhJSk
 						Uf13ppG6F4RF0QOHD3Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford, Staging IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://it.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity and Access Management</md:GivenName>
-      <md:EmailAddress>mailto:iam@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Identity and Access Management</md:GivenName>
-      <md:EmailAddress>mailto:iam@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, Staging IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity and Access Management</md:GivenName>
+    <md:EmailAddress>mailto:iam@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Identity and Access Management</md:GivenName>
+    <md:EmailAddress>mailto:iam@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
index 1c888eae..834498e2 100644
--- a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
 BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
 MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
@@ -47,26 +47,26 @@ PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
 tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
 lKnM7w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
 BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
 MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
@@ -87,24 +87,24 @@ PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
 tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
 lKnM7w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>technical support</md:GivenName>
-      <md:EmailAddress>mailto:ced@irccs-stellamaris.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>technical support</md:GivenName>
+    <md:EmailAddress>mailto:ced@irccs-stellamaris.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml
index 17540003..77d4deb8 100644
--- a/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.brighton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Brighton (Test)</mdui:DisplayName>
+        <mdui:Logo height="30" width="32">https://idp-test.brighton.ac.uk/idp/images/logo-brighton.ac.uk.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp-test.brighton.ac.uk/idp/images/favicon-brighton.ac.uk.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Brighton (Test)</mdui:DisplayName>
-          <mdui:Logo height="30" width="32">https://idp-test.brighton.ac.uk/idp/images/logo-brighton.ac.uk.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp-test.brighton.ac.uk/idp/images/favicon-brighton.ac.uk.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQjCCAiqgAwIBAgITX3a30d9XiqM9vVXseM3W2/n/pTANBgkqhkiG9w0BAQUF
 						ADAiMSAwHgYDVQQDExdpZHAtdGVzdC5icmlnaHRvbi5hYy51azAeFw0xMjAxMDQx
 						NjI4MDJaFw0zMjAxMDQxNjI4MDJaMCIxIDAeBgNVBAMTF2lkcC10ZXN0LmJyaWdo
@@ -40,26 +40,26 @@
 						TyUmU5tpQkbm7llvISEh/TfpYWyDpJohYPAT2BmH06biaAP0n+oXvHCpRwz4KSwI
 						ZGopIeez+JgQien0+2hmrAoCEBscww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.brighton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.brighton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQjCCAiqgAwIBAgITX3a30d9XiqM9vVXseM3W2/n/pTANBgkqhkiG9w0BAQUF
 						ADAiMSAwHgYDVQQDExdpZHAtdGVzdC5icmlnaHRvbi5hYy51azAeFw0xMjAxMDQx
 						NjI4MDJaFw0zMjAxMDQxNjI4MDJaMCIxIDAeBgNVBAMTF2lkcC10ZXN0LmJyaWdo
@@ -79,26 +79,26 @@
 						TyUmU5tpQkbm7llvISEh/TfpYWyDpJohYPAT2BmH06biaAP0n+oXvHCpRwz4KSwI
 						ZGopIeez+JgQien0+2hmrAoCEBscww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Brighton (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brighton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Holden</md:SurName>
-      <md:EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Brighton (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brighton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Holden</md:SurName>
+    <md:EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml
index 38d74b45..b8ad8b0b 100644
--- a/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.bsms.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brighton and Sussex Medical School (Test)</mdui:DisplayName>
+        <mdui:Logo height="63" width="40">https://idp-test.bsms.ac.uk/idp/images/logo-bsms.ac.uk.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp-test.bsms.ac.uk/idp/images/favicon-bsms.ac.uk.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brighton and Sussex Medical School (Test)</mdui:DisplayName>
-          <mdui:Logo height="63" width="40">https://idp-test.bsms.ac.uk/idp/images/logo-bsms.ac.uk.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp-test.bsms.ac.uk/idp/images/favicon-bsms.ac.uk.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAMOvj1rjzW6b/X9XZ3j1EUBtCU2TMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcC10ZXN0LmJzbXMuYWMudWswHhcNMTIwMTA0MTYy
 						ODA5WhcNMzIwMTA0MTYyODA5WjAeMRwwGgYDVQQDExNpZHAtdGVzdC5ic21zLmFj
@@ -41,27 +41,27 @@
 						O57WM45US3pZcz15guQB57aIg2+BtLfebM+aNxsCMYVlt31goe51bqG2Y/jT6HnQ
 						YXhX6GjmeXs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.bsms.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.bsms.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAMOvj1rjzW6b/X9XZ3j1EUBtCU2TMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcC10ZXN0LmJzbXMuYWMudWswHhcNMTIwMTA0MTYy
 						ODA5WhcNMzIwMTA0MTYyODA5WjAeMRwwGgYDVQQDExNpZHAtdGVzdC5ic21zLmFj
@@ -81,26 +81,26 @@
 						O57WM45US3pZcz15guQB57aIg2+BtLfebM+aNxsCMYVlt31goe51bqG2Y/jT6HnQ
 						YXhX6GjmeXs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brighton and Sussex Medical School (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bsms.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Holden</md:SurName>
-      <md:EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brighton and Sussex Medical School (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bsms.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Holden</md:SurName>
+    <md:EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml
index 310e0bd5..0b0438ab 100644
--- a/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.essex.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-03T15:04:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-03T15:04:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Essex test IdP</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Essex test IdP</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUc2qae097+pkdjp+uUEKBZzGqiSQwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
 						MzA3WhcNMzUwNTE1MTAwMzA3WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
@@ -40,13 +40,13 @@
 						XlioySiVaS8oqLO5edwzwVRYdnBcz0BLKLKmKIcIx06TBQ3mBp9rtmOGToAhS6X3
 						yGMY1s5np9J/xHxJjwaE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIULJr1XXhT+S3ey6YboSWZXF4zcoYwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
 						MzA1WhcNMzUwNTE1MTAwMzA1WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
@@ -66,13 +66,13 @@
 						0VpLooL/mMU9VbJR6WT1+uX7uJ+3qLZhLYeV2Yjl4T2QkQUtziJfxdqXcu6fPycZ
 						GFtAhBQHvhlmPU7wzNwn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUZozs58pLdQvrhtNplOVI0oAY+cYwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
 						MzA2WhcNMzUwNTE1MTAwMzA2WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
@@ -92,26 +92,26 @@
 						1oRl6W8FAYaIrGHdwkMNRDBKnbPub6Qm6TYbEN6CNRNm9yn8PWLSLSPukxZO9Syd
 						OHCALjxd0RBvEBzxEmDl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.essex.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.essex.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUc2qae097+pkdjp+uUEKBZzGqiSQwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
 						MzA3WhcNMzUwNTE1MTAwMzA3WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
@@ -131,13 +131,13 @@
 						XlioySiVaS8oqLO5edwzwVRYdnBcz0BLKLKmKIcIx06TBQ3mBp9rtmOGToAhS6X3
 						yGMY1s5np9J/xHxJjwaE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIULJr1XXhT+S3ey6YboSWZXF4zcoYwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
 						MzA1WhcNMzUwNTE1MTAwMzA1WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
@@ -157,13 +157,13 @@
 						0VpLooL/mMU9VbJR6WT1+uX7uJ+3qLZhLYeV2Yjl4T2QkQUtziJfxdqXcu6fPycZ
 						GFtAhBQHvhlmPU7wzNwn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUZozs58pLdQvrhtNplOVI0oAY+cYwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
 						MzA2WhcNMzUwNTE1MTAwMzA2WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
@@ -183,24 +183,24 @@
 						1oRl6W8FAYaIrGHdwkMNRDBKnbPub6Qm6TYbEN6CNRNm9yn8PWLSLSPukxZO9Syd
 						OHCALjxd0RBvEBzxEmDl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Essex test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essex.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alexis</md:GivenName>
-      <md:SurName>Wolton</md:SurName>
-      <md:EmailAddress>mailto:awolton@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alexis</md:GivenName>
-      <md:SurName>Wolton</md:SurName>
-      <md:EmailAddress>mailto:awolton@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Essex test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essex.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alexis</md:GivenName>
+    <md:SurName>Wolton</md:SurName>
+    <md:EmailAddress>mailto:awolton@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alexis</md:GivenName>
+    <md:SurName>Wolton</md:SurName>
+    <md:EmailAddress>mailto:awolton@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml
index 5dabbf0f..fa6d7fb8 100644
--- a/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.lancs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-06T09:32:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-06T09:32:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUYU6NkvsQbpPZ0YcuNXj04ufIkuUwDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLXRlc3QubGFuY3MuYWMudWswHhcNMTMwMjIyMTA0
 						MDQ5WhcNMzMwMjIyMTA0MDQ5WjAfMR0wGwYDVQQDExRpZHAtdGVzdC5sYW5jcy5h
@@ -37,26 +37,26 @@
 						6DVOmoLSq0nR7CUO5lFWaSTpD0w/xOBwVYMAZGlUJH5fnF5qyisYIKNYAgBtPMYO
 						paN4cH6RgjoaIKmzc9qC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUYU6NkvsQbpPZ0YcuNXj04ufIkuUwDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLXRlc3QubGFuY3MuYWMudWswHhcNMTMwMjIyMTA0
 						MDQ5WhcNMzMwMjIyMTA0MDQ5WjAfMR0wGwYDVQQDExRpZHAtdGVzdC5sYW5jcy5h
@@ -76,26 +76,26 @@
 						6DVOmoLSq0nR7CUO5lFWaSTpD0w/xOBwVYMAZGlUJH5fnF5qyisYIKNYAgBtPMYO
 						paN4cH6RgjoaIKmzc9qC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Lancaster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lancaster University (Test IdP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ISS Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:iss-service-desk@lancaster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:S.Bennett@lancaster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Lancaster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lancaster University (Test IdP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ISS Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:iss-service-desk@lancaster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:S.Bennett@lancaster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml
index a191526a..d339cd50 100644
--- a/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.londonmet.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAPy27MCB6aTiLx0QJJIVl19/Nlg5MA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGGlkcC10ZXN0LmxvbmRvbm1ldC5hYy51azAeFw0xNDA2
 						MjQwNzIwNDdaFw0zNDA2MjQwNzIwNDdaMCMxITAfBgNVBAMTGGlkcC10ZXN0Lmxv
@@ -35,26 +35,26 @@
 						whQdva1gQF2TXgJSIQN4n8gBVQ25HrITKlbnbQl2JKiFn/4RdNGi3CkWsFdpaYnP
 						MdvSvmbXG0Pvff01bGQ5w+2NV847gBm2lLigGenD5aI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.londonmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.londonmet.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAPy27MCB6aTiLx0QJJIVl19/Nlg5MA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGGlkcC10ZXN0LmxvbmRvbm1ldC5hYy51azAeFw0xNDA2
 						MjQwNzIwNDdaFw0zNDA2MjQwNzIwNDdaMCMxITAfBgNVBAMTGGlkcC10ZXN0Lmxv
@@ -74,27 +74,27 @@
 						whQdva1gQF2TXgJSIQN4n8gBVQ25HrITKlbnbQl2JKiFn/4RdNGi3CkWsFdpaYnP
 						MdvSvmbXG0Pvff01bGQ5w+2NV847gBm2lLigGenD5aI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London Metropolitan University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Metropolitan University - Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.londonmet.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rui</md:GivenName>
-      <md:SurName>Zong</md:SurName>
-      <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rui</md:GivenName>
-      <md:SurName>Zong</md:SurName>
-      <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London Metropolitan University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Metropolitan University - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.londonmet.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rui</md:GivenName>
+    <md:SurName>Zong</md:SurName>
+    <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rui</md:GivenName>
+    <md:SurName>Zong</md:SurName>
+    <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml
index 0b41d32d..db1ee6ff 100644
--- a/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml
+++ b/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.shibboleth.ox.ac.uk/shibboleth-idp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-26T13:38:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-26T13:38:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIJAJndjhMuiIt3MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHGlkcC10ZXN0LnNoaWJib2xldGgub3guYWMudWswHhcNMTMxMjEzMTIwNTM3
 						WhcNMzMxMjA4MTIwNTM3WjAnMSUwIwYDVQQDExxpZHAtdGVzdC5zaGliYm9sZXRo
@@ -37,26 +37,26 @@
 						BxEOB8wOhHyZdUMLGDMf1Vh8FsLeBbEyTSufmCMElvvhyypcf6OeRkoorvg6DO5z
 						mLIz9BqxkSzMZ08i2sFYDzsN1brrua9J38vP2UXhUBER7f4jaituaTx0ZA1vYJs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIJAJndjhMuiIt3MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHGlkcC10ZXN0LnNoaWJib2xldGgub3guYWMudWswHhcNMTMxMjEzMTIwNTM3
 						WhcNMzMxMjA4MTIwNTM3WjAnMSUwIwYDVQQDExxpZHAtdGVzdC5zaGliYm9sZXRo
@@ -76,25 +76,25 @@
 						BxEOB8wOhHyZdUMLGDMf1Vh8FsLeBbEyTSufmCMElvvhyypcf6OeRkoorvg6DO5z
 						mLIz9BqxkSzMZ08i2sFYDzsN1brrua9J38vP2UXhUBER7f4jaituaTx0ZA1vYJs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services IAM Team</md:GivenName>
-      <md:EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Services IAM Team</md:GivenName>
-      <md:EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services IAM Team</md:GivenName>
+    <md:EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Services IAM Team</md:GivenName>
+    <md:EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml
index 9ceaf076..5daa9191 100644
--- a/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.shu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-01T18:42:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-01T18:42:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sheffield Hallam University (TEST ONLY)</mdui:DisplayName>
+        <mdui:Logo height="43" width="80">https://extra.shu.ac.uk/ukfed/shu-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sheffield Hallam University (TEST ONLY)</mdui:DisplayName>
-          <mdui:Logo height="43" width="80">https://extra.shu.ac.uk/ukfed/shu-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxjCCAq6gAwIBAgIEU62O9jANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgMD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBwwJU2hlZmZpZWxk
 						MSQwIgYDVQQKDBtTaGVmZmllbGQgSGFsbGFtIFVuaXZlcnNpdHkxJDAiBgNVBAsM
@@ -44,26 +44,26 @@
 						Wiv9QUX8zNtt8reICQ8CmcKXLEV196GK9HU7nXwBDDo2tGGFh9PPhRV4F2kZteDx
 						8D/dzUJDDSS5HQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.shu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.shu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxjCCAq6gAwIBAgIEU62O9jANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgMD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBwwJU2hlZmZpZWxk
 						MSQwIgYDVQQKDBtTaGVmZmllbGQgSGFsbGFtIFVuaXZlcnNpdHkxJDAiBgNVBAsM
@@ -86,37 +86,37 @@
 						Wiv9QUX8zNtt8reICQ8CmcKXLEV196GK9HU7nXwBDDo2tGGFh9PPhRV4F2kZteDx
 						8D/dzUJDDSS5HQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sheffield Hallam University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sheffield Hallam University (TEST ONLY)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Turner</md:SurName>
-      <md:EmailAddress>mailto:a.p.turner@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gavin</md:GivenName>
-      <md:SurName>Moore</md:SurName>
-      <md:EmailAddress>mailto:g.r.moore@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Turner</md:SurName>
-      <md:EmailAddress>mailto:a.p.turner@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gavin</md:GivenName>
-      <md:SurName>Moore</md:SurName>
-      <md:EmailAddress>mailto:g.r.moore@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sheffield Hallam University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sheffield Hallam University (TEST ONLY)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Turner</md:SurName>
+    <md:EmailAddress>mailto:a.p.turner@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gavin</md:GivenName>
+    <md:SurName>Moore</md:SurName>
+    <md:EmailAddress>mailto:g.r.moore@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Turner</md:SurName>
+    <md:EmailAddress>mailto:a.p.turner@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gavin</md:GivenName>
+    <md:SurName>Moore</md:SurName>
+    <md:EmailAddress>mailto:g.r.moore@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
index 81856362..d4572d92 100644
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.ucs.ed.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
 						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
@@ -37,26 +37,26 @@
 						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
 						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
 						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
@@ -76,25 +76,25 @@
 						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
 						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: V2 TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>shibboleth@ed.ac.uk</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>shibboleth@ed.ac.uk</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: V2 TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>shibboleth@ed.ac.uk</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>shibboleth@ed.ac.uk</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.univ-lille1.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.univ-lille1.fr-idp-shibboleth.xml
index 933cc2e7..d36ef8ef 100644
--- a/swamid-interfederations-2.0/idp-test.univ-lille1.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.univ-lille1.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.univ-lille1.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-28T17:11:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-28T17:11:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lille - Sciences et Technologies (TEST)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDoxMiswMjowMLKWJ4sAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MTIrMDI6MDDDy583AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lille1.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">staff ans students for test only</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Lille - Sciences et Technologies (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnels et étudiants pour tests</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lille - Sciences et Technologies (TEST)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDoxMiswMjowMLKWJ4sAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MTIrMDI6MDDDy583AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lille1.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">staff ans students for test only</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Lille - Sciences et Technologies (TEST)</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnels et étudiants pour tests</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAPRq+Ii8lzQBkk7D9EU9oblok6/tMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC10ZXN0LnVuaXYtbGlsbGUxLmZyMB4XDTE2MDIw
 ODEzMjcyOFoXDTM2MDIwODEzMjcyOFowIjEgMB4GA1UEAwwXaWRwLXRlc3QudW5p
@@ -40,26 +40,26 @@ rJqoqrGqIjLYjHRGjQdWkHHy1Gv8gl7zxrjGoQRpuyRJV1cRdVUIitVpqcLy0aWR
 rLNuMTDpeuSwjE0p92SPk/jNwXne/clD2GtcqvoYkcQ3WDf9UQH1CSfNPpO8GeG1
 tHOWGFKnw5isV2bY6Iwyp3F1ZXey9VsL1Og3yA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.univ-lille1.fr/idp/profile/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.univ-lille1.fr/idp/profile/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAPRq+Ii8lzQBkk7D9EU9oblok6/tMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC10ZXN0LnVuaXYtbGlsbGUxLmZyMB4XDTE2MDIw
 ODEzMjcyOFoXDTM2MDIwODEzMjcyOFowIjEgMB4GA1UEAwwXaWRwLXRlc3QudW5p
@@ -79,20 +79,20 @@ rJqoqrGqIjLYjHRGjQdWkHHy1Gv8gl7zxrjGoQRpuyRJV1cRdVUIitVpqcLy0aWR
 rLNuMTDpeuSwjE0p92SPk/jNwXne/clD2GtcqvoYkcQ3WDf9UQH1CSfNPpO8GeG1
 tHOWGFKnw5isV2bY6Iwyp3F1ZXey9VsL1Og3yA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lille - Sciences et Technologies (TEST)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lille - Sciences et Technologies (TEST)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ines wallon</md:SurName>
-      <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.univ-lille1.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lille - Sciences et Technologies (TEST)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lille - Sciences et Technologies (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ines wallon</md:SurName>
+    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml
index 94d62c7e..2b6e87eb 100644
--- a/swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.warwick.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-24T16:20:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-24T16:20:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUMIS+8kDOqLvJbUPFF2xn+2rtu2AwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWaWRwLXRlc3Qud2Fyd2ljay5hYy51azAeFw0xNDA3MDkx
 						NDM4NTdaFw0zNDA3MDkxNDM4NTdaMCExHzAdBgNVBAMTFmlkcC10ZXN0Lndhcndp
@@ -37,26 +37,26 @@
 						I4SuWzKOc8mKnhAOms8r10DMOttuIvgCs1cZtHZmZPen1SpXVFx92sWeN2oRlN99
 						UkwJwkWY8lTvMN7ELcyAHFYYTqjILF4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUMIS+8kDOqLvJbUPFF2xn+2rtu2AwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWaWRwLXRlc3Qud2Fyd2ljay5hYy51azAeFw0xNDA3MDkx
 						NDM4NTdaFw0zNDA3MDkxNDM4NTdaMCExHzAdBgNVBAMTFmlkcC10ZXN0Lndhcndp
@@ -76,27 +76,27 @@
 						I4SuWzKOc8mKnhAOms8r10DMOttuIvgCs1cZtHZmZPen1SpXVFx92sWeN2oRlN99
 						UkwJwkWY8lTvMN7ELcyAHFYYTqjILF4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Warwick</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Warwick (Test IdP - do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Howes</md:SurName>
-      <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Howes</md:SurName>
-      <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Warwick</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Warwick (Test IdP - do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Howes</md:SurName>
+    <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Howes</md:SurName>
+    <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml b/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml
index 4b69411a..1649b55a 100644
--- a/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml
+++ b/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.wmin.ac.uk/idp/entity">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-07T09:38:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-07T09:38:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUO4Z4TGad3zOqf20WubZJx3X2ObgwDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTaWRwLXRlc3Qud21pbi5hYy51azAeFw0xNTAzMzAxMDM2
 						MzdaFw0zNTAzMzAxMDM2MzdaMB4xHDAaBgNVBAMME2lkcC10ZXN0LndtaW4uYWMu
@@ -37,29 +37,29 @@
 						RMBgwrAipmgIcDLOeMl+oGrjXtnN+8bFdNpaf+h+VHa3y27tX/6HhP4/Fo+qhOO+
 						6/Qdq15NW15ehGY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.wmin.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.wmin.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUO4Z4TGad3zOqf20WubZJx3X2ObgwDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTaWRwLXRlc3Qud21pbi5hYy51azAeFw0xNTAzMzAxMDM2
 						MzdaFw0zNTAzMzAxMDM2MzdaMB4xHDAaBgNVBAMME2lkcC10ZXN0LndtaW4uYWMu
@@ -79,25 +79,25 @@
 						RMBgwrAipmgIcDLOeMl+oGrjXtnN+8bFdNpaf+h+VHa3y27tX/6HhP4/Fo+qhOO+
 						6/Qdq15NW15ehGY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Westminster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Westminster - Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.westminster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>FixIT</md:GivenName>
-      <md:EmailAddress>mailto:it-servicedesk@westminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ProofID</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Westminster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Westminster - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.westminster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>FixIT</md:GivenName>
+    <md:EmailAddress>mailto:it-servicedesk@westminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ProofID</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
index f0f3f184..46faf1e6 100644
--- a/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-02-18T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-02-18T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unito.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Turin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Torino</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users of University of Turin</mdui:Description>
+        <mdui:Description xml:lang="it">Identity PRovider per gli utenti dell'Università di Torino</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto_en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unito.it/unitoWAR/page/istituzionale_en/main/P181600246861349184985899</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/notecopyright</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_50x50.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unito.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Turin</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Torino</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for users of University of Turin</mdui:Description>
-          <mdui:Description xml:lang="it">Identity PRovider per gli utenti dell'Università di Torino</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto_en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unito.it/unitoWAR/page/istituzionale_en/main/P181600246861349184985899</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/notecopyright</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
-          <mdui:Logo height="50" width="50" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_50x50.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
 MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
@@ -46,26 +46,26 @@ Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
 rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
 07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unito.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unito.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unito.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unito.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unito.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unito.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unito.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unito.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unito.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unito.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
 MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
@@ -85,24 +85,24 @@ Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
 rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
 07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Torino</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Turin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Torino</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Turin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/home_en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>mailto:portale-supporto@unito.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Torino</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Turin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Torino</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Turin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/home_en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>mailto:portale-supporto@unito.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
index 4f3cf804..685df22c 100644
--- a/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unitus-prod.cineca.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-20T08:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-20T08:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitus.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Universita' Studi della Tuscia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universita' Studi della Tuscia</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider di produzione utenti Tuscia</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider production users Tuscia</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idp.unitus.it/static/help.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://idp.unitus.it/static/help.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp.unitus.it/static/help.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp.unitus.it/static/help.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unitus.it/static/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitus.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Universita' Studi della Tuscia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universita' Studi della Tuscia</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider di produzione utenti Tuscia</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider production users Tuscia</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idp.unitus.it/static/help.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://idp.unitus.it/static/help.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp.unitus.it/static/help.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp.unitus.it/static/help.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unitus.it/static/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE8zCCA9ugAwIBAgICB58wDQYJKoZIhvcNAQEFBQAwgbUxCzAJBgNVBAYTAklU
 MQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UEBxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAo
 Qk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29uc29yemlvIEludGVydW5pdmVyc2l0YXJp
@@ -52,28 +52,28 @@ qdwba7WvaoL4eyGeUMFwFyg2wQdNeMW7/APQFMGz9qX2yq4vnnwjwFzeWR+euXPs
 LWxendzaDigSKZxGj2JNiAySgZ2su+k2h07itO1VPGi/HhlbC+Cd+AndH8zGjFHf
 N2UAjpeR7GCIUbqf35pg6y/RlJFI46w=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitus.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitus.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitus.it:443/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitus.it:443/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitus.it:443/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitus.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitus.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitus.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitus.it:443/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitus.it:443/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitus.it:443/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitus.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE8zCCA9ugAwIBAgICB58wDQYJKoZIhvcNAQEFBQAwgbUxCzAJBgNVBAYTAklU
 MQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UEBxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAo
 Qk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29uc29yemlvIEludGVydW5pdmVyc2l0YXJp
@@ -102,25 +102,25 @@ qdwba7WvaoL4eyGeUMFwFyg2wQdNeMW7/APQFMGz9qX2yq4vnnwjwFzeWR+euXPs
 LWxendzaDigSKZxGj2JNiAySgZ2su+k2h07itO1VPGi/HhlbC+Cd+AndH8zGjFHf
 N2UAjpeR7GCIUbqf35pg6y/RlJFI46w=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitus.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitus.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Universita' degli Studi della Tuscia</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Universita' degli Studi della TusciaTuscia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Universita' Studi della Tuscia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Universita' Studi della Tuscia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www3.unitus.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www3.unitus.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Maurizio</md:GivenName>
-      <md:SurName>Menicacci</md:SurName>
-      <md:EmailAddress>mailto:webmaster@unitus.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitus.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitus.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Universita' degli Studi della Tuscia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Universita' degli Studi della TusciaTuscia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' Studi della Tuscia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universita' Studi della Tuscia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www3.unitus.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www3.unitus.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Maurizio</md:GivenName>
+    <md:SurName>Menicacci</md:SurName>
+    <md:EmailAddress>mailto:webmaster@unitus.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
index 755990c0..50e2d90d 100644
--- a/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -1,740 +1,740 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-v2.konstfack.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konstfack.se</shibmd:Scope>
+  </md:Extensions>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
+        <auth:DisplayName>employeeID</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
+        <auth:DisplayName>employeeID</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-v2.konstfack.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.konstfack.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konstfack.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">University College of Arts, Crafts and Design</mdui:Description>
+        <mdui:Description xml:lang="en">University College of Arts, Crafts and Design</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-this-site</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:ClaimTypesRequested>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
-          <auth:DisplayName>Is Registered User</auth:DisplayName>
-          <auth:Description>User is registered to use this device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
-          <auth:DisplayName>Device Identifier</auth:DisplayName>
-          <auth:Description>Identifier of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
-          <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
-          <auth:Description>Identifier for Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
-          <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
-          <auth:Description>Display name of Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
-          <auth:DisplayName>Device OS type</auth:DisplayName>
-          <auth:Description>OS type of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
-          <auth:DisplayName>Device OS Version</auth:DisplayName>
-          <auth:Description>OS version of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
-          <auth:DisplayName>Is Managed Device</auth:DisplayName>
-          <auth:Description>Device is managed by a management service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
-          <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
-          <auth:Description>IP address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
-          <auth:DisplayName>Client Application</auth:DisplayName>
-          <auth:Description>Type of the Client Application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
-          <auth:DisplayName>Client User Agent</auth:DisplayName>
-          <auth:Description>Device type the client is using to access the application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
-          <auth:DisplayName>Client IP</auth:DisplayName>
-          <auth:Description>IP address of the client</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
-          <auth:DisplayName>Endpoint Path</auth:DisplayName>
-          <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
-          <auth:DisplayName>Proxy</auth:DisplayName>
-          <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
-          <auth:DisplayName>Application Identifier</auth:DisplayName>
-          <auth:Description>Identifier for the Relying Party</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
-          <auth:DisplayName>Application policies</auth:DisplayName>
-          <auth:Description>Application policies of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
-          <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
-          <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
-          <auth:DisplayName>Basic Constraint</auth:DisplayName>
-          <auth:Description>One of the basic constraints of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
-          <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
-          <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
-          <auth:DisplayName>Issuer</auth:DisplayName>
-          <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
-          <auth:DisplayName>Issuer Name</auth:DisplayName>
-          <auth:Description>The distinguished name of the certificate issuer</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
-          <auth:DisplayName>Key Usage</auth:DisplayName>
-          <auth:Description>One of the key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
-          <auth:DisplayName>Not After</auth:DisplayName>
-          <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
-          <auth:DisplayName>Not Before</auth:DisplayName>
-          <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
-          <auth:DisplayName>Certificate Policies</auth:DisplayName>
-          <auth:Description>The policies under which the certificate has been issued</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
-          <auth:DisplayName>Public Key</auth:DisplayName>
-          <auth:Description>Public Key of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
-          <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
-          <auth:Description>The raw data of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
-          <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
-          <auth:Description>One of the alternative names of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
-          <auth:DisplayName>Serial Number</auth:DisplayName>
-          <auth:Description>The serial number of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
-          <auth:DisplayName>Signature Algorithm</auth:DisplayName>
-          <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
-          <auth:DisplayName>Subject</auth:DisplayName>
-          <auth:Description>The subject from the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
-          <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
-          <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
-          <auth:DisplayName>Subject Name</auth:DisplayName>
-          <auth:Description>The subject distinguished name from a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
-          <auth:DisplayName>V2 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
-          <auth:DisplayName>V1 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
-          <auth:DisplayName>Thumbprint</auth:DisplayName>
-          <auth:Description>Thumbprint of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
-          <auth:DisplayName>X.509 Version</auth:DisplayName>
-          <auth:Description>The X.509 format version of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
-          <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
-          <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
-          <auth:DisplayName>Password Expiration Time</auth:DisplayName>
-          <auth:Description>Used to display the time when the password expires</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
-          <auth:DisplayName>Password Expiration Days</auth:DisplayName>
-          <auth:Description>Used to display the number of days to password expiry</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
-          <auth:DisplayName>Update Password URL</auth:DisplayName>
-          <auth:Description>Used to display the web address of update password service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
-          <auth:DisplayName>Authentication Methods References</auth:DisplayName>
-          <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
-          <auth:DisplayName>Client Request ID</auth:DisplayName>
-          <auth:Description>Identifier for a user session</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
-          <auth:DisplayName>Alternate Login ID</auth:DisplayName>
-          <auth:Description>Alternate login ID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
-          <auth:DisplayName>employeeID</auth:DisplayName>
-        </auth:ClaimType>
-      </fed:ClaimTypesRequested>
-      <fed:TargetScopes>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust</Address>
-        </EndpointReference>
-      </fed:TargetScopes>
-      <fed:ApplicationServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-      </fed:ApplicationServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.konstfack.se">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:TokenTypesOffered>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
-      </fed:TokenTypesOffered>
-      <fed:ClaimTypesOffered>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
-          <auth:DisplayName>Is Registered User</auth:DisplayName>
-          <auth:Description>User is registered to use this device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
-          <auth:DisplayName>Device Identifier</auth:DisplayName>
-          <auth:Description>Identifier of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
-          <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
-          <auth:Description>Identifier for Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
-          <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
-          <auth:Description>Display name of Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
-          <auth:DisplayName>Device OS type</auth:DisplayName>
-          <auth:Description>OS type of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
-          <auth:DisplayName>Device OS Version</auth:DisplayName>
-          <auth:Description>OS version of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
-          <auth:DisplayName>Is Managed Device</auth:DisplayName>
-          <auth:Description>Device is managed by a management service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
-          <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
-          <auth:Description>IP address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
-          <auth:DisplayName>Client Application</auth:DisplayName>
-          <auth:Description>Type of the Client Application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
-          <auth:DisplayName>Client User Agent</auth:DisplayName>
-          <auth:Description>Device type the client is using to access the application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
-          <auth:DisplayName>Client IP</auth:DisplayName>
-          <auth:Description>IP address of the client</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
-          <auth:DisplayName>Endpoint Path</auth:DisplayName>
-          <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
-          <auth:DisplayName>Proxy</auth:DisplayName>
-          <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
-          <auth:DisplayName>Application Identifier</auth:DisplayName>
-          <auth:Description>Identifier for the Relying Party</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
-          <auth:DisplayName>Application policies</auth:DisplayName>
-          <auth:Description>Application policies of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
-          <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
-          <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
-          <auth:DisplayName>Basic Constraint</auth:DisplayName>
-          <auth:Description>One of the basic constraints of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
-          <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
-          <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
-          <auth:DisplayName>Issuer</auth:DisplayName>
-          <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
-          <auth:DisplayName>Issuer Name</auth:DisplayName>
-          <auth:Description>The distinguished name of the certificate issuer</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
-          <auth:DisplayName>Key Usage</auth:DisplayName>
-          <auth:Description>One of the key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
-          <auth:DisplayName>Not After</auth:DisplayName>
-          <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
-          <auth:DisplayName>Not Before</auth:DisplayName>
-          <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
-          <auth:DisplayName>Certificate Policies</auth:DisplayName>
-          <auth:Description>The policies under which the certificate has been issued</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
-          <auth:DisplayName>Public Key</auth:DisplayName>
-          <auth:Description>Public Key of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
-          <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
-          <auth:Description>The raw data of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
-          <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
-          <auth:Description>One of the alternative names of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
-          <auth:DisplayName>Serial Number</auth:DisplayName>
-          <auth:Description>The serial number of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
-          <auth:DisplayName>Signature Algorithm</auth:DisplayName>
-          <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
-          <auth:DisplayName>Subject</auth:DisplayName>
-          <auth:Description>The subject from the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
-          <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
-          <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
-          <auth:DisplayName>Subject Name</auth:DisplayName>
-          <auth:Description>The subject distinguished name from a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
-          <auth:DisplayName>V2 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
-          <auth:DisplayName>V1 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
-          <auth:DisplayName>Thumbprint</auth:DisplayName>
-          <auth:Description>Thumbprint of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
-          <auth:DisplayName>X.509 Version</auth:DisplayName>
-          <auth:Description>The X.509 format version of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
-          <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
-          <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
-          <auth:DisplayName>Password Expiration Time</auth:DisplayName>
-          <auth:Description>Used to display the time when the password expires</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
-          <auth:DisplayName>Password Expiration Days</auth:DisplayName>
-          <auth:Description>Used to display the number of days to password expiry</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
-          <auth:DisplayName>Update Password URL</auth:DisplayName>
-          <auth:Description>Used to display the web address of update password service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
-          <auth:DisplayName>Authentication Methods References</auth:DisplayName>
-          <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
-          <auth:DisplayName>Client Request ID</auth:DisplayName>
-          <auth:Description>Identifier for a user session</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
-          <auth:DisplayName>Alternate Login ID</auth:DisplayName>
-          <auth:Description>Alternate login ID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" Optional="true">
-          <auth:DisplayName>employeeID</auth:DisplayName>
-        </auth:ClaimType>
-      </fed:ClaimTypesOffered>
-      <fed:SecurityTokenServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/services/trust/2005/certificatemixed</Address>
-          <Metadata>
-            <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
-              <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
-                <wsx:MetadataReference>
-                  <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-v2.konstfack.se/adfs/services/trust/mex</Address>
-                </wsx:MetadataReference>
-              </wsx:MetadataSection>
-            </Metadata>
-          </Metadata>
-        </EndpointReference>
-      </fed:SecurityTokenServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.konstfack.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.konstfack.se/adfs/ls/" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/" index="2"/>
-    </md:SPSSODescriptor>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konstfack.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">University College of Arts, Crafts and Design</mdui:Description>
-          <mdui:Description xml:lang="en">University College of Arts, Crafts and Design</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-this-site</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="100">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeID"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Håkan</md:GivenName>
-      <md:SurName>Pettersson</md:SurName>
-      <md:EmailAddress>netsupport@konstfack.se</md:EmailAddress>
-      <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIIWVVUmcWy8KMwDQYJKoZIhvcNAQELBQAwgcYxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xNDAyBgNVBAMTK1N0YXJmaWVsZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTYwMzE4MTEwODM4WhcNMTkwMzE4MTEwODM4WjBBMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC12Mi5rb25zdGZhY2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc4aKJIr/SA+wVmhBWdivMqvsQGRaD7oDlOzpiOykD4P7DD7w9ex+xe/Gz+RTU5Hh8f++h4rRv6yMopON52WTEIe2S39LmQ+f0WWq1NsPkJFwynGmvVWmlR+gu8JgtWB19IGplBF5i7wLdN5W8ENcsm/mO7yvhqbLeKcNXtEdQuXbNnAVuA74cx5rkP7QesSO9nEfbfuIZTgg0kz5lza7wcqbzxmpvuTbrufU5iVLsLNtaF04OzUy0h0159GruioZ9olRZGAoiRiyK+zqNlbGa29LoChE4uVh6f55/fyvT5b3g2A4vq0/evDtdvy2FkjpIzitlVIBY01wIz+v74FGFAgMBAAGjggHiMIIB3jAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zdGFyZmllbGR0ZWNoLmNvbS9zZmlnMnMxLTI1LmNybDBjBgNVHSAEXDBaME4GC2CGSAGG/W4BBxcBMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly9jZXJ0aWZpY2F0ZXMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQIBMIGCBggrBgEFBQcBAQR2MHQwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnN0YXJmaWVsZHRlY2guY29tLzBGBggrBgEFBQcwAoY6aHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5L3NmaWcyLmNydDAfBgNVHSMEGDAWgBQlRYFoUCY4PTstLL7Natm2PbNmYzA3BgNVHREEMDAughNpZHAtdjIua29uc3RmYWNrLnNlghd3d3cuaWRwLXYyLmtvbnN0ZmFjay5zZTAdBgNVHQ4EFgQUSE3LMcug5Hdxxvf0OQ6En7Ft7aMwDQYJKoZIhvcNAQELBQADggEBACOXE7ZTDnPZjQLJOm+/Hs7hhruDNEGe92RxrcjItfsGZLHYXYIgppaZNpp2wduWBWCKZmVGq9zfNvRQDBdBU+VQ/O1YeGAytdc1Se31q6hHxcrka1P9FtY5Vpt22/uerSio/Bm2n/iVmWSb1D0oevRzXTZtpNFDHHnTxbQoezhFi1RkCv7oLgtTh2ZXTcZkrFg2UGYeStVApeXTCVdHzf5yoZf7rRsyt4RVwkkkQQRGOPsL8K4QJmX7aT5llbcdDchNQ/gnJxxL/EVkEmzRHRirFITQ4TD+IymODaYeJ5Fh+PD/tgYuYcQT2q0W3YoysFX/43oq0IJqtTJzVQnlPfk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/employeeID" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeID"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Håkan</md:GivenName>
+    <md:SurName>Pettersson</md:SurName>
+    <md:EmailAddress>netsupport@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp-v2.suni.se-adfs-services-trust.xml
index 88131329..4d8cbbe8 100644
--- a/swamid-interfederations-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -1,746 +1,746 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-v2.suni.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns="" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suni.se</shibmd:Scope>
+  </md:Extensions>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.suni.se">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" Optional="true">
+        <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.suni.se">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
+        <auth:DisplayName>Is Registered User</auth:DisplayName>
+        <auth:Description>User is registered to use this device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
+        <auth:DisplayName>Device Identifier</auth:DisplayName>
+        <auth:Description>Identifier of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
+        <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
+        <auth:Description>Identifier for Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
+        <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
+        <auth:Description>Display name of Device Registration</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
+        <auth:DisplayName>Device OS type</auth:DisplayName>
+        <auth:Description>OS type of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
+        <auth:DisplayName>Device OS Version</auth:DisplayName>
+        <auth:Description>OS version of the device</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
+        <auth:DisplayName>Is Managed Device</auth:DisplayName>
+        <auth:Description>Device is managed by a management service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
+        <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
+        <auth:Description>IP address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
+        <auth:DisplayName>Client Application</auth:DisplayName>
+        <auth:Description>Type of the Client Application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
+        <auth:DisplayName>Client User Agent</auth:DisplayName>
+        <auth:Description>Device type the client is using to access the application</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
+        <auth:DisplayName>Client IP</auth:DisplayName>
+        <auth:Description>IP address of the client</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
+        <auth:DisplayName>Endpoint Path</auth:DisplayName>
+        <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
+        <auth:DisplayName>Proxy</auth:DisplayName>
+        <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
+        <auth:DisplayName>Application Identifier</auth:DisplayName>
+        <auth:Description>Identifier for the Relying Party</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
+        <auth:DisplayName>Application policies</auth:DisplayName>
+        <auth:Description>Application policies of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
+        <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
+        <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
+        <auth:DisplayName>Basic Constraint</auth:DisplayName>
+        <auth:Description>One of the basic constraints of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
+        <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
+        <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
+        <auth:DisplayName>Issuer</auth:DisplayName>
+        <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
+        <auth:DisplayName>Issuer Name</auth:DisplayName>
+        <auth:Description>The distinguished name of the certificate issuer</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
+        <auth:DisplayName>Key Usage</auth:DisplayName>
+        <auth:Description>One of the key usages of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
+        <auth:DisplayName>Not After</auth:DisplayName>
+        <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
+        <auth:DisplayName>Not Before</auth:DisplayName>
+        <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
+        <auth:DisplayName>Certificate Policies</auth:DisplayName>
+        <auth:Description>The policies under which the certificate has been issued</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
+        <auth:DisplayName>Public Key</auth:DisplayName>
+        <auth:Description>Public Key of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
+        <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
+        <auth:Description>The raw data of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
+        <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
+        <auth:Description>One of the alternative names of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
+        <auth:DisplayName>Serial Number</auth:DisplayName>
+        <auth:Description>The serial number of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
+        <auth:DisplayName>Signature Algorithm</auth:DisplayName>
+        <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
+        <auth:DisplayName>Subject</auth:DisplayName>
+        <auth:Description>The subject from the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
+        <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
+        <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
+        <auth:DisplayName>Subject Name</auth:DisplayName>
+        <auth:Description>The subject distinguished name from a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
+        <auth:DisplayName>V2 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
+        <auth:DisplayName>V1 Template Name</auth:DisplayName>
+        <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
+        <auth:DisplayName>Thumbprint</auth:DisplayName>
+        <auth:Description>Thumbprint of the certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
+        <auth:DisplayName>X.509 Version</auth:DisplayName>
+        <auth:Description>The X.509 format version of a certificate</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
+        <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
+        <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
+        <auth:DisplayName>Password Expiration Time</auth:DisplayName>
+        <auth:Description>Used to display the time when the password expires</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
+        <auth:DisplayName>Password Expiration Days</auth:DisplayName>
+        <auth:Description>Used to display the number of days to password expiry</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
+        <auth:DisplayName>Update Password URL</auth:DisplayName>
+        <auth:Description>Used to display the web address of update password service</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
+        <auth:DisplayName>Authentication Methods References</auth:DisplayName>
+        <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
+        <auth:DisplayName>Client Request ID</auth:DisplayName>
+        <auth:Description>Identifier for a user session</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
+        <auth:DisplayName>Alternate Login ID</auth:DisplayName>
+        <auth:Description>Alternate login ID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" Optional="true">
+        <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" Optional="true">
+        <auth:DisplayName>eduPersonEntitlement</auth:DisplayName>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" Optional="true">
+        <auth:DisplayName>eduPersonScopedAffiliation</auth:DisplayName>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-v2.suni.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp-v2.suni.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.suni.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
       <shibmd:Scope xmlns="" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suni.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ny Identitetshanterare för Södertörns högskola</mdui:Description>
+        <mdui:Description xml:lang="en">New Identity Provider for Södertörn University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.suni.se">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:ClaimTypesRequested>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
-          <auth:DisplayName>Is Registered User</auth:DisplayName>
-          <auth:Description>User is registered to use this device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
-          <auth:DisplayName>Device Identifier</auth:DisplayName>
-          <auth:Description>Identifier of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
-          <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
-          <auth:Description>Identifier for Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
-          <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
-          <auth:Description>Display name of Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
-          <auth:DisplayName>Device OS type</auth:DisplayName>
-          <auth:Description>OS type of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
-          <auth:DisplayName>Device OS Version</auth:DisplayName>
-          <auth:Description>OS version of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
-          <auth:DisplayName>Is Managed Device</auth:DisplayName>
-          <auth:Description>Device is managed by a management service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
-          <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
-          <auth:Description>IP address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
-          <auth:DisplayName>Client Application</auth:DisplayName>
-          <auth:Description>Type of the Client Application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
-          <auth:DisplayName>Client User Agent</auth:DisplayName>
-          <auth:Description>Device type the client is using to access the application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
-          <auth:DisplayName>Client IP</auth:DisplayName>
-          <auth:Description>IP address of the client</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
-          <auth:DisplayName>Endpoint Path</auth:DisplayName>
-          <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
-          <auth:DisplayName>Proxy</auth:DisplayName>
-          <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
-          <auth:DisplayName>Application Identifier</auth:DisplayName>
-          <auth:Description>Identifier for the Relying Party</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
-          <auth:DisplayName>Application policies</auth:DisplayName>
-          <auth:Description>Application policies of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
-          <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
-          <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
-          <auth:DisplayName>Basic Constraint</auth:DisplayName>
-          <auth:Description>One of the basic constraints of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
-          <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
-          <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
-          <auth:DisplayName>Issuer</auth:DisplayName>
-          <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
-          <auth:DisplayName>Issuer Name</auth:DisplayName>
-          <auth:Description>The distinguished name of the certificate issuer</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
-          <auth:DisplayName>Key Usage</auth:DisplayName>
-          <auth:Description>One of the key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
-          <auth:DisplayName>Not After</auth:DisplayName>
-          <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
-          <auth:DisplayName>Not Before</auth:DisplayName>
-          <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
-          <auth:DisplayName>Certificate Policies</auth:DisplayName>
-          <auth:Description>The policies under which the certificate has been issued</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
-          <auth:DisplayName>Public Key</auth:DisplayName>
-          <auth:Description>Public Key of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
-          <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
-          <auth:Description>The raw data of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
-          <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
-          <auth:Description>One of the alternative names of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
-          <auth:DisplayName>Serial Number</auth:DisplayName>
-          <auth:Description>The serial number of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
-          <auth:DisplayName>Signature Algorithm</auth:DisplayName>
-          <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
-          <auth:DisplayName>Subject</auth:DisplayName>
-          <auth:Description>The subject from the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
-          <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
-          <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
-          <auth:DisplayName>Subject Name</auth:DisplayName>
-          <auth:Description>The subject distinguished name from a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
-          <auth:DisplayName>V2 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
-          <auth:DisplayName>V1 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
-          <auth:DisplayName>Thumbprint</auth:DisplayName>
-          <auth:Description>Thumbprint of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
-          <auth:DisplayName>X.509 Version</auth:DisplayName>
-          <auth:Description>The X.509 format version of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
-          <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
-          <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
-          <auth:DisplayName>Password Expiration Time</auth:DisplayName>
-          <auth:Description>Used to display the time when the password expires</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
-          <auth:DisplayName>Password Expiration Days</auth:DisplayName>
-          <auth:Description>Used to display the number of days to password expiry</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
-          <auth:DisplayName>Update Password URL</auth:DisplayName>
-          <auth:Description>Used to display the web address of update password service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
-          <auth:DisplayName>Authentication Methods References</auth:DisplayName>
-          <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
-          <auth:DisplayName>Client Request ID</auth:DisplayName>
-          <auth:Description>Identifier for a user session</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
-          <auth:DisplayName>Alternate Login ID</auth:DisplayName>
-          <auth:Description>Alternate login ID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" Optional="true">
-          <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
-        </auth:ClaimType>
-      </fed:ClaimTypesRequested>
-      <fed:TargetScopes>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/ls/</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust</Address>
-        </EndpointReference>
-      </fed:TargetScopes>
-      <fed:ApplicationServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-      </fed:ApplicationServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp-v2.suni.se">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:TokenTypesOffered>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
-      </fed:TokenTypesOffered>
-      <fed:ClaimTypesOffered>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or AD FS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of domain\user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" Optional="true">
-          <auth:DisplayName>Is Registered User</auth:DisplayName>
-          <auth:Description>User is registered to use this device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" Optional="true">
-          <auth:DisplayName>Device Identifier</auth:DisplayName>
-          <auth:Description>Identifier of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" Optional="true">
-          <auth:DisplayName>Device Registration Identifier</auth:DisplayName>
-          <auth:Description>Identifier for Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" Optional="true">
-          <auth:DisplayName>Device Registration DisplayName</auth:DisplayName>
-          <auth:Description>Display name of Device Registration</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" Optional="true">
-          <auth:DisplayName>Device OS type</auth:DisplayName>
-          <auth:Description>OS type of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" Optional="true">
-          <auth:DisplayName>Device OS Version</auth:DisplayName>
-          <auth:Description>OS version of the device</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" Optional="true">
-          <auth:DisplayName>Is Managed Device</auth:DisplayName>
-          <auth:Description>Device is managed by a management service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" Optional="true">
-          <auth:DisplayName>Forwarded Client IP</auth:DisplayName>
-          <auth:Description>IP address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" Optional="true">
-          <auth:DisplayName>Client Application</auth:DisplayName>
-          <auth:Description>Type of the Client Application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" Optional="true">
-          <auth:DisplayName>Client User Agent</auth:DisplayName>
-          <auth:Description>Device type the client is using to access the application</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" Optional="true">
-          <auth:DisplayName>Client IP</auth:DisplayName>
-          <auth:Description>IP address of the client</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" Optional="true">
-          <auth:DisplayName>Endpoint Path</auth:DisplayName>
-          <auth:Description>Absolute Endpoint path which can be used to determine active versus passive clients</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" Optional="true">
-          <auth:DisplayName>Proxy</auth:DisplayName>
-          <auth:Description>DNS name of the federation server proxy that passed the request</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" Optional="true">
-          <auth:DisplayName>Application Identifier</auth:DisplayName>
-          <auth:Description>Identifier for the Relying Party</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" Optional="true">
-          <auth:DisplayName>Application policies</auth:DisplayName>
-          <auth:Description>Application policies of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" Optional="true">
-          <auth:DisplayName>Authority Key Identifier</auth:DisplayName>
-          <auth:Description>The Authority Key Identifier extension of the certificate that signed an issued certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" Optional="true">
-          <auth:DisplayName>Basic Constraint</auth:DisplayName>
-          <auth:Description>One of the basic constraints of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" Optional="true">
-          <auth:DisplayName>Enhanced Key Usage</auth:DisplayName>
-          <auth:Description>Describes one of the enhanced key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" Optional="true">
-          <auth:DisplayName>Issuer</auth:DisplayName>
-          <auth:Description>The name of the certificate authority that issued the X.509 certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" Optional="true">
-          <auth:DisplayName>Issuer Name</auth:DisplayName>
-          <auth:Description>The distinguished name of the certificate issuer</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" Optional="true">
-          <auth:DisplayName>Key Usage</auth:DisplayName>
-          <auth:Description>One of the key usages of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" Optional="true">
-          <auth:DisplayName>Not After</auth:DisplayName>
-          <auth:Description>Date in local time after which a certificate is no longer valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" Optional="true">
-          <auth:DisplayName>Not Before</auth:DisplayName>
-          <auth:Description>The date in local time on which a certificate becomes valid</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" Optional="true">
-          <auth:DisplayName>Certificate Policies</auth:DisplayName>
-          <auth:Description>The policies under which the certificate has been issued</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" Optional="true">
-          <auth:DisplayName>Public Key</auth:DisplayName>
-          <auth:Description>Public Key of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" Optional="true">
-          <auth:DisplayName>Certificate Raw Data</auth:DisplayName>
-          <auth:Description>The raw data of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" Optional="true">
-          <auth:DisplayName>Subject Alternative Name</auth:DisplayName>
-          <auth:Description>One of the alternative names of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" Optional="true">
-          <auth:DisplayName>Serial Number</auth:DisplayName>
-          <auth:Description>The serial number of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" Optional="true">
-          <auth:DisplayName>Signature Algorithm</auth:DisplayName>
-          <auth:Description>The algorithm used to create the signature of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" Optional="true">
-          <auth:DisplayName>Subject</auth:DisplayName>
-          <auth:Description>The subject from the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" Optional="true">
-          <auth:DisplayName>Subject Key Identifier</auth:DisplayName>
-          <auth:Description>Describes the subject key identifier of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" Optional="true">
-          <auth:DisplayName>Subject Name</auth:DisplayName>
-          <auth:Description>The subject distinguished name from a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" Optional="true">
-          <auth:DisplayName>V2 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 2 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" Optional="true">
-          <auth:DisplayName>V1 Template Name</auth:DisplayName>
-          <auth:Description>The name of the version 1 certificate template used when issuing or renewing a certificate. The extension is Microsoft specific.</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" Optional="true">
-          <auth:DisplayName>Thumbprint</auth:DisplayName>
-          <auth:Description>Thumbprint of the certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" Optional="true">
-          <auth:DisplayName>X.509 Version</auth:DisplayName>
-          <auth:Description>The X.509 format version of a certificate</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" Optional="true">
-          <auth:DisplayName>Inside Corporate Network</auth:DisplayName>
-          <auth:Description>Used to indicate if a request originated inside corporate network</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" Optional="true">
-          <auth:DisplayName>Password Expiration Time</auth:DisplayName>
-          <auth:Description>Used to display the time when the password expires</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" Optional="true">
-          <auth:DisplayName>Password Expiration Days</auth:DisplayName>
-          <auth:Description>Used to display the number of days to password expiry</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" Optional="true">
-          <auth:DisplayName>Update Password URL</auth:DisplayName>
-          <auth:Description>Used to display the web address of update password service</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/claims/authnmethodsreferences" Optional="true">
-          <auth:DisplayName>Authentication Methods References</auth:DisplayName>
-          <auth:Description>Used to indicate all authentication methods used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" Optional="true">
-          <auth:DisplayName>Client Request ID</auth:DisplayName>
-          <auth:Description>Identifier for a user session</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2013/11/alternateloginid" Optional="true">
-          <auth:DisplayName>Alternate Login ID</auth:DisplayName>
-          <auth:Description>Alternate login ID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" Optional="true">
-          <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" Optional="true">
-          <auth:DisplayName>eduPersonEntitlement</auth:DisplayName>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" Optional="true">
-          <auth:DisplayName>eduPersonScopedAffiliation</auth:DisplayName>
-        </auth:ClaimType>
-      </fed:ClaimTypesOffered>
-      <fed:SecurityTokenServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/services/trust/2005/certificatemixed</Address>
-          <Metadata>
-            <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
-              <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
-                <wsx:MetadataReference>
-                  <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp-v2.suni.se/adfs/services/trust/mex</Address>
-                </wsx:MetadataReference>
-              </wsx:MetadataSection>
-            </Metadata>
-          </Metadata>
-        </EndpointReference>
-      </fed:SecurityTokenServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp-v2.suni.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-v2.suni.se/adfs/ls/" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/" index="2"/>
-    </md:SPSSODescriptor>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns="" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suni.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Ny Identitetshanterare för Södertörns högskola</mdui:Description>
-          <mdui:Description xml:lang="en">New Identity Provider for Södertörn University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
-          <mdui:Logo height="100" width="100">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.suni.se/adfs/services/trust/artifactresolution" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.sh.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tomas</md:GivenName>
-      <md:SurName>Legat</md:SurName>
-      <md:EmailAddress>server@sh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFMjCCBBqgAwIBAgIQAm3ZwLUL7U5eOFDOgDO7bDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAzMTUwMDAwMDBaFw0xOTAzMjAxMjAwMDBaMHsxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xETAPBgNVBAcTCEh1ZGRpbmdlMR8wHQYDVQQKDBZTw7ZkZXJ0w7ZybnMgaMO2Z3Nrb2xhMQswCQYDVQQLEwJJVDEXMBUGA1UEAxMOaWRwLXYyLnN1bmkuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOXlJ5/dL14M8QLLElvZWd3UQYlu5Ofu5amzIWCbxSisc2dga7auPgo4q+NDWhQMFI1kVYKD5T4AaKVbM6FSwW1alOsaDmVYkqv/z21bTa4bzqwg/GXtlIoxgQI3spHoVCqn2lB4iWD9YHb+85F+BlY4OBgLzUCpXM2w6eIMEfqghRc0XaDUvX1+eymVkKMQ+UNpc9IDkwvaKgQVaEo1hRl76bEVytBtAerMylEvAa7AFs5VBXCA6aoW4hXvYNnL6jJv5gh4kD1vH1WvOA0WlR0wRaO5nRwwPm1kMREXhweP9/l2AXPB9FuceGBz3P16SZKZ2TO4zXhqiEXZFIMqn5AgMBAAGjggHHMIIBwzAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUWx+gXBAJLGLQqiZF+QPFw1TJmbgwGQYDVR0RBBIwEIIOaWRwLXYyLnN1bmkuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAEyWyos2TCFAjsW4+VnJikhoydbbI8h/gMpvJImJbsQBhCCN/j0oJi6wDJ08vWC5gKlLG2YHOlhXN5piygmfIXcfF/BkTL++RuF072Ve7pL0NAcETL3xSXnKHqfKzxqjg9t2gInnqdkowtlx7RZdXIabHYCA3tY6r7cg0MCKQJjJvsMfgqYZjSVnZB1AXiJf0NNkH4Dd0zJPW3FjUa7c1pHW4IQFKZkPFlwT5G1VwGJXxJD/oZBgh5dXB/FE1wAJtQyCneg0yKP6T77dPXG96ev15NV7qcFeo7haDeMbGCtDNjzCP/vhiUo1gHYXOUKMkeIIlsyOnWYZApO96h0WfDk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.suni.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.sh.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Legat</md:SurName>
+    <md:EmailAddress>server@sh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml
index 7f983594..5d4fe227 100644
--- a/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.4cd.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">4cd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Contra Costa Community College District</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">4cd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Contra Costa Community College District</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC3jCCAcagAwIBAgIQY/dQsE83PaZJoxxonVIzyzANBgkqhkiG9w0BAQUFADAY
 MRYwFAYDVQQDEw1NRUcuYWMucG9ydGFsMB4XDTE1MDczMDE3MzU0NVoXDTE2MDcz
 MDAwMDAwMFowGDEWMBQGA1UEAxMNTUVHLmFjLnBvcnRhbDCCASIwDQYJKoZIhvcN
@@ -36,13 +36,13 @@ P3CEd4HX6C7wBBMtrMBtZUDH7yZpjfh0YAXZD289l7Frm6P2/4eIXEzdYUvN9X+M
 VGhn/FMx6CwPgaVvSUFhZSF1S/Zy5LGo5L+NwSskBZbsggvcFK81A8OQyRpqkfJ0
 FdNlLCLTu6n6ORJmir+X2PzI
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUbFc/9Zd90s2OyW+CDf6IsoyodFIwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwLjRjZC5lZHUwHhcNMTUwNzE1MjIwNTM4WhcNMzUw
 NzE1MjIwNTM4WjAWMRQwEgYDVQQDDAtpZHAuNGNkLmVkdTCCASIwDQYJKoZIhvcN
@@ -61,28 +61,28 @@ mDPEfrVywFVFmXyEtwyEYJSYXsfWLrFwAOpeiO1mq9T1Vk2Mr3P/F5+2E4+J06wg
 +iP2GsQmy1PGMfVhuKKGDMDx2YhCzbiGaDjF2782KYJ5xHr8jRIr3qzTRr/SIMsd
 5JecuW9DWVNJsuwR/jW02/KrcCa429lfK5mp
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.4cd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.4cd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.4cd.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.4cd.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.4cd.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.4cd.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.4cd.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Contra Costa Community College District</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Contra Costa Community College District</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.4cd.edu/default.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fred Tahan</md:GivenName>
-      <md:EmailAddress>ftahan@4cd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeanie Smith</md:GivenName>
-      <md:EmailAddress>jsmith@4cd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.4cd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.4cd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.4cd.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.4cd.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.4cd.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.4cd.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.4cd.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Contra Costa Community College District</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Contra Costa Community College District</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.4cd.edu/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fred Tahan</md:GivenName>
+    <md:EmailAddress>ftahan@4cd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeanie Smith</md:GivenName>
+    <md:EmailAddress>jsmith@4cd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index b13fb350..2584b3f2 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -1,675 +1,675 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.arnes.si/idp/20090116">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-08-25T15:08:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-08-25T15:08:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arnes.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.arnes.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.arnes.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pirnice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvkds.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrace.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddvic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iam.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-zetale.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmalecnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-volicina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ljutomer.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-logatec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zelezniki.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">8talcev.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ososkar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bistrica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostomaz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vergerio.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mps.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gracisce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-starse.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtci-brezovica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strocjavas.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cufar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-miklavz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslesce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dutovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-danilekumar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osenams.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrvatini.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os2ms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-svjurij.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-sezana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbeltinci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-raka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-raka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-ormoz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poldestrazisar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrojica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornberk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iroba.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerknica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoseze.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-laporje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljudskivrtptuj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscankova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podgrad.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-verzej.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konsak.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miroslav-vilhar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-crnomelj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjernej.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-sentjernej.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszuzemberk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cirkovce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-sg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gabrovka-dole.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kapela.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vstp.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjanz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorjup.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.osgorjup.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mostnasoci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirkulane-zavrc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osblanca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmetlika.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmsn.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrusevec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvodmat.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssjj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kutezevo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-kamnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljubecna.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-podlehnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helpdesk.arnes.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dragatus.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmislinja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospuconci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec.ospuconci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreska.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kosana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreserje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszalog.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icp-mb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-radenci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslucija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrteczala.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospo-slb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbakovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-divaca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekonomska-ms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinko-smrekar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdragomelj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-s.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arrs.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos-prosenjakovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbos.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstopice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-odranci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshjh-staritrg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leon.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ajdovscina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-igroharja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kis.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-azilb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kanal.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trebnje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mklj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okrogar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kamnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrsmb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrna.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jelsane.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrovo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmoravce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osferdavesela.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-tuhinj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pivka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sladki-vrh.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdi-univerzum.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miklavz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbohinj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimjes.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezovica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslimbus.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osorehek.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmslj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslag.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loka-crnomelj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-turnisce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgusi.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszrece.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jozmos.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-negova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bic-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koseze.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmjc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivantavcar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvp.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osicljutomer.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljane.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osflv.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfram.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskosmac.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osld.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ng-slo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dssl.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimidrija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sszagorje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmalgaja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slivnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vzgojni-zavod-verzej.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konservatorij-maribor.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-majdevrhovnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fokovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novejarse.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgradec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfml.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prezihovvoranc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszboraodposlancev.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ponikva.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimsen.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bled.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bostanj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smarje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-predoslje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirius-vipava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-sentjernej.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gro.sik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsv.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-atl.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjenka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mojstrana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-rence.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobrova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimoste.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hoce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">egss.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-cezanjevci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossiska.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vodice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrovte.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-spidrija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osagpostojna.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koroskijeklarji.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-prestranek.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askerc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sencur.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbistricaobsotli.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvsmuc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osminka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossevnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cerkljeobkrki.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sostro.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbocje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ingoliceva.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tretja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mozirje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrakek.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrslj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osborovnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpt-velenje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvelikadolina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">francebevk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-trzic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmnr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrihardajakopica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-naklo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmepius.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slomskov-zavod.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpmaribor.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prvagim.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijaki.prvagim.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodzemelj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os4ms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossecovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grm-nm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.grm-nm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osprule.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vojnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-litija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sostanj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-makole.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podcetrtek.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfdps.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssfkz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfp.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-salovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc-naklo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentrupert.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc1.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslovrenc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsnm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ges-sb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viviss.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbrdo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zgnl.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.zgnl.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koper.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-koper.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iskvarce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loskipotok.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospvmb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-tezno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">facka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscv.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskranj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seslj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sts-koper.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossempas.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vizvisnjagora.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssdomzale.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stps-trbovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ludvik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sveta-ana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kozara.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dd-msobota.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskomenda-moste.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">padeznik-mojasola.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">centerjanezalevca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdj-cerklje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-duplek.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sodrazica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frana-rosa.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sggos.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbi.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sturje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskorena.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-domzale.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikigaber.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kidricevo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslasko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-marijevere.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnicanapohorju.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">makspecar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.makspecar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoroskabela.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vipava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssof.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hajdina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acs.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimvic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pedag.gimvic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.gimvic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sticna.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jakobaaljaza.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospolje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strazisce-kr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossentvid.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-petrovce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanislav.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vv.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mirna.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossavskonaselje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbogojina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jd.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-vodice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-skofljica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ev-prade.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavidem.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-mk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glazer.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kdk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-kdk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iosce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrize.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-idrija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novefuzine.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbenedikt.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrpelje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossjsmlednik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iios-rogaska.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkvenjak.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kobarid.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivanjkovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vrhovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1osrogaska.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">3os-celje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">net.3os-celje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zssm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osapace.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zadobrova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-borcev.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjkb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zirovnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmklj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmezica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franakranjca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svsgl.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osszkr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gozdis.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-branik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">opvbistricams.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dravograd.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivade.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskobilje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osziri.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antonukmar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-col.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mladika.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimng.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szks.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dekani.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osartice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartnolitija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fgp.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stranje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivada.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodgorje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-komen.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trzin.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmuta.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospesnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmmsentjanz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-poljane.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-selnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frankolovo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-globoko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jela-janezica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slodrs.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostpavcka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.ostpavcka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-konjice-zrece.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cresnjevec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssgt-mb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gim-ms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzisce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossredisceobdravi.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-krsko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshorjul.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrogatec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-lipnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zveza-slepih.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrsko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-knezak.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olgica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljcane.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmarezige.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-planina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dusanabordona.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sempeter.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-velenje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">presernova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miren.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tsaljose.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solaklavora.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gsve.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmatijecopa.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vavta-vas.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimtol.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tolmin.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">2os-slb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos1-lendava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorisnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjvkg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdramlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scuoladecastro.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sesgs.sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sser.sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sts.sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sg.sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mic.sckr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-rodica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osoplotnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrnovo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssj-jesenice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osams.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-skofjaloka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvelikanedelja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pregarje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osig.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-crna.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vitakraigherja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonecufar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddmaribor.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-trbovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cepovan.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-destrnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-koper.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrezice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslenart.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dosdobrovnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbraslovce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slander.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bozidarjajakca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ribalon.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobrepolje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os3ms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrestanica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrad.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorica-velenje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjursinci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brinje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbezigrad.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-krizevci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssom.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossenovo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-maksadurjave.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbicevje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-otlica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.osgrm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-toncke-cec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leskovec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osobrinzi.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjarenina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osljubno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnisnicna-sola.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osloce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-lesicno.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvinica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osobdravinji.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossalek.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-livada.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskozje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-venopilon.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dgnp-mb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bts.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fa.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrod.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdeskle.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vperka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmedvode.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikapolana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-velikapolana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonetacufarja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tinje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-tinje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskuzma.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tisina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dob.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddkoper.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossentilj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-majsperk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smarjeta.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scrm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijak.scrm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smihel.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-markovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smartno-poh.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-store.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osradlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1os-zalec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.1os-zalec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptrubar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpcrensovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ravne.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvuzenica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dantealighieri.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-luce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-grize.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hudinja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dosgenterovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbizeljsko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpet.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-skofjaloka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrmelj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gasp.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgornjigrad.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-polzela.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospisece.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-rimsketoplice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskaselj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnhr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-tolmin.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfara.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovnasolaprevole.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">podgoro.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstaracerkev.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kungota.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrbovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-nazarje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavitanje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-skofije.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-antonajanse.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrecica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voranc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbovec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-razkrizje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srednjasolaizola.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-slovenskabistrica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zelenajama.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stari-trg-ok.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koprivnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vransko.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfpkr.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjdol.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-malanedelja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-montessori.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pei.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-ajdovscina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cksg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-prebold.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polancic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.polancic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gib.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jmdol.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-jmdol.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsd-kranj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miklavzev-vrtec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos2-lendava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-solkan.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seps-kp.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradbena.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjd.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">escelje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scng.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ac.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirius-kamnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-gradgona.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossklm.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavriceva.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">waldorf.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">3osrs.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmarje.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Arnes</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Arnes</mdui:Description>
+        <mdui:Keywords xml:lang="en">arnes idp identity</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
+        <mdui:Logo height="135" width="150">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.arnes.si/en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.arnes.si/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arnes.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.arnes.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.arnes.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pirnice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvkds.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrace.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddvic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iam.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-zetale.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmalecnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-volicina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ljutomer.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-logatec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zelezniki.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">8talcev.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ososkar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bistrica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostomaz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vergerio.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mps.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gracisce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-starse.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtci-brezovica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strocjavas.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cufar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-miklavz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslesce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dutovlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-danilekumar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osenams.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrvatini.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os2ms.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-svjurij.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-sezana.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbeltinci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-raka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-raka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospg.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-ormoz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poldestrazisar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrojica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornberk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iroba.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerknica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoseze.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-laporje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljudskivrtptuj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscankova.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podgrad.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-verzej.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konsak.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miroslav-vilhar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-crnomelj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjernej.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-sentjernej.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszuzemberk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cirkovce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-sg.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gabrovka-dole.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kapela.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vstp.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjanz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorjup.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.osgorjup.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mostnasoci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirkulane-zavrc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osblanca.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmetlika.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmsn.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrusevec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvodmat.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssjj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kutezevo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-kamnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljubecna.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-podlehnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helpdesk.arnes.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dragatus.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmislinja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospuconci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec.ospuconci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreska.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kosana.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreserje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszalog.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icp-mb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-radenci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslucija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrteczala.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospo-slb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbakovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-divaca.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekonomska-ms.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinko-smrekar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdragomelj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-s.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arrs.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos-prosenjakovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbos.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstopice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-odranci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshjh-staritrg.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leon.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ajdovscina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-igroharja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kis.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-azilb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kanal.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trebnje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mklj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okrogar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kamnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrsmb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrna.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jelsane.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrovo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmoravce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osferdavesela.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-tuhinj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pivka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sladki-vrh.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdi-univerzum.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miklavz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbohinj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimjes.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezovica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslimbus.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osorehek.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmslj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslag.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loka-crnomelj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-turnisce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgusi.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszrece.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jozmos.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-negova.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bic-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koseze.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmjc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivantavcar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvp.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osicljutomer.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljane.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osflv.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfram.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskosmac.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osld.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ng-slo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dssl.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimidrija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sszagorje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmalgaja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slivnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vzgojni-zavod-verzej.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konservatorij-maribor.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-majdevrhovnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fokovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novejarse.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgradec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfml.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prezihovvoranc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszboraodposlancev.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ponikva.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimsen.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bled.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bostanj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smarje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-predoslje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirius-vipava.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-sentjernej.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gro.sik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsv.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-atl.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjenka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mojstrana.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-rence.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobrova.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimoste.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hoce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">egss.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-cezanjevci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossiska.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vodice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrovte.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-spidrija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osagpostojna.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koroskijeklarji.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-prestranek.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askerc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sencur.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbistricaobsotli.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvsmuc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osminka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossevnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cerkljeobkrki.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sostro.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbocje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ingoliceva.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tretja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mozirje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrakek.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrslj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osborovnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpt-velenje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osms.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvelikadolina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">francebevk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-trzic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmnr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrihardajakopica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-naklo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmepius.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slomskov-zavod.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpmaribor.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prvagim.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijaki.prvagim.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodzemelj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os4ms.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossecovlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grm-nm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.grm-nm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osprule.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vojnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-litija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sostanj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-makole.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podcetrtek.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfdps.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssfkz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfp.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-salovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc-naklo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentrupert.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc1.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslovrenc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsnm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ges-sb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viviss.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbrdo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zgnl.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.zgnl.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koper.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-koper.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iskvarce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loskipotok.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospvmb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-tezno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">facka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscv.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskranj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seslj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sts-koper.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossempas.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vizvisnjagora.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssdomzale.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stps-trbovlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ludvik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sveta-ana.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kozara.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dd-msobota.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskomenda-moste.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">padeznik-mojasola.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">centerjanezalevca.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdj-cerklje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-duplek.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sodrazica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frana-rosa.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sggos.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbi.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sturje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskorena.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-domzale.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikigaber.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kidricevo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslasko.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-marijevere.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnicanapohorju.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">makspecar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.makspecar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoroskabela.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vipava.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssof.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hajdina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acs.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimvic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pedag.gimvic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.gimvic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sticna.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jakobaaljaza.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospolje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strazisce-kr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossentvid.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-petrovce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanislav.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vv.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mirna.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossavskonaselje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbogojina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jd.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-vodice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-skofljica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ev-prade.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavidem.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-mk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glazer.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kdk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-kdk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iosce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrize.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-idrija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novefuzine.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbenedikt.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrpelje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossjsmlednik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iios-rogaska.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkvenjak.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kobarid.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivanjkovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vrhovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1osrogaska.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">3os-celje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">net.3os-celje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zssm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osapace.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zadobrova.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-borcev.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjkb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zirovnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmklj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmezica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franakranjca.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svsgl.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osszkr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gozdis.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-branik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">opvbistricams.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobova.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dravograd.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivade.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskobilje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osziri.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antonukmar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-col.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mladika.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimng.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szks.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dekani.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osartice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartnolitija.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fgp.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stranje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivada.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodgorje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-komen.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trzin.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmuta.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospesnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmmsentjanz.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-poljane.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-selnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frankolovo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-globoko.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jela-janezica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slodrs.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostpavcka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.ostpavcka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-konjice-zrece.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cresnjevec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssgt-mb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gim-ms.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzisce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossredisceobdravi.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-krsko.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshorjul.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrogatec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-lipnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zveza-slepih.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrsko.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-knezak.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olgica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljcane.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmarezige.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-planina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dusanabordona.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sempeter.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-velenje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">presernova.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miren.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tsaljose.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solaklavora.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gsve.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmatijecopa.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vavta-vas.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimtol.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tolmin.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">2os-slb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos1-lendava.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorisnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjvkg.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdramlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scuoladecastro.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sesgs.sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sser.sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sts.sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sg.sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mic.sckr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-rodica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osoplotnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrnovo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssj-jesenice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osams.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-skofjaloka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvelikanedelja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pregarje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osig.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-crna.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vitakraigherja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonecufar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddmaribor.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-trbovlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cepovan.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-destrnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-koper.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrezice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslenart.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dosdobrovnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbraslovce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slander.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bozidarjajakca.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ribalon.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobrepolje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os3ms.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrestanica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrad.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorica-velenje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjursinci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brinje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbezigrad.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-krizevci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssom.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossenovo.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-maksadurjave.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbicevje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-otlica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.osgrm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-toncke-cec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leskovec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osobrinzi.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjarenina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osljubno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnisnicna-sola.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osloce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-lesicno.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvinica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osobdravinji.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossalek.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-livada.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskozje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-venopilon.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dgnp-mb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bts.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fa.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrod.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdeskle.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vperka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmedvode.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikapolana.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-velikapolana.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonetacufarja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tinje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-tinje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskuzma.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tisina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dob.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddkoper.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossentilj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-majsperk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smarjeta.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scrm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijak.scrm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smihel.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-markovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smartno-poh.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-store.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osradlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1os-zalec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.1os-zalec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptrubar.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpcrensovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ravne.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvuzenica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dantealighieri.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-luce.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornava.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-grize.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hudinja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dosgenterovci.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbizeljsko.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpet.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-skofjaloka.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrmelj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gasp.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgornjigrad.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-polzela.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospisece.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-rimsketoplice.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskaselj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnhr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-tolmin.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfara.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovnasolaprevole.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">podgoro.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstaracerkev.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kungota.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrbovlje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-nazarje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavitanje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-skofije.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-antonajanse.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrecica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voranc.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbovec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-razkrizje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srednjasolaizola.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-slovenskabistrica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zelenajama.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stari-trg-ok.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koprivnica.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vransko.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfpkr.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjdol.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-malanedelja.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-montessori.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pei.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-ajdovscina.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cksg.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-prebold.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polancic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.polancic.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gib.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jmdol.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-jmdol.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bb.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsd-kranj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miklavzev-vrtec.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos2-lendava.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-solkan.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seps-kp.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradbena.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjd.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">escelje.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scng.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ac.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirius-kamnik.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-gradgona.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossklm.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavriceva.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">waldorf.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">3osrs.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmarje.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization Arnes</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Arnes</mdui:Description>
-          <mdui:Keywords xml:lang="en">arnes idp identity</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
-          <mdui:Logo height="135" width="150">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.arnes.si/en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.arnes.si/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/en.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ARNES</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Arnes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.arnes.si/en.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.arnes.si/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Arnes</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AAA</md:GivenName>
-      <md:SurName>Podpora</md:SurName>
-      <md:EmailAddress>mailto:aaa-podpora@arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Arnes</md:GivenName>
-      <md:SurName>Arnes</md:SurName>
-      <md:EmailAddress>mailto:arnes@arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ARNES</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Arnes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.arnes.si/en.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.arnes.si/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Arnes</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAA</md:GivenName>
+    <md:SurName>Podpora</md:SurName>
+    <md:EmailAddress>mailto:aaa-podpora@arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Arnes</md:GivenName>
+    <md:SurName>Arnes</md:SurName>
+    <md:EmailAddress>mailto:arnes@arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.um.si-idp.xml b/swamid-interfederations-2.0/idp.aai.um.si-idp.xml
index 40ca3f80..8baf4b7a 100644
--- a/swamid-interfederations-2.0/idp.aai.um.si-idp.xml
+++ b/swamid-interfederations-2.0/idp.aai.um.si-idp.xml
@@ -1,100 +1,100 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.um.si/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-29T16:10:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-29T16:10:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.um.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.um.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-m.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.u-m.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.u-m.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Maribor</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Univerza v Mariboru</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization University of Maribor</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization University of Maribor</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Keywords>
+        <mdui:Logo height="300" width="300">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.um.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.um.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.um.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.um.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-m.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.u-m.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.u-m.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Maribor</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Univerza v Mariboru</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization University of Maribor</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization University of Maribor</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Keywords>
-          <mdui:Logo height="300" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAYAAAB5fY51AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAIz9JREFUeNrsnWmYXNV1rt/qbg0tJHULSaABMRmQLGYZBAJswAbMFBMDDsZOLrGNEzvGOM7FcW4IN5fEsePcxCaOwdcJnjA4HhhtJmOmMMgMAgxikEDMEgIJJKRGQ6vVXffH+k7qqFRzVUvdVd/7PPX0UOfsOnX2Pt9ee+21185ks1mMMWY40OZbYIyxYBljjAXLGGPBMsYYC5YxxliwjDEWLGOMsWAZY4wFyxhjwTLGGAuWMcZYsIwxFixjjLFgGWOMBcsYY8EyxhgLljHGWLCMMRYsY4yxYBljjAXLGGPBMsYYC5YxxliwjDEWLGOMsWAZY4wFyxhjwTLGGAuWMcaCZYwxFixjjLFgGWMsWMYYY8EyxhgLljHGgmWMMRYsY4yxYBljLFjGGGPBMsYYC5YxxoJljDEWLGOMsWAZYyxYxhhjwTLGGAuWMcaCZYwxFixjjLFgGWMsWMYYY8EyxhgLljHGgmWMMRYsY4yxYBljLFjGGGPBMsZYsIwxxoJljDEWLGOMBcsYYyxYxhhjwTLGWLCMMcaCZYwxFixjjAXLGGOGEB2VHpg596u+W63LGOCfgT8A3m5gRzcAjANWAmcCi3yrW5Ps5X/dWMEyrd2egCnARL0azQSg3bfZeEhoGsEG4IeDWP41wAu+zcaCZRrFA8Dzg1T2DRJFYyxYpiGsAm4ahHLXAvN9e00l2IdlKmUz8GPgdGAS9Tvfs8Bk4JvAct9eY8EyjeZV4GqgG1jdAMGaBjwM9PnWGguWaRTdwBeB04CxEpt6yRIzg3OATwCXAnf5VhsLlqmHU4C/k7AMFnsB7wV+CvwDsMK33RTCTndTjE7g68CVgyxWCTsB5wO3Ae/z7TcWLFMpM4CfARdoOLgtOVCW1tmuBuMhoSnHLOCqbWRVFWMq8G/qUK9ylRhbWKYQewwBsUqYCHwb+LirxViwTD5jge8NEbFK6CbitE5w9RgLlknIAH8PHDsEr20y8B1gF1eTsWAZiLQxnx3C17cn8DW3V2Onu+ki4qxG1VnOUuAtIrfVO/pfFhhPONF3A3aoo/yzgZuB/3SVWbBM63IesE8d5z8BPEQsjt5LAtUlseqXeN1DrEWcRcRYjazhc9qBvwVuJZYFGQuWaWIywCHE+r0b9L/dgS/UUebVwGLgUOBoIhEfQI/a1ggiALUXeBn4LfAMkV10ag2fNxP4GLGMB33udOAWfYZpcuwTaB1GAxcC/5T631mEU7sWriVSGp9FOOvXAfcDtwNPAs8RawNvBR4nMjz8qYTqRuCNGj/3LHLBrB8nIvF3dvXawjLNV9cTiBzqnfr7lDrKe0AW217AHRoC7k/kfx+vIVwPkZhvpURrKnCMLKS1NQrNPOAIwp/VTfjF3I4tWKYJh4TtwEZgE7EEZm4d5X2U8E0tAQ6SeOTnZU8c+TOAvWWF3QgcTDjha22zp0iwkvIn4RTLHhKapuucdpZg9RP+n3pmBueovGeIqPRym0iMA14Dngb2pTbHe9rK6tR3gfpmH40FywxRRsrKGU+kc6mHN4iso9OrOGdXwmdWrzU0i3DA9+jv8a5aC5ZpLkbLIsoQgZi71VneMpU1o4pzuogQiheoLwlgp4azibW4o6vXgmWai/bU0GweuRCEWsgSvqt3Uf0s42wiwPTZOr/Pbnq1U3/Qq7FgmSHGJCIuKvFl1TOMWkZkBZ1Rw7nTZZm9WKeVNZ2IKYNI/ue2bMEyTUSX6rtND3h3HWW9Istmeg3njiFmKBeSW8JTC5NlLYJnuy1YpulIz6R1U/ss3SZiQ9WZKcGolr0I31M923t1E365xHp0W7ZgmSZion6OJ1K19NdYzhtEIOjUOq5lHwlOPTtJp8MoOjXMNBYs0ySMznvQk63hq/UjvSiL5t11Xs/ewEt1nD8iz3q0YLUAHvu3Tse0Z+rhvhd4hPAlvVlhxzVSIvck9S3pSZgH3AT8C7EIe10VojOSCED9Y/29uztfC5ZpHrLEouTDCYf5auAwwgE+sYKHPathV+JzalTcUycwQMRTbazwnH7C4f4mcAWxuetPcbYGC5ZpKsHqJJzkHYTT+wM1lNMrK2tdA65pFRFecTa1ZYzYTMRyjSZiyrKu5tYYKpjmZyzwJWL935lEiMOdNZTTA/TRGH9RVuXUEtqwSKL5GWKZzl8QayONBcs0AeOJdXxIJMaQc7rXIjSNIKOyailvmay9ztTQcidXswXLNAcDKYHql1iMGMbfZzQx29mnvzfpZSxYpkkEa2AQrCRjLFim4WRSdZ0sz2mvsb20N6jdJNeRqeP7ZFJ/GwuWaRI6UkPAjIZUtSS9y+i8MQ0S0Qy1zVR35Iluu0WrdRqyaX7WAN8nAiw3AA9KtB6nshCFrI5/B5hPRKnvrb+rFYoBYpZyOZFi+W0icr6SsvqJUIhHiZCGHgnxSGJfRGPB+m/2J/IO9fu2DQuyskL6iTCA7xFBoptSlsk9VVhDSRhCu8obSP2/Wssqm7KufpT6O1vBuQOpYemlEqw1RCDpLCLWrFGhF2bwaSdmfBc2WrB+TSx4tcN2eAnWeuBI4K+ILbIGmuhhTr7jg8D5EuX9muw7NjsZWdvTGi1YbakPMMOjIZCyRrJ59dhM37FNbbm9Cb9jK9DW8AM9FBy29LN1WEOzsYnq1iOaoddGGy5YxgxlSytj69+mmDHGWLCMMcaCZYyxYBljjAXLGGMsWGY7UmueK2NK4rWEJkusL3yJWN4yldjReXSV5WzW+U8DrxFZTvchtpPvrLJzHCAi9J8n1hjuTqRRHunqsmCZ1mUjsZh5KRHDtBF4GXiIWNx8QBnhykpQVgCPEZtbTCLyxS8DFqj83YD3qKxymR56iKU2L0ug+vV7G7HsZibDO/mgsWCZGugBbiY2RT0Z2CP13rMSrcXAh4jsCmn6gLeAJTomo/NPINIxI0vtYGIfw6eAXxALk2cR6Zq7C7S/lcB1eu94WXpItJ4gdv5ZpOsd4yq0YJnWYD3wSwnDWQXen6nXjyUSp5PLprACeJjYLmwcsb/g7CKf007s0LMXsXxmAbGv4QJguqyunWQ99QK/IhbBnlqgnc6R2P0Hsa/icdSWhNBYsMwwHArurSFWKU6XtZWkdOmXtbQe+DDVbVc/EjhCr6USnceBY/XeO8TON/uXKGMM8HHCR9ZnwbJgmdZgR2BuBcftoGFdur28vwGfvwuxHyHkZhMn6lWOSXqZFsRhDWZ74wXLxhaWqZjEJwUxi7dZQ8CDygz5Xgd+q+HcaJ3TC+xLzoH/BpHOuF2vjYQvax4wpUTZLxC+rk6d945+n8vWEwDGgmVaiNuAT6YEq0/DtO8Anyhx3p2EP2lEnmBdTGQ3bQPuBs7JE6w+4CrgY0XK3UykTf5KnmB1AdcD73OVWbBM67KB3Iakfan/l0uGty51TrHzNkrEip1biCzh1B/IO66nSFmmhbAPyxSLZyoX6V4seLOTnF9qZJXnQm4rsXzG4Uh3C5ZvQcuTrfL/tZZXbxlen2gsWMYYC5YxxliwjDEWLGOMsWCZIV/XbTW2jVLnZeooOzMI12qaBMdhtY5YJRup9ucJy/oi5yQxTwNFyisWE5WOw9pUZdkZIlC00DWtIxfvNUDMGCbilsULoS1YpmnEKkMskdmDWIoDEQs1kchnNbnAeS8Ad0k8+vNEZSqRDbTQecuB/9LnFiv7eSLFzHK2DFXoIDKVvlHgvE4iu8M4fYd+XUsXkbtrk9uzBcsMf5I8VuuJBHmbUlbOWuC9RLK89LFJ9tEVFF6cvIRYD/j+1Hlp6+l1/X4ocHTqvUScNqiMQkO5HuAjxLKf9HkZWVkvpEQ4ic3aIKvLC6ktWGaYkyxmPpHIHtqM7ENkT/XSnRYYLpjmt7AgFhBvK96muP9qMFhF+Lfcnm1hmRbhdcLn9L46hlbPAguJ3XNGEamR9yNSMdfCYpV1ZAWi7OGgBcu0CHcSmztkCYf4URpmVTrkfJDwLfUSDvm5hA/sWYnOBCJP1swKy8wSaW+eIiYHXib8ZVNcVRYs07qsBn6godRJxIYQTwF3yFI6VZZSId4E7gNeJWbq9iT2D9wldcx+RP72V4kc7ncTM5XziNm+QiwFbiEyNpxG7MLzOJFDayZbb1BhLFimBXhUltW7NAxM8qkfJeGZD1wBHENsWJGwTOf1ELnV36fjC2UCHQe8W6/lOvc5ldutsqenjn9Q13UAkUs+SX1zHLE12H3AZcDvkdsCzFiwTJOzkZg5PB44sMD7uwC/D/yOLYM4e4l9BidLbHam8hxVU/WaTYRXLJJ4TSSX6bSD2NvwXQXO34fYAuxhwsk+HTvZLVimJRhJ5GzvKHPMXLbMJjqC2B9wdB1iMYbYCXoGET81MtUWD6J0xPpYYluwXuxkt2CZlqGtCsEZkXfemAZeQzqzaIbKl9eMchVasExr8zTwEuGPml3FeUs0tJsiC6mQ5fMU4XjfjfBnVUI/4fhfTjjb93QVGfsATD/wMyLW6RQNua6r8NybCKf7ycSOzj9g6zTG1+mYkwiH/tWUT3W8GfhXHX8yEdJwr6vKWLDMo8CfE9HpEOsHLyDiqkrxLPBFWUAQjvwvE/sJpo85n3CSo59fksVVjCwRVvGX5HbNeVnnrXJ1WbBMa7OQ3GLlhBeA+8ucN19DwTRvSmwSC+phIq4qzUtEdoVSFt/dbJkhAuAZYtbSWLBMC1PMj1lu7WGxYd2q1HvFjsnUcE3eNcdYsEzRNlBuX8JMifOS99prFKxC19SOk/S5sfoWmCotKGMsWMYYY8EyxliwjDHGgmUGg1IJ7tqr/H+6zHJtqqPKc0t9dqntv9rdllsDL81pDbHKktt+q0c/RxJr8lYUOW+1fq4ntx1XltwawA1Fzns7JUhrihyTnLuOLTePaNd1rS5wzrpUeemdfMalrtELoi1YZpiTWCvzifxVq1P/Hy0BOz31v0Sc3gF+TuRmT8dVZYgF0KuJFDRtOi+rczt0XkZieEbKwuvXMauBayQ02ZTQZCRYnSo7WXjdp9+fJ5b2bEhd0zgiQLWXLRdqGwuWGYYklshBxJZbPSnxgchrNSrPGkNCtb6I1ZIl1gd+Pm+IlyXWASZBp8eyZVxWepuvUilijpf45J/Xm7LOMinBagNu1WcbC5YZxiQP+45EuuHxVZy7Y42f2V3m/bE1llvsvJ3zrEPTpNhR6c6pGRiRZx0aN2IzTElm194iFif3N2Gnu5LSs4jGgmWGCclQ6R5io4g3aa7ZtPGE0/0dKs8vbyxYZoiSTPcfABzGtt0BeluQOPXnY6e7Bcs0hWBB7DrTrGmGNxJ+LAtWk+Mxf2uQDhxtRnqIWC0HjlqwjBnyZCxWFixjjBlS2Idl0qyi9mDRDcBPgceIMAOIQM/9gLOBnbbDNRkLlmlCHgQuJNb+TSO22JpZxfnXAF8ldsPpLTBcuxz4AnBuFWXeClxMLA96N/ANXZuxYJkW5kVim68H9PdC4DMSoUosm6uA88htE5ZPltj663xifeKfVVDmI8A55DJJPEEsiP4ujrVqaezDMvNTYpVwt16VnPvlEmKVP2S8qIJy+4Fb2DrtzY0SLmPBMi1MX5H/ryxzXhb4EbCsis9aBXyf0mv+shoG5rOxQmE0FizTgm6Bcrml1hCbm1bL85TfwXlEkeu0C8OCZUxNrGdrB3sl9BO+LGMsWGabUevGpm1ud8aCZYyxYBljjAXLGGMsWKZKhmJa4YFhcp3GgmW2McUS+q3bjte0tsD/1tDcKXJMBTiuxewPnEWs+euQdTNAZCjdXp3oUcByYhlOhgifGAvs5uqyYJnW5gjgPeQ2ccjqtb3W7LUBHwZOIcImMkQm0TZy+ycaC5ZpYbdA5xBsl+m26QXP5r8bqzHGWLCMMcaCZYyxYBljjAXLGGO2sWBZ3IZvHQ/GNli1Zl0YjGwNSZntru7m1qFqGs4439dhyWjV8w4NLndSjQLRrnMbyTgi9GG8q3tYUrG2VBOH9X1gCoXT15qhyUjV1wrgNgnXW3WWmSW27HoDeLWG818FfgjsrOuq1/IbD/xO5V4JzKL4ciMz9BgDvF7pwZlstrI1pZlzv+pba4wZFLKX/3XDh4TGGLNdsWAZYyxYxhhjwTLGWLCMMcaCZYwxFixjjAWrOBkiSrlakUtS72YG+btsq88x24akPmvdsDVNe+o1lNpHR4nvNgv4NHC4DYstb1il7AP8KfAK8F1gQ4WN7veADwK3ADcO4nc5BjgDuAf4uat22HMYkWt+EzAC+BnwYA3lnACcCPTpwf858PAQ+H57A+frebpE15fmZODrwOXAY0ReewtWFcfOBr4ILAF+UqFgtQMnAZ/R74MpWCcAnwP2sGA1BQcDf576e3d1SNVs99UNfBl4f+p/S4eIYB0MnAc8A/w7sStQ/rPTYeuq9iFhssVSv3q9SsimeobB3lduKbAYeMrV2jRDQlId48FUv5PPYcQOPBtT5QwVS2U58BywiNhkI59+/RxwU6jNwhrqfA+4BuhxtTZVZ3or0CUr6STg8SoE73hiAfj3gWkaGg4V5ktMN7N994BsWgtrqLORWPXtym8OEov8ReA/9PtpVJ6KZAZwptrFpYSvaCjRT2SrWOWqbk3BaqZhkMkJ1kjgDgnO4RrmVcKhxMar9wGPDuM6HqByF4yHhNuAI2Xy36y/95C/YgrheMwCbwN3E36qYuwiH8dzeiWN/QBgV+BeYGUF13MIke/p4SLHdwPv0+cl17cGWEjkZSpGF7FhaY8eoMRHMRk4lfCtXK3GOVtDmHUU9/0lm512AE8T+alIfe8Z+h4T9NkTyGUf3Qg8C/xXDfXVpTrr1bCm3ORLt4Y+bwIPUb1PZozq4TrgCyrr9jLndBIOeohZY4j8W6WYJoEbr3s1gZidHNCw7TXgV5T2xc4EDgQeyLPo3k3MYj8lAc3qc+YBa3V8sXLX6L2ZRKjDNF3XZtXjAuCJCu7jVAn+ZGJD2kxqVHK3rqMYU3Tuc2zpI95Fw+y1ujcbVPbBusYFZdrHNGCOynxxOAjWDsTU7aHAP+jvj+lG5LOAmPG5s0hZZ6mMHxHhFwnnAecAXwPKJd3ZF7heD8kZwF157/8+MXN1dIFzl+uzv1JkWHoUkbhuiRrqVOBcYvr6cAnAr9SQLtcxpVivxjBC3+0fU+8dB3wLeFeJ89fqei+kOr/fbsAVEsWT9QCW4kzg/6neTqxRIAHul2B9HPhOnkDnM1111QP8Wv8bXeL4WYT/c1aZUccNxEx5sYfrXOACtblL1a4/RYT17A5cpY4T1fn16rxOKNBmshLLk9WJHyPhyOcF4N+I0Ihi/AkR03VIkffvBP4v4S8sxIeBywhf4Kf0fF6gazpQnd8dao8ziBCUTcDp6sgp8cx+Hfgq8H+Gg2CNVEMaCVys/z0H/EDW1Eb1dB/Vzb5KD2OhmcCJUvd0T7pJVs85ujmXlbHSjlBjf6zAZ5xOZLTslHjeovIzaugfA/6KSP/7Z2wdVzMe2FE95V/qeubovaUSs42qkwXkZmOzecOJfvk99lFPllgUaUboAbgPeFni1ENk4uwD5qoRfl7/v7CKOnsZeFKiXU6wdgA+Ikt0IbXNeI1IWUqvAHtJzK8vcc5xuifzgUdSQ6tSVlybrOoXZNFv0L3ZIMH4E/nQNquuCw3TEv/a+9UeP08uHfQjEsWkPseq7XeVeA77JQgHEhlVf5qqz9G6ngOAbwKr1QHl80XgG/p9vsRpk8ruAv6Hrvc9+v2XBcpIUk/PldHwR+rckVhdSi7L60iNaNboeSzFJNVv13AZEg6QC5e4TVbB4wVE5Tqp+0zgbOBvCpTVq0rItxZuV2XuofOXlhhGnJjqcVbkmfrf1TGXyYpannq/HbhJlse5+i6/yCt/gxraePUq6JgbJJCLdD/61CjGFHko+mVdXS/BelgWTJrfSPTW67sXekAvlMX5aV334grrbI3q42gJ/FiKpyTeRb3wWt2fenxZbwDXysI9Q99xXRGR/AP9fk1q6F2KJ2XlbCBSSBcant0ry+4M+dHuLXBM0pY/pA6uD/gnXetitkwpvSH1M1vE19UB/FYjh6clVmnh/Z7E6HTgf8pCSlueB8n6RqL2j3ntGoncJcSM6rc0PF1RwJpHrorEkr9MdfqsRg0Jyaznugp8b715GlCWoeB0b0/d0JuKCMp8IlgVPaSjqyj/OflqMsCxJY6bqPfXFhgKflK9wW3AX+SJVSIiP5FpjnqqjhLf91o98J+U1fh0XkNMHpyeAq/1EuyT5X/4VIHrWQ8sKyJWyfv/qnszWdZaNTysa5yrRlyMw9XjPqkHr15ulDieUWR4lLSPI+VzurnCcjdJTN4s4Uu6SsNSKB4PlpzbpyHOHHU+t1Nb/vsMEd1/k4ahAwWs3W+oE9lfQ9A0H5KVc4+s+hUFPuNpIuD6VQ33T2briYFMSoy+rc85X/d3SZnrbyhDaZaw3HDhgVSvvWMV5famGtqcAsOntPN/ghy89+UNW5Ox/79TOvDw2tTnzCpyv5fJSriH2jZL+GM9DANqhAtrvN8bU53DyCrPXSJHbyfw3hLDrFNT/scNDWgj96U+99giI4aT9X3uVO/fSBLf1agiD2PyPF0hF8eTDXKblKqfheSc7vvkdYyHqZ3cTuHg1PxOPd3JFOJ+ddgLKrRcaWbBKmc1rUk5YavdcuyxlON73yL3IZkuv4Mtl0nslnJel5vJWCbLaEdZLoV6nA0lLJ9yHCLzvV0965V13O8xGs5B9asQVqas0LlFOoFxavxrSjhzq6U3ZTWdWqAd7Kjh0Sb5GBsdJZ62NLIlLKy3GvyMlrJU1sqahJgVJuUjm61rfaaCz3mU3GxkMcHqKeCb3aYMpUj3cg9N0khqyRjxjHqFQ2T9LMh7P4mkTqbq00zQg9Cjzx1TpAFl9f/XZJ6PKtEAR9VgXU2TWHVpaHRxBfdsnK5lLw2hdiRmJ6fp56waBSuroUpWls6ebD1Jcais4Wdp7Nq9uzV0O4VYQJyOsZqnB25hjSLZqTIPlItgku7VFP2+d4WjgZHb+NlJRGRndfwb1ca6yAWoluMtlTOW4hkktrtedAwBIaqUd4jZsfYaynxNQ7BDiBmkK9lyf8XZaqTLU0PPdK89Wvfq+pQwFfqebWrg/Q22XkcQzs4jZb5/uczQtINwPF8ksdqoa8rqtbEBPeUCidR+Eomn8kT5qJT/8c0G3ov5EsCTJFqPkYtJO0nH3EJ1EeQZnXuxOrTk/mRTrzUMXZalhoGZOp69bAnrcUjQsQ1EqL9BDrgkLiVTR0NPAg9nsOWs2Af08xG2ni1LLLoBWVlJupNCltMmCeFr1OZkLUYylbyemCp/uszxn9aQsV3+i9vUqN/WcO4ZcsG6c2q8pqW6X/sRM0w3pOp6LLkQgIcGoQO8johtOpPwK76hjuIMfcdfV1nmcbr+dl3vr+Sne1uWxyoi3OHbhIO6fYg9x12pe5MtMITNVvFM1/ucZoaKYLWlvlh/Fed0p4Z09d6ITB3q/1uJ0WxZHYtT13iMBOnuAuetVm/bT+T2WiLBylbg52gEpwFf0vX9rwoexp2IOLDRwL8QAX6FGE/9mQtuJ2Lc5ulzk9nKWXq9LrFsNLeq/g6QZXwbsfpgEhFucFcVZY0jZrw6iDCIM0scO9SEKqE71VZ7C4hQNdddb5LDTKqDb7ilVm3G0WR4MraKsfWu+n17L/J8LeVLOS71ffYl4lXWF3m4etQQdiDn5O2TIBV69aWGE/Wys/xW44lYq29VcM4BsiA3ELFrpeq+XpfAk7JuDmTLyYwT9PNx4PlBqMtXySXzO07f5Szd819Wee/Hq4weCgdebnMrooZnOJmwWpn67hv0dwcRDF2OMTr2HeqbrFinIXVmewvWq3oQJ1E8xD+fSfJv9FHhWqFB5r5UI5+m3w+TED1Z5OFamrIcpm/Dax1PRPzvLmvif1cxZOqQ36jUbORAA6zAp1OdwLxUezpGFulNg3h/btH1n0KEVhwq8by6ynLayU2CLK1w2NQ/hARr19Sw/uU84XhW32+vCso5UMcurtPyXkf4+8ZSfv3m5sEUrMVqnF0amnRXcM7fkgvT/80QqNyF8kvsR27JxLF6wO9iS0d8ekiYhEWctw2v9SuEI3gxsS6umqnyzRqilbKEV6QazNs1XuMmchHfp8j6nkAEb/aSW3g8GNxIrA6YRURdT5b/6aUqy9ksseqm9NrLxGqBbeuA76N0xPgZesbWkluGlHRID+kZ/2CZYeEO5FZ5PEx92SH6CX9pF+XXw7ZVa4m1Vdk4L9HvRwD/SUTSTi/gQzmaWMaQPOBXVtF71Uupch5NWQTv1bUepXNKPVw/088PEkGbU0ocO4HCcUnVfL9z5YfapM5hkRpAt352kVubmKzHSnhGlsYoYpKhkOl/ELHucf9U71or9+oBnqOO4AO6tkU0JnCz2H1br+FfG7lo+6trKG8NERDZSQTl5ockjJAonk1MLkDEntXblrMVvl/sgZ4MfJaYkIHIGfZc3jHXSmTn6XnctUA5M4klPnvIKr+jwOdlq/he68j5EM8hYvHyOZiYvPgoufWxFVGND2OAWPt2EfD3UuQTicXFyYLMMbopB6UeoqtlaRUTzFGpB6ncte6g8XGh3mKU/j++TG/1oBre14isDrtKTO8vcd4dsnj+Rt8lmU5fqRs+TcPKdv3+c+CfCwjFDnrQSvlAuglHebLLy3kSr+4CjTfpoS4jMjwkvrqfSFg/p4a9WPUxRQ00f3nTRWqwV+T10pWQLBg+mFi+kizmvYf6otuTtllqYewv9B27JJC/LHFs8n3HFnjALlVbPoUIXXlE93mqhlP7E3FZCZ9Tff4wr6MbWcE1k9feRxdpD4m/9DTV/SpZghl1UgenXDP3qb1tLjBkv0jvfVqGxgPEZMiA2sMHiDg6iL0XXipigSXXVM4i2qx28FlZrDfKuFmtTmFfGQtjC9RNQwUrPVRZQsymHC9xOqiA6Xy3LvaHFM+106sebiPlnfLvyHLIUjgdyhs6plw4wXVEjNLuaowrgR9TOsXKABGjs4JY/3dIGT9eoQwGq9RQXiozdu+QwEySuB2lByGJj0lPVY9I9bZpLtF7nye3EDjdW95FzIi9SoRLfISYKVtdg2BtVqc0XfezV9df74YjPbrWUmvVnlQ73EmCVWqotlIWa6EgypvVSVygYfhJee8vkIXyqNr8Z4FPyMJNC1YytK4ku+lqPRerigzBVqiDnQH8YZEyFhHhGJeobRXim/qcc4g4vkIrPX5NLO6/rkgZb+oZqDRr6yK1u7/TZ+a7Up7SNe9OLFN7ezAFC2Kd1lg1qNm6qcmDtFwNab4coz1lLJ7f6eeKCgRrvqyKQqv0X9LwpNwmFCv0wE5Tme2UTryXfjB/Q0Rvj5NDMZMaLq/Qd11L4YRqr8uKSyYvKDHUeVBmcpJGpJ2tZ26yem8EW8dl9eha91UP2qbjX5Mf704i1miNrIg56m1rTSP8OLEWrUPfbTW5YMZaWa76/F2ZOnlQn1tuxf9CWUmvFOmQ7tB9ODVlwa9Ue7qXmEF+ITWMmltgCPa8LJhKMl+slNg9X6QDe1Ed3yS1uY6UVd0vIb9X9biyTGd7J7mEmPumXEEDaju3lhlhvKLPerwK18YTRNjLROlD4t9aLIG8iZjRPoQqZpIz2eyQDWo1xpitfEjGGGPBMsYYC5YxxoJljDEWLGOMsWAZYyxYxhhjwTLGGAuWMcaCZYwxFixjjLFgGWMsWMYYY8EyxhgLljHGgmWMMRYsY4yxYBljLFjGGGPBMsYYC5YxxoJljDEWLGOMsWAZYyxYxhhjwTLGGAuWMcaCZYwxFixjjAXLGGMsWMYYY8EyxliwjDHGgmWMMRYsY4wFyxhjLFjGGGPBMsZYsIwxxoJljDEWLGOMBcsYYyxYxhhjwTLGWLCMMcaCZYwxFixjjAXLGGMsWMYYY8EyxliwjDHGgmWMMRYsY4wFyxhjLFjGGGPBMsZYsIwxxoJljLFgGWOMBcsYYyxYxhgLljHGWLCMMcaCZYyxYBljjAXLGGMsWMYYC5YxxliwjDGmSv7/AIVwb0oH+ZVTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.um.si</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.um.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.um.si/idp/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.um.si/idp/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Univerza v Mariboru</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Univerza v Mariboru</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Univerza v Mariboru</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Univerza v Mariboru</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.um.si</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.um.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Izidor</md:GivenName>
-      <md:SurName>Golob</md:SurName>
-      <md:EmailAddress>mailto:izidor.golob@uni-mb.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:skrbnik@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gorazd</md:GivenName>
-      <md:SurName>Ropoša</md:SurName>
-      <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Danijel</md:GivenName>
-      <md:SurName>Rebolj</md:SurName>
-      <md:EmailAddress>mailto:danijel.rebolj@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janez</md:GivenName>
-      <md:SurName>Brezovnik</md:SurName>
-      <md:EmailAddress>mailto:janez.brezovnik@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Albin</md:GivenName>
-      <md:SurName>Bregant</md:SurName>
-      <md:EmailAddress>mailto:albin.bregant@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gorazd</md:GivenName>
-      <md:SurName>Ropoša</md:SurName>
-      <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Izidor</md:GivenName>
-      <md:SurName>Golob</md:SurName>
-      <md:EmailAddress>mailto:izidor.golob@um.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eneko</md:GivenName>
-      <md:SurName>Anorga Irigoyen</md:SurName>
-      <md:EmailAddress>mailto:eneko.anorga@um.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.um.si/idp/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.um.si/idp/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Univerza v Mariboru</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Univerza v Mariboru</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Univerza v Mariboru</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Univerza v Mariboru</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.um.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.um.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Izidor</md:GivenName>
+    <md:SurName>Golob</md:SurName>
+    <md:EmailAddress>mailto:izidor.golob@uni-mb.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:skrbnik@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gorazd</md:GivenName>
+    <md:SurName>Ropoša</md:SurName>
+    <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Danijel</md:GivenName>
+    <md:SurName>Rebolj</md:SurName>
+    <md:EmailAddress>mailto:danijel.rebolj@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janez</md:GivenName>
+    <md:SurName>Brezovnik</md:SurName>
+    <md:EmailAddress>mailto:janez.brezovnik@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Albin</md:GivenName>
+    <md:SurName>Bregant</md:SurName>
+    <md:EmailAddress>mailto:albin.bregant@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gorazd</md:GivenName>
+    <md:SurName>Ropoša</md:SurName>
+    <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Izidor</md:GivenName>
+    <md:SurName>Golob</md:SurName>
+    <md:EmailAddress>mailto:izidor.golob@um.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eneko</md:GivenName>
+    <md:SurName>Anorga Irigoyen</md:SurName>
+    <md:EmailAddress>mailto:eneko.anorga@um.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
index c651e70a..b1562f6a 100644
--- a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aalto.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aalto.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+        <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aalto.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
-          <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMTExMTAwMDAwMFoXDTE2MTExMDIzNTk1OVowOjEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxpZHAuYWFsdG8u
@@ -48,36 +48,36 @@ U+WwQBqDu5B4ZLpp1188FPxqX+cq/5AdJ0/yxiQjG5yC0o5iPV94AEnUBCrB7Kp1
 Y79B00ak/mPB48aieNaM+iyYfkmyrzg7qlaRcXhh0CsFlL9zDt7l8eUImkesv6UM
 Cxdagkq9pUvFaktXeSRZbrRFcaP2j/TqkPnCtuoK/oQxvwcnllp4PqGQHypWfHOd
 ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mika</md:GivenName>
-      <md:SurName>Niemi</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Timo</md:GivenName>
-      <md:SurName>Tunturi</md:SurName>
-      <md:EmailAddress>mailto:idp-admin@aalto.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IdP</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mika</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Tunturi</md:SurName>
+    <md:EmailAddress>mailto:idp-admin@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IdP</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml
index 27b92d19..6fbda3a3 100644
--- a/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abingdon-witney.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T15:50:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T15:50:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abingdon-witney.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Abingdon and Witney College</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://idp.abingdon-witney.ac.uk/idp/images/awcicon16x16.png</mdui:Logo>
+        <mdui:Logo height="80" width="60">https://idp.abingdon-witney.ac.uk/idp/images/awclogored80x60.png</mdui:Logo>
+        <mdui:Logo height="350" width="170">https://idp.abingdon-witney.ac.uk/idp/images/awclogored350x170.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abingdon-witney.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Abingdon and Witney College</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://idp.abingdon-witney.ac.uk/idp/images/awcicon16x16.png</mdui:Logo>
-          <mdui:Logo height="80" width="60">https://idp.abingdon-witney.ac.uk/idp/images/awclogored80x60.png</mdui:Logo>
-          <mdui:Logo height="350" width="170">https://idp.abingdon-witney.ac.uk/idp/images/awclogored350x170.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUfiVxgSRDxCzABDMLiAjqfpU+PuMwDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
 						MzAxMDI4MzlaFw0zNTEwMzAxMDI4MzlaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
@@ -43,13 +43,13 @@
 						ktEDvpbOHC8IJyp4vTGgiIy+G08diHDDGRjVx/2NCNGhO8OkYqijFKBFw1sH02N/
 						YCK7eydlkPufBd4mL2wfQ9HGBEq9bbc8w407g/NrkJb/KT8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUPdKuMgQHT3w/Ux+Tj8Vneskj30owDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
 						MzAxMDI4MzRaFw0zNTEwMzAxMDI4MzRaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
@@ -69,13 +69,13 @@
 						+0jolUo6/0w181pG0tK3jSqRRG3UAvxp7v/oMkdH+0fNmhbwIEUfAb2wdc2cNLko
 						z/nsVV3bjy7BvANR9zBR2P2kSUigfb8XlBN+FrVImqdtIj8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUASRtwxa77nvzG1pY8eQRuAM5HGcwDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
 						MzAxMDI4MzdaFw0zNTEwMzAxMDI4MzdaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
@@ -95,26 +95,26 @@
 						ObrTbjOI4EheoS793EIihLWUkN1/1P2rZI+KhAgXqOtnpaUKdga6z8BjQExpJMzr
 						Wrt0e8XJ7W1dmFHPHsp9LRKIPSbXP+gDI+GHEQGxXxAmUYk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.abingdon-witney.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abingdon-witney.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.abingdon-witney.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abingdon-witney.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUfiVxgSRDxCzABDMLiAjqfpU+PuMwDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
 						MzAxMDI4MzlaFw0zNTEwMzAxMDI4MzlaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
@@ -134,13 +134,13 @@
 						ktEDvpbOHC8IJyp4vTGgiIy+G08diHDDGRjVx/2NCNGhO8OkYqijFKBFw1sH02N/
 						YCK7eydlkPufBd4mL2wfQ9HGBEq9bbc8w407g/NrkJb/KT8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUPdKuMgQHT3w/Ux+Tj8Vneskj30owDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
 						MzAxMDI4MzRaFw0zNTEwMzAxMDI4MzRaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
@@ -160,13 +160,13 @@
 						+0jolUo6/0w181pG0tK3jSqRRG3UAvxp7v/oMkdH+0fNmhbwIEUfAb2wdc2cNLko
 						z/nsVV3bjy7BvANR9zBR2P2kSUigfb8XlBN+FrVImqdtIj8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUASRtwxa77nvzG1pY8eQRuAM5HGcwDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
 						MzAxMDI4MzdaFw0zNTEwMzAxMDI4MzdaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
@@ -186,22 +186,22 @@
 						ObrTbjOI4EheoS793EIihLWUkN1/1P2rZI+KhAgXqOtnpaUKdga6z8BjQExpJMzr
 						Wrt0e8XJ7W1dmFHPHsp9LRKIPSbXP+gDI+GHEQGxXxAmUYk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Abingdon and Witney College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Abingdon and Witney College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abingdon-witney.ac.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT services</md:GivenName>
-      <md:EmailAddress>mailto:itservices@abingdon-witney.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT services</md:GivenName>
-      <md:EmailAddress>mailto:itservices@abingdon-witney.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Abingdon and Witney College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Abingdon and Witney College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abingdon-witney.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT services</md:GivenName>
+    <md:EmailAddress>mailto:itservices@abingdon-witney.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT services</md:GivenName>
+    <md:EmailAddress>mailto:itservices@abingdon-witney.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index 7b1a7bee..3424f620 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abo.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abo.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
+        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
+        <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
+        <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
+        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>abo.fi</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abo.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
-          <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
-          <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
-          <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
-          <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>abo.fi</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQUKEF0Hc6Dw4AYw6tjKijXjANBgkqhkiG9w0BAQsFADBk
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQUKEF0Hc6Dw4AYw6tjKijXjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMjAeFw0xNTA2MDQwMDAwMDBaFw0xODA2MDMyMzU5NTlaMDgxITAfBgNVBAsT
@@ -59,41 +59,41 @@ hhSXlCvW7y7xJBoKm1X8d8Rf+z/6Cpu/lWliNSko2YBqmeXGK+G/xBELvq66fQkq
 CnhkW4Ot1pCYHuQIdcnTjsC6UWtJBKMfGdD0Epp//Rzc+k/AatJYtO3+GemMO+OE
 2p9oUNSkiH/BYtPIo+w9XojB4bUR0PoJ336ldVX4MThHSV0i3MoGba2fGNB9R+B2
 tyET/2ZrFDSClFuAkzB+eYe/</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Barbro</md:GivenName>
-      <md:SurName>Sjoblom</md:SurName>
-      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dennis</md:GivenName>
-      <md:SurName>Holtlund</md:SurName>
-      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barbro</md:GivenName>
-      <md:SurName>Sjoblom</md:SurName>
-      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Barbro</md:GivenName>
-      <md:SurName>Sjoblom</md:SurName>
-      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dennis</md:GivenName>
+    <md:SurName>Holtlund</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
index cd1d50a4..34a9fe64 100644
--- a/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.accross.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16:16:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16:16:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Accrington &amp; Rossendale College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://idp.accross.ac.uk/images/accross-logo-80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.accross.ac.uk/images/accross-logo-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Accrington &amp; Rossendale College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://idp.accross.ac.uk/images/accross-logo-80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.accross.ac.uk/images/accross-logo-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAMq0Vv+YzRX5vh1Y4Lz5r1/3SHdQMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
 						MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
@@ -36,13 +36,13 @@
 						tHR3hAmLNxQ4sbUmRJV6QzY9lbrEyI1fpwSFW0ly/RrvzaDSXeaCvfe8OzVcLubM
 						4S3BP+CQStlZdm89skKfpQuf+o7uQWXoM1IYlPfkjUY2sTh6y4fl7HAjLXoLWDa5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUL734gRp+xFc7syC52EK33icqG0wwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWswHhcNMTUxMDI3MTUxMTMw
 						WhcNMzUxMDI3MTQxMTMwWjAcMRowGAYDVQQDDBFpZHAuYWNjcm9zcy5hYy51azCC
@@ -61,13 +61,13 @@
 						HH7m3nc5OkK4HzPj+3ttOdXsoM7prcEziHkXbO/yxUp0j3s2oLgqZWHOwEqzY0a+
 						IRRswVGPP8t4dQnVn8iyvb3Omzzk/tgM/VO4yfA+vG5ILv/moWR9ppjEaeHdj+Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVALHFYHDwuzoc1vC86QChN5nghZOFMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
 						MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
@@ -86,26 +86,26 @@
 						pI/E1tMBlsPPGnq2dJWNouCPVS8VeIrYX4mmdBp2pW7GY5QsUp+zjM7J8xSLLuiO
 						P2UJp9bK8uFepWiwmKCO4nroELlmRYJOpJebxeA8OI8dGguscbzpHCJLDQEJIp2G
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.accross.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.accross.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol:urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.accross.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.accross.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol:urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDLDCCAhSgAwIBAgIVAMq0Vv+YzRX5vh1Y4Lz5r1/3SHdQMA0GCSqGSIb3DQEB
 					CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
 					MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
@@ -124,13 +124,13 @@
 					tHR3hAmLNxQ4sbUmRJV6QzY9lbrEyI1fpwSFW0ly/RrvzaDSXeaCvfe8OzVcLubM
 					4S3BP+CQStlZdm89skKfpQuf+o7uQWXoM1IYlPfkjUY2sTh6y4fl7HAjLXoLWDa5
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUL734gRp+xFc7syC52EK33icqG0wwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWswHhcNMTUxMDI3MTUxMTMw
 						WhcNMzUxMDI3MTQxMTMwWjAcMRowGAYDVQQDDBFpZHAuYWNjcm9zcy5hYy51azCC
@@ -149,13 +149,13 @@
 						HH7m3nc5OkK4HzPj+3ttOdXsoM7prcEziHkXbO/yxUp0j3s2oLgqZWHOwEqzY0a+
 						IRRswVGPP8t4dQnVn8iyvb3Omzzk/tgM/VO4yfA+vG5ILv/moWR9ppjEaeHdj+Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVALHFYHDwuzoc1vC86QChN5nghZOFMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
 						MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
@@ -174,25 +174,25 @@
 						pI/E1tMBlsPPGnq2dJWNouCPVS8VeIrYX4mmdBp2pW7GY5QsUp+zjM7J8xSLLuiO
 						P2UJp9bK8uFepWiwmKCO4nroELlmRYJOpJebxeA8OI8dGguscbzpHCJLDQEJIp2G
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Accrington and Rossendale College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Accrington &amp; Rossendale College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.accross.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Carol</md:GivenName>
-      <md:SurName>Visser</md:SurName>
-      <md:EmailAddress>mailto:cvisser@accross.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Shipway</md:SurName>
-      <md:EmailAddress>mailto:mshipway@accross.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Accrington and Rossendale College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Accrington &amp; Rossendale College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.accross.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carol</md:GivenName>
+    <md:SurName>Visser</md:SurName>
+    <md:EmailAddress>mailto:cvisser@accross.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Shipway</md:SurName>
+    <md:EmailAddress>mailto:mshipway@accross.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
index ad020f0d..d54a51f0 100644
--- a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aco.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-11-23T13:36:52Z"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-11-23T13:36:52Z"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
+        <mdui:Logo width="137" height="60">https://idp.aco.net/logos/137x60.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.153.174.0/24</mdui:IPHint>
+        <mdui:DomainHint>aco.net</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:48.2132234,16.3581464</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
-          <mdui:Logo width="137" height="60">https://idp.aco.net/logos/137x60.gif</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>192.153.174.0/24</mdui:IPHint>
-          <mdui:DomainHint>aco.net</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:48.2132234,16.3581464</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
 MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
@@ -50,30 +50,30 @@ rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
 CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
 nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aco.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aco.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aco.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aco.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
 MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
@@ -92,30 +92,30 @@ rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
 CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
 nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">ACOnet Team</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ACOnet staff</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>ACOnet</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:admin@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">ACOnet Team</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ACOnet staff</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>ACOnet</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:admin@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml b/swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml
index ee135788..50085d92 100644
--- a/swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml
+++ b/swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.acs-schools.com/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T17:22:59Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T17:22:59Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acs-schools.com</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acs-schools.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/acs-schools.com/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/acs-schools.com/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ACS Schools</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.acs-schools.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/acs-schools.com/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/acs-schools.com/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ACS Schools</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.acs-schools.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
index 06fb84a3..242223ab 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.admin.grnet.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
+        <mdui:Logo height="54" width="125">https://idp.admin.grnet.gr/static/mdui_grnet_logo_125x54.png</mdui:Logo>
+        <mdui:Logo height="64" width="65">https://idp.admin.grnet.gr/static/mdui_grnet_logo_65x64.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
+        <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
+        <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.98709500,23.765772</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
-          <mdui:Logo height="54" width="125">https://idp.admin.grnet.gr/static/mdui_grnet_logo_125x54.png</mdui:Logo>
-          <mdui:Logo height="64" width="65">https://idp.admin.grnet.gr/static/mdui_grnet_logo_65x64.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
-          <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
-          <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
-          <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-          <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:37.98709500,23.765772</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
                             BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
                             NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
@@ -49,27 +49,27 @@
                             9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
                             WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
                             BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
                             NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
@@ -88,32 +88,32 @@
                             9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
                             WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Greek Research and Technology Network</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-      <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>GRNET headquarters</md:Company>
-      <md:EmailAddress>support@admin.grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-2107474275</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>GRNET headquarters</md:Company>
+    <md:EmailAddress>support@admin.grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-2107474275</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
index 1e065ea1..6400cfac 100644
--- a/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aegean.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aegean.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of the Aegean</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.aegean.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.aegean.gr/</mdui:InformationURL>
+        <mdui:Logo height="54" width="125">https://ype.aegean.gr/logo/mdui_aegean_logo_125x54.png</mdui:Logo>
+        <mdui:Logo height="64" width="65">https://ype.aegean.gr/logo/mdui_aegean_logo_65x64.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>admin.aegean.gr</mdui:DomainHint>
+        <mdui:DomainHint>noc.aegean.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.128.0/18</mdui:IPHint>
+        <mdui:IPHint>2001:648:2050::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:39.085161,26.568544</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aegean.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of the Aegean</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.aegean.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.aegean.gr/</mdui:InformationURL>
-          <mdui:Logo height="54" width="125">https://ype.aegean.gr/logo/mdui_aegean_logo_125x54.png</mdui:Logo>
-          <mdui:Logo height="64" width="65">https://ype.aegean.gr/logo/mdui_aegean_logo_65x64.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>admin.aegean.gr</mdui:DomainHint>
-          <mdui:DomainHint>noc.aegean.gr</mdui:DomainHint>
-          <mdui:IPHint>195.251.128.0/18</mdui:IPHint>
-          <mdui:IPHint>2001:648:2050::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:39.085161,26.568544</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEaDCCA1CgAwIBAgIRAMYUOgVr0qiLghJGEEbiPEYwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
@@ -54,26 +54,26 @@
                             8rrgJ/4uT/w1V4FnzEWdMmvMjNO6GFMobA5StKvLTZwKMR6TnP7HVOPuacnk6Jse
                             gdlRNUv8weObUJDrlAGWvVbepBwpG7+UNXa9ew==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aegean.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aegean.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aegean.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aegean.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aegean.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aegean.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aegean.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aegean.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aegean.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aegean.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aegean.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aegean.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aegean.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aegean.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEaDCCA1CgAwIBAgIRAMYUOgVr0qiLghJGEEbiPEYwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
@@ -99,29 +99,29 @@
                             8rrgJ/4uT/w1V4FnzEWdMmvMjNO6GFMobA5StKvLTZwKMR6TnP7HVOPuacnk6Jse
                             gdlRNUv8weObUJDrlAGWvVbepBwpG7+UNXa9ew==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aegean.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aegean.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the Aegean</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Αιγαίου</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the Aegean</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aegean.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.aegean.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tasos</md:GivenName>
-      <md:SurName>Moschos</md:SurName>
-      <md:EmailAddress>tmos@aegean.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of the Aegean</md:Company>
-      <md:EmailAddress>noc@aegean.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aegean.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aegean.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the Aegean</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Αιγαίου</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the Aegean</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aegean.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.aegean.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tasos</md:GivenName>
+    <md:SurName>Moschos</md:SurName>
+    <md:EmailAddress>tmos@aegean.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of the Aegean</md:Company>
+    <md:EmailAddress>noc@aegean.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
index 0dabde9e..a019d5b1 100644
--- a/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ait.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ait.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Athlone Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta Bhaile Átha Luain</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</mdui:InformationURL>
+        <mdui:Logo height="73" width="211" xml:lang="en">https://edugate.heanet.ie/rr3/logos/ait.png</mdui:Logo>
+        <mdui:Logo height="73" width="211" xml:lang="en">data:image/png;base64,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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.4108177,-7.8923645</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ait.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Athlone Institute of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta Bhaile Átha Luain</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</mdui:InformationURL>
-          <mdui:Logo height="73" width="211" xml:lang="en">https://edugate.heanet.ie/rr3/logos/ait.png</mdui:Logo>
-          <mdui:Logo height="73" width="211" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.4108177,-7.8923645</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKw7msQ/Rhb4chwEi3azizevjePPMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5haXQuaWUwHhcNMTEwMzIxMTUyMjUyWhcNMzEw
 MzIxMTUyMjUyWjAVMRMwEQYDVQQDEwppZHAuYWl0LmllMIIBIjANBgkqhkiG9w0B
@@ -39,35 +39,35 @@ xSS9WVQ7qm9/LoId9C1bBTSgSoE/3190gEO1Rox09dNKh2qZBlxqzg9VWaGodw1+
 S9AlbrF9+Pfu2lmvqmVUw6OQW0Usf6ANTb0pXim274/efX34EVz63en/hFbP97eQ
 Ge5BNlqT3Xh9wwnHhhgTKZivKII/N7hZ
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ait.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ait.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ait.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Athlone Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Athlone Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>COlin</md:GivenName>
-      <md:SurName>Donohue</md:SurName>
-      <md:EmailAddress>mailto:colindonohue@ait.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Hallissy</md:SurName>
-      <md:EmailAddress>mailto:ihallissy@ait.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Rossa</md:GivenName>
-      <md:SurName>Coleman</md:SurName>
-      <md:EmailAddress>mailto:rcoleman@ait.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ait.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ait.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ait.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Athlone Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Athlone Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>COlin</md:GivenName>
+    <md:SurName>Donohue</md:SurName>
+    <md:EmailAddress>mailto:colindonohue@ait.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Hallissy</md:SurName>
+    <md:EmailAddress>mailto:ihallissy@ait.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Rossa</md:GivenName>
+    <md:SurName>Coleman</md:SurName>
+    <md:EmailAddress>mailto:rcoleman@ait.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml
index 05be76ab..2409ebe6 100644
--- a/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.altoncollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T10:39:55Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T10:39:55Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">altoncollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">altoncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjgCCQC9aDsLCT+yJTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
 						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
 						QWx0b24gQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmFsdG9uY29sbGVnZS5hYy51azAe
@@ -30,26 +30,26 @@
 						9HL3TJh7T9W2wwiXCPBrbBXgsMEJbqBD8IqmduocWIEmoS42u/NRDqm2Pd0Xo6ek
 						X3N5HAhy6iR2no15bK6N+a+qaju+C9vIQyHuWCAf3xfr8loi
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.altoncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">altoncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.altoncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">altoncollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjgCCQC9aDsLCT+yJTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
 						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
 						QWx0b24gQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmFsdG9uY29sbGVnZS5hYy51azAe
@@ -69,27 +69,27 @@
 						9HL3TJh7T9W2wwiXCPBrbBXgsMEJbqBD8IqmduocWIEmoS42u/NRDqm2Pd0Xo6ek
 						X3N5HAhy6iR2no15bK6N+a+qaju+C9vIQyHuWCAf3xfr8loi
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Alton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Alton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.altoncollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Guy</md:GivenName>
-      <md:SurName>Hines-Dedman</md:SurName>
-      <md:EmailAddress>mailto:guy.hines-dedman@altoncollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Guy</md:GivenName>
-      <md:SurName>Hines-Dedman</md:SurName>
-      <md:EmailAddress>mailto:guy.hines-dedman@altoncollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Alton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Alton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.altoncollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Guy</md:GivenName>
+    <md:SurName>Hines-Dedman</md:SurName>
+    <md:EmailAddress>mailto:guy.hines-dedman@altoncollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Guy</md:GivenName>
+    <md:SurName>Hines-Dedman</md:SurName>
+    <md:EmailAddress>mailto:guy.hines-dedman@altoncollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml
index b7b0a6b3..2cb91d28 100644
--- a/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.american.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">american.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">American University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">american.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">American University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAJDrEjwuZf7tKwar/iJcnJUpBaD3MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC5hbWVyaWNhbi5lZHUwHhcNMTEwNzA2MTc1NDA1
 WhcNMzEwNzA2MTc1NDA1WjAbMRkwFwYDVQQDExBpZHAuYW1lcmljYW4uZWR1MIIB
@@ -37,23 +37,23 @@ zTtMuRrRCaxg3NUU2JuqTo17lFNguUB7+uzfop//nu+u7PyT6325o/Bla1iP4HNc
 Qld5H3yair/rrHPwpk3aH+torcKqdV/VlyPcgwXZ1LhqmgBIbQ6jGWZsniwh+xfs
 GSfLlV8bGtUawXlz2hsCK4EGIzVMeGanIBE/kozBqy3Ul6SVPZzxsU2nJCRuIHS5
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.american.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.american.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.american.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.american.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.american.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">american.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.american.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.american.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.american.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.american.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.american.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">american.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAJDrEjwuZf7tKwar/iJcnJUpBaD3MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC5hbWVyaWNhbi5lZHUwHhcNMTEwNzA2MTc1NDA1
 WhcNMzEwNzA2MTc1NDA1WjAbMRkwFwYDVQQDExBpZHAuYW1lcmljYW4uZWR1MIIB
@@ -72,22 +72,22 @@ zTtMuRrRCaxg3NUU2JuqTo17lFNguUB7+uzfop//nu+u7PyT6325o/Bla1iP4HNc
 Qld5H3yair/rrHPwpk3aH+torcKqdV/VlyPcgwXZ1LhqmgBIbQ6jGWZsniwh+xfs
 GSfLlV8bGtUawXlz2hsCK4EGIzVMeGanIBE/kozBqy3Ul6SVPZzxsU2nJCRuIHS5
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.american.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">American University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">American University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.american.edu/index1.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Saeed Pater-Rov</md:GivenName>
-      <md:EmailAddress>paterrov@american.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eric Weakland</md:GivenName>
-      <md:EmailAddress>eric@american.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.american.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">American University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">American University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.american.edu/index1.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Saeed Pater-Rov</md:GivenName>
+    <md:EmailAddress>paterrov@american.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eric Weakland</md:GivenName>
+    <md:EmailAddress>eric@american.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml
index 775cce1b..8f502918 100644
--- a/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.amersham.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T19:36:23Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T19:36:23Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amersham.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Amersham &amp; Wycombe College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amersham.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Amersham &amp; Wycombe College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVALWxW6Db2xAPZ4pIJ+T4NU75vxlwMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51azAeFw0xMzA2MjUwOTAy
 						MDBaFw0zMzA2MjUwOTAyMDBaMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51
@@ -33,29 +33,29 @@
 						T1m7Vb/gKNqpwHzxUnfNtZm8EOudFsbqyPO5YIVJ7Bh4GOf1L8q8JTSRwR/Sle0R
 						7tCYiJS1fps=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.amersham.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amersham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.amersham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amersham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVALWxW6Db2xAPZ4pIJ+T4NU75vxlwMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51azAeFw0xMzA2MjUwOTAy
 						MDBaFw0zMzA2MjUwOTAyMDBaMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51
@@ -75,27 +75,27 @@
 						T1m7Vb/gKNqpwHzxUnfNtZm8EOudFsbqyPO5YIVJ7Bh4GOf1L8q8JTSRwR/Sle0R
 						7tCYiJS1fps=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Amersham &amp; Wycombe College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Amersham &amp; Wycombe College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.amersham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Dawe</md:SurName>
-      <md:EmailAddress>mailto:pdawe@amersham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Dawe</md:SurName>
-      <md:EmailAddress>mailto:pdawe@amersham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Amersham &amp; Wycombe College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Amersham &amp; Wycombe College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amersham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Dawe</md:SurName>
+    <md:EmailAddress>mailto:pdawe@amersham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Dawe</md:SurName>
+    <md:EmailAddress>mailto:pdawe@amersham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.amu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.amu.cz-idp-shibboleth.xml
index caf43d91..2a18a15c 100644
--- a/swamid-interfederations-2.0/idp.amu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.amu.cz-idp-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.amu.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-01-11T13:24:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-01-11T13:24:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Academy of Performing Arts in Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Akademie múzických umění v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Academy of Performing Arts in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Akademie múzických umění v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.amu.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.amu.cz</mdui:InformationURL>
+        <mdui:Logo height="40" width="218">https://idp.amu.cz/idp/images/amu_logo_218x40.png</mdui:Logo>
+        <mdui:Logo height="50" width="273">https://idp.amu.cz/idp/images/amu_logo_273x50.png</mdui:Logo>
+        <mdui:Logo height="100" width="546">https://idp.amu.cz/idp/images/amu_logo_546x100.png</mdui:Logo>
+        <mdui:Logo height="120" width="655">https://idp.amu.cz/idp/images/amu_logo_655x120.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amu.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Academy of Performing Arts in Prague</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Akademie múzických umění v Praze</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students of the Academy of Performing Arts in Prague</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Akademie múzických umění v Praze</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.amu.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.amu.cz</mdui:InformationURL>
-          <mdui:Logo height="40" width="218">https://idp.amu.cz/idp/images/amu_logo_218x40.png</mdui:Logo>
-          <mdui:Logo height="50" width="273">https://idp.amu.cz/idp/images/amu_logo_273x50.png</mdui:Logo>
-          <mdui:Logo height="100" width="546">https://idp.amu.cz/idp/images/amu_logo_546x100.png</mdui:Logo>
-          <mdui:Logo height="120" width="655">https://idp.amu.cz/idp/images/amu_logo_655x120.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEgTCCA2mgAwIBAgIRANjln9Z7fwd0U324koy2j5UwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMDEyMjEwMDAwMDBaFw0xMzEyMjAyMzU5NTlaMFMxCzAJBgNV
@@ -59,13 +59,13 @@ vF9nw9tlYsG7ekmWZ0lpa7PrJcNUCUSsKGe97z/mQtDO/z1O8P5ajlMJLib9bl3O
 9HFBz3DylVy8Fxeq2vd9XIrl6f2epx741RwK5DoUKK/rnlrc/qPoVIzArE8+hwuK
 Wa6hE3gQwE0DJqTCtKGPCQ0TbCD6id/silN2opRZYbN3Laf+3fhS0jqy/L1ZhIlm
 AVKWGgk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKxsw11H/ow5YfSgVgM6xFFLoJPJMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC5hbXUuY3owHhcNMTYwNDIxMTI0NzI5WhcNMzYw
 NDIxMTI0NzI5WjAVMRMwEQYDVQQDDAppZHAuYW11LmN6MIIBIjANBgkqhkiG9w0B
@@ -83,26 +83,26 @@ uBBYGmEF712EwvZvERM4VIqMoeRif7bfQcu5msIs3+NPhhpV01x5G/Esd7bRhaLo
 bIf+0aNTTAXAgdr6w7e8NtWVzc+gjuQ9faZ9oRYsUZPmVG3RLD4fcN6RtPSRngEX
 vcWxau3MCMrohdf+TKydW+Gvmfm3TrPwTCuvtZpu2WX0AbJMtjZVDsh7tC5XPJ4h
 1Db7355ul2tCuzYqux/NioF9zGt56XfK</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.amu.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amu.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.amu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amu.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amu.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.amu.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amu.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.amu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amu.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEgTCCA2mgAwIBAgIRANjln9Z7fwd0U324koy2j5UwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMDEyMjEwMDAwMDBaFw0xMzEyMjAyMzU5NTlaMFMxCzAJBgNV
@@ -128,13 +128,13 @@ vF9nw9tlYsG7ekmWZ0lpa7PrJcNUCUSsKGe97z/mQtDO/z1O8P5ajlMJLib9bl3O
 9HFBz3DylVy8Fxeq2vd9XIrl6f2epx741RwK5DoUKK/rnlrc/qPoVIzArE8+hwuK
 Wa6hE3gQwE0DJqTCtKGPCQ0TbCD6id/silN2opRZYbN3Laf+3fhS0jqy/L1ZhIlm
 AVKWGgk=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKxsw11H/ow5YfSgVgM6xFFLoJPJMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC5hbXUuY3owHhcNMTYwNDIxMTI0NzI5WhcNMzYw
 NDIxMTI0NzI5WjAVMRMwEQYDVQQDDAppZHAuYW11LmN6MIIBIjANBgkqhkiG9w0B
@@ -152,30 +152,30 @@ uBBYGmEF712EwvZvERM4VIqMoeRif7bfQcu5msIs3+NPhhpV01x5G/Esd7bRhaLo
 bIf+0aNTTAXAgdr6w7e8NtWVzc+gjuQ9faZ9oRYsUZPmVG3RLD4fcN6RtPSRngEX
 vcWxau3MCMrohdf+TKydW+Gvmfm3TrPwTCuvtZpu2WX0AbJMtjZVDsh7tC5XPJ4h
 1Db7355ul2tCuzYqux/NioF9zGt56XfK</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Academy of Performing Arts in Prague</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Akademie múzických umění v Praze</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Academy of Performing Arts in Prague</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Akademie múzických umění v Praze</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.amu.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.amu.cz</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tomas</md:GivenName>
-      <md:SurName>Jungwirth</md:SurName>
-      <md:EmailAddress>tomas.jungwirth@amu.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jakub</md:GivenName>
-      <md:SurName>Ivanov</md:SurName>
-      <md:EmailAddress>jakub.ivanov@amu.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Academy of Performing Arts in Prague</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Akademie múzických umění v Praze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Academy of Performing Arts in Prague</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Akademie múzických umění v Praze</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amu.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.amu.cz</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Jungwirth</md:SurName>
+    <md:EmailAddress>tomas.jungwirth@amu.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jakub</md:GivenName>
+    <md:SurName>Ivanov</md:SurName>
+    <md:EmailAddress>jakub.ivanov@amu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
index 5deaa683..c18ebc55 100644
--- a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.amue.fr/idp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-26T11:26:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-26T11:26:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amue.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpu.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe.amue.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuf.cpu.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQoz0WSTWvcdRSFn/Ob/39eMi+ZaTohQZKmtJESg0VrKYgLa9d2IQWX0u9gsR+gq+7EhWtBUVzUna2LQsVli2CFSLEgpiZqdLQZZzLJvNzTxST1rB8u5977KCIEZhqDBEZS7OxN7v7Sffhkd/14+eLp1sJsCcg4pJ+jBoH/HcRH33c+3+j0O9393d6V1eaNd9bnm+V0NF1gW4CxYas3/nazNxxFMqOIOw+2bt/fNJGBpjCW5e3d4QGpVkqWQxEJW8mF3v7w8R//ycrAWEB/OL71w/aDv31iqf1SK7vQzt9aqn/WHQ9kK4oFWtUcOYGAvWF8eOena1/+SLXSNwO7WdL1C/Ofvr30ysnjM6VsrjFzbrWNU5JAvr+x8/HXj7qD+POfvsNyEqmcab1dO7e6uNyeffeNldfX5hGZHSZ9cu/RYDhJmb97uLn9tN9dnlurzZ0+lueKtVmffXPp0qlmXkgCxWTy607v8o1vfuuOD2qVVK81qqU0Uy7WK5dfbL5/fmGxWgDr8OgkxJPO3sEgQAGJMMkwmvDVz90vNjqAjj4FTuCD8WhijHAiku2kQshj69bjXcASxNSFZFK7XinmqcBEMokkwk4WxGAsHBCQpnzCrL4we2a5BZmFkGUcCMRKIxdJCJAkkSTKxcIHV15u1TOZUIAksBq5rq63pjBHSQKhV0/N3XzvtYtn2rnSdOmTzfza+YVLJ6rg/20GRQQIYhz+/en+xl+Dre5oppKdXaytNIrlfKraYSXgGXy1Bx0qBeYCAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE0KzAyOjAwAx+NhQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMHJCNTkAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.amue.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amue.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpu.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe.amue.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuf.cpu.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQoz0WSTWvcdRSFn/Ob/39eMi+ZaTohQZKmtJESg0VrKYgLa9d2IQWX0u9gsR+gq+7EhWtBUVzUna2LQsVli2CFSLEgpiZqdLQZZzLJvNzTxST1rB8u5977KCIEZhqDBEZS7OxN7v7Sffhkd/14+eLp1sJsCcg4pJ+jBoH/HcRH33c+3+j0O9393d6V1eaNd9bnm+V0NF1gW4CxYas3/nazNxxFMqOIOw+2bt/fNJGBpjCW5e3d4QGpVkqWQxEJW8mF3v7w8R//ycrAWEB/OL71w/aDv31iqf1SK7vQzt9aqn/WHQ9kK4oFWtUcOYGAvWF8eOena1/+SLXSNwO7WdL1C/Ofvr30ysnjM6VsrjFzbrWNU5JAvr+x8/HXj7qD+POfvsNyEqmcab1dO7e6uNyeffeNldfX5hGZHSZ9cu/RYDhJmb97uLn9tN9dnlurzZ0+lueKtVmffXPp0qlmXkgCxWTy607v8o1vfuuOD2qVVK81qqU0Uy7WK5dfbL5/fmGxWgDr8OgkxJPO3sEgQAGJMMkwmvDVz90vNjqAjj4FTuCD8WhijHAiku2kQshj69bjXcASxNSFZFK7XinmqcBEMokkwk4WxGAsHBCQpnzCrL4we2a5BZmFkGUcCMRKIxdJCJAkkSTKxcIHV15u1TOZUIAksBq5rq63pjBHSQKhV0/N3XzvtYtn2rnSdOmTzfza+YVLJ6rg/20GRQQIYhz+/en+xl+Dre5oppKdXaytNIrlfKraYSXgGXy1Bx0qBeYCAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE0KzAyOjAwAx+NhQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMHJCNTkAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.amue.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDgTCCAmmgAwIBAgIJAJz0e9ITZF9gMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
 BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
 A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTQxMDE1MTQyMjUz
@@ -42,13 +42,13 @@ I+tTmgFAcNORr5ucYnCdj3BzirEwLhGbczidsBquyvKL4VzT0oMlVND4jD5DFSlG
 Y6g6XMXwo2b6mIgK0y4447ZzOokArx1Jy7yvg7LDXTwUVVevrIy2Gb+sQlpGeKmr
 lO2z79XxgAmGiMTqrh2EIm+X9F53PSRqNjOExud+Ge1XjSYNVg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDgTCCAmmgAwIBAgIJANYhmQZ/PLaYMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
 BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
 A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTMxMTI1MDk0NzM3
@@ -69,24 +69,24 @@ HReuVPebHm8bm731uo491q1LdjCfUAaz14UMGYJL2UfigFa0fp3ONfkoZR2aob1w
 zYcZ/I9oT7x7mBJe4Fb1lUMrI9+0A4XBORW0i374j1hzvMprE3UW777QDK+TorKh
 JwghMs3y4HmiEKEylVhTWipavdzRw41b9jbFKmgB7MqdBiCfhQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amue.fr/idp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amue.fr/idp/saml2/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.amue.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>German hurtado</md:SurName>
-      <md:EmailAddress>German.hurtado@amue.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Didier Denjean</md:SurName>
-      <md:EmailAddress>Didier.denjean@amue.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amue.fr/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amue.fr/idp/saml2/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amue.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>German hurtado</md:SurName>
+    <md:EmailAddress>German.hurtado@amue.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Didier Denjean</md:SurName>
+    <md:EmailAddress>Didier.denjean@amue.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml
index 6805c6b3..118e6f6f 100644
--- a/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.anglia.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-17T17:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-17T17:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anglia.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anglia.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbjCCA1agAwIBAgIJAKgOBqreKA7kMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJHQjEOMAwGA1UECAwFRXNzZXgxEzARBgNVBAcMCkNoZWxtc2ZvcmQxITAf
 						BgNVBAoMGEFuZ2xpYSBSdXNraW4gVW5pdmVyc2l0eTEbMBkGA1UECwwSVW5pdmVy
@@ -38,25 +38,25 @@
 						IR9hHcyp+OyjkSQAtk4aR3EG4ETL1DRg1lOn4vLx0iZvunV414E+oz4AjRor9NDO
 						jhjABmtX2fYOehXDJQvAW8f+ExSl+RlQHZNyTQX3V3xJXA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.anglia.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.anglia.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Anglia Ruskin University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Anglia Ruskin University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://libweb.anglia.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Collins</md:SurName>
-      <md:EmailAddress>mailto:alex.collins@anglia.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Collins</md:SurName>
-      <md:EmailAddress>mailto:alex.collins@anglia.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.anglia.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.anglia.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Anglia Ruskin University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Anglia Ruskin University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://libweb.anglia.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Collins</md:SurName>
+    <md:EmailAddress>mailto:alex.collins@anglia.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Collins</md:SurName>
+    <md:EmailAddress>mailto:alex.collins@anglia.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml
index df7d4f66..638a3a0b 100644
--- a/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ap-hm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-23T17:04:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-23T17:04:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ap-hm.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aphm.ap-hm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://fr.ap-hm.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">French public hospital of Marseille</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Employés de l'Assistance Publique Hôpitaux de Marseille (AP-HM)</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ap-hm.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aphm.ap-hm.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://fr.ap-hm.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">French public hospital of Marseille</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Employés de l'Assistance Publique Hôpitaux de Marseille (AP-HM)</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVAOhqE6xG9Jim8D5otVZZ5i3uzRwKMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMMDGlkcC5hcC1obS5mcjAeFw0xNTEwMTUxMzU4NDZaFw0z
 NTEwMTUxMzU4NDZaMBcxFTATBgNVBAMMDGlkcC5hcC1obS5mcjCCASIwDQYJKoZI
@@ -40,19 +40,19 @@ fv3rQ2OiSWaCaqlaS3NZ5FrBQ3qak8qdgbEEJMfXZn5Sktz8x+HgaSw8VaJy/9eo
 1lDRwcJL6+TF26PhCgpxAuG57NVtKW/HFGtvKdQ5ViHJ/8KfSErtB4l9akt7cHYW
 dmh1bRX6hc+FqDavw7bMJS6CyMnsnGL6oVO75Q3H/Is=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ap-hm.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ap-hm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://fr.ap-hm.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>systunix@ap-hm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ap-hm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ap-hm.fr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://fr.ap-hm.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>systunix@ap-hm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml b/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml
index f57801df..cdeca447 100644
--- a/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.apu.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Azusa Pacific University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Azusa Pacific University's Faculty, Staff, Students and Alumni.</mdui:Description>
+        <mdui:Logo height="100" width="150" xml:lang="en">https://idp.apu.edu/images/apu_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Azusa Pacific University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Azusa Pacific University's Faculty, Staff, Students and Alumni.</mdui:Description>
-          <mdui:Logo height="100" width="150" xml:lang="en">https://idp.apu.edu/images/apu_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDsDCCApgCCQCjgzJFa0BoNzANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
 VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDjAMBgNVBAcMBUF6dXNhMSEwHwYDVQQK
 DBhBenVzYSBQYWNpZmljIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0lNVDEUMBIGA1UE
@@ -42,24 +42,24 @@ uASqOe8zF+6kXJQf1LVb9y+VXT0TeqUrROQhsoQlDyaCrEYZNnp3fvzeCNoqUSzH
 DcuZ4AsMi4iOwJWnfPD7+R9RHW5E8or/a1lmGLcPkS4KaEvMmJ139KFuFFU2sfAI
 MtHJYXN/BoS3/iNepB1mnnaprpvPqcp56isQ48gVvWuqEEVF
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apu.edu:8443/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apu.edu:8443/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.apu.edu/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.apu.edu/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.apu.edu/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.apu.edu/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apu.edu:8443/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apu.edu:8443/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.apu.edu/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.apu.edu/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.apu.edu/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.apu.edu/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDsDCCApgCCQCjgzJFa0BoNzANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
 VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDjAMBgNVBAcMBUF6dXNhMSEwHwYDVQQK
 DBhBenVzYSBQYWNpZmljIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0lNVDEUMBIGA1UE
@@ -81,19 +81,19 @@ uASqOe8zF+6kXJQf1LVb9y+VXT0TeqUrROQhsoQlDyaCrEYZNnp3fvzeCNoqUSzH
 DcuZ4AsMi4iOwJWnfPD7+R9RHW5E8or/a1lmGLcPkS4KaEvMmJ139KFuFFU2sfAI
 MtHJYXN/BoS3/iNepB1mnnaprpvPqcp56isQ48gVvWuqEEVF
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apu.edu:8443/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apu.edu:8443/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Azusa Pacific University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Azusa Pacific University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.apu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joshua Riffle</md:GivenName>
-      <md:EmailAddress>jriffle@apu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apu.edu:8443/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apu.edu:8443/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Azusa Pacific University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Azusa Pacific University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.apu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joshua Riffle</md:GivenName>
+    <md:EmailAddress>jriffle@apu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml
index 91147cc7..f3b946f5 100644
--- a/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aquinas.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-25T21:10:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-25T21:10:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aquinas.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aquinas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjgCCQCg2y4jrOTluTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCVN0b2NrcG9ydDEYMBYGA1UE
 						ChMPQXF1aW5hcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuYXF1aW5hcy5hYy51azAe
@@ -32,26 +32,26 @@
 						C6j3J1qFgiVaMhKL9ylqHcQEpgoGmC3AuU+C7b2hRmeshOu9J8KkCzW/ypbkbmjz
 						gksEb356B4ItPcFswd5Xuzp4GArt+NVr/4whnniyfRjS+Ryl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aquinas.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aquinas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aquinas.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aquinas.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjgCCQCg2y4jrOTluTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCVN0b2NrcG9ydDEYMBYGA1UE
 						ChMPQXF1aW5hcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuYXF1aW5hcy5hYy51azAe
@@ -71,27 +71,27 @@
 						C6j3J1qFgiVaMhKL9ylqHcQEpgoGmC3AuU+C7b2hRmeshOu9J8KkCzW/ypbkbmjz
 						gksEb356B4ItPcFswd5Xuzp4GArt+NVr/4whnniyfRjS+Ryl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aquinas College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aquinas College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aquinas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Houghton</md:SurName>
-      <md:EmailAddress>mailto:philh@aquinas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Houghton</md:SurName>
-      <md:EmailAddress>mailto:philh@aquinas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aquinas College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aquinas College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aquinas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Houghton</md:SurName>
+    <md:EmailAddress>mailto:philh@aquinas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Houghton</md:SurName>
+    <md:EmailAddress>mailto:philh@aquinas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml
index e437b2ba..a8be0acd 100644
--- a/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ariadne-t.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">demokritos.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">demokritos.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDLDCCAhSgAwIBAgIVALxnNk/iLXAEN6bKpJarNog5IEulMA0GCSqGSIb3DQEB
                             BQUAMBsxGTAXBgNVBAMTEGlkcC5hcmlhZG5lLXQuZ3IwHhcNMTAwNjIxMDc0MDU2
                             WhcNMzAwNjIxMDc0MDU2WjAbMRkwFwYDVQQDExBpZHAuYXJpYWRuZS10LmdyMIIB
@@ -37,26 +37,26 @@
                             PQeV5TE2rBwMS6hsjSo+C2/BkOAjGoGO3dpiHZBcOFAi6r/Ig03JjIFUL7xN0yYH
                             VOeb9+qOojXunPrN/2skpWXv/1x0bwMDDIZqXQMQHQHjmKiK3k13OETi/EZTbwmE
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ariadne-t.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">demokritos.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ariadne-t.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">demokritos.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDLDCCAhSgAwIBAgIVALxnNk/iLXAEN6bKpJarNog5IEulMA0GCSqGSIb3DQEB
                             BQUAMBsxGTAXBgNVBAMTEGlkcC5hcmlhZG5lLXQuZ3IwHhcNMTAwNjIxMDc0MDU2
                             WhcNMzAwNjIxMDc0MDU2WjAbMRkwFwYDVQQDExBpZHAuYXJpYWRuZS10LmdyMIIB
@@ -75,31 +75,31 @@
                             PQeV5TE2rBwMS6hsjSo+C2/BkOAjGoGO3dpiHZBcOFAi6r/Ig03JjIFUL7xN0yYH
                             VOeb9+qOojXunPrN/2skpWXv/1x0bwMDDIZqXQMQHQHjmKiK3k13OETi/EZTbwmE
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NCSR Demokritos</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">ΕΚΕΦΕ Δημόκριτος</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NCSR Demokritos</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">ΕΚΕΦΕ Δημόκριτος</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.demokritos.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.demokritos.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Charalampos</md:GivenName>
-      <md:SurName>Koutsouris</md:SurName>
-      <md:EmailAddress>harisk@ariadne-t.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ariadne-t NOC</md:GivenName>
-      <md:EmailAddress>noc@ariadne-t.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-210-650-3125</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NCSR Demokritos</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΕΚΕΦΕ Δημόκριτος</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NCSR Demokritos</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">ΕΚΕΦΕ Δημόκριτος</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.demokritos.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.demokritos.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Charalampos</md:GivenName>
+    <md:SurName>Koutsouris</md:SurName>
+    <md:EmailAddress>harisk@ariadne-t.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ariadne-t NOC</md:GivenName>
+    <md:EmailAddress>noc@ariadne-t.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-210-650-3125</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml
index 514164ea..df9ee9a3 100644
--- a/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.arts.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5DCCAswCCQD996epTPDENDANBgkqhkiG9w0BAQUFADCBszELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xJzAl
 						BgNVBAoMHlVuaXZlcnNpdHkgb2YgdGhlIEFydHMsIExvbmRvbjEUMBIGA1UECwwL
@@ -33,26 +33,26 @@
 						+QSJKGU5LkUlhzDceN+QA/RuIuTUF0VSi283LNzyyp2q9ya+mv7UYVaGJs7AYuNR
 						mUNMMO4EcXmyJkn6gSTesu0OCj76227/ss3Ni3p+nehxcBY9R/olXg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.arts.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.arts.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.arts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.arts.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.arts.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.arts.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.arts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.arts.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5DCCAswCCQD996epTPDENDANBgkqhkiG9w0BAQUFADCBszELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xJzAl
 						BgNVBAoMHlVuaXZlcnNpdHkgb2YgdGhlIEFydHMsIExvbmRvbjEUMBIGA1UECwwL
@@ -75,25 +75,25 @@
 						+QSJKGU5LkUlhzDceN+QA/RuIuTUF0VSi283LNzyyp2q9ya+mv7UYVaGJs7AYuNR
 						mUNMMO4EcXmyJkn6gSTesu0OCj76227/ss3Ni3p+nehxcBY9R/olXg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the Arts London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the Arts London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.arts.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UAL Service desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@arts.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:shib-support@arts.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the Arts London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the Arts London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.arts.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UAL Service desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@arts.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:shib-support@arts.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml b/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml
index 539a2cd9..c9eabf1b 100644
--- a/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ashridge.org.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-10T09:48:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-10T09:48:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ashridge.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ashridge.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -35,23 +35,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ashridge.org.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ashridge.org.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ashridge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ashridge.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ashridge.org.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ashridge.org.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ashridge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ashridge.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml
index 30860e59..f75969f6 100644
--- a/swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aspete.gr-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aspete.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspete.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">School of Pedagogical and Technological Education</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</mdui:DisplayName>
+        <mdui:Description xml:lang="en">School of Pedagogical and Technological Education</mdui:Description>
+        <mdui:Description xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.aspete.gr/index.php/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.aspete.gr/index.php/el/</mdui:InformationURL>
+        <mdui:Logo height="304" width="304">https://www.aspete.gr/images/logos/aspaitelogoonly304x304trans.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="80" width="60">https://www.aspete.gr/images/logos/aspaitelogomoto82x60trans_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="el" height="80" width="60">https://www.aspete.gr/images/logos/aspaitelogomoto82x60trans_el.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="150" width="204">https://www.aspete.gr/images/logos/aspaitelogomoto204x150trans_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="el" height="150" width="204">https://www.aspete.gr/images/logos/aspaitelogomoto204x150trans_el.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="237" width="322">https://www.aspete.gr/images/logos/aspaitelogomoto322x237trans_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="el" height="237" width="322">https://www.aspete.gr/images/logos/aspaitelogomoto322x237trans_el.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>www.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>elecengedu.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>mechanical.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>civil.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>paidagogiko.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>eppaikpesyp.aspete.gr</mdui:DomainHint>
+        <mdui:DomainHint>elke.aspete.gr</mdui:DomainHint>
+        <mdui:IPHint>83.212.12.64/26</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.0434378,23.7862765</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspete.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">School of Pedagogical and Technological Education</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</mdui:DisplayName>
-          <mdui:Description xml:lang="en">School of Pedagogical and Technological Education</mdui:Description>
-          <mdui:Description xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.aspete.gr/index.php/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.aspete.gr/index.php/el/</mdui:InformationURL>
-          <mdui:Logo height="304" width="304">https://www.aspete.gr/images/logos/aspaitelogoonly304x304trans.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="80" width="60">https://www.aspete.gr/images/logos/aspaitelogomoto82x60trans_en.png</mdui:Logo>
-          <mdui:Logo xml:lang="el" height="80" width="60">https://www.aspete.gr/images/logos/aspaitelogomoto82x60trans_el.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="150" width="204">https://www.aspete.gr/images/logos/aspaitelogomoto204x150trans_en.png</mdui:Logo>
-          <mdui:Logo xml:lang="el" height="150" width="204">https://www.aspete.gr/images/logos/aspaitelogomoto204x150trans_el.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="237" width="322">https://www.aspete.gr/images/logos/aspaitelogomoto322x237trans_en.png</mdui:Logo>
-          <mdui:Logo xml:lang="el" height="237" width="322">https://www.aspete.gr/images/logos/aspaitelogomoto322x237trans_el.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>www.aspete.gr</mdui:DomainHint>
-          <mdui:DomainHint>elecengedu.aspete.gr</mdui:DomainHint>
-          <mdui:DomainHint>mechanical.aspete.gr</mdui:DomainHint>
-          <mdui:DomainHint>civil.aspete.gr</mdui:DomainHint>
-          <mdui:DomainHint>paidagogiko.aspete.gr</mdui:DomainHint>
-          <mdui:DomainHint>eppaikpesyp.aspete.gr</mdui:DomainHint>
-          <mdui:DomainHint>elke.aspete.gr</mdui:DomainHint>
-          <mdui:IPHint>83.212.12.64/26</mdui:IPHint>
-          <mdui:GeolocationHint>geo:38.0434378,23.7862765</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEaDCCA1CgAwIBAgIRAKqJUe8UYbOGhgKO3vhgmRcwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
@@ -65,26 +65,26 @@
                             C9LlTkZ8GVIF6HxcOiQNRzAft0mSGLEXqOpefOAAhs4GW0jDaphmYZHEJtKq3PTl
                             w8LvrRCWWrxMJZ91O2tHn6HIrviKjXyakQ8GnA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aspete.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aspete.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aspete.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aspete.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aspete.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aspete.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspete.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aspete.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aspete.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aspete.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aspete.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aspete.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aspete.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspete.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEaDCCA1CgAwIBAgIRAKqJUe8UYbOGhgKO3vhgmRcwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
@@ -110,29 +110,29 @@
                             C9LlTkZ8GVIF6HxcOiQNRzAft0mSGLEXqOpefOAAhs4GW0jDaphmYZHEJtKq3PTl
                             w8LvrRCWWrxMJZ91O2tHn6HIrviKjXyakQ8GnA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aspete.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aspete.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">School of Pedagogical and Technological Education</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">School of Pedagogical and Technological Education</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aspete.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.aspete.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Apostolos</md:GivenName>
-      <md:SurName>Oikonomou</md:SurName>
-      <md:EmailAddress>apeco@aspete.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>School of Pedagogical and Technological Education NOC</md:Company>
-      <md:EmailAddress>noc@aspete.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aspete.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aspete.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">School of Pedagogical and Technological Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">School of Pedagogical and Technological Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ανώτατη Σχολή Παιδαγωγικής και Τεχνολογικής Εκπαίδευσης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aspete.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.aspete.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Apostolos</md:GivenName>
+    <md:SurName>Oikonomou</md:SurName>
+    <md:EmailAddress>apeco@aspete.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>School of Pedagogical and Technological Education NOC</md:Company>
+    <md:EmailAddress>noc@aspete.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
index 9f33de4f..68393d8d 100644
--- a/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.asu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-23T10:20:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-23T10:20:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Astronomical Institute of the Czech Academy of Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Astronomický ústav Akademie věd České Republiky</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees of Astronomical Institute of the Czech Academy of Sciences.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Astronomického ústavu Akademie věd České Republiky.</mdui:Description>
+        <mdui:Logo height="40" width="99">https://idp.asu.cas.cz/logo-asu_99_40.png</mdui:Logo>
+        <mdui:Logo height="76" width="187">https://idp.asu.cas.cz/logo-asu_187_76.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Astronomical Institute of the Czech Academy of Sciences</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Astronomický ústav Akademie věd České Republiky</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees of Astronomical Institute of the Czech Academy of Sciences.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Astronomického ústavu Akademie věd České Republiky.</mdui:Description>
-          <mdui:Logo height="40" width="99">https://idp.asu.cas.cz/logo-asu_99_40.png</mdui:Logo>
-          <mdui:Logo height="76" width="187">https://idp.asu.cas.cz/logo-asu_187_76.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVANrv5WGUsquQhfjq0eTxVi20NsReMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMloX
 DTM1MDcyMzA5MDgzMlowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
@@ -48,13 +48,13 @@ jdMW+fZSfndHznmHrVjnhwMqaPgNOM45vkuwZeT0WZuhAhNXcCw3AGGrB8W4nmNd
 dsQVYrfF/KF/LG3HI3nCPWbe7vSKzdRidotQof3ZpVx/+mhM2xQu5PPAJKvT5TyO
 k7HbFDf0m9+/4WILNVLYF8L10+Gg2NSrdovl9NkyiEYi8udx9G9zvw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJdNb/Rhko4nwYw+ygi1hua8ErgsMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMVoX
 DTM1MDcyMzA5MDgzMVowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
@@ -73,13 +73,13 @@ VQqEbFfPqunsbacUA1zF4HZ3ceJQNKzIFYuFTpp+1i5RZN/+28zwNQj1XlCJ8+fN
 5KC/z5C4Kfg6PKnx5A0EJAr6Dk8afdoj6UO92/t+GF7Devsohpe2excLJ3zVJKWN
 0mIfCxb1hPlXsnaFfv/ekGZcz+JHqpHyEAXEUwLhqy97bRlPjKMFSQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHD3PnOGmtImskndM+6f3qKBHwkUwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owHhcNMTUwNzIzMDkwODMyWhcN
 MzUwNzIzMDkwODMyWjAZMRcwFQYDVQQDDA5pZHAuYXN1LmNhcy5jejCCASIwDQYJ
@@ -98,31 +98,31 @@ y0pSMmN1A1dFK/v1PrIeaZ/YZvnuh/k7IpVKX81Kg+qhkeh9eAxiLZi6Bdd3jB6r
 RLH/RkYhMb3hf89qLrOFgXCR3hAyX4xQAnyTZyxliYteSiGMfmLW6Mmr+MNaojx5
 CuBQbcFvp2S6zogNWjt2678eGQSvtIIqAVNLzE9FpmksXm5Gyimt
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.asu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.asu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVANrv5WGUsquQhfjq0eTxVi20NsReMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMloX
 DTM1MDcyMzA5MDgzMlowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
@@ -141,13 +141,13 @@ jdMW+fZSfndHznmHrVjnhwMqaPgNOM45vkuwZeT0WZuhAhNXcCw3AGGrB8W4nmNd
 dsQVYrfF/KF/LG3HI3nCPWbe7vSKzdRidotQof3ZpVx/+mhM2xQu5PPAJKvT5TyO
 k7HbFDf0m9+/4WILNVLYF8L10+Gg2NSrdovl9NkyiEYi8udx9G9zvw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJdNb/Rhko4nwYw+ygi1hua8ErgsMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMVoX
 DTM1MDcyMzA5MDgzMVowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
@@ -166,13 +166,13 @@ VQqEbFfPqunsbacUA1zF4HZ3ceJQNKzIFYuFTpp+1i5RZN/+28zwNQj1XlCJ8+fN
 5KC/z5C4Kfg6PKnx5A0EJAr6Dk8afdoj6UO92/t+GF7Devsohpe2excLJ3zVJKWN
 0mIfCxb1hPlXsnaFfv/ekGZcz+JHqpHyEAXEUwLhqy97bRlPjKMFSQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHD3PnOGmtImskndM+6f3qKBHwkUwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owHhcNMTUwNzIzMDkwODMyWhcN
 MzUwNzIzMDkwODMyWjAZMRcwFQYDVQQDDA5pZHAuYXN1LmNhcy5jejCCASIwDQYJ
@@ -191,23 +191,23 @@ y0pSMmN1A1dFK/v1PrIeaZ/YZvnuh/k7IpVKX81Kg+qhkeh9eAxiLZi6Bdd3jB6r
 RLH/RkYhMb3hf89qLrOFgXCR3hAyX4xQAnyTZyxliYteSiGMfmLW6Mmr+MNaojx5
 CuBQbcFvp2S6zogNWjt2678eGQSvtIIqAVNLzE9FpmksXm5Gyimt
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Astronomical Institute of the CAS</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Astronomický ústav AVČR, v.v.i.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Astronomical institute of the Czech Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Astronomický ústav Akademie věd České republiky</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asu.cas.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.asu.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Ryšavý</md:SurName>
-      <md:EmailAddress>petr.rysavy@asu.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Astronomical Institute of the CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Astronomický ústav AVČR, v.v.i.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Astronomical institute of the Czech Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Astronomický ústav Akademie věd České republiky</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asu.cas.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.asu.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Ryšavý</md:SurName>
+    <md:EmailAddress>petr.rysavy@asu.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml
index 5b5ddcc5..02d90217 100644
--- a/swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aua.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aua.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aua.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYTCCA0mgAwIBAgIQLao5DrjKl4jtinW5yqZdmDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDcxNTAwMDAwMFoXDTE2MDcxNDIzNTk1OVowODEhMB8GA1UE
@@ -44,26 +44,26 @@
                             mQptmsByxpJOAuAuzFRgct/YD2rGwiP2/iuL/QX2wSvWZpABTSAPaynG10ScZl55
                             HWQrDaq4qyBzo7Flcck4QDjBirDo
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aua.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aua.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aua.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aua.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aua.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aua.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aua.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aua.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYTCCA0mgAwIBAgIQLao5DrjKl4jtinW5yqZdmDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDcxNTAwMDAwMFoXDTE2MDcxNDIzNTk1OVowODEhMB8GA1UE
@@ -89,30 +89,30 @@
                             mQptmsByxpJOAuAuzFRgct/YD2rGwiP2/iuL/QX2wSvWZpABTSAPaynG10ScZl55
                             HWQrDaq4qyBzo7Flcck4QDjBirDo
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Agricultural University of Athens</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Γεωπονικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Agricultural University of Athens</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Γεωπονικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aua.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.aua.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alexandros</md:GivenName>
-      <md:SurName>Lekatsas</md:SurName>
-      <md:EmailAddress>alex@aua.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alexandros</md:GivenName>
-      <md:SurName>Lekatsas</md:SurName>
-      <md:EmailAddress>alex@aua.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Agricultural University of Athens</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Γεωπονικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Agricultural University of Athens</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Γεωπονικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aua.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.aua.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alexandros</md:GivenName>
+    <md:SurName>Lekatsas</md:SurName>
+    <md:EmailAddress>alex@aua.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alexandros</md:GivenName>
+    <md:SurName>Lekatsas</md:SurName>
+    <md:EmailAddress>alex@aua.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml
index ea616959..c067de2d 100644
--- a/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aub.edu.lb/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.edu.lb</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">American University of Beirut</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.edu.lb</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">American University of Beirut</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIULYKLvS4tqdodA2Tpx8fCYWx2u9AwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmF1Yi5lZHUubGIwHhcNMTQwNzIyMDkxMTM4WhcN
 MzQwNzIyMDkxMTM4WjAZMRcwFQYDVQQDEw5pZHAuYXViLmVkdS5sYjCCASIwDQYJ
@@ -37,26 +37,26 @@ JfTFVPALyF2oZex7bbHZ2i6CyE0qLetqWmZGgLEl2SscK2Ue1w/pqW6yoo2YMsOC
 X4Ic+GreOjVGJN1TRDjBY6sei0ef+aAulVL1K1aWSjFWjJUazdq4TlZsOF0Z/WGG
 Zderlj8oMgziT8XJHB+2YcRnJm63bJ4PpmitJEcGpgcszR+U1OoQ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.edu.lb/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aub.edu.lb/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.edu.lb/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.edu.lb</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.edu.lb/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aub.edu.lb/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.edu.lb/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.edu.lb</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIULYKLvS4tqdodA2Tpx8fCYWx2u9AwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmF1Yi5lZHUubGIwHhcNMTQwNzIyMDkxMTM4WhcN
 MzQwNzIyMDkxMTM4WjAZMRcwFQYDVQQDEw5pZHAuYXViLmVkdS5sYjCCASIwDQYJ
@@ -75,30 +75,30 @@ JfTFVPALyF2oZex7bbHZ2i6CyE0qLetqWmZGgLEl2SscK2Ue1w/pqW6yoo2YMsOC
 X4Ic+GreOjVGJN1TRDjBY6sei0ef+aAulVL1K1aWSjFWjJUazdq4TlZsOF0Z/WGG
 Zderlj8oMgziT8XJHB+2YcRnJm63bJ4PpmitJEcGpgcszR+U1OoQ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">American University of Beirut</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">American University of Beirut</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aub.edu.lb/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mona Assi</md:GivenName>
-      <md:EmailAddress>monassi@aub.edu.lb</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support Team</md:GivenName>
-      <md:EmailAddress>Shibboleth@aub.edu.lb</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Techincal Team</md:GivenName>
-      <md:EmailAddress>Shibboleth@aub.edu.lb</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Maher Kassab</md:GivenName>
-      <md:EmailAddress>maherk@aub.edu.lb</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">American University of Beirut</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">American University of Beirut</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aub.edu.lb/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mona Assi</md:GivenName>
+    <md:EmailAddress>monassi@aub.edu.lb</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support Team</md:GivenName>
+    <md:EmailAddress>Shibboleth@aub.edu.lb</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Techincal Team</md:GivenName>
+    <md:EmailAddress>Shibboleth@aub.edu.lb</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Maher Kassab</md:GivenName>
+    <md:EmailAddress>maherk@aub.edu.lb</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml
index 9728e31f..932dd89f 100644
--- a/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aucb.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-09T14:13:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-09T14:13:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aucb.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Arts University Bournemouth</mdui:DisplayName>
+        <mdui:Logo height="80" width="80">https://idp.aub.ac.uk/oala/aub-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aucb.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Arts University Bournemouth</mdui:DisplayName>
-          <mdui:Logo height="80" width="80">https://idp.aub.ac.uk/oala/aub-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPjCCAiYCCQC8xJ9vaIeK2DANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJH
 						QjEUMBIGA1UEBwwLQm91cm5lbW91dGgxJDAiBgNVBAoMG0FydHMgVW5pdmVyc2l0
 						eSBCb3VybmVtb3V0aDEWMBQGA1UEAwwNaWRwLmF1Yi5hYy51azAeFw0xNTA1MTIw
@@ -36,13 +36,13 @@
 						zBqWdOpqVeBsiTPjpR7wL3RTPF4IrjBp0SuDmglqX0F/kV/3dniVZxGDx0pIralA
 						QrGWIgmGZgtbr5YI+CYEjTax
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPjCCAiYCCQC8xJ9vaIeK2DANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJH
 						QjEUMBIGA1UEBwwLQm91cm5lbW91dGgxJDAiBgNVBAoMG0FydHMgVW5pdmVyc2l0
 						eSBCb3VybmVtb3V0aDEWMBQGA1UEAwwNaWRwLmF1Yi5hYy51azAeFw0xNTA1MTIw
@@ -62,24 +62,24 @@
 						zBqWdOpqVeBsiTPjpR7wL3RTPF4IrjBp0SuDmglqX0F/kV/3dniVZxGDx0pIralA
 						QrGWIgmGZgtbr5YI+CYEjTax
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aub.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Arts University Bournemouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Arts University Bournemouth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://aub.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Calvert</md:SurName>
-      <md:EmailAddress>mailto:acalvert@aub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@aub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aub.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Arts University Bournemouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Arts University Bournemouth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://aub.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Calvert</md:SurName>
+    <md:EmailAddress>mailto:acalvert@aub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@aub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
index f35ccebe..52adbbe6 100644
--- a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aueb.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aueb.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Athens University of Economics and Business</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.aueb.gr/index_en.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.aueb.gr/</mdui:InformationURL>
+        <mdui:Logo width="83" height="83">https://idp.aueb.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.251.248.0/21</mdui:IPHint>
+        <mdui:IPHint>195.251.232.0/22</mdui:IPHint>
+        <mdui:IPHint>83.212.204.0/22</mdui:IPHint>
+        <mdui:DomainHint>aueb.gr</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:37.593870,23.435599</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aueb.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Athens University of Economics and Business</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.aueb.gr/index_en.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.aueb.gr/</mdui:InformationURL>
-          <mdui:Logo width="83" height="83">https://idp.aueb.gr/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>195.251.248.0/21</mdui:IPHint>
-          <mdui:IPHint>195.251.232.0/22</mdui:IPHint>
-          <mdui:IPHint>83.212.204.0/22</mdui:IPHint>
-          <mdui:DomainHint>aueb.gr</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:37.593870,23.435599</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYzCCA0ugAwIBAgIQMkBM34MgBP6WOyvexdVHxDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYxNzAwMDAwMFoXDTE2MDYxNjIzNTk1OVowOTEhMB8GA1UE
@@ -53,26 +53,26 @@
                             ra+kKyuWg+uN0sCITnS3SE0TkcHSgLPTUZmtEeDW30p2X/9VODp79ypkyPBIzQe5
                             0Mzg/vjsooFHC3rLHgFtsJIKEBgHv+4=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aueb.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aueb.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aueb.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aueb.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aueb.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aueb.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aueb.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aueb.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aueb.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aueb.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYzCCA0ugAwIBAgIQMkBM34MgBP6WOyvexdVHxDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYxNzAwMDAwMFoXDTE2MDYxNjIzNTk1OVowOTEhMB8GA1UE
@@ -98,29 +98,29 @@
                             ra+kKyuWg+uN0sCITnS3SE0TkcHSgLPTUZmtEeDW30p2X/9VODp79ypkyPBIzQe5
                             0Mzg/vjsooFHC3rLHgFtsJIKEBgHv+4=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Athens University of Economics and Business</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Athens University of Economics and Business</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aueb.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.aueb.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Yiorgos</md:GivenName>
-      <md:SurName>Alexandris</md:SurName>
-      <md:EmailAddress>alexandr@aueb.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Athens University of Economics and Business</md:Company>
-      <md:EmailAddress>noc@aueb.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Athens University of Economics and Business</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Athens University of Economics and Business</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aueb.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.aueb.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yiorgos</md:GivenName>
+    <md:SurName>Alexandris</md:SurName>
+    <md:EmailAddress>alexandr@aueb.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Athens University of Economics and Business</md:Company>
+    <md:EmailAddress>noc@aueb.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml
index 65102e7e..39636d94 100644
--- a/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aus.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aus.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">American University of Sharjah</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the American University of Sharjah </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.aus.edu</mdui:InformationURL>
+        <mdui:Logo height="71" width="394" xml:lang="en">https://www.aus.edu/site/styles/css_img/logo-final.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aus.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">American University of Sharjah</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for the American University of Sharjah </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.aus.edu</mdui:InformationURL>
-          <mdui:Logo height="71" width="394" xml:lang="en">https://www.aus.edu/site/styles/css_img/logo-final.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJjCCAg4CCQC0u6dmZ9/CYDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
 RTEQMA4GA1UECAwHU2hhcmphaDEQMA4GA1UEBwwHU2hhcmphaDEMMAoGA1UECgwD
 QVVTMRQwEgYDVQQDDAtpZHAuYXVzLmVkdTAeFw0xNTAyMDkxNTEwMTJaFw0yNTAy
@@ -40,24 +40,24 @@ fM7tDfyk1i3MtP1v7RecCSDboJGCYUgxtOApAOvBttTYh8Aswc9X6+JHDTXiUS+6
 bdFUpKzYfJN5qvPbN7aO4b6WYutrATd2XleDvTwdMF9/GuxATxAZuWAgSPDmIGMC
 dyrwmVwoKB3/P28kLxOLL8gvjSnWnKo3GJPob/c5rP13XMj7wRDdMpAJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aus.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aus.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aus.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aus.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aus.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aus.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aus.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aus.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aus.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aus.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aus.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aus.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aus.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aus.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJjCCAg4CCQC0u6dmZ9/CYDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
 RTEQMA4GA1UECAwHU2hhcmphaDEQMA4GA1UEBwwHU2hhcmphaDEMMAoGA1UECgwD
 QVVTMRQwEgYDVQQDDAtpZHAuYXVzLmVkdTAeFw0xNTAyMDkxNTEwMTJaFw0yNTAy
@@ -76,31 +76,31 @@ fM7tDfyk1i3MtP1v7RecCSDboJGCYUgxtOApAOvBttTYh8Aswc9X6+JHDTXiUS+6
 bdFUpKzYfJN5qvPbN7aO4b6WYutrATd2XleDvTwdMF9/GuxATxAZuWAgSPDmIGMC
 dyrwmVwoKB3/P28kLxOLL8gvjSnWnKo3GJPob/c5rP13XMj7wRDdMpAJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aus.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aus.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">American University of Sharjah</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">American University of Sharjah</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aus.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IdP Support Team</md:GivenName>
-      <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IdP Support Team</md:GivenName>
-      <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IdP Support Team</md:GivenName>
-      <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>IdP Support Team</md:GivenName>
-      <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aus.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aus.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">American University of Sharjah</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">American University of Sharjah</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aus.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IdP Support Team</md:GivenName>
+    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IdP Support Team</md:GivenName>
+    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IdP Support Team</md:GivenName>
+    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>IdP Support Team</md:GivenName>
+    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml
index 573b25eb..718733c1 100644
--- a/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ayrcoll.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ayrcoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ayrcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ayrcoll.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ayrcoll.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ayrshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ayrshire.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ayrcoll.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ayrcoll.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ayrshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ayrshire.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml
index 07019300..5699b336 100644
--- a/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bangor.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T14:44:01Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T14:44:01Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bangor University</mdui:DisplayName>
+        <mdui:Logo height="73" width="59">https://www.bangor.ac.uk/shibboleth-logos/bangor-73x59.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.bangor.ac.uk/shibboleth-logos/bangor-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bangor University</mdui:DisplayName>
-          <mdui:Logo height="73" width="59">https://www.bangor.ac.uk/shibboleth-logos/bangor-73x59.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.bangor.ac.uk/shibboleth-logos/bangor-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUF2tfR3F/95LsBO8Z7dI/3Od1JrEwDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAxMQaWRwLmJhbmdvci5hYy51azAeFw0xMzAxMTYxNjM3NTNa
 						Fw0zMzAxMTYxNjM3NTNaMBsxGTAXBgNVBAMTEGlkcC5iYW5nb3IuYWMudWswggEi
@@ -34,26 +34,26 @@
 						bOwIjKElyD6/LYB0zUAsVYvMHuwP/hpMpwyOk6baedxu7Ij0Rfea+m3yJOWzQkap
 						BXv9usAPuXT0WpAXr236FlYZCkMosBJavcYBZVuKlS2JhipYXJyJfcRvFRw7dnI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bangor.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bangor.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUF2tfR3F/95LsBO8Z7dI/3Od1JrEwDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAxMQaWRwLmJhbmdvci5hYy51azAeFw0xMzAxMTYxNjM3NTNa
 						Fw0zMzAxMTYxNjM3NTNaMBsxGTAXBgNVBAMTEGlkcC5iYW5nb3IuYWMudWswggEi
@@ -72,27 +72,27 @@
 						bOwIjKElyD6/LYB0zUAsVYvMHuwP/hpMpwyOk6baedxu7Ij0Rfea+m3yJOWzQkap
 						BXv9usAPuXT0WpAXr236FlYZCkMosBJavcYBZVuKlS2JhipYXJyJfcRvFRw7dnI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bangor University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bangor University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bangor.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Jones</md:SurName>
-      <md:EmailAddress>mailto:c.m.jones@bangor.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:matthew.williams@bangor.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bangor University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bangor University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bangor.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:c.m.jones@bangor.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:matthew.williams@bangor.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml b/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml
index 63c67c03..084d3d93 100644
--- a/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml
+++ b/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.barkingcollege.ac.uk/shibbolethidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-31T10:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-31T10:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQCUfpmzVfedFDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
 						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
@@ -33,26 +33,26 @@
 						ztgXowLLdqXkiomBszPW+IERhpRPMd14IJJye7kQ/CDJLCbhb7VJfsrTxgef1LV+
 						Nb4mckExHiZcajH+gD63kcn29VoGBsEefG88zI9R
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQCUfpmzVfedFDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
 						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
@@ -73,25 +73,25 @@
 						ztgXowLLdqXkiomBszPW+IERhpRPMd14IJJye7kQ/CDJLCbhb7VJfsrTxgef1LV+
 						Nb4mckExHiZcajH+gD63kcn29VoGBsEefG88zI9R
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Barking and Dagenham College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barking &amp; Dagenham College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.barkingdagenhamcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software Solutions Ltd Support</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Overt Software Solutions Ltd Support</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Barking and Dagenham College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barking &amp; Dagenham College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.barkingdagenhamcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software Solutions Ltd Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Overt Software Solutions Ltd Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml
index e2775b1a..2fcd7089 100644
--- a/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.barkingdagenhamcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-07T13:21:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-07T13:21:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingdagenhamcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingdagenhamcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQD/ZQQfcmZ8hjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
 						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
@@ -38,26 +38,26 @@
 						AUxTm+GBLNybpZcm5xOJYncOwq8sZCty4GHUKtz/GyPn2HmzxOVPNMTQusWwBdVc
 						QMY0U7rEj5aWo7GrBazucvLC4XteBdQoOnwlG+Ez
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingdagenhamcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barkingdagenhamcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQD/ZQQfcmZ8hjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
 						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
@@ -78,27 +78,27 @@
 						AUxTm+GBLNybpZcm5xOJYncOwq8sZCty4GHUKtz/GyPn2HmzxOVPNMTQusWwBdVc
 						QMY0U7rEj5aWo7GrBazucvLC4XteBdQoOnwlG+Ez
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Barking and Dagenham College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barking &amp; Dagenham College TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.barkingdagenhamcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ewens</md:SurName>
-      <md:EmailAddress>mailto:John.Ewens@bdc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Farrant</md:SurName>
-      <md:EmailAddress>mailto:David.Farrant@bdc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Barking and Dagenham College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barking &amp; Dagenham College TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.barkingdagenhamcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ewens</md:SurName>
+    <md:EmailAddress>mailto:John.Ewens@bdc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Farrant</md:SurName>
+    <md:EmailAddress>mailto:David.Farrant@bdc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml
index abb49268..5d15e30a 100644
--- a/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.barnetsouthgate.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-15T09:44:10Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-15T09:44:10Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnetsouthgate.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnetsouthgate.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALtgf/tnX8POhw6lNPBrB0KlwpZ6MA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGWlkcC5iYXJuZXRzb3V0aGdhdGUuYWMudWswHhcNMTMw
 						MTE0MTI0MzQ4WhcNMzMwMTE0MTI0MzQ4WjAkMSIwIAYDVQQDExlpZHAuYmFybmV0
@@ -30,26 +30,26 @@
 						iRZLwturU+9n8xCFM9j8todbW0nwgCvPdBLfyqIxXN/CljNpF9kZKCKIMV4HJAzi
 						Y+/goLkSyma0k8zstnZ+JNmISHaATJXpLgfl0CsNZay6C3od
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnetsouthgate.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnetsouthgate.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALtgf/tnX8POhw6lNPBrB0KlwpZ6MA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGWlkcC5iYXJuZXRzb3V0aGdhdGUuYWMudWswHhcNMTMw
 						MTE0MTI0MzQ4WhcNMzMwMTE0MTI0MzQ4WjAkMSIwIAYDVQQDExlpZHAuYmFybmV0
@@ -69,27 +69,27 @@
 						iRZLwturU+9n8xCFM9j8todbW0nwgCvPdBLfyqIxXN/CljNpF9kZKCKIMV4HJAzi
 						Y+/goLkSyma0k8zstnZ+JNmISHaATJXpLgfl0CsNZay6C3od
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Barnet and Southgate College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barnet and Southgate College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.barnetsouthgate.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Garry</md:GivenName>
-      <md:SurName>Waters</md:SurName>
-      <md:EmailAddress>mailto:garry.waters@barnetsouthgate.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Jones</md:SurName>
-      <md:EmailAddress>mailto:Richard.Jones@barnetsouthgate.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Barnet and Southgate College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barnet and Southgate College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.barnetsouthgate.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Waters</md:SurName>
+    <md:EmailAddress>mailto:garry.waters@barnetsouthgate.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:Richard.Jones@barnetsouthgate.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml
index 9be09708..268a679a 100644
--- a/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.barnfield.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T09:52:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T09:52:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnfield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAPkbgLWmrMD9YvMjkZ3ZIvYHZY8yMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcC5iYXJuZmllbGQuYWMudWswHhcNMTMwNzA4MTAx
 						NDIyWhcNMzMwNzA4MTAxNDIyWjAeMRwwGgYDVQQDExNpZHAuYmFybmZpZWxkLmFj
@@ -32,29 +32,29 @@
 						i+Y3qCR43frIAR8fVowgjw4CESHWXG1Pok8zWN9WN5vLZdsQnviCmMgysWMp2bN/
 						V1gTnOpDSSuVdzxe
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barnfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.barnfield.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnfield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAPkbgLWmrMD9YvMjkZ3ZIvYHZY8yMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcC5iYXJuZmllbGQuYWMudWswHhcNMTMwNzA4MTAx
 						NDIyWhcNMzMwNzA4MTAxNDIyWjAeMRwwGgYDVQQDExNpZHAuYmFybmZpZWxkLmFj
@@ -74,27 +74,27 @@
 						i+Y3qCR43frIAR8fVowgjw4CESHWXG1Pok8zWN9WN5vLZdsQnviCmMgysWMp2bN/
 						V1gTnOpDSSuVdzxe
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Barnfield Education Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barnfield College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.barnfield.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Norman</md:SurName>
-      <md:EmailAddress>mailto:adam.norman@barnfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Norman</md:SurName>
-      <md:EmailAddress>mailto:adam.norman@barnfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Barnfield Education Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barnfield College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.barnfield.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Norman</md:SurName>
+    <md:EmailAddress>mailto:adam.norman@barnfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Norman</md:SurName>
+    <md:EmailAddress>mailto:adam.norman@barnfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml
index 351d9f82..dc6d2fdc 100644
--- a/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.barnsley.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnsley.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barnsley.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/barnsley.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/barnsley.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barnsley College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.barnsley.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/barnsley.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/barnsley.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barnsley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.barnsley.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml
index b23ef288..46911d35 100644
--- a/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.barton.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">barton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/barton.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/barton.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barton Peveril College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.barton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/barton.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/barton.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barton Peveril College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.barton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml
index df27a3fc..68ce4aa9 100644
--- a/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bath.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-21T13:17:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-21T13:17:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bath.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Bath</mdui:DisplayName>
+        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bath.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Bath</mdui:DisplayName>
-          <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAOqBrGCnJlQiSzyI6NPPnvws1tCfMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azAeFw0xMTA4MTYwNjM1MjVa
 						Fw0zMTA4MTYwNjM1MjVaMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azCCASIw
@@ -35,26 +35,26 @@
 						gc9lPrivWMfMU64EedcDvakTkW8wPne4BklOmYPecOG6k/CW8F27k0T7nuJKKa41
 						wVJCyjIVKbGuDsEITTV/TE4sTDQCvRXjKF3enji4c0Ap3MBGaCBo/FDYXAI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.bath.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.bath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.bath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.bath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bath.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.bath.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.bath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.bath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.bath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bath.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAOqBrGCnJlQiSzyI6NPPnvws1tCfMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azAeFw0xMTA4MTYwNjM1MjVa
 						Fw0zMTA4MTYwNjM1MjVaMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azCCASIw
@@ -73,26 +73,26 @@
 						gc9lPrivWMfMU64EedcDvakTkW8wPne4BklOmYPecOG6k/CW8F27k0T7nuJKKa41
 						wVJCyjIVKbGuDsEITTV/TE4sTDQCvRXjKF3enji4c0Ap3MBGaCBo/FDYXAI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Bath</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bath</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bath.ac.uk/bucs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Webmaster</md:GivenName>
-      <md:EmailAddress>mailto:webmaster@bath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Phillips</md:SurName>
-      <md:EmailAddress>mailto:R.I.Phillips@bath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bath</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bath</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bath.ac.uk/bucs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Webmaster</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@bath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Phillips</md:SurName>
+    <md:EmailAddress>mailto:R.I.Phillips@bath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bbk.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.bbk.ac.uk-openathens.xml
index 721317c3..f62080da 100644
--- a/swamid-interfederations-2.0/idp.bbk.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.bbk.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bbk.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbk.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbk.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bbk.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bbk.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Birkbeck College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bbk.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bbk.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bbk.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Birkbeck College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bbk.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
index f7dba9a7..5dca3bcd 100644
--- a/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bbmri-eric.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-15T10:10:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/other</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-15T10:10:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/other</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BBMRI-ERIC</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">BBMRI-ERIC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for BBMRI-ERIC</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider BBMRI-ERIC</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bbmri-eric.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.bbmri-eric.eu/</mdui:InformationURL>
+        <mdui:Logo height="176" width="531">https://idp.bbmri-eric.eu/idp/images/BBMRI-ERIC_3lines.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">BBMRI-ERIC</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">BBMRI-ERIC</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for BBMRI-ERIC</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider BBMRI-ERIC</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.bbmri-eric.eu/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.bbmri-eric.eu/</mdui:InformationURL>
-          <mdui:Logo height="176" width="531">https://idp.bbmri-eric.eu/idp/images/BBMRI-ERIC_3lines.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAItr4H0b26J+BZNSg6o1nw3b7SBZMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDc0
 M1oXDTM1MDkxNzEzNDc0M1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
@@ -50,13 +50,13 @@ Ls/XqOydBMvp9i4A5kYYXXCT/TMVoaTbPFOqq2F6yFVzuUeTtToB4aCBEnNqL+ps
 xovLThSc13PPlfcRv72JKYFcO6pabOeMJwwhQ/p5WMILbSl+sPlscEW0c+7oJXvz
 cnEwlw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVANM3aONpPS/BDOU54pnvNyySwvuOMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDcz
 N1oXDTM1MDkxNzEzNDczN1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
@@ -76,13 +76,13 @@ NyXyU13Jj+eQlD4g/kNDlLG4cG0wg1RN9czgI6kKsI4Pn2qspOjzSwDHQ7bdcMRV
 0QbS/x2x/DAgBV0b1RKGTWHh+bokeB5IG3Il4pUs+4yVEihFgnzaQo96Pd5nOv+S
 p6gqsg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUdIWoF+CL+1dNJmpv1Np09b5b45kwDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUwHhcNMTUwOTE3MTM0NzQx
 WhcNMzUwOTE3MTM0NzQxWjAcMRowGAYDVQQDDBFpZHAuYmJtcmktZXJpYy5ldTCC
@@ -102,27 +102,27 @@ BFQ09uQ7MqzlPcyRnkgJ4fjNqf8dnl6IACD1E7Qq3xbVfDD9UshJRIqiNe5O80jQ
 4EtMufd1/de2bNG37ttdxCSKrMevZJEh8lX+TmGZAUcYEZdhwfsOmC8njY5Qh+Xx
 Urzk
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bbmri-eric.eu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bbmri-eric.eu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAItr4H0b26J+BZNSg6o1nw3b7SBZMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDc0
 M1oXDTM1MDkxNzEzNDc0M1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
@@ -142,13 +142,13 @@ Ls/XqOydBMvp9i4A5kYYXXCT/TMVoaTbPFOqq2F6yFVzuUeTtToB4aCBEnNqL+ps
 xovLThSc13PPlfcRv72JKYFcO6pabOeMJwwhQ/p5WMILbSl+sPlscEW0c+7oJXvz
 cnEwlw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVANM3aONpPS/BDOU54pnvNyySwvuOMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDcz
 N1oXDTM1MDkxNzEzNDczN1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
@@ -168,13 +168,13 @@ NyXyU13Jj+eQlD4g/kNDlLG4cG0wg1RN9czgI6kKsI4Pn2qspOjzSwDHQ7bdcMRV
 0QbS/x2x/DAgBV0b1RKGTWHh+bokeB5IG3Il4pUs+4yVEihFgnzaQo96Pd5nOv+S
 p6gqsg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUdIWoF+CL+1dNJmpv1Np09b5b45kwDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUwHhcNMTUwOTE3MTM0NzQx
 WhcNMzUwOTE3MTM0NzQxWjAcMRowGAYDVQQDDBFpZHAuYmJtcmktZXJpYy5ldTCC
@@ -194,21 +194,21 @@ BFQ09uQ7MqzlPcyRnkgJ4fjNqf8dnl6IACD1E7Qq3xbVfDD9UshJRIqiNe5O80jQ
 4EtMufd1/de2bNG37ttdxCSKrMevZJEh8lX+TmGZAUcYEZdhwfsOmC8njY5Qh+Xx
 Urzk
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">BBMRI-ERIC</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">BBMRI-ERIC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">BBMRI-ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">BBMRI-ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bbmri-eric.eu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Holub</md:SurName>
-      <md:EmailAddress>petr.holub@bbmri-eric.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BBMRI-ERIC</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">BBMRI-ERIC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BBMRI-ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">BBMRI-ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bbmri-eric.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Holub</md:SurName>
+    <md:EmailAddress>petr.holub@bbmri-eric.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
index 1a01d365..1e533415 100644
--- a/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bc.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-02T15:40:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-02T15:40:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Biology Centre AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Biologické centrum AV ČR, AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider  BC AS CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BC AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bc.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.bc.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-bc-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-bc-255.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Biology Centre AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Biologické centrum AV ČR, AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider  BC AS CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BC AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.bc.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.bc.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-bc-44.png</mdui:Logo>
-          <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-bc-255.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
 MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
@@ -51,29 +51,29 @@ RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
 Q+dMM6gJ5hG79Yj0n643KGUcqRHC2+WXmQadp5voCQC//M44
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bc.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bc.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
 MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
@@ -93,26 +93,26 @@ RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
 Q+dMM6gJ5hG79Yj0n643KGUcqRHC2+WXmQadp5voCQC//M44
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Biology Centre AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Biologické centrum AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Biology Centre AS CR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Biologické centrum AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bc.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.bc.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Biology Centre AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Biologické centrum AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Biology Centre AS CR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Biologické centrum AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bc.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.bc.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml
index 3f6b70d1..15c12f03 100644
--- a/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bcot.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcot.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcot.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bcot.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bcot.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Basingstoke College of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bcot.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bcot.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bcot.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Basingstoke College of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bcot.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml
index 8d8228fa..9ae6a63e 100644
--- a/swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bedford.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bedford.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bedford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bedford.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bedford.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bedford College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bedford.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bedford.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bedford.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bedford College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bedford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
index 557a61e8..6d994d28 100644
--- a/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.beds.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-08T18:08:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-08T18:08:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">beds.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">beds.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEaTCCA1GgAwIBAgIQSzfaeKahBOK3I4on09FG0DANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowPDEhMB8GA1UE
@@ -38,26 +38,26 @@
 						8EYzIAss513al942nZiH4RfHtOKUs5waxCaLb7QPH4mKUe9IK/Pg444YJsrEgaAO
 						9QLVsNMkaE7Rl0xZfbp08NbjxGvR3pziJ0AFcS4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.beds.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">beds.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.beds.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">beds.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEaTCCA1GgAwIBAgIQSzfaeKahBOK3I4on09FG0DANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowPDEhMB8GA1UE
@@ -83,27 +83,27 @@
 						8EYzIAss513al942nZiH4RfHtOKUs5waxCaLb7QPH4mKUe9IK/Pg444YJsrEgaAO
 						9QLVsNMkaE7Rl0xZfbp08NbjxGvR3pziJ0AFcS4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Bedfordshire</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bedfordshire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.beds.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Haysom</md:SurName>
-      <md:EmailAddress>mailto:paul.haysom@beds.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Haysom</md:SurName>
-      <md:EmailAddress>mailto:paul.haysom@beds.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bedfordshire</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bedfordshire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.beds.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Haysom</md:SurName>
+    <md:EmailAddress>mailto:paul.haysom@beds.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Haysom</md:SurName>
+    <md:EmailAddress>mailto:paul.haysom@beds.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml
index 59ee9920..788e756a 100644
--- a/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Birmingham</mdui:DisplayName>
+        <mdui:Logo height="34" width="141">https://shibbolethidp2.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
+        <mdui:Logo height="48" width="39">https://shibbolethidp2.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Birmingham</mdui:DisplayName>
-          <mdui:Logo height="34" width="141">https://shibbolethidp2.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
-          <mdui:Logo height="48" width="39">https://shibbolethidp2.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVANTuNiziz4l2CViQyzhD3hfr5trpMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGhpZHAyLmJoYW0uYWMudWswHhcNMTIw
 						NjE5MDgyMzM2WhcNMzIwNjE5MDgyMzM2WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -35,26 +35,26 @@
 						QWiiYxZz8CM72DGVGuJ2OxH2NboDiQeEyZYsbM/HYOlIyAMc237cHWz5dz38fZdF
 						ddkS4AwsjYMI7dZhdZmcD+lNoak8kCkaypOHKqjRV/UKJBrD
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVANTuNiziz4l2CViQyzhD3hfr5trpMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGhpZHAyLmJoYW0uYWMudWswHhcNMTIw
 						NjE5MDgyMzM2WhcNMzIwNjE5MDgyMzM2WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -74,27 +74,27 @@
 						QWiiYxZz8CM72DGVGuJ2OxH2NboDiQeEyZYsbM/HYOlIyAMc237cHWz5dz38fZdF
 						ddkS4AwsjYMI7dZhdZmcD+lNoak8kCkaypOHKqjRV/UKJBrD
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Birmingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Birmingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Bryan</md:SurName>
-      <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Bryan</md:SurName>
-      <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Birmingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Birmingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Bryan</md:SurName>
+    <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Bryan</md:SurName>
+    <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml
index 45f62353..3de47a09 100644
--- a/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bhasvic.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bhasvic.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bhasvic.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bhasvic.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bhasvic.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brighton Hove &amp; Sussex 6th Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bhasvic.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bhasvic.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bhasvic.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brighton Hove &amp; Sussex 6th Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bhasvic.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml
index 3e995a23..04797439 100644
--- a/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bilborough.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bilborough.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bilborough.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bilborough.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bilborough.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bilborough College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bilborough.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bilborough.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bilborough.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bilborough College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bilborough.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml
index d9379a26..74e263f5 100644
--- a/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bishopb-college.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bishopb-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bishopb-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bishopb-college.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bishopb-college.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bishop Burton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bishopb-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bishopb-college.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bishopb-college.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bishop Burton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bishopb-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml
index 8c99ce4a..3cf368af 100644
--- a/swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bishopg.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bishopg.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bishopg.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bishopg.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bishopg.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bishop Grosseteste University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bishopg.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bishopg.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bishopg.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bishop Grosseteste University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bishopg.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml
index cc584113..844ef041 100644
--- a/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.blackburn.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T16:57:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T16:57:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackburn.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackburn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQCDh5l0tXKOTzANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2tidXJuMRowGAYD
 						VQQKExFCbGFja2J1cm4gQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmJsYWNrYnVybi5h
@@ -32,26 +32,26 @@
 						oaR0/Gdlwm+88m394nirzjEkGX3YHIPMh5Sd6DOyiyG+apm59uv5lzl4WNZbCBhl
 						iJ5xfqTVtk2Ic+IW+u3PQ8sqH9v+UnIxr1o51pAQL4ambSFHaE7mr4tMUHv5mlFC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.blackburn.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackburn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.blackburn.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackburn.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQCDh5l0tXKOTzANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2tidXJuMRowGAYD
 						VQQKExFCbGFja2J1cm4gQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmJsYWNrYnVybi5h
@@ -71,27 +71,27 @@
 						oaR0/Gdlwm+88m394nirzjEkGX3YHIPMh5Sd6DOyiyG+apm59uv5lzl4WNZbCBhl
 						iJ5xfqTVtk2Ic+IW+u3PQ8sqH9v+UnIxr1o51pAQL4ambSFHaE7mr4tMUHv5mlFC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Blackburn College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Blackburn College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.blackburn.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hussein</md:GivenName>
-      <md:SurName>Lorgat</md:SurName>
-      <md:EmailAddress>mailto:h.lorgat@blackburn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hussein</md:GivenName>
-      <md:SurName>Lorgat</md:SurName>
-      <md:EmailAddress>mailto:h.lorgat@blackburn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Blackburn College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Blackburn College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.blackburn.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hussein</md:GivenName>
+    <md:SurName>Lorgat</md:SurName>
+    <md:EmailAddress>mailto:h.lorgat@blackburn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hussein</md:GivenName>
+    <md:SurName>Lorgat</md:SurName>
+    <md:EmailAddress>mailto:h.lorgat@blackburn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml
index e6c7a290..76f9630b 100644
--- a/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bnl.gov/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.bnl.gov/idp_error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnl.gov</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brookhaven National Laboratory</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Brookhaven National Laboratory - BNL.GOV</mdui:Description>
+        <mdui:Logo height="145" width="396" xml:lang="en">https://idp.bnl.gov/images/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.bnl.gov/idp_error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnl.gov</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brookhaven National Laboratory</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Brookhaven National Laboratory - BNL.GOV</mdui:Description>
-          <mdui:Logo height="145" width="396" xml:lang="en">https://idp.bnl.gov/images/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOGh/YR9xc1MGpDIq3Ut/5BiePy1MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5ibmwuZ292MB4XDTEyMTAwNTE3NDgyOFoXDTMy
 MTAwNTE3NDgyOFowFjEUMBIGA1UEAxMLaWRwLmJubC5nb3YwggEiMA0GCSqGSIb3
@@ -42,23 +42,23 @@ TTO9Lz2eYKw0tkAVekSQIVlYaM9ORfS3mw9tzGvdHDtXdSf4+h1T8vdDbP5T4NG7
 IKJ4yJBMQ4EpreFzVEdfm0IEnIUUbMl66EKRary7Eqiv9GRDlBmon+lF/AtLMCSv
 EjMU9o0OaQzgglUiyJA4z6uMNmIWWttLoEtZjQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bnl.gov/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bnl.gov/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bnl.gov/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bnl.gov/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bnl.gov/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnl.gov</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bnl.gov/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bnl.gov/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bnl.gov/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bnl.gov/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bnl.gov/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnl.gov</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOGh/YR9xc1MGpDIq3Ut/5BiePy1MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5ibmwuZ292MB4XDTEyMTAwNTE3NDgyOFoXDTMy
 MTAwNTE3NDgyOFowFjEUMBIGA1UEAxMLaWRwLmJubC5nb3YwggEiMA0GCSqGSIb3
@@ -77,27 +77,27 @@ TTO9Lz2eYKw0tkAVekSQIVlYaM9ORfS3mw9tzGvdHDtXdSf4+h1T8vdDbP5T4NG7
 IKJ4yJBMQ4EpreFzVEdfm0IEnIUUbMl66EKRary7Eqiv9GRDlBmon+lF/AtLMCSv
 EjMU9o0OaQzgglUiyJA4z6uMNmIWWttLoEtZjQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bnl.gov/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bnl.gov/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brookhaven National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brookhaven National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bnl.gov/world/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Cortijo</md:GivenName>
-      <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David Cortijo</md:GivenName>
-      <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Cortijo</md:GivenName>
-      <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bnl.gov/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bnl.gov/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brookhaven National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brookhaven National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bnl.gov/world/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Cortijo</md:GivenName>
+    <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David Cortijo</md:GivenName>
+    <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Cortijo</md:GivenName>
+    <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml
index 20e16fcd..83ecc204 100644
--- a/swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bnu.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-20T11:17:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-20T11:17:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnu.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bibliothèque Nationale Universitaire - Strasbourg</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.bnu.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Strasbourg Bibliothèque Nationale et Universitaire borrower</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Bibliothèque Nationale et Universitaire - Strasbourg</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Lecteurs inscrits à la Bibliothèque Nationale et Universitaire de Strasbourg</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnu.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bibliothèque Nationale Universitaire - Strasbourg</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.bnu.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Strasbourg Bibliothèque Nationale et Universitaire borrower</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Bibliothèque Nationale et Universitaire - Strasbourg</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Lecteurs inscrits à la Bibliothèque Nationale et Universitaire de Strasbourg</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEzCCAfugAwIBAgIUI5Ka0M/zHdh+HcmAhSkAefHxOOUwDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLmJudS5mcjAeFw0xNjA0MTkwODM3NDBaFw0zNjA0
 MTkwODM3NDBaMBUxEzARBgNVBAMMCmlkcC5ibnUuZnIwggEiMA0GCSqGSIb3DQEB
@@ -38,21 +38,21 @@ EDpsSI2L7wU5j8MlIcqDaEWb3NUAoDnnfn0kAPkkvRF6Eq2Mp13bpXzN2Ui5PHs/
 RKRAcZpPLABGLNIMbgyp8bd2ULsWpAwsugXlFMygIqdhLnSnE/E47hcEbUlAFMVO
 xPXXIHkfUmU4qn4VZGHrIL7F/3/BtqU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bnu.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bnu.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bnu.fr/idp/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bibliothèque Nationale et Universitaire - Strasbourg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bibliothèque Nationale et Universitaire - Strasbourg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bnu.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri-contact@bnu.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bnu.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bnu.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bnu.fr/idp/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bibliothèque Nationale et Universitaire - Strasbourg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bibliothèque Nationale et Universitaire - Strasbourg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bnu.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri-contact@bnu.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml
index 240417b7..b7fb57d1 100644
--- a/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.boisestate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boisestate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Boise State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">You are connecting to a Boise State University website that requires authentication.  Please enter your BroncoWeb username and password to continue.</mdui:Description>
+        <mdui:Logo height="50" width="180" xml:lang="en">https://news.boisestate.edu/files/2009/07/horz_blue_on_white180.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boisestate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Boise State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">You are connecting to a Boise State University website that requires authentication.  Please enter your BroncoWeb username and password to continue.</mdui:Description>
-          <mdui:Logo height="50" width="180" xml:lang="en">https://news.boisestate.edu/files/2009/07/horz_blue_on_white180.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAIuvWcgfE1GnTa2d9w2NekBq5X02MA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVkdTAeFw0xMjAxMjMyMTUz
 NDlaFw0zMjAxMjMyMTUzNDlaMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVk
@@ -40,13 +40,13 @@ ZZDyc0uTM8Ivrz1OKpryFLNjj7i8lLE2IWv1ufJMdy1MFKEKlzyxzLlF4Znqk2s8
 AGyfAOotjoF4AwX5oD3TWE76qjnurlM3rp+BfjBqgJ/3dL+7My7Sl44vCwB5s5nd
 TJz5EX3kAK4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQCh7DpvHeKsfDANBgkqhkiG9w0BAQUFADBrMRswGQYDVQQDDBJp
 ZHAuYm9pc2VzdGF0ZS5lZHUxHzAdBgNVBAoMFkJvaXNlIFN0YXRlIFVuaXZlcnNp
 dHkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEOMAwGA1UEBwwFQm9pc2Uw
@@ -66,24 +66,24 @@ js0N1pt9WALg5Z/wpN2r7M/DMFwomZIQFE3CjSubL7/8XzWnpVt8+FWCJ3llkmky
 e1qTYz22pd6BmkSUdiibOtx9EYOpDyc39BFQhf6g0L+z8sgd1T+QXUHiU3kPN3Sh
 5+1SoObQOrckBNFUqBaK0Xp302oAlbQcZoTzjWHQY3w+CitVoJY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boisestate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boisestate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.boisestate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.boisestate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.boisestate.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.boisestate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boisestate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boisestate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boisestate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.boisestate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.boisestate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.boisestate.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.boisestate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boisestate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAIuvWcgfE1GnTa2d9w2NekBq5X02MA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVkdTAeFw0xMjAxMjMyMTUz
 NDlaFw0zMjAxMjMyMTUzNDlaMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVk
@@ -103,13 +103,13 @@ ZZDyc0uTM8Ivrz1OKpryFLNjj7i8lLE2IWv1ufJMdy1MFKEKlzyxzLlF4Znqk2s8
 AGyfAOotjoF4AwX5oD3TWE76qjnurlM3rp+BfjBqgJ/3dL+7My7Sl44vCwB5s5nd
 TJz5EX3kAK4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQCh7DpvHeKsfDANBgkqhkiG9w0BAQUFADBrMRswGQYDVQQDDBJp
 ZHAuYm9pc2VzdGF0ZS5lZHUxHzAdBgNVBAoMFkJvaXNlIFN0YXRlIFVuaXZlcnNp
 dHkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEOMAwGA1UEBwwFQm9pc2Uw
@@ -129,19 +129,19 @@ js0N1pt9WALg5Z/wpN2r7M/DMFwomZIQFE3CjSubL7/8XzWnpVt8+FWCJ3llkmky
 e1qTYz22pd6BmkSUdiibOtx9EYOpDyc39BFQhf6g0L+z8sgd1T+QXUHiU3kPN3Sh
 5+1SoObQOrckBNFUqBaK0Xp302oAlbQcZoTzjWHQY3w+CitVoJY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boisestate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boisestate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Boise State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Boise State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://boisestate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary Kincaid</md:GivenName>
-      <md:EmailAddress>gkincaid@boisestate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boisestate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boisestate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Boise State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Boise State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://boisestate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary Kincaid</md:GivenName>
+    <md:EmailAddress>gkincaid@boisestate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bolton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bolton.ac.uk-idp-shibboleth.xml
index ec1fab67..2ac3b091 100644
--- a/swamid-interfederations-2.0/idp.bolton.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bolton.ac.uk-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bolton.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-06-06T14:04:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-06-06T14:04:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Bolton - Test, Do Not Use</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Bolton</mdui:Description>
+        <mdui:Logo height="60" width="80">https://www.bolton.ac.uk//SiteWideAssets/Logo/UoB-Logo-80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.bolton.ac.uk/SiteWideAssets/Logo/UoB-Icon-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.63.48.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.49.0/24</mdui:IPHint>
+        <mdui:IPHint>194.66.188.0/24</mdui:IPHint>
+        <mdui:IPHint>194.66.189.0/24</mdui:IPHint>
+        <mdui:DomainHint>bolton.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.5735109,-2.4362381</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Bolton - Test, Do Not Use</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Bolton</mdui:Description>
-          <mdui:Logo height="60" width="80">https://www.bolton.ac.uk//SiteWideAssets/Logo/UoB-Logo-80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.bolton.ac.uk/SiteWideAssets/Logo/UoB-Icon-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.63.48.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.49.0/24</mdui:IPHint>
-          <mdui:IPHint>194.66.188.0/24</mdui:IPHint>
-          <mdui:IPHint>194.66.189.0/24</mdui:IPHint>
-          <mdui:DomainHint>bolton.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:53.5735109,-2.4362381</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOQ3OP1TvUp4Y32Y6ZT7gPJJQazzMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5ib2x0b24uYWMudWswHhcNMTYwNTA5MTM0NDM5
 						WhcNMzYwNTA5MTM0NDM5WjAbMRkwFwYDVQQDDBBpZHAuYm9sdG9uLmFjLnVrMIIB
@@ -50,13 +50,13 @@
 						Of/8PazEBWgqM3j0H9Yd0NfhZo8tXDs+DIajW+dGvw7mDbbLemCcDrhacqVmi2si
 						zQRFOaKLsHMpVwWbZWmXfmlOHFYedvy9OTVk9SiM+JH+YnjZMFDmpMOPJcPoulWy
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAKx1TKB0vvg4ziN4STUNwKvcEZbNMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5ib2x0b24uYWMudWswHhcNMTYwNTA5MTM0NDM4
 						WhcNMzYwNTA5MTM0NDM4WjAbMRkwFwYDVQQDDBBpZHAuYm9sdG9uLmFjLnVrMIIB
@@ -75,13 +75,13 @@
 						5qnHiKb9vYqMestNNy1MzFN7cUl+IRsZrWsjrupPXL0Wmp65jD5nuxsLRmQW0zyj
 						Y06rIv377G+rcZe51FI1Decv6Kk6lFmgHEVQ2z85CevYkrjEgtAU35wKhFQ4IFb3
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUMELX4kAB11xqzNUWrtK1w4638gcwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwLmJvbHRvbi5hYy51azAeFw0xNjA1MDkxMzQ0Mzha
 						Fw0zNjA1MDkxMzQ0MzhaMBsxGTAXBgNVBAMMEGlkcC5ib2x0b24uYWMudWswggEi
@@ -100,26 +100,26 @@
 						A6V/QNz2JCEDWM757g3w+ggie2LTt5Of30UOdZ79prPAklHPSfK9cZIo9Bf1v9E/
 						fvgZDyKA96AokpX67LMaZsaNQCGQYojpdxRwhlheo6Uxh8+vkwEgTMLzY7ZpoQM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bolton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bolton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bolton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bolton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bolton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bolton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bolton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bolton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bolton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bolton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bolton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bolton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOQ3OP1TvUp4Y32Y6ZT7gPJJQazzMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5ib2x0b24uYWMudWswHhcNMTYwNTA5MTM0NDM5
 						WhcNMzYwNTA5MTM0NDM5WjAbMRkwFwYDVQQDDBBpZHAuYm9sdG9uLmFjLnVrMIIB
@@ -138,13 +138,13 @@
 						Of/8PazEBWgqM3j0H9Yd0NfhZo8tXDs+DIajW+dGvw7mDbbLemCcDrhacqVmi2si
 						zQRFOaKLsHMpVwWbZWmXfmlOHFYedvy9OTVk9SiM+JH+YnjZMFDmpMOPJcPoulWy
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAKx1TKB0vvg4ziN4STUNwKvcEZbNMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5ib2x0b24uYWMudWswHhcNMTYwNTA5MTM0NDM4
 						WhcNMzYwNTA5MTM0NDM4WjAbMRkwFwYDVQQDDBBpZHAuYm9sdG9uLmFjLnVrMIIB
@@ -163,13 +163,13 @@
 						5qnHiKb9vYqMestNNy1MzFN7cUl+IRsZrWsjrupPXL0Wmp65jD5nuxsLRmQW0zyj
 						Y06rIv377G+rcZe51FI1Decv6Kk6lFmgHEVQ2z85CevYkrjEgtAU35wKhFQ4IFb3
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUMELX4kAB11xqzNUWrtK1w4638gcwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwLmJvbHRvbi5hYy51azAeFw0xNjA1MDkxMzQ0Mzha
 						Fw0zNjA1MDkxMzQ0MzhaMBsxGTAXBgNVBAMMEGlkcC5ib2x0b24uYWMudWswggEi
@@ -188,23 +188,23 @@
 						A6V/QNz2JCEDWM757g3w+ggie2LTt5Of30UOdZ79prPAklHPSfK9cZIo9Bf1v9E/
 						fvgZDyKA96AokpX67LMaZsaNQCGQYojpdxRwhlheo6Uxh8+vkwEgTMLzY7ZpoQM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bolton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Bolton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bolton - Test, Do Not Use</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bolton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@bolton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Williamson</md:SurName>
-      <md:EmailAddress>mailto:M.E.Williamson@bolton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bolton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Bolton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bolton - Test, Do Not Use</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bolton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@bolton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Williamson</md:SurName>
+    <md:EmailAddress>mailto:M.E.Williamson@bolton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml
index 2699f6f7..15c0740c 100644
--- a/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.boltoncc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-15T18:01:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-15T18:01:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-community-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-community-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi4CCQCsi3PM6isCkjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJv
 						bHRvbiBDb2xsZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswHhcNMTMx
@@ -32,26 +32,26 @@
 						QUfQMXNSt4yna9Dh4QT6SaMcD4tKhA1nqlghNPBFFGgZo3hCyWzwCXVEIpCJmNqR
 						K9mlz3r6b+Vka51fYE5nKPrUGT60d4hOe+s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.boltoncc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-community-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.boltoncc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-community-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi4CCQCsi3PM6isCkjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJv
 						bHRvbiBDb2xsZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswHhcNMTMx
@@ -71,27 +71,27 @@
 						QUfQMXNSt4yna9Dh4QT6SaMcD4tKhA1nqlghNPBFFGgZo3hCyWzwCXVEIpCJmNqR
 						K9mlz3r6b+Vka51fYE5nKPrUGT60d4hOe+s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bolton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bolton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bolton-community-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Railton</md:GivenName>
-      <md:SurName>Knott</md:SurName>
-      <md:EmailAddress>mailto:railton.knott@boltoncc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dean</md:GivenName>
-      <md:SurName>Baggaley</md:SurName>
-      <md:EmailAddress>mailto:Dean.Baggaley@boltoncc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bolton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bolton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bolton-community-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Railton</md:GivenName>
+    <md:SurName>Knott</md:SurName>
+    <md:EmailAddress>mailto:railton.knott@boltoncc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dean</md:GivenName>
+    <md:SurName>Baggaley</md:SurName>
+    <md:EmailAddress>mailto:Dean.Baggaley@boltoncc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml
index b3922eaf..cfc5d074 100644
--- a/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.borderscollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-20T15:57:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-20T15:57:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">borderscollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">borderscollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID/DCCAuQCCQDmNVK58fWDtTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
 						R0IxGjAYBgNVBAgMEVNjb3R0aXNoIEJvcmRlcnMgMRMwEQYDVQQHDApHYWxhc2hp
 						ZWxzMRgwFgYDVQQKDA9Cb3JkZXJzIENvbGxlZ2UxFzAVBgNVBAsMDklDVCBEZXBh
@@ -36,26 +36,26 @@
 						9pPT26OiCFI3SypXYPOYjSWiNz5tlY3CYna/x7LAZSg3h+RJmp0VByjNe0s3CkZg
 						ez/Z03T/OFgp5FhaUpqzxQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.borderscollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">borderscollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.borderscollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">borderscollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID/DCCAuQCCQDmNVK58fWDtTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
 						R0IxGjAYBgNVBAgMEVNjb3R0aXNoIEJvcmRlcnMgMRMwEQYDVQQHDApHYWxhc2hp
 						ZWxzMRgwFgYDVQQKDA9Cb3JkZXJzIENvbGxlZ2UxFzAVBgNVBAsMDklDVCBEZXBh
@@ -79,27 +79,27 @@
 						9pPT26OiCFI3SypXYPOYjSWiNz5tlY3CYna/x7LAZSg3h+RJmp0VByjNe0s3CkZg
 						ez/Z03T/OFgp5FhaUpqzxQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Borders College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Borders College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.borderscollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Kyle</md:SurName>
-      <md:EmailAddress>mailto:AKyle@borderscollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Saunders</md:SurName>
-      <md:EmailAddress>mailto:GSaun@borderscollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Borders College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Borders College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.borderscollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Kyle</md:SurName>
+    <md:EmailAddress>mailto:AKyle@borderscollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Saunders</md:SurName>
+    <md:EmailAddress>mailto:GSaun@borderscollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml
index 2c330ecb..9d45749a 100644
--- a/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bournemouth.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bournemouth.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bournemouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqTCCApGgAwIBAgIJALZkHs4cgnSCMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
 						BAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5ib3VybmVt
 						b3V0aC5hYy51azAeFw0xNDAxMjAwOTI3NDlaFw0yNDAxMTgwOTI3NDlaMEExHzAd
@@ -32,25 +32,25 @@
 						dITlX1wWoQsNsCXRR+ss3mhVrQhbWPBDvOQcSTqY9sHCEEvVVEelccI7DaXTr1RE
 						sNEN/lIZ5gfmE611CgjOy8LpmWwzM1n45XVK9Wo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bournemouth.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bournemouth.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bournemouth University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bournemouth University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bournemouth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Foy</md:SurName>
-      <md:EmailAddress>mailto:mfoy@bournemouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Foy</md:SurName>
-      <md:EmailAddress>mailto:mfoy@bournemouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bournemouth.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bournemouth.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bournemouth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bournemouth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bournemouth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Foy</md:SurName>
+    <md:EmailAddress>mailto:mfoy@bournemouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Foy</md:SurName>
+    <md:EmailAddress>mailto:mfoy@bournemouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml
index 2dd7f386..cd161aa6 100644
--- a/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bournville.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-14T16:14:23Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-14T16:14:23Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bournville.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bournville College of Further Education</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bournville.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bournville College of Further Education</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMVOqQ1Map32HnZJGhKs8Wp1jYykMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC5ib3VybnZpbGxlLmFjLnVrMB4XDTEzMDExNDA5
 						MTAxOFoXDTMzMDExNDA5MTAxOFowHzEdMBsGA1UEAxMUaWRwLmJvdXJudmlsbGUu
@@ -33,26 +33,26 @@
 						KI23lp0qS3GeWPrif5C8EMO0nh/9yJ3UUTrHCsMZVT5Zb/9uPPKWC6dMS0Ywanu+
 						t9/SkewVV1FPgkkbJ2LVTQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bournville.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bournville.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bournville.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bournville.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMVOqQ1Map32HnZJGhKs8Wp1jYykMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC5ib3VybnZpbGxlLmFjLnVrMB4XDTEzMDExNDA5
 						MTAxOFoXDTMzMDExNDA5MTAxOFowHzEdMBsGA1UEAxMUaWRwLmJvdXJudmlsbGUu
@@ -72,27 +72,27 @@
 						KI23lp0qS3GeWPrif5C8EMO0nh/9yJ3UUTrHCsMZVT5Zb/9uPPKWC6dMS0Ywanu+
 						t9/SkewVV1FPgkkbJ2LVTQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bournville College of Further Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bournville College of Further Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bournville.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jacob</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:jacob.smith@bournville.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Sumner</md:SurName>
-      <md:EmailAddress>mailto:james.sumner@bournville.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bournville College of Further Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bournville College of Further Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bournville.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jacob</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:jacob.smith@bournville.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Sumner</md:SurName>
+    <md:EmailAddress>mailto:james.sumner@bournville.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml
index ba6c005d..d344de23 100644
--- a/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bpc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-29T16:48:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-29T16:48:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bpc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bpc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQC43jaLLv2IZzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGRG9yc2V0MQ4wDAYDVQQHEwVQb29sZTEqMCgGA1UEChMhVGhl
 						IEJvdXJuZW1vdXRoIGFuZCBQb29sZSBDb2xsZWdlMRYwFAYDVQQDEw1pZHAuYnBj
@@ -33,26 +33,26 @@
 						H7WG4Yb5iX6P99OsC2A+qeDjftPDFrQ50Io7382aXqH1fApzAmG4A3TtBb9ZRGC/
 						Yl8vCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bpc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bpc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bpc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bpc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQC43jaLLv2IZzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGRG9yc2V0MQ4wDAYDVQQHEwVQb29sZTEqMCgGA1UEChMhVGhl
 						IEJvdXJuZW1vdXRoIGFuZCBQb29sZSBDb2xsZWdlMRYwFAYDVQQDEw1pZHAuYnBj
@@ -73,27 +73,27 @@
 						H7WG4Yb5iX6P99OsC2A+qeDjftPDFrQ50Io7382aXqH1fApzAmG4A3TtBb9ZRGC/
 						Yl8vCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Bournemouth and Poole College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bournemouth and Poole College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bpc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Deb</md:GivenName>
-      <md:SurName>Farrell</md:SurName>
-      <md:EmailAddress>mailto:farrelld@bpc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Davis</md:SurName>
-      <md:EmailAddress>mailto:davism@bpc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Bournemouth and Poole College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bournemouth and Poole College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bpc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Deb</md:GivenName>
+    <md:SurName>Farrell</md:SurName>
+    <md:EmailAddress>mailto:farrelld@bpc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Davis</md:SurName>
+    <md:EmailAddress>mailto:davism@bpc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml
index 172796c7..cf7a5360 100644
--- a/swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bridgend.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgend.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgend.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bridgend.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bridgend.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bridgend College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bridgend.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bridgend.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bridgend.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bridgend College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bridgend.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml
index cdf6de5e..0c155e21 100644
--- a/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bridgeport.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgeport.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Bridgeport</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgeport.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Bridgeport</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAJBfTu+adrdocAWNWMrxwsQDwbgMMA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVkdTAeFw0xNTAyMTcxNzAy
 MDhaFw0zNTAyMTcxNzAyMDhaMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVk
@@ -38,23 +38,23 @@ rYyOmoL9mXRqzHMl05ZcI8fUZlT+E/yVPIvs973WwsG5ucJhtRJo1MCDTJvjWw2e
 4b4d7MXdduNZ9DTkP+xKvxcR0/7njMmhDx+2Ziy6RAXD2NPOPoK7qZU0b2RFkGj2
 Je/ZCyY6zCI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bridgeport.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bridgeport.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bridgeport.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgeport.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bridgeport.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bridgeport.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bridgeport.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgeport.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAJBfTu+adrdocAWNWMrxwsQDwbgMMA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVkdTAeFw0xNTAyMTcxNzAy
 MDhaFw0zNTAyMTcxNzAyMDhaMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVk
@@ -74,18 +74,18 @@ rYyOmoL9mXRqzHMl05ZcI8fUZlT+E/yVPIvs973WwsG5ucJhtRJo1MCDTJvjWw2e
 4b4d7MXdduNZ9DTkP+xKvxcR0/7njMmhDx+2Ziy6RAXD2NPOPoK7qZU0b2RFkGj2
 Je/ZCyY6zCI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Bridgeport</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bridgeport</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://bridgeport.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UB SysAdmin Group</md:GivenName>
-      <md:EmailAddress>sysadmin@bridgeport.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bridgeport</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bridgeport</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://bridgeport.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UB SysAdmin Group</md:GivenName>
+    <md:EmailAddress>sysadmin@bridgeport.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml b/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml
index 1ae2ab25..9022077a 100644
--- a/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml
+++ b/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bridgewater.edu/simplesaml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgewater.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bridgewater College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgewater.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bridgewater College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEPTCCAyWgAwIBAgIJAII+Q2YNzT28MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExFDASBgNVBAcMC0JyaWRnZXdhdGVy
 MRwwGgYDVQQKDBNCcmlkZ2V3YXRlciBDb2xsZWdlMRkwFwYDVQQLDBBOZXR3b3Jr
@@ -43,22 +43,22 @@ hqWNeWfsSSUxNSVs79QUGZnXUPnnczpPFqdvxKm7YGKu3Wil1Fc7dCJnFFtDzmTq
 g5qWuTqkZt9Y5cXLfvodkWCrsXZQMwlVZI1E26T0zGN81+uJieXdUrcY3acvAj3S
 cQDTdDSmMKz8ApAZjSXYVuZIfayMuifajRVC8Ls6U91/
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgewater.edu/simplesaml/shib13/idp/ArtifactResolutionService.php" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bridgewater.edu/simplesaml/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/ArtifactResolutionService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bridgewater College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bridgewater College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bridgewater.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>charles frank</md:GivenName>
-      <md:EmailAddress>cfrank@bridgewater.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgewater.edu/simplesaml/shib13/idp/ArtifactResolutionService.php" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bridgewater.edu/simplesaml/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/ArtifactResolutionService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bridgewater College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bridgewater College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bridgewater.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>charles frank</md:GivenName>
+    <md:EmailAddress>cfrank@bridgewater.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml
index 221cce30..261cc36c 100644
--- a/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brighton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Brighton</mdui:DisplayName>
+        <mdui:Logo height="30" width="32">https://idp.brighton.ac.uk/idp/images/logo-brighton.ac.uk.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.brighton.ac.uk/idp/images/favicon-brighton.ac.uk.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Brighton</mdui:DisplayName>
-          <mdui:Logo height="30" width="32">https://idp.brighton.ac.uk/idp/images/logo-brighton.ac.uk.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.brighton.ac.uk/idp/images/favicon-brighton.ac.uk.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAJtTrJ6fUZBDJiA/AL+K10ByMCF5MA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51azAeFw0xMjAxMTExMDE3
 						MzlaFw0zMjAxMTExMDE3MzlaMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51
@@ -35,26 +35,26 @@
 						7E1eO+mot7dPa60wFfoDkGGIq7OBnXwFjXxBOmrjpr9tEA41vVu4MNQCEG9Omt1y
 						LmAj9g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brighton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brighton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAJtTrJ6fUZBDJiA/AL+K10ByMCF5MA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51azAeFw0xMjAxMTExMDE3
 						MzlaFw0zMjAxMTExMDE3MzlaMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51
@@ -74,26 +74,26 @@
 						7E1eO+mot7dPa60wFfoDkGGIq7OBnXwFjXxBOmrjpr9tEA41vVu4MNQCEG9Omt1y
 						LmAj9g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Brighton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brighton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Holden</md:SurName>
-      <md:EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Brighton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brighton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Holden</md:SurName>
+    <md:EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml
index 3347abed..036d9152 100644
--- a/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bris.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-09T16:18:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-09T16:18:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bris.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bris.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEljCCA36gAwIBAgIQOrmPBwdw3r9jz9aNrrpM0jANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -39,26 +39,26 @@
 						60p76Z72Ue7R6QXHKlr8+eYm6SoERL93VH0x0/qIsWbr54dQnj1BIGdGEMNxg9Ic
 						qlIicnNUlmiEdCe+ehY7lX0ogvFplRO6Kp4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bris.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bris.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bris.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bris.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bris.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bris.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bris.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bris.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bris.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bris.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEljCCA36gAwIBAgIQOrmPBwdw3r9jz9aNrrpM0jANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -85,27 +85,27 @@
 						60p76Z72Ue7R6QXHKlr8+eYm6SoERL93VH0x0/qIsWbr54dQnj1BIGdGEMNxg9Ic
 						qlIicnNUlmiEdCe+ehY7lX0ogvFplRO6Kp4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Bristol</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bristol</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bristol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Naveed</md:GivenName>
-      <md:SurName>Hashmi</md:SurName>
-      <md:EmailAddress>mailto:Naveed.Hashmi@bristol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Naveed</md:GivenName>
-      <md:SurName>Hashmi</md:SurName>
-      <md:EmailAddress>mailto:Naveed.Hashmi@bristol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bristol</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bristol</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bristol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Naveed</md:GivenName>
+    <md:SurName>Hashmi</md:SurName>
+    <md:EmailAddress>mailto:Naveed.Hashmi@bristol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Naveed</md:GivenName>
+    <md:SurName>Hashmi</md:SurName>
+    <md:EmailAddress>mailto:Naveed.Hashmi@bristol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml
index 1401b8bf..43bffe32 100644
--- a/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.broadinstitute.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.broadinstitute.org/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">broadinstitute.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Broad Institute of MIT and Harvard</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Authenticates employees and associates of the Broad Institute.</mdui:Description>
+        <mdui:Logo height="100" width="214" xml:lang="en">https://idp.broadinstitute.org/identity/servlet/logo</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.broadinstitute.org/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">broadinstitute.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Broad Institute of MIT and Harvard</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Authenticates employees and associates of the Broad Institute.</mdui:Description>
-          <mdui:Logo height="100" width="214" xml:lang="en">https://idp.broadinstitute.org/identity/servlet/logo</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID4jCCAsoCCQClF9rYNH4miDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
 VVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEY
 MBYGA1UECgwPQnJvYWQgSW5zdGl0dXRlMQ0wCwYDVQQLDARCSVRTMR8wHQYDVQQD
@@ -43,33 +43,33 @@ PamR3Bf4PrB7fSLsWkZYxnr5lu9NyY6qhirIDQOte7GQ9/IbF3GtIpeoVgYp5rY+
 ERfaoBjWG6QK6bRz1aocVgG9dZOLAX1NxO/hw67JBo9oywbLuCpEwBTPWmz322+e
 aRRs2nf6FLKMWFwZT6JgxR1b9Y4EbOFPTrapEU/56Q09wG5n15A=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.broadinstitute.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.broadinstitute.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.broadinstitute.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.broadinstitute.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Broad Institute of MIT and Harvard</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Broad Institute of MIT and Harvard</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.broadinstitute.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.broadinstitute.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.broadinstitute.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.broadinstitute.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.broadinstitute.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Broad Institute of MIT and Harvard</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Broad Institute of MIT and Harvard</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.broadinstitute.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml
index 6a83fbbb..f7d71ffe 100644
--- a/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brock.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-19T15:11:51Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-19T15:11:51Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brock.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brock.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVANN1qLwgEDjyuLo3Focb4T3EV2gCMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azAeFw0xMzAyMTgwOTA1NDla
 						Fw0zMzAyMTgwOTA1NDlaMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azCCASIw
@@ -29,26 +29,26 @@
 						p0qobtoz00+ETWsQ82JOccQ93FWqkzwEAvdD2oc8KDBQgeSLYT2fhppTtmlmSNDk
 						okEJmm6PxABBZBrAZUlLPTzfIG9tQiZD8a/JIrUo8nH3xjQhgMtOuyTLH/c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brock.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brock.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brock.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brock.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brock.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brock.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brock.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brock.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brock.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brock.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVANN1qLwgEDjyuLo3Focb4T3EV2gCMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azAeFw0xMzAyMTgwOTA1NDla
 						Fw0zMzAyMTgwOTA1NDlaMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azCCASIw
@@ -67,27 +67,27 @@
 						p0qobtoz00+ETWsQ82JOccQ93FWqkzwEAvdD2oc8KDBQgeSLYT2fhppTtmlmSNDk
 						okEJmm6PxABBZBrAZUlLPTzfIG9tQiZD8a/JIrUo8nH3xjQhgMtOuyTLH/c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brockenhurst College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brockenhurst College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brock.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Shepherd</md:SurName>
-      <md:EmailAddress>mailto:pshepherd@brock.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Shepherd</md:SurName>
-      <md:EmailAddress>mailto:pshepherd@brock.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brockenhurst College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brockenhurst College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brock.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Shepherd</md:SurName>
+    <md:EmailAddress>mailto:pshepherd@brock.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Shepherd</md:SurName>
+    <md:EmailAddress>mailto:pshepherd@brock.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml
index a2b2d76b..82154892 100644
--- a/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brookehouse.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brookehouse.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brookehouse.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/brookehouse.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/brookehouse.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bsix Brooke House Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brookehouse.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/brookehouse.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/brookehouse.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bsix Brooke House Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brookehouse.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml
index 0f9c3f47..5116eb26 100644
--- a/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brookes.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T15:34:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T15:34:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brookes.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brookes.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAJUaJYwXesdgxfeIuyhEEzVnxSpLMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC5icm9va2VzLmFjLnVrMB4XDTEyMTAyMzEwNTUz
 						NFoXDTMyMTAyMzEwNTUzNFowHDEaMBgGA1UEAxMRaWRwLmJyb29rZXMuYWMudWsw
@@ -32,29 +32,29 @@
 						XY8id/1W4LtBx8ydd17dZx5v8SV8fXIsoO46FfPns3K/B104YQm2mqDyqvkHQMbq
 						doYQJw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brookes.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brookes.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brookes.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brookes.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAJUaJYwXesdgxfeIuyhEEzVnxSpLMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC5icm9va2VzLmFjLnVrMB4XDTEyMTAyMzEwNTUz
 						NFoXDTMyMTAyMzEwNTUzNFowHDEaMBgGA1UEAxMRaWRwLmJyb29rZXMuYWMudWsw
@@ -74,25 +74,25 @@
 						XY8id/1W4LtBx8ydd17dZx5v8SV8fXIsoO46FfPns3K/B104YQm2mqDyqvkHQMbq
 						doYQJw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Oxford Brookes University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oxford Brookes University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brookes.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@brookes.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OBIS Sysadmin</md:GivenName>
-      <md:EmailAddress>mailto:obis-sysadmin@brookes.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Oxford Brookes University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford Brookes University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brookes.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@brookes.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OBIS Sysadmin</md:GivenName>
+    <md:EmailAddress>mailto:obis-sysadmin@brookes.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml
index 9c80fa2a..bd6f8dc9 100644
--- a/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brooklands.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T13:27:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T13:27:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brooklands.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brooklands.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUXTHSnL92ioEhfn9CpPYcgVRrCm0wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLmJyb29rbGFuZHMuYWMudWswHhcNMTQwNTI4MTM1
 						OTQ3WhcNMzQwNTI4MTM1OTQ3WjAfMR0wGwYDVQQDExRpZHAuYnJvb2tsYW5kcy5h
@@ -32,29 +32,29 @@
 						558y9UPG4tE2GRueRJyjyH+6orKixPCF4f2DHJ+wKqITQ8n1xfpTFcvDw/Zo0GZL
 						u4XG40SUQeuZ0sZZHe+V
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brooklands.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brooklands.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brooklands.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brooklands.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUXTHSnL92ioEhfn9CpPYcgVRrCm0wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLmJyb29rbGFuZHMuYWMudWswHhcNMTQwNTI4MTM1
 						OTQ3WhcNMzQwNTI4MTM1OTQ3WjAfMR0wGwYDVQQDExRpZHAuYnJvb2tsYW5kcy5h
@@ -74,27 +74,27 @@
 						558y9UPG4tE2GRueRJyjyH+6orKixPCF4f2DHJ+wKqITQ8n1xfpTFcvDw/Zo0GZL
 						u4XG40SUQeuZ0sZZHe+V
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brooklands College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brooklands College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brooklands.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Vicky</md:GivenName>
-      <md:SurName>Wright</md:SurName>
-      <md:EmailAddress>mailto:vicky.wright@brooklands.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roy</md:GivenName>
-      <md:SurName>Pachnanda</md:SurName>
-      <md:EmailAddress>mailto:roy.pachnanda@brooklands.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brooklands College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brooklands College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brooklands.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vicky</md:GivenName>
+    <md:SurName>Wright</md:SurName>
+    <md:EmailAddress>mailto:vicky.wright@brooklands.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roy</md:GivenName>
+    <md:SurName>Pachnanda</md:SurName>
+    <md:EmailAddress>mailto:roy.pachnanda@brooklands.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
index 19aa7a7d..54224c0f 100644
--- a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brunel.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-23T11:55:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-23T11:55:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brunel University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Brunel University identity provider</mdui:Description>
+        <mdui:Logo height="60" width="80">https://idp.brunel.ac.uk/logo/80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.brunel.ac.uk/logo/16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>134.83.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brunel University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Brunel University identity provider</mdui:Description>
-          <mdui:Logo height="60" width="80">https://idp.brunel.ac.uk/logo/80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.brunel.ac.uk/logo/16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>134.83.0.0/16</mdui:IPHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAN2ITPb7HnQnnS6Q5lFqSQWjQjlUMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5icnVuZWwuYWMudWswHhcNMTMwODE5MTE0NzE5
 						WhcNMzMwODE5MTE0NzE5WjAbMRkwFwYDVQQDExBpZHAuYnJ1bmVsLmFjLnVrMIIB
@@ -40,29 +40,29 @@
 						3UdINWCXCsiS4l3wREpoNON+ZcAxX+Y7PhvkYQD4XwKMZ3lXfWOHEDhzaeReClWi
 						VSQUpuMp4dipeRerfQ1jhB9bZ0t09/Omp2wA2PqPJqtrQT48fpBTxA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAN2ITPb7HnQnnS6Q5lFqSQWjQjlUMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5icnVuZWwuYWMudWswHhcNMTMwODE5MTE0NzE5
 						WhcNMzMwODE5MTE0NzE5WjAbMRkwFwYDVQQDExBpZHAuYnJ1bmVsLmFjLnVrMIIB
@@ -81,25 +81,25 @@
 						3UdINWCXCsiS4l3wREpoNON+ZcAxX+Y7PhvkYQD4XwKMZ3lXfWOHEDhzaeReClWi
 						VSQUpuMp4dipeRerfQ1jhB9bZ0t09/Omp2wA2PqPJqtrQT48fpBTxA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brunel University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brunel University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computing Support</md:GivenName>
-      <md:EmailAddress>mailto:Computing-Support@brunel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Web</md:GivenName>
-      <md:EmailAddress>mailto:sysweb@brunel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brunel University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brunel University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computing Support</md:GivenName>
+    <md:EmailAddress>mailto:Computing-Support@brunel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Web</md:GivenName>
+    <md:EmailAddress>mailto:sysweb@brunel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml
index 2227d8bf..fdd0b41a 100644
--- a/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.brynmawr.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brynmawr.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bryn Mawr College</mdui:DisplayName>
+        <mdui:Logo height="89" width="325" xml:lang="en">https://idp.brynmawr.edu/idp/images/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brynmawr.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bryn Mawr College</mdui:DisplayName>
-          <mdui:Logo height="89" width="325" xml:lang="en">https://idp.brynmawr.edu/idp/images/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMZQic8OVtgucOwzh/ScyVxJkqleMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC5icnlubWF3ci5lZHUwHhcNMTQwNjEyMTUzNDEw
 WhcNMzQwNjEyMTUzNDEwWjAbMRkwFwYDVQQDExBpZHAuYnJ5bm1hd3IuZWR1MIIB
@@ -38,23 +38,23 @@ GdOEqebquuPlInkU0QShR35azgopDRLT+xT6D0kk+Mcb6R6RcuhJJX6qncnOpxBn
 Ei862+zrJ/dFHIW9QSPKAXPKbHd6e7dhkcNu338z+lbiat4i809Q66vNdYFwSSKD
 zLCYZhlk3ldpmygjFF5SpsEJjBIkDYxwiFYAzGQcDIawRMw21Gh3LJ2GRYUtIyrL
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brynmawr.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brynmawr.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brynmawr.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brynmawr.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brynmawr.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brynmawr.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brynmawr.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brynmawr.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGPzCCBSegAwIBAgIQCKxWt74u7PaFnYsZWE0RpTANBgkqhkiG9w0BAQsFADBE
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMR4wHAYDVQQDExV0
 aGF3dGUgRVYgU1NMIENBIC0gRzMwHhcNMTUwNTI4MDAwMDAwWhcNMTYwNjI2MjM1
@@ -90,26 +90,26 @@ XVyJZnZq/pdlHOqwEwEPgNv7tgrBIl1OR4W0cOjHpL+EFpIIrgbiCnhaRnmIF8uL
 YbJymzZUJQrdF0OsNdwIvWD52OiT9leFj9lR1BTkVyeEsrQO8UOiTCsQSo4igNHi
 PgfUnmesa3ddg0twrkz5l+SIJw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bryn Mawr College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bryn Mawr College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.brynmawr.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew Chiarello</md:GivenName>
-      <md:EmailAddress>achiarello@brynmawr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bryn Mawr Help Desk</md:GivenName>
-      <md:EmailAddress>help@brynmawr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Bertagni</md:GivenName>
-      <md:EmailAddress>dbertagni@brynmawr.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bryn Mawr College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bryn Mawr College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.brynmawr.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew Chiarello</md:GivenName>
+    <md:EmailAddress>achiarello@brynmawr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bryn Mawr Help Desk</md:GivenName>
+    <md:EmailAddress>help@brynmawr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Bertagni</md:GivenName>
+    <md:EmailAddress>dbertagni@brynmawr.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml
index 53df8290..ed474e0d 100644
--- a/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bsms.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brighton and Sussex Medical School</mdui:DisplayName>
+        <mdui:Logo height="63" width="40">https://idp.bsms.ac.uk/idp/images/logo-bsms.ac.uk.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.bsms.ac.uk/idp/images/favicon-bsms.ac.uk.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brighton and Sussex Medical School</mdui:DisplayName>
-          <mdui:Logo height="63" width="40">https://idp.bsms.ac.uk/idp/images/logo-bsms.ac.uk.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.bsms.ac.uk/idp/images/favicon-bsms.ac.uk.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUVPdR3/QgLrYLEH5e7QfhKE8r9VkwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLmJzbXMuYWMudWswHhcNMTIwMTExMTAxNzQ5WhcN
 						MzIwMTExMTAxNzQ5WjAZMRcwFQYDVQQDEw5pZHAuYnNtcy5hYy51azCCASIwDQYJ
@@ -35,27 +35,27 @@
 						r2gkn2ffy5Z/2izMU7nHRjO8z93LBHAsUlZK1qdbnKQa9ft5SEqVl22Ww/xWvrCD
 						DCf9hZ/XDTkhfXkdFY4uujO+3Qqlin9ufSQG5VHzUVZ4knc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsms.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsms.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brighton.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUVPdR3/QgLrYLEH5e7QfhKE8r9VkwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLmJzbXMuYWMudWswHhcNMTIwMTExMTAxNzQ5WhcN
 						MzIwMTExMTAxNzQ5WjAZMRcwFQYDVQQDEw5pZHAuYnNtcy5hYy51azCCASIwDQYJ
@@ -74,26 +74,26 @@
 						r2gkn2ffy5Z/2izMU7nHRjO8z93LBHAsUlZK1qdbnKQa9ft5SEqVl22Ww/xWvrCD
 						DCf9hZ/XDTkhfXkdFY4uujO+3Qqlin9ufSQG5VHzUVZ4knc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brighton and Sussex Medical School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bsms.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Holden</md:SurName>
-      <md:EmailAddress>mailto:ukfederation-tech@bsms.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Brighton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brighton and Sussex Medical School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bsms.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@brighton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Holden</md:SurName>
+    <md:EmailAddress>mailto:ukfederation-tech@bsms.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml
index 5573782f..0e7e13fe 100644
--- a/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bsz-bw.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-28T08:48:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-28T08:48:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsz-bw.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Bibliotheksservice-Zentrum Baden-Württemberg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Bibliotheksservice-Zentrum Baden-Wuerttemberg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider des Bibliotheksservice-Zentrums Baden-Württemberg</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of Bibliotheksservice-Zentrums Baden-Wuerttemberg</mdui:Description>
+        <mdui:Logo height="32" width="32">https://idp.bsz-bw.de/idp/images/favicon.ico</mdui:Logo>
+        <mdui:Logo height="49" width="350">https://idp.bsz-bw.de/idp/images/logo.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.bsz-bw.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bsz-bw.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsz-bw.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Bibliotheksservice-Zentrum Baden-Württemberg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Bibliotheksservice-Zentrum Baden-Wuerttemberg</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider des Bibliotheksservice-Zentrums Baden-Württemberg</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of Bibliotheksservice-Zentrums Baden-Wuerttemberg</mdui:Description>
-          <mdui:Logo height="32" width="32">https://idp.bsz-bw.de/idp/images/favicon.ico</mdui:Logo>
-          <mdui:Logo height="49" width="350">https://idp.bsz-bw.de/idp/images/logo.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.bsz-bw.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.bsz-bw.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.bsz-bw.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.bsz-bw.de,OU=Webserver,O=Bibliotheksservice-Zentrum Baden-Wuerttemberg,L=Konstanz,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGyjCCBbKgAwIBAgIHGAAaqAVbcDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.bsz-bw.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.bsz-bw.de,OU=Webserver,O=Bibliotheksservice-Zentrum Baden-Wuerttemberg,L=Konstanz,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGyjCCBbKgAwIBAgIHGAAaqAVbcDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
 EwJERTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4t
 V3VlcnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG
 9w0BCQEWDXBraUBic3otYncuZGUwHhcNMTQwODA1MDkwMDA4WhcNMTkwNzA5MjM1
@@ -68,33 +68,33 @@ O/EgLANDyqhTS0VUr76KxiPZYOPOhVJPvughrbxZMtOSl+aYNOUrXEFxbfB/Zr9m
 FJfk2TC3SL5x295M818e8rJwkn22fjo9oLRUaWcg7oM6eXB9DcDDcIy31hObpnLa
 cyobduSNkOZaUoroSIY=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsz-bw.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsz-bw.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsz-bw.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsz-bw.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.bsz-bw.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.bsz-bw.de,OU=Webserver,O=Bibliotheksservice-Zentrum Baden-Wuerttemberg,L=Konstanz,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGyjCCBbKgAwIBAgIHGAAaqAVbcDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsz-bw.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsz-bw.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsz-bw.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsz-bw.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.bsz-bw.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.bsz-bw.de,OU=Webserver,O=Bibliotheksservice-Zentrum Baden-Wuerttemberg,L=Konstanz,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGyjCCBbKgAwIBAgIHGAAaqAVbcDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
 EwJERTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4t
 V3VlcnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG
 9w0BCQEWDXBraUBic3otYncuZGUwHhcNMTQwODA1MDkwMDA4WhcNMTkwNzA5MjM1
@@ -132,31 +132,31 @@ O/EgLANDyqhTS0VUr76KxiPZYOPOhVJPvughrbxZMtOSl+aYNOUrXEFxbfB/Zr9m
 FJfk2TC3SL5x295M818e8rJwkn22fjo9oLRUaWcg7oM6eXB9DcDDcIy31hObpnLa
 cyobduSNkOZaUoroSIY=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e56</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e56</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Bibliotheksservice Zentrum Baden-Wuerttemberg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Bibliotheksservice Zentrum Baden-Wuerttemberg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.bsz-bw.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.bsz-bw.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e56</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e56</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Bibliotheksservice Zentrum Baden-Wuerttemberg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Bibliotheksservice Zentrum Baden-Wuerttemberg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.bsz-bw.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.bsz-bw.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
index 3bfd3506..52543c64 100644
--- a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal - OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel - OLD</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal - OLD</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel - OLD</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal - OLD</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel - OLD</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal - OLD</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel - OLD</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-          <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>bth.se</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
 MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
@@ -50,26 +50,26 @@ DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
 n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bth.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bth.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
 MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
@@ -89,36 +89,36 @@ DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
 n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal - OLD</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel - OLD</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal - OLD</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel - OLD</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml
index a60bf7db..f8b3deff 100644
--- a/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bucks.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVANqu+NZEXr9JDN0KL+SXOAzT26P1MA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcDIuYnVja3MuYWMudWswHhcNMTAwMjIyMTEyNDQ3
 						WhcNMzAwMjIyMTEyNDQ3WjAbMRkwFwYDVQQDExBpZHAyLmJ1Y2tzLmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						ZYZ8rzVKUn7pgsboBcZrcDJu5U80WKeE9UeCeb2NiySJozPNDyIxH5AAzfXTT+jd
 						biSMmVvAhGXgJqfaAeAqGEUayk8ttUtYCXDV3T+XkcJr8P8Iiwq5hejvWSb+cKwr
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.bucks.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.bucks.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVANqu+NZEXr9JDN0KL+SXOAzT26P1MA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcDIuYnVja3MuYWMudWswHhcNMTAwMjIyMTEyNDQ3
 						WhcNMzAwMjIyMTEyNDQ3WjAbMRkwFwYDVQQDExBpZHAyLmJ1Y2tzLmFjLnVrMIIB
@@ -67,26 +67,26 @@
 						ZYZ8rzVKUn7pgsboBcZrcDJu5U80WKeE9UeCeb2NiySJozPNDyIxH5AAzfXTT+jd
 						biSMmVvAhGXgJqfaAeAqGEUayk8ttUtYCXDV3T+XkcJr8P8Iiwq5hejvWSb+cKwr
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Buckinghamshire New University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Buckinghamshire New University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@bucks.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Oliver</md:GivenName>
-      <md:SurName>Facey</md:SurName>
-      <md:EmailAddress>mailto:Oliver.Facey@bucks.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Buckinghamshire New University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Buckinghamshire New University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@bucks.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Facey</md:SurName>
+    <md:EmailAddress>mailto:Oliver.Facey@bucks.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
index 1680e762..f686b137 100644
--- a/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cadcol.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cadcol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cadcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEsjCCA5qgAwIBAgIQC6lglEc1muN3LFkfQ12m7DANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEyMTExNjAwMDAwMFoXDTE1MTExNjIzNTk1OVowgYwxCzAJBgNV
@@ -38,26 +38,26 @@
 						Eh8cGFy2epl4edQCAfQPBq+MeewnhuSXh60WLN3MUAk9kG1ULtKvfU2gWTNFez20
 						yE/uAc/7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cadcol.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cadcol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cadcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cadcol.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cadcol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cadcol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEsjCCA5qgAwIBAgIQC6lglEc1muN3LFkfQ12m7DANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEyMTExNjAwMDAwMFoXDTE1MTExNjIzNTk1OVowgYwxCzAJBgNV
@@ -85,27 +85,27 @@
 						Eh8cGFy2epl4edQCAfQPBq+MeewnhuSXh60WLN3MUAk9kG1ULtKvfU2gWTNFez20
 						yE/uAc/7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cadcol.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cadbury Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cadbury Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cadcol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Naseer</md:GivenName>
-      <md:SurName>Iqbal</md:SurName>
-      <md:EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Naseer</md:GivenName>
-      <md:SurName>Iqbal</md:SurName>
-      <md:EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cadcol.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cadbury Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cadbury Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cadcol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Naseer</md:GivenName>
+    <md:SurName>Iqbal</md:SurName>
+    <md:EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Naseer</md:GivenName>
+    <md:SurName>Iqbal</md:SurName>
+    <md:EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml
index a7b09a7f..5d74a9ff 100644
--- a/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.calderdale.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-07T17:36:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-07T17:36:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calderdale.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calderdale.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkwCCQDCBJgSsIDDIjANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
 						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlmYXgxGzAZ
 						BgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNhbGRlcmRh
@@ -33,26 +33,26 @@
 						DmObHsLnFUzF6kTwb/GOVLcTnRMIt6geVfLn+Fvd8TEvRL/9tpnU1QjnvfalQrec
 						uF5jkFFaZrc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calderdale.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calderdale.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calderdale.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calderdale.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkwCCQDCBJgSsIDDIjANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
 						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlmYXgxGzAZ
 						BgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNhbGRlcmRh
@@ -73,27 +73,27 @@
 						DmObHsLnFUzF6kTwb/GOVLcTnRMIt6geVfLn+Fvd8TEvRL/9tpnU1QjnvfalQrec
 						uF5jkFFaZrc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Calderdale College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Calderdale College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.calderdale.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Haworth</md:SurName>
-      <md:EmailAddress>mailto:michaelh@calderdale.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Haworth</md:SurName>
-      <md:EmailAddress>mailto:michaelh@calderdale.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Calderdale College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Calderdale College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.calderdale.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Haworth</md:SurName>
+    <md:EmailAddress>mailto:michaelh@calderdale.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Haworth</md:SurName>
+    <md:EmailAddress>mailto:michaelh@calderdale.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml
index c739d8df..6080ad45 100644
--- a/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.calpoly.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calpoly.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California Polytechnic State University-San Luis Obispo</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.calpoly.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://afd.calpoly.edu/security/policies/index.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calpoly.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California Polytechnic State University-San Luis Obispo</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.calpoly.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://afd.calpoly.edu/security/policies/index.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGXzCCBUegAwIBAgIQJ+EtooE7aPQyEUAEQQAwyjANBgkqhkiG9w0BAQsFADB2
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
@@ -57,24 +57,24 @@ ZmYEyv4r6X6Fk0bEMhAJwM7Qjau0KACibd8lNUyfKRpKwFjlIPwM3bRoMCWptH2K
 ytVSwHP8Fc4H3kO1pfS7kmpmR1eaVapLHcNo+/7GQXET7X9xo5jAP/LslBgvWoZn
 /xkI
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calpoly.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calpoly.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calpoly.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calpoly.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calpoly.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calpoly.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calpoly.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calpoly.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calpoly.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calpoly.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calpoly.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calpoly.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calpoly.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calpoly.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGXzCCBUegAwIBAgIQJ+EtooE7aPQyEUAEQQAwyjANBgkqhkiG9w0BAQsFADB2
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
@@ -111,27 +111,27 @@ ZmYEyv4r6X6Fk0bEMhAJwM7Qjau0KACibd8lNUyfKRpKwFjlIPwM3bRoMCWptH2K
 ytVSwHP8Fc4H3kO1pfS7kmpmR1eaVapLHcNo+/7GQXET7X9xo5jAP/LslBgvWoZn
 /xkI
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calpoly.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calpoly.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California Polytechnic State University-San Luis Obispo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California Polytechnic State University-San Luis Obispo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.calpoly.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Identity Management Team</md:GivenName>
-      <md:EmailAddress>identity-management@calpoly.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Dan Malone</md:GivenName>
-      <md:EmailAddress>dmalone@calpoly.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management Team</md:GivenName>
-      <md:EmailAddress>identity-management@calpoly.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calpoly.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calpoly.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California Polytechnic State University-San Luis Obispo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California Polytechnic State University-San Luis Obispo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.calpoly.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Identity Management Team</md:GivenName>
+    <md:EmailAddress>identity-management@calpoly.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dan Malone</md:GivenName>
+    <md:EmailAddress>dmalone@calpoly.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management Team</md:GivenName>
+    <md:EmailAddress>identity-management@calpoly.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml
index 1d47fb60..1f22b1f2 100644
--- a/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.calstatela.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calstatela.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Los Angeles</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calstatela.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Los Angeles</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkDCCBHigAwIBAgIJAN84AoxNS7qCMA0GCSqGSIb3DQEBBQUAMIHfMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2Vs
 ZXMxMTAvBgNVBAoTKENhbGlmb3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgTG9zIEFu
@@ -50,24 +50,24 @@ fkG6JS2f2VWBm21DqQBkddxT/NCj9Kia/FUwppyx2ceBYoWdGsKiEX6WA3lBI+N/
 NIlrOaf/+H8n2yV3uFO5ARjQVwY678a31gUq9CBwlapYYEUrGwj0dQeAAZyLEjVz
 FCK5DwJyRwWe486Q2eZYqETX7uSR1TXgtlr/PGbSvzsIXW7b
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calstatela.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calstatela.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calstatela.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calstatela.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calstatela.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calstatela.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calstatela.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calstatela.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calstatela.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calstatela.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calstatela.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calstatela.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calstatela.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calstatela.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkDCCBHigAwIBAgIJAN84AoxNS7qCMA0GCSqGSIb3DQEBBQUAMIHfMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2Vs
 ZXMxMTAvBgNVBAoTKENhbGlmb3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgTG9zIEFu
@@ -99,31 +99,31 @@ fkG6JS2f2VWBm21DqQBkddxT/NCj9Kia/FUwppyx2ceBYoWdGsKiEX6WA3lBI+N/
 NIlrOaf/+H8n2yV3uFO5ARjQVwY678a31gUq9CBwlapYYEUrGwj0dQeAAZyLEjVz
 FCK5DwJyRwWe486Q2eZYqETX7uSR1TXgtlr/PGbSvzsIXW7b
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calstatela.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calstatela.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Los Angeles</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Los Angeles</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.calstatela.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sheryl Okuno</md:GivenName>
-      <md:EmailAddress>seng@calstatela.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Ng</md:GivenName>
-      <md:EmailAddress>dng3@cslanet.calstatela.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jason Solis</md:GivenName>
-      <md:EmailAddress>jason.solis@calstatela.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Lee</md:GivenName>
-      <md:EmailAddress>mlee40@calstatela.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calstatela.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calstatela.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Los Angeles</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Los Angeles</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.calstatela.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sheryl Okuno</md:GivenName>
+    <md:EmailAddress>seng@calstatela.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Ng</md:GivenName>
+    <md:EmailAddress>dng3@cslanet.calstatela.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jason Solis</md:GivenName>
+    <md:EmailAddress>jason.solis@calstatela.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Lee</md:GivenName>
+    <md:EmailAddress>mlee40@calstatela.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml
index 79729a8a..faf75aae 100644
--- a/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.caltech.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.caltech.edu/idp/profile/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">caltech.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California Institute of Technology</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.caltech.edu/idp/profile/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">caltech.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California Institute of Technology</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUC0Z5A7Hz0aGgHdvfgWBw/TW939IwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MB4XDTEwMDIwNDAwMzgxNFoX
 DTMwMDIwNDAwMzgxNFowGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MIIBIjAN
@@ -40,24 +40,24 @@ uxiE+1ntesuGTmWuLx9dIKILJ6XuD/rmGSkeKWljLC1jNQEjHioskqIFhcF1JxDv
 qnn8IBfnaoc4GX6AV3fEHifdQEOu7GdicUeA8o+cKqddCZf1PoUTSPby1NcFeDO6
 PPYq4pWYGD1Sc8SOXB+99YOD8hJObGIcskF0VRwv1Kg7rrTBqPLic7kcRA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.caltech.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.caltech.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.caltech.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.caltech.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.caltech.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.caltech.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">caltech.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.caltech.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.caltech.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.caltech.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.caltech.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.caltech.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.caltech.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">caltech.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUC0Z5A7Hz0aGgHdvfgWBw/TW939IwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MB4XDTEwMDIwNDAwMzgxNFoX
 DTMwMDIwNDAwMzgxNFowGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MIIBIjAN
@@ -76,23 +76,23 @@ uxiE+1ntesuGTmWuLx9dIKILJ6XuD/rmGSkeKWljLC1jNQEjHioskqIFhcF1JxDv
 qnn8IBfnaoc4GX6AV3fEHifdQEOu7GdicUeA8o+cKqddCZf1PoUTSPby1NcFeDO6
 PPYq4pWYGD1Sc8SOXB+99YOD8hJObGIcskF0VRwv1Kg7rrTBqPLic7kcRA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.caltech.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.caltech.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.caltech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zailo Leite</md:GivenName>
-      <md:EmailAddress>zleite@caltech.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>RuthAnne Bevier</md:GivenName>
-      <md:EmailAddress>ruthanne@caltech.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.caltech.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.caltech.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.caltech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zailo Leite</md:GivenName>
+    <md:EmailAddress>zleite@caltech.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>RuthAnne Bevier</md:GivenName>
+    <md:EmailAddress>ruthanne@caltech.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml
index 11d75d0b..8d765211 100644
--- a/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cambria.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-26T16:07:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-26T16:07:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambria.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambria.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIISzyK9gZorNowDQYJKoZIhvcNAQEFBQAwNzEWMBQGA1UE
 						CgwNQ29sZWcgQ2FtYnJpYTEdMBsGA1UEAwwUb2EuaWRwLmNhbWJyaWEuYWMudWsw
 						HhcNMTYwMzA3MTQzOTM2WhcNMjYwMzA3MTQzOTM2WjA3MRYwFAYDVQQKDA1Db2xl
@@ -32,13 +32,13 @@
 						mq6VF0PEksJJGubKZwWUAXgoPGrPu9fhSr9uj3qjXn9uD5NnyRl9QHyWc99pYTIr
 						9nYZ5vIuX2yxGi/sM8qmpiVCL9s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIISzyK9gZorNowDQYJKoZIhvcNAQEFBQAwNzEWMBQGA1UE
 						CgwNQ29sZWcgQ2FtYnJpYTEdMBsGA1UEAwwUb2EuaWRwLmNhbWJyaWEuYWMudWsw
 						HhcNMTYwMzA3MTQzOTM2WhcNMjYwMzA3MTQzOTM2WjA3MRYwFAYDVQQKDA1Db2xl
@@ -58,25 +58,25 @@
 						mq6VF0PEksJJGubKZwWUAXgoPGrPu9fhSr9uj3qjXn9uD5NnyRl9QHyWc99pYTIr
 						9nYZ5vIuX2yxGi/sM8qmpiVCL9s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa.idp.cambria.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa.idp.cambria.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coleg Cambria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg Cambria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cambria.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Brandish</md:SurName>
-      <md:EmailAddress>mailto:mark.brandish@cambria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Brandish</md:SurName>
-      <md:EmailAddress>mailto:mark.brandish@cambria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa.idp.cambria.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa.idp.cambria.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coleg Cambria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg Cambria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cambria.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Brandish</md:SurName>
+    <md:EmailAddress>mailto:mark.brandish@cambria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Brandish</md:SurName>
+    <md:EmailAddress>mailto:mark.brandish@cambria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml b/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml
index 047eaf49..b739a77a 100644
--- a/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cambridgeimaging.co.uk/entity">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T14:39:45Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T14:39:45Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridgeimaging.co.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridgeimaging.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUFqyUnksKx2uVyCZeWl+JRq1o2rcwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMaaWRwLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMw
 						MjIxMTA0NDQ4WhcNMzMwMjIxMTA0NDQ4WjAlMSMwIQYDVQQDExppZHAuY2FtYnJp
@@ -35,26 +35,26 @@
 						jAAuZz8W5S4RMFM1Poe4uEhH5A8dUr31EBcsNTygQOyphzfB/UQmg+Zc4aoDJOqq
 						HNe8mt/HQOesfG/fANyKI7HUpXtIeIqRt/hbk8X+Dy3Dn+lxCmUW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cambridgeimaging.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridgeimaging.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cambridgeimaging.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridgeimaging.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUFqyUnksKx2uVyCZeWl+JRq1o2rcwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMaaWRwLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMw
 						MjIxMTA0NDQ4WhcNMzMwMjIxMTA0NDQ4WjAlMSMwIQYDVQQDExppZHAuY2FtYnJp
@@ -74,27 +74,27 @@
 						jAAuZz8W5S4RMFM1Poe4uEhH5A8dUr31EBcsNTygQOyphzfB/UQmg+Zc4aoDJOqq
 						HNe8mt/HQOesfG/fANyKI7HUpXtIeIqRt/hbk8X+Dy3Dn+lxCmUW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cambridge Imaging Systems Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cambridge Imaging Systems (test only)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://cambridgeimaging.co.uk/identity_provider</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Hemington</md:SurName>
-      <md:EmailAddress>mailto:graham.hemington@cambridgeimaging.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>McConkey</md:SurName>
-      <md:EmailAddress>mailto:paul.mcconkey@cambridgeimaging.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cambridge Imaging Systems Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cambridge Imaging Systems (test only)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://cambridgeimaging.co.uk/identity_provider</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Hemington</md:SurName>
+    <md:EmailAddress>mailto:graham.hemington@cambridgeimaging.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>McConkey</md:SurName>
+    <md:EmailAddress>mailto:paul.mcconkey@cambridgeimaging.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml
index 79c8fc17..4bf036c5 100644
--- a/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.camosun.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T20:22:29Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T20:22:29Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camosun.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Camosun College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Camosun College</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.camosun.ca</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camosun.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Camosun College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Camosun College</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.camosun.ca</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPhUQO35onbVePkXGdKrAkBJk0uiMA0GCSqGSIb3DQEB
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPhUQO35onbVePkXGdKrAkBJk0uiMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMMDmlkcC5jYW1vc3VuLmNhMB4XDTE1MDYxOTE5MDkwOVoX
 DTM1MDYxOTE5MDkwOVowGTEXMBUGA1UEAwwOaWRwLmNhbW9zdW4uY2EwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCHBmK+VJdfG5ksaVqQfNbmMxJCU6k
@@ -32,29 +32,29 @@ iI4CZ7cBEbo/Li69ms3vBQjiwoW5XCMu8EfGqtowAv6pnhGNoV87PAR3q/1UdsoQ
 pw5z4m/INOggN7LnZTx8B5+slUFaspox2RU0MWAUdn9AZ0E4DWtxpyrJQMacKUu5
 kNRHgdvfQkrNQk/qOpdDh10wJSP50jy+tZaVw/rjqwnzkU/KoaNakopLHOqLRuXB
 fMDTRYP77TLlpD+uApJmxedJ67j4aOhQ2v7iOZewpThU3Wpzndpo9Q==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.camosun.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.camosun.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.camosun.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.camosun.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.camosun.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.camosun.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.camosun.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camosun.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPhUQO35onbVePkXGdKrAkBJk0uiMA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.camosun.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.camosun.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.camosun.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.camosun.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.camosun.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.camosun.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.camosun.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camosun.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPhUQO35onbVePkXGdKrAkBJk0uiMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMMDmlkcC5jYW1vc3VuLmNhMB4XDTE1MDYxOTE5MDkwOVoX
 DTM1MDYxOTE5MDkwOVowGTEXMBUGA1UEAwwOaWRwLmNhbW9zdW4uY2EwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCHBmK+VJdfG5ksaVqQfNbmMxJCU6k
@@ -71,21 +71,21 @@ iI4CZ7cBEbo/Li69ms3vBQjiwoW5XCMu8EfGqtowAv6pnhGNoV87PAR3q/1UdsoQ
 pw5z4m/INOggN7LnZTx8B5+slUFaspox2RU0MWAUdn9AZ0E4DWtxpyrJQMacKUu5
 kNRHgdvfQkrNQk/qOpdDh10wJSP50jy+tZaVw/rjqwnzkU/KoaNakopLHOqLRuXB
 fMDTRYP77TLlpD+uApJmxedJ67j4aOhQ2v7iOZewpThU3Wpzndpo9Q==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.camosun.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Camosun College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Camosun College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.camosun.ca</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Stephen Campbell, Camosun College Information Technology Services</md:SurName>
-      <md:EmailAddress>mailto:campbells@camosun.bc.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.camosun.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Camosun College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Camosun College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.camosun.ca</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Stephen Campbell, Camosun College Information Technology Services</md:SurName>
+    <md:EmailAddress>mailto:campbells@camosun.bc.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml
index aa33f546..9297c179 100644
--- a/swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.camre.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camre.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camre.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/camre.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/camre.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cambridge Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.camre.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/camre.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/camre.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cambridge Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.camre.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
index 351b5a54..85f55d09 100644
--- a/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.canarie.ca/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
 http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canarie.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CANARIE </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">CANARIE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Canadaâs Advanced Research and Innovation Network</mdui:Description>
+        <mdui:Description xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canarie.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CANARIE </mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">CANARIE</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Canadaâs Advanced Research and Innovation Network</mdui:Description>
-          <mdui:Description xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
 DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
@@ -42,26 +42,26 @@ DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
 zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.canarie.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.canarie.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.canarie.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canarie.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.canarie.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.canarie.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.canarie.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canarie.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
 DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
@@ -81,24 +81,24 @@ DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
 zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CANARIE</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">CANARIE </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Canada's Advanced Research and Innovation Network</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Network Operations Center</md:SurName>
-      <md:EmailAddress>noc@canarie.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CANARIE</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">CANARIE </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Canada's Advanced Research and Innovation Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Network Operations Center</md:SurName>
+    <md:EmailAddress>noc@canarie.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml
index 3209230d..72cedcc1 100644
--- a/swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.candi.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-06T17:37:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-06T17:37:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">candi.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">candi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXjCCAkYCCQCg/FLFP/fzOTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNVBAoT
 						GkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2FuZGku
@@ -33,26 +33,26 @@
 						PVGtTIe+TUbsRU4VYYaUPQx9TY5zeg5y5P71c0QhVOFl4vGU2Usoaa3/5GpdoRxT
 						lHI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.candi.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.candi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.candi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.candi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">candi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.candi.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.candi.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.candi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.candi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">candi.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXjCCAkYCCQCg/FLFP/fzOTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNVBAoT
 						GkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2FuZGku
@@ -73,27 +73,27 @@
 						PVGtTIe+TUbsRU4VYYaUPQx9TY5zeg5y5P71c0QhVOFl4vGU2Usoaa3/5GpdoRxT
 						lHI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City and Islington College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City and Islington College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.candi.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Terri</md:GivenName>
-      <md:SurName>Omer</md:SurName>
-      <md:EmailAddress>mailto:terri.omer@candi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thambiayah</md:GivenName>
-      <md:SurName>Sivakumar</md:SurName>
-      <md:EmailAddress>mailto:Thambiayah.Sivakumar@candi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City and Islington College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City and Islington College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.candi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Terri</md:GivenName>
+    <md:SurName>Omer</md:SurName>
+    <md:EmailAddress>mailto:terri.omer@candi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thambiayah</md:GivenName>
+    <md:SurName>Sivakumar</md:SurName>
+    <md:EmailAddress>mailto:Thambiayah.Sivakumar@candi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.canterbury.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.canterbury.ac.uk-shibboleth.xml
index 10cc6f3c..a1497a5c 100644
--- a/swamid-interfederations-2.0/idp.canterbury.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.canterbury.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.canterbury.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canterbury.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canterbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/canterbury.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/canterbury.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Canterbury Christ Church University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.canterbury.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/canterbury.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/canterbury.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Canterbury Christ Church University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.canterbury.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
index 691564e6..dbc65fec 100644
--- a/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.capes.gov.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
+        <mdui:Description xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.capes.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.capes.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
-          <mdui:Description xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.capes.gov.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.capes.gov.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDmDCCAoACAQAwDQYJKoZIhvcNAQEFBQAwgZExDjAMBgNVBAoTBUNBUEVTMQ4w
 DAYDVQQLEwVDQVBFUzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIx
 EjAQBgNVBAcUCUJyYXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYT
@@ -44,26 +44,26 @@ rmpcmEWQr4TehtiDJTAWcxlPuBp4SepXQwiFl3mnc7T7YHFLah5FLiIgnp6okU97
 WcQDFcFmVxjm4aNnbIYplvTtHd9skzcB5myj5qSNvVgHAqsL0WNXRQIfZk87IdZG
 lLrJjJ6tQYgZleqz
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.capes.gov.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.capes.gov.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.capes.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.capes.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 
 MIIDmDCCAoACAQAwDQYJKoZIhvcNAQEFBQAwgZExDjAMBgNVBAoTBUNBUEVTMQ4w
@@ -89,24 +89,24 @@ lLrJjJ6tQYgZleqz
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.capes.gov.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.capes.gov.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>DTI/CGII</md:SurName>
-      <md:EmailAddress>rede@capes.gov.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.capes.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.capes.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>DTI/CGII</md:SurName>
+    <md:EmailAddress>rede@capes.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
index a6f6e29e..33240188 100644
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cardiff.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-23T17:54:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-23T17:54:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cy">Prifysgol Caerdydd</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://static.cf.ac.uk/images/FAMLogos/cu-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="126" width="128">https://static.cf.ac.uk/images/FAMLogos/cu-logo-128x126.png</mdui:Logo>
+        <mdui:Logo height="62" width="64">https://static.cf.ac.uk/images/FAMLogos/cu-logo-64x62.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://static.cf.ac.uk/images/FAMLogos/cu-logo-80x60t.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>131.251.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>cardiff.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>cf.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.487626,-3.178638</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cardiff University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cy">Prifysgol Caerdydd</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://static.cf.ac.uk/images/FAMLogos/cu-logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="126" width="128">https://static.cf.ac.uk/images/FAMLogos/cu-logo-128x126.png</mdui:Logo>
-          <mdui:Logo height="62" width="64">https://static.cf.ac.uk/images/FAMLogos/cu-logo-64x62.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://static.cf.ac.uk/images/FAMLogos/cu-logo-80x60t.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>131.251.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>cardiff.ac.uk</mdui:DomainHint>
-          <mdui:DomainHint>cf.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.487626,-3.178638</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
 						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
 						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
@@ -50,31 +50,31 @@
 						fj8uW6fP20q8JEagC8olauNbiOgoRFaxjTOjudZKT449m6DrOdbcvPgV0s0vxTlR
 						tSTvwfp+LJO2OrKN2zIzV+mrAeKIWaatx542gFAATg8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
 						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
 						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
@@ -93,26 +93,26 @@
 						fj8uW6fP20q8JEagC8olauNbiOgoRFaxjTOjudZKT449m6DrOdbcvPgV0s0vxTlR
 						tSTvwfp+LJO2OrKN2zIzV+mrAeKIWaatx542gFAATg8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>The Athens Team</md:GivenName>
-      <md:EmailAddress>mailto:athens@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>The Athens Team</md:GivenName>
+    <md:EmailAddress>mailto:athens@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml
index 2a370e70..7db6f4ca 100644
--- a/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cardiffmet.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-26T17:02:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-26T17:02:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiffmet.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://idplogos.cardiffmet.ac.uk/cmet80x60.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idplogos.cardiffmet.ac.uk/cmet_16x16_crest.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiffmet.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://idplogos.cardiffmet.ac.uk/cmet80x60.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idplogos.cardiffmet.ac.uk/cmet_16x16_crest.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAM/WrHuhoD12UZd9duSVXiTcAQKqMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMMFGlkcC5jYXJkaWZmbWV0LmFjLnVrMB4XDTE0MTEyODE0
 						NTA1OFoXDTM0MTEyODE0NTA1OFowHzEdMBsGA1UEAwwUaWRwLmNhcmRpZmZtZXQu
@@ -37,29 +37,29 @@
 						3qrSFwHAyC6nXz1MLyanluHTBD+41hABSHxu5pwWhD8xXbFS0dA+8qJwagPvuO8q
 						JA5KMQm1uzCs13HbQj79Nw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cardiffmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiffmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cardiffmet.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiffmet.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAM/WrHuhoD12UZd9duSVXiTcAQKqMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMMFGlkcC5jYXJkaWZmbWV0LmFjLnVrMB4XDTE0MTEyODE0
 						NTA1OFoXDTM0MTEyODE0NTA1OFowHzEdMBsGA1UEAwwUaWRwLmNhcmRpZmZtZXQu
@@ -79,26 +79,26 @@
 						3qrSFwHAyC6nXz1MLyanluHTBD+41hABSHxu5pwWhD8xXbFS0dA+8qJwagPvuO8q
 						JA5KMQm1uzCs13HbQj79Nw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff Metropolitan University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff Metropolitan University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiffmet.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@cardiffmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andi</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:amorris@cardiffmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff Metropolitan University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff Metropolitan University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiffmet.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@cardiffmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andi</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:amorris@cardiffmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml
index f8dad1f7..b0dbcb48 100644
--- a/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cardinalnewman.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardinalnewman.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardinalnewman.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAJXtCjT47ZPtsA2VBKyWHL0NGjqUMA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5hbG5ld21hbi5hYy51azAeFw0xMTA4
 						MDgwOTU2NTBaFw0zMTA4MDgwOTU2NTBaMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5h
@@ -30,26 +30,26 @@
 						DKKf5b/CUVzrbvNvNpbxgqiH0CHQ+c62cxglU5i28G11UvlhSpm1GZ1LAeE+rEEO
 						/vAZMV0yVq3MPZvOkL6Nktyh9Q/qV+6INTMpDQMv7Uk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cardinalnewman.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardinalnewman.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cardinalnewman.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardinalnewman.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAJXtCjT47ZPtsA2VBKyWHL0NGjqUMA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5hbG5ld21hbi5hYy51azAeFw0xMTA4
 						MDgwOTU2NTBaFw0zMTA4MDgwOTU2NTBaMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5h
@@ -69,37 +69,37 @@
 						DKKf5b/CUVzrbvNvNpbxgqiH0CHQ+c62cxglU5i28G11UvlhSpm1GZ1LAeE+rEEO
 						/vAZMV0yVq3MPZvOkL6Nktyh9Q/qV+6INTMpDQMv7Uk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardinal Newman College, Preston</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardinal Newman College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardinalnewman.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Gray</md:SurName>
-      <md:EmailAddress>mailto:sgray@cardinalnewman.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Anthony</md:GivenName>
-      <md:SurName>Dickinson</md:SurName>
-      <md:EmailAddress>mailto:ADickinson@cardinalnewman.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Gray</md:SurName>
-      <md:EmailAddress>mailto:sgray@cardinalnewman.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anthony</md:GivenName>
-      <md:SurName>Dickinson</md:SurName>
-      <md:EmailAddress>mailto:ADickinson@cardinalnewman.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardinal Newman College, Preston</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardinal Newman College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardinalnewman.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Gray</md:SurName>
+    <md:EmailAddress>mailto:sgray@cardinalnewman.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anthony</md:GivenName>
+    <md:SurName>Dickinson</md:SurName>
+    <md:EmailAddress>mailto:ADickinson@cardinalnewman.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Gray</md:SurName>
+    <md:EmailAddress>mailto:sgray@cardinalnewman.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anthony</md:GivenName>
+    <md:SurName>Dickinson</md:SurName>
+    <md:EmailAddress>mailto:ADickinson@cardinalnewman.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml
index 0eb755cc..68a0baee 100644
--- a/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cc.uga.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uga.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Georgia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Shibboleth 2.x</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uga.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Georgia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Shibboleth 2.x</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRjCCAi4CCQD0C+UOJQz5qjANBgkqhkiG9w0BAQUFADBlMRgwFgYDVQQDDA9p
 ZHAuZGV2LnVnYS5lZHUxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2VvcmdpYTEL
 MAkGA1UEBhMCVVMxCzAJBgNVBAgMAkdBMQ8wDQYDVQQHDAZBdGhlbnMwHhcNMTUw
@@ -39,13 +39,13 @@ RI44IKzN3h2IENCq86zLpu0t9eBb6FRT1QBxr42p6Gv+PwNyDfthxW85bO2sSVDd
 Ki/S+qS1S8KfxPmHlUYIw7dHs3xrAJXmKadkZK30KhT5nw2dJ6iLDoOMRV7Xq18W
 Pod/7K5BxkdiDL8kTktbtYDFm1OdZXo/isk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAggCCQDYTLE1vTqdiTANBgkqhkiG9w0BAQUFADBSMRcwFQYDVQQDDA5p
 ZHAuY2MudWdhLmVkdTEMMAoGA1UECgwDVUdBMQswCQYDVQQGEwJVUzELMAkGA1UE
 CAwCR0ExDzANBgNVBAcMBkF0aGVuczAeFw0xNTAzMjMxNDM0NTlaFw0xNjAzMjIx
@@ -64,23 +64,23 @@ BGrzVttkbT455bMbCQC/PBdpVRuEpUMiXQCMOymr2Jw2yOaazS8u0k3JCA4LOCDU
 AJ9/YMkcjWB3NvaXhpKoeYlvMHEsxvSZT0mqNXImDI7VttSVS3Oxm05/JRGfdqRa
 M/mm6iec1w/QK2k+0r/xVKB8C6q9AYPPhXQsPnS6xhugQNWn
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cc.uga.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cc.uga.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cc.uga.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uga.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cc.uga.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cc.uga.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cc.uga.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uga.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRjCCAi4CCQD0C+UOJQz5qjANBgkqhkiG9w0BAQUFADBlMRgwFgYDVQQDDA9p
 ZHAuZGV2LnVnYS5lZHUxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2VvcmdpYTEL
 MAkGA1UEBhMCVVMxCzAJBgNVBAgMAkdBMQ8wDQYDVQQHDAZBdGhlbnMwHhcNMTUw
@@ -100,13 +100,13 @@ RI44IKzN3h2IENCq86zLpu0t9eBb6FRT1QBxr42p6Gv+PwNyDfthxW85bO2sSVDd
 Ki/S+qS1S8KfxPmHlUYIw7dHs3xrAJXmKadkZK30KhT5nw2dJ6iLDoOMRV7Xq18W
 Pod/7K5BxkdiDL8kTktbtYDFm1OdZXo/isk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAggCCQDYTLE1vTqdiTANBgkqhkiG9w0BAQUFADBSMRcwFQYDVQQDDA5p
 ZHAuY2MudWdhLmVkdTEMMAoGA1UECgwDVUdBMQswCQYDVQQGEwJVUzELMAkGA1UE
 CAwCR0ExDzANBgNVBAcMBkF0aGVuczAeFw0xNTAzMjMxNDM0NTlaFw0xNjAzMjIx
@@ -125,18 +125,18 @@ BGrzVttkbT455bMbCQC/PBdpVRuEpUMiXQCMOymr2Jw2yOaazS8u0k3JCA4LOCDU
 AJ9/YMkcjWB3NvaXhpKoeYlvMHEsxvSZT0mqNXImDI7VttSVS3Oxm05/JRGfdqRa
 M/mm6iec1w/QK2k+0r/xVKB8C6q9AYPPhXQsPnS6xhugQNWn
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Georgia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Georgia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uga.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Keith Martin</md:GivenName>
-      <md:EmailAddress>keith.martin@uga.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Georgia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Georgia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uga.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Keith Martin</md:GivenName>
+    <md:EmailAddress>keith.martin@uga.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml
index e4123d48..f9ac2699 100644
--- a/swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ccad.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccad.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccad.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccad.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccad.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cleveland College of Art and Design</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ccad.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccad.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccad.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cleveland College of Art and Design</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccad.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml
index 09cbe4b9..72c656de 100644
--- a/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cced.cranfield.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T15:41:49Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T15:41:49Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cced.cranfield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cced.cranfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cced.cranfield.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cced.cranfield.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cranfield University SoM Executive Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cced.cranfield.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cced.cranfield.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cranfield University SoM Executive Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
index a9c8416d..8a1f36bb 100644
--- a/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ccn.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccn.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccn.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccn.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City College Norwich</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ccn.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccn.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccn.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City College Norwich</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccn.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml
index 565643d1..bb22e22a 100644
--- a/swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cdd.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdd.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdd.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cdd.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cdd.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Conservatoire for Dance and Drama</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cdd.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cdd.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cdd.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Conservatoire for Dance and Drama</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cdd.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml
index 074fd140..7406d752 100644
--- a/swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.centralsussex.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">centralsussex.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">centralsussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/centralsussex.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/centralsussex.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Central Sussex College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.centralsussex.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/centralsussex.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/centralsussex.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Central Sussex College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.centralsussex.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml
index 33447ad9..a535702d 100644
--- a/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ceredigion.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T14:42:22Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T14:42:22Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceredigion.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceredigion.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ceredigion.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ceredigion.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg Ceredigion</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ceredigion.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ceredigion.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ceredigion.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg Ceredigion</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ceredigion.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
index e95f05f4..c57234ca 100644
--- a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -1,380 +1,380 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.chalmers.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>http://idp.chalmers.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp.chalmers.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://idp.chalmers.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </md:RoleDescriptor>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.chalmers.se/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/" index="2"/>
+  </md:SPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chalmers.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Chalmers</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Chalmers</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Chalmers</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Chalmers</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.chalmers.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>chalmers.se</mdui:DomainHint>
+        <mdui:IPHint>129.16.0.0/16</mdui:IPHint>
+        <mdui:GeolocationHint>geo:57.6899722,11.9774444</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:ClaimTypesRequested>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-        </auth:ClaimType>
-      </fed:ClaimTypesRequested>
-      <fed:TargetScopes>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/ls/</Address>
-        </EndpointReference>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>http://idp.chalmers.se/adfs/services/trust</Address>
-        </EndpointReference>
-      </fed:TargetScopes>
-      <fed:ApplicationServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-        </EndpointReference>
-      </fed:ApplicationServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <fed:TokenTypesOffered>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
-        <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
-      </fed:TokenTypesOffered>
-      <fed:ClaimTypesOffered>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
-          <auth:DisplayName>E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
-          <auth:DisplayName>Given Name</auth:DisplayName>
-          <auth:Description>The given name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
-          <auth:DisplayName>Name</auth:DisplayName>
-          <auth:Description>The unique name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
-          <auth:DisplayName>UPN</auth:DisplayName>
-          <auth:Description>The user principal name (UPN) of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
-          <auth:DisplayName>Common Name</auth:DisplayName>
-          <auth:Description>The common name of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
-          <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-          <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
-          <auth:DisplayName>Group</auth:DisplayName>
-          <auth:Description>A group that the user is a member of</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
-          <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-          <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
-          <auth:DisplayName>Role</auth:DisplayName>
-          <auth:Description>A role that the user has</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
-          <auth:DisplayName>Surname</auth:DisplayName>
-          <auth:Description>The surname of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
-          <auth:DisplayName>PPID</auth:DisplayName>
-          <auth:Description>The private identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
-          <auth:DisplayName>Name ID</auth:DisplayName>
-          <auth:Description>The SAML name identifier of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
-          <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-          <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
-          <auth:DisplayName>Authentication method</auth:DisplayName>
-          <auth:Description>The method used to authenticate the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
-          <auth:DisplayName>Deny only group SID</auth:DisplayName>
-          <auth:Description>The deny-only group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
-          <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-          <auth:Description>The deny-only primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
-          <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-          <auth:Description>The deny-only primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
-          <auth:DisplayName>Group SID</auth:DisplayName>
-          <auth:Description>The group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
-          <auth:DisplayName>Primary group SID</auth:DisplayName>
-          <auth:Description>The primary group SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
-          <auth:DisplayName>Primary SID</auth:DisplayName>
-          <auth:Description>The primary SID of the user</auth:Description>
-        </auth:ClaimType>
-        <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
-          <auth:DisplayName>Windows account name</auth:DisplayName>
-          <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-        </auth:ClaimType>
-      </fed:ClaimTypesOffered>
-      <fed:SecurityTokenServiceEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/services/trust/2005/certificatemixed</Address>
-          <Metadata>
-            <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
-              <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
-                <wsx:MetadataReference>
-                  <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp.chalmers.se/adfs/services/trust/mex</Address>
-                </wsx:MetadataReference>
-              </wsx:MetadataSection>
-            </Metadata>
-          </Metadata>
-        </EndpointReference>
-      </fed:SecurityTokenServiceEndpoint>
-      <fed:PassiveRequestorEndpoint>
-        <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-          <Address>https://idp.chalmers.se/adfs/ls/</Address>
-        </EndpointReference>
-      </fed:PassiveRequestorEndpoint>
-    </md:RoleDescriptor>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.chalmers.se/adfs/ls/" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/" index="2"/>
-    </md:SPSSODescriptor>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chalmers.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Chalmers</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Chalmers</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Chalmers</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Chalmers</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.chalmers.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>chalmers.se</mdui:DomainHint>
-          <mdui:IPHint>129.16.0.0/16</mdui:IPHint>
-          <mdui:GeolocationHint>geo:57.6899722,11.9774444</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CHALMERS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.chalmers.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Chalmers</md:Company>
-      <md:SurName>IT-system</md:SurName>
-      <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 31 772 8658</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Chalmers</md:Company>
-      <md:SurName>IT-support</md:SurName>
-      <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 31 772 6000</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CHALMERS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chalmers.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Chalmers</md:Company>
+    <md:SurName>IT-system</md:SurName>
+    <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 31 772 8658</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Chalmers</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 31 772 6000</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.chester.ac.uk-shibboleth.xml
index a56de3f2..fa7bd49d 100644
--- a/swamid-interfederations-2.0/idp.chester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.chester.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.chester.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chester.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/chester.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/chester.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Chester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.chester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/chester.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/chester.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Chester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
index a0ddc9f7..a1a995b3 100644
--- a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.chesterfield.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-14T16:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-14T16:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chesterfield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chesterfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEIDCCAwigAwIBAgIJAI1fOA60F77hMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
 						VQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UEBwwMQ2hlc3RlcmZp
 						ZWxkMR0wGwYDVQQKDBRDaGVzdGVyZmllbGQgQ29sbGVnZTEVMBMGA1UECwwMSUNU
@@ -37,26 +37,26 @@
 						f78RSU1/IrqCyKLhCu0MpaqsNBW6vettZXLYfwS32SQXnLKdPRCsOpC/paeyfkpB
 						TDscwQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.chesterfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chesterfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.chesterfield.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chesterfield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEIDCCAwigAwIBAgIJAI1fOA60F77hMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
 						VQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UEBwwMQ2hlc3RlcmZp
 						ZWxkMR0wGwYDVQQKDBRDaGVzdGVyZmllbGQgQ29sbGVnZTEVMBMGA1UECwwMSUNU
@@ -81,25 +81,25 @@
 						f78RSU1/IrqCyKLhCu0MpaqsNBW6vettZXLYfwS32SQXnLKdPRCsOpC/paeyfkpB
 						TDscwQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Chesterfield College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Chesterfield College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.chesterfield.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@chesterfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@chesterfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Chesterfield College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chesterfield College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chesterfield.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@chesterfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@chesterfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml
index ce502522..9b07d337 100644
--- a/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.chichester.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chichester.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chichester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJjvxUK9DXhdlH/EkMId7VAbUERjMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC5jaGljaGVzdGVyLmFjLnVrMB4XDTEzMDcwMzE1
 						MjUxNloXDTMzMDcwMzE1MjUxNlowHzEdMBsGA1UEAxMUaWRwLmNoaWNoZXN0ZXIu
@@ -30,26 +30,26 @@
 						11qYKdO9e8zZ1qufcZmIXPh4pVeM9WuRPq378hTwCMgBCEKM+/UMqcfagwLe+180
 						n9abLyFHDmPsq3igTHKAkQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.chichester.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chichester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.chichester.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chichester.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJjvxUK9DXhdlH/EkMId7VAbUERjMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC5jaGljaGVzdGVyLmFjLnVrMB4XDTEzMDcwMzE1
 						MjUxNloXDTMzMDcwMzE1MjUxNlowHzEdMBsGA1UEAxMUaWRwLmNoaWNoZXN0ZXIu
@@ -69,26 +69,26 @@
 						11qYKdO9e8zZ1qufcZmIXPh4pVeM9WuRPq378hTwCMgBCEKM+/UMqcfagwLe+180
 						n9abLyFHDmPsq3igTHKAkQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Chichester College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Chichester College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.chichester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@chichester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Owen</md:GivenName>
-      <md:SurName>Heaume</md:SurName>
-      <md:EmailAddress>mailto:Owen.Heaume@chichester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Chichester College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chichester College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chichester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@chichester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Owen</md:GivenName>
+    <md:SurName>Heaume</md:SurName>
+    <md:EmailAddress>mailto:Owen.Heaume@chichester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
index e0354783..d224d1eb 100644
--- a/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cirad.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-30T14:52:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-30T14:52:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirad.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CIRAD</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC30lEQVQ4y42TT2hcVRTGf/e++5o3k5nYTDStjVMRqrVaVwaRVmlFqYLQLoxIl4KgC0GwRbQuBEVRrCK6s4uCFPyH0kUVqlJJpabVtFWowSZNE9PEZjKTzL/MTO68d+9xkWgtdeHZnvN9nPOd71P8jxLeBFQfuWAfPVoYaz+reBEA9V+AE7KeU0zxBLBOfQZMvb3wiNorqw2q4qiPz/9481hrq+JdzL+BEwIj3N2bZ3J/P0G/xnUy+EazcGjn7XoqRzLZQOYTmGMLXH/1BpMChtRTlbHWAQPEAsnEdaSmb8FGRRZe38xtc1vw9RhpO5+nK1C8hAYYFojZ9fiFc60D01WYqMGlIsQjN2G1Z2Y4wvXNcmHTNwRtjWVpHO4BWD6h/0vh4LrsQZ1EiCh8mHDDmT6SDnAkLA5pulcJNl2lfOcoc7+tObaBB1cI5CM+ZfvTl49HndYqRAlBKSDfTNFKe8p/xGQqBtedYERzSp/lXjl//MSKAPodPmHoaPn+2VYnpXaaYpwmms5gtWfJO7LnIoQEv+TQNcfpBywl6R1YTRYAvUd9TV13rC1aQ6ltmE1COkuKZuyoNTWpszHOeoKm4+eKZeEhQ7kWbdis6ssEz8kurDZxOTZUEkO1ZTBtoeU8a2YjShcXoZVQHvV8vy9k0RpmGqH++3t6E2l8IzlfE0PNBdRcQOw8DRHCXx0K8IWAQ/tT2J6AahyQi1QRkWWCZ9TH7NjZ+0Gzrah7RUVpZtKazHyIG6zB2gwfvpflzzw0rKLqNT25eOgXOq4Y6SvZxpGTjaODF+2O0AtWwfZLkFlSfH6HkE0g8CBAOoK3Bopqmypc8cGjapDDsvXhUtXODxdULlLCd3nwCGkLHnBArDUvDPD8F9wFFK4N07eykSMj4ejhM/pW7yBc6YoCZeC+3V2vTrDqlR/UsX8w16TxpKynAk82fbT7pzHV2xGp+MYu+f2xbv/y+/ip19T4VfN/AbdxUQrXQYS3AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.cirad.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CIRAD</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirad.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CIRAD</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC30lEQVQ4y42TT2hcVRTGf/e++5o3k5nYTDStjVMRqrVaVwaRVmlFqYLQLoxIl4KgC0GwRbQuBEVRrCK6s4uCFPyH0kUVqlJJpabVtFWowSZNE9PEZjKTzL/MTO68d+9xkWgtdeHZnvN9nPOd71P8jxLeBFQfuWAfPVoYaz+reBEA9V+AE7KeU0zxBLBOfQZMvb3wiNorqw2q4qiPz/9481hrq+JdzL+BEwIj3N2bZ3J/P0G/xnUy+EazcGjn7XoqRzLZQOYTmGMLXH/1BpMChtRTlbHWAQPEAsnEdaSmb8FGRRZe38xtc1vw9RhpO5+nK1C8hAYYFojZ9fiFc60D01WYqMGlIsQjN2G1Z2Y4wvXNcmHTNwRtjWVpHO4BWD6h/0vh4LrsQZ1EiCh8mHDDmT6SDnAkLA5pulcJNl2lfOcoc7+tObaBB1cI5CM+ZfvTl49HndYqRAlBKSDfTNFKe8p/xGQqBtedYERzSp/lXjl//MSKAPodPmHoaPn+2VYnpXaaYpwmms5gtWfJO7LnIoQEv+TQNcfpBywl6R1YTRYAvUd9TV13rC1aQ6ltmE1COkuKZuyoNTWpszHOeoKm4+eKZeEhQ7kWbdis6ssEz8kurDZxOTZUEkO1ZTBtoeU8a2YjShcXoZVQHvV8vy9k0RpmGqH++3t6E2l8IzlfE0PNBdRcQOw8DRHCXx0K8IWAQ/tT2J6AahyQi1QRkWWCZ9TH7NjZ+0Gzrah7RUVpZtKazHyIG6zB2gwfvpflzzw0rKLqNT25eOgXOq4Y6SvZxpGTjaODF+2O0AtWwfZLkFlSfH6HkE0g8CBAOoK3Bopqmypc8cGjapDDsvXhUtXODxdULlLCd3nwCGkLHnBArDUvDPD8F9wFFK4N07eykSMj4ejhM/pW7yBc6YoCZeC+3V2vTrDqlR/UsX8w16TxpKynAk82fbT7pzHV2xGp+MYu+f2xbv/y+/ip19T4VfN/AbdxUQrXQYS3AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.cirad.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CIRAD</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVAIpsWCg8y/CbjokdRD9xw1tntEMjMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjAeFw0xMTA5MDkxMjEwMTZaFw0z
 MTA5MDkxMjEwMTZaMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjCCASIwDQYJKoZI
@@ -37,22 +37,22 @@ W/S4lmyzcH5A+zobfOREY1nThRnVvLsAuvmD6W44sRodxDitH6MBst4Cw18LpTHk
 7ZKBQ87Qbdtbk1Se9lrDplk20K5lBisEEM5W+/W6lbqJCim24CPO8s8jq0af2ahM
 RIDZRysGp5esSU0Sm4xoDDASmC49fVStwwYMtq6P+T0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cirad.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirad.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirad.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CIRAD</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CIRAD</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cirad.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Frédéric MAZZINI</md:SurName>
-      <md:EmailAddress>frederic.mazzini@cirad.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cirad.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirad.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirad.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CIRAD</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CIRAD</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cirad.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frédéric MAZZINI</md:SurName>
+    <md:EmailAddress>frederic.mazzini@cirad.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml
index 5ce74fba..22fb7a9b 100644
--- a/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cirencester.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-22T15:23:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-22T15:23:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirencester.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirencester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTjCCAjagAwIBAgIIRKejSpcxL9UwDQYJKoZIhvcNAQEFBQAwPjEcMBoGA1UE
 						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
 						LmFjLnVrMB4XDTE0MDcyMTA5NTIwNFoXDTI0MDcyMTA5NTIwNFowPjEcMBoGA1UE
@@ -32,13 +32,13 @@
 						xXole5MprQ9wmqmmf5lMO/Q/lDJKgS05SPkfCH6qXTbWr7UTruSVJGbg5ZQxyMak
 						Dy5B9h6OWZR1PUUJlALjWmBQaZKFTBhHgACu0br2JUgSqw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTjCCAjagAwIBAgIIRKejSpcxL9UwDQYJKoZIhvcNAQEFBQAwPjEcMBoGA1UE
 						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
 						LmFjLnVrMB4XDTE0MDcyMTA5NTIwNFoXDTI0MDcyMTA5NTIwNFowPjEcMBoGA1UE
@@ -58,25 +58,25 @@
 						xXole5MprQ9wmqmmf5lMO/Q/lDJKgS05SPkfCH6qXTbWr7UTruSVJGbg5ZQxyMak
 						Dy5B9h6OWZR1PUUJlALjWmBQaZKFTBhHgACu0br2JUgSqw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirencester.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirencester.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cirencester College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cirencester Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cirencester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Forsdike</md:SurName>
-      <md:EmailAddress>mailto:matt.forsdike@cirencester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Forsdike</md:SurName>
-      <md:EmailAddress>mailto:matt.forsdike@cirencester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirencester.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirencester.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cirencester College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cirencester Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cirencester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Forsdike</md:SurName>
+    <md:EmailAddress>mailto:matt.forsdike@cirencester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Forsdike</md:SurName>
+    <md:EmailAddress>mailto:matt.forsdike@cirencester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml b/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml
index ee3e2470..5456c836 100644
--- a/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml
+++ b/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cirrusidentity.com/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirrusidentity.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cirrus Identity, Inc.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Cirrus Identity employees.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://cirrusidentity.com/about/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="144" width="144" xml:lang="en">https://apps.cirrusidentity.com/console/static/images/cirrusidentity-ipad-144.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirrusidentity.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cirrus Identity, Inc.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Cirrus Identity employees.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://cirrusidentity.com/about/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="144" width="144" xml:lang="en">https://apps.cirrusidentity.com/console/static/images/cirrusidentity-ipad-144.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID+jCCAuICCQDuv6UDX8Sf4zANBgkqhkiG9w0BAQUFADCBvjELMAkGA1UEBhMC
 VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEDAOBgNVBAcTB09ha2xhbmQxHjAcBgNV
 BAoTFUNpcnJ1cyBJZGVudGl0eSwgSW5jLjEcMBoGA1UECxMTQ2lycnVzIElkZW50
@@ -45,27 +45,27 @@ JvbaSUb9vNgYNja2LTw2akvA9sOZis5VSqOyG9kU/6jBONiKqioQzTTVb+H/Mw2v
 /RrmIthzClneATCN70+7IYQUKe+jIksRg7CnWLJAXdHOI1vHxF0TV8Zk6VXOvLYF
 2DR8dnwEcMytTiMxvGk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirrusidentity.com/idp/SLOService/HTTP-Redirect"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirrusidentity.com/idp/SSOService/HTTP-Redirect"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cirrus Identity, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cirrus Identity, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://cirrusidentity.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Cirrus Identity Support</md:GivenName>
-      <md:EmailAddress>support@cirrusidentity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Cirrus Identity Security</md:GivenName>
-      <md:EmailAddress>security@cirrusidentity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Patrick Radtke</md:GivenName>
-      <md:EmailAddress>support@cirrusidentity.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirrusidentity.com/idp/SLOService/HTTP-Redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirrusidentity.com/idp/SSOService/HTTP-Redirect"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cirrus Identity, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cirrus Identity, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://cirrusidentity.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cirrus Identity Support</md:GivenName>
+    <md:EmailAddress>support@cirrusidentity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Cirrus Identity Security</md:GivenName>
+    <md:EmailAddress>security@cirrusidentity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Patrick Radtke</md:GivenName>
+    <md:EmailAddress>support@cirrusidentity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cit.ie-idp.xml b/swamid-interfederations-2.0/idp.cit.ie-idp.xml
index 1ff88554..02eb3bfc 100644
--- a/swamid-interfederations-2.0/idp.cit.ie-idp.xml
+++ b/swamid-interfederations-2.0/idp.cit.ie-idp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cit.ie/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T01:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T01:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cork Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Chorcaí</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.cit.ie</mdui:InformationURL>
+        <mdui:Logo height="61" width="250">https://edugate.heanet.ie/rr3/logos/cit.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:51.88399481564332,-8.53386640548706</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cork Institute of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Chorcaí</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.cit.ie</mdui:InformationURL>
-          <mdui:Logo height="61" width="250">https://edugate.heanet.ie/rr3/logos/cit.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:51.88399481564332,-8.53386640548706</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgACCQCHeJdzXpsZGDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJJ
 RTENMAsGA1UECBMEQ29yazENMAsGA1UEBxMEQ29yazEMMAoGA1UEChMDQ0lUMRMw
 EQYDVQQDEwppZHAuY2l0LmllMB4XDTA5MDgyNTExMjIzN1oXDTEyMDUyMTExMjIz
@@ -38,13 +38,13 @@ U8w0QgpWiq2w8mJT46sXp5//BDTluHg3MTwr0CvlQvpwh86fPF79ZZ2FmjeXvoSN
 WBXb83go+9GYN/H/CV61rR3LEWwx7WxE9CNb4IXfBou0B7O59G7TQ9dmzmwIcua7
 XgaFswJzpOWgaoJH7ftFEX2PALtD1x0PEFC+aw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhwCCQCW78PfEeR8uTANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJJ
 RTEQMA4GA1UECAwHTXVuc3RlcjENMAsGA1UEBwwEQ29yazEMMAoGA1UECgwDQ0lU
 MQswCQYDVQQLDAJJVDERMA8GA1UEAwwIY2l0LXNhbWwwHhcNMTYwNTA0MTQ1ODIy
@@ -64,30 +64,30 @@ Et5lDIS1sFGpWl0FL+z7xiRdthmlhq4N9G9GLQfOHMo5JSRL4yaFu08QOUMUv+ef
 bIEMILErofLodEDuJdtZvUK0Jz7WB+epQCbGSAxPd+cL/RzPiBLxQiQXWIoqn1mQ
 fOtwHKdBpDg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cork Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cork Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cit.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Anna</md:GivenName>
-      <md:SurName>ODonovan</md:SurName>
-      <md:EmailAddress>mailto:anna.odonovan@cit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT</md:GivenName>
-      <md:SurName>Services</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@cit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cork Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cork Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anna</md:GivenName>
+    <md:SurName>ODonovan</md:SurName>
+    <md:EmailAddress>mailto:anna.odonovan@cit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Services</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@cit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml
index 65af1c24..573a2fa7 100644
--- a/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.citybathcoll.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T18:17:54Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T18:17:54Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citybathcoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citybathcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUjCCAjqgAwIBAgIIfbSOFSC/ASkwDQYJKoZIhvcNAQEFBQAwQDEdMBsGA1UE
 						CgwUQ2l0eSBvZiBCYXRoIENvbGxlZ2UxHzAdBgNVBAMMFmlkcC5jaXR5YmF0aGNv
 						bGwuYWMudWswHhcNMTMwNDE4MTMyMTUzWhcNMjMwNDE4MTMyMTUzWjBAMR0wGwYD
@@ -30,13 +30,13 @@
 						4hLCRi7w+XmEl47/Lc7uJfuwoBl7h01Tdw4y8gPPLBoXKbg0MdYxbUbEONaFfNc/
 						3Lx/vmCft7bkCTFeY/m+j8a6an5M5PxQXyB3QaHDcuITralR0bQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUjCCAjqgAwIBAgIIfbSOFSC/ASkwDQYJKoZIhvcNAQEFBQAwQDEdMBsGA1UE
 						CgwUQ2l0eSBvZiBCYXRoIENvbGxlZ2UxHzAdBgNVBAMMFmlkcC5jaXR5YmF0aGNv
 						bGwuYWMudWswHhcNMTMwNDE4MTMyMTUzWhcNMjMwNDE4MTMyMTUzWjBAMR0wGwYD
@@ -56,25 +56,25 @@
 						4hLCRi7w+XmEl47/Lc7uJfuwoBl7h01Tdw4y8gPPLBoXKbg0MdYxbUbEONaFfNc/
 						3Lx/vmCft7bkCTFeY/m+j8a6an5M5PxQXyB3QaHDcuITralR0bQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.citybathcoll.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.citybathcoll.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bath College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bath College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.citybathcoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Naomi</md:GivenName>
-      <md:SurName>Elliott</md:SurName>
-      <md:EmailAddress>mailto:naomi.elliott@bathcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Justin</md:GivenName>
-      <md:SurName>Haskins</md:SurName>
-      <md:EmailAddress>mailto:haskinsj@bathcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.citybathcoll.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.citybathcoll.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bath College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bath College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.citybathcoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Naomi</md:GivenName>
+    <md:SurName>Elliott</md:SurName>
+    <md:EmailAddress>mailto:naomi.elliott@bathcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Justin</md:GivenName>
+    <md:SurName>Haskins</md:SurName>
+    <md:EmailAddress>mailto:haskinsj@bathcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml
index 057587e4..3442afb1 100644
--- a/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cityofbristol.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofbristol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofbristol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIJAI1toHyODheqMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEgMB4G
 						A1UEChMXQ2l0eSBvZiBCcmlzdG9sIENvbGxlZ2UxDDAKBgNVBAsTA0lDVDEgMB4G
@@ -36,26 +36,26 @@
 						RcBdINvWCrZHyLLxIqCpE9U95kY1JYsxLuVpkwTlf25VZIhAO0aTu0RI9Waq+DIm
 						Fn2vK00uJvNRLNZs0Cjgz4ZWOQzJHWQt0Tk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cityofbristol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofbristol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cityofbristol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofbristol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIJAI1toHyODheqMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEgMB4G
 						A1UEChMXQ2l0eSBvZiBCcmlzdG9sIENvbGxlZ2UxDDAKBgNVBAsTA0lDVDEgMB4G
@@ -81,26 +81,26 @@
 						RcBdINvWCrZHyLLxIqCpE9U95kY1JYsxLuVpkwTlf25VZIhAO0aTu0RI9Waq+DIm
 						Fn2vK00uJvNRLNZs0Cjgz4ZWOQzJHWQt0Tk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City of Bristol College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City of Bristol College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cityofbristol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:it.helpdesk@cityofbristol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dale</md:GivenName>
-      <md:SurName>Simpkins</md:SurName>
-      <md:EmailAddress>mailto:dale.simpkins@cityofbristol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City of Bristol College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City of Bristol College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cityofbristol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:it.helpdesk@cityofbristol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dale</md:GivenName>
+    <md:SurName>Simpkins</md:SurName>
+    <md:EmailAddress>mailto:dale.simpkins@cityofbristol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml
index 7c4f198b..7b2a8406 100644
--- a/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cityofglasgowcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T14:34:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T14:34:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofglasgowcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofglasgowcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZjCCAk6gAwIBAgIVAI38uSRnFA9tDvzGsjh8FcUJn5XSMA0GCSqGSIb3DQEB
 						BQUAMCkxJzAlBgNVBAMTHmlkcC5jaXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azAe
 						Fw0xNDA1MTkwOTIyMDVaFw0zNDA1MTkwOTIyMDVaMCkxJzAlBgNVBAMTHmlkcC5j
@@ -33,29 +33,29 @@
 						IKiRu3CJ7CUBlfqfhvOAlSfA6aPZZK7UqVXaB2JNlw2gqvoms/9/WAiph1lk6kSj
 						jatFpe4qgOFjPw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofglasgowcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityofglasgowcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZjCCAk6gAwIBAgIVAI38uSRnFA9tDvzGsjh8FcUJn5XSMA0GCSqGSIb3DQEB
 						BQUAMCkxJzAlBgNVBAMTHmlkcC5jaXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azAe
 						Fw0xNDA1MTkwOTIyMDVaFw0zNDA1MTkwOTIyMDVaMCkxJzAlBgNVBAMTHmlkcC5j
@@ -76,26 +76,26 @@
 						IKiRu3CJ7CUBlfqfhvOAlSfA6aPZZK7UqVXaB2JNlw2gqvoms/9/WAiph1lk6kSj
 						jatFpe4qgOFjPw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City of Glasgow College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City of Glasgow College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cityofglasgowcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@cityofglasgowcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Landi</md:SurName>
-      <md:EmailAddress>mailto:marco.landi@cityofglasgowcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City of Glasgow College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City of Glasgow College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cityofglasgowcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@cityofglasgowcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Landi</md:SurName>
+    <md:EmailAddress>mailto:marco.landi@cityofglasgowcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml
index 3bf99b12..195fe510 100644
--- a/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.citysun.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-02T17:44:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-02T17:44:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citysun.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citysun.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQCvtyS3mHeGmjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjETMBEGA1UECAwKU3VuZGVybGFuZDETMBEGA1UEBwwKU3VuZGVybGFuZDEbMBkG
 						A1UECgwSU3VuZGVybGFuZCBDb2xsZWdlMRowGAYDVQQDDBFpZHAuY2l0eXN1bi5h
@@ -32,26 +32,26 @@
 						xaJMNNnK3Fwjt+RODk9qCoaqM4D8sSLoRUgOJa4OXrwLH+e7++NOeqeM9ScjFrFt
 						cflw6bvFBAvh/kDN5LUPBYeVYTmdB5RAahYEvCVpecQG2yVChpfCyV2PywtMn0Mt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.citysun.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citysun.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.citysun.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">citysun.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQCvtyS3mHeGmjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjETMBEGA1UECAwKU3VuZGVybGFuZDETMBEGA1UEBwwKU3VuZGVybGFuZDEbMBkG
 						A1UECgwSU3VuZGVybGFuZCBDb2xsZWdlMRowGAYDVQQDDBFpZHAuY2l0eXN1bi5h
@@ -71,27 +71,27 @@
 						xaJMNNnK3Fwjt+RODk9qCoaqM4D8sSLoRUgOJa4OXrwLH+e7++NOeqeM9ScjFrFt
 						cflw6bvFBAvh/kDN5LUPBYeVYTmdB5RAahYEvCVpecQG2yVChpfCyV2PywtMn0Mt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sunderland College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sunderland College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.citysun.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Fernando</md:GivenName>
-      <md:SurName>Mora</md:SurName>
-      <md:EmailAddress>mailto:fernando.mora@sunderlandcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fernando</md:GivenName>
-      <md:SurName>Mora</md:SurName>
-      <md:EmailAddress>mailto:fernando.mora@sunderlandcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunderland College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunderland College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.citysun.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Fernando</md:GivenName>
+    <md:SurName>Mora</md:SurName>
+    <md:EmailAddress>mailto:fernando.mora@sunderlandcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fernando</md:GivenName>
+    <md:SurName>Mora</md:SurName>
+    <md:EmailAddress>mailto:fernando.mora@sunderlandcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.clarion.edu-idp.xml b/swamid-interfederations-2.0/idp.clarion.edu-idp.xml
index dbc57e93..3b44a7dc 100644
--- a/swamid-interfederations-2.0/idp.clarion.edu-idp.xml
+++ b/swamid-interfederations-2.0/idp.clarion.edu-idp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.clarion.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clarion.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Clarion University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Clarion University is a member of the Pennsylvania State System of Higher Education</mdui:Description>
+        <mdui:Logo height="68" width="207" xml:lang="en">https://idp.clarion.edu/idp/images/eagle_logo2.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clarion.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Clarion University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Clarion University is a member of the Pennsylvania State System of Higher Education</mdui:Description>
-          <mdui:Logo height="68" width="207" xml:lang="en">https://idp.clarion.edu/idp/images/eagle_logo2.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUBafbshnnIQs9vn04YDHVguyflZswDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MB4XDTEyMTIxODE1MDc0N1oX
 DTMyMTIxODE1MDc0N1owGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MIIBIjAN
@@ -39,23 +39,23 @@ R/+XlwCtHu5YnWULAF6CiyS7z1KXj12fT8a4brLHLV1WGDYeOP3Wt0gF0lalQ+0x
 EnfRqvXvlWlxTuzRLDqKXzowjyAsGsxCItlvmIwANgYxn1SxDBTW0ZwMZ6lVR0F2
 8ergXvj+UYo/oR2H/HIprHaREQadi68xBDCSKMaZVqbdk/DfFzNiUEeOyQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clarion.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clarion.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.clarion.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.clarion.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.clarion.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clarion.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clarion.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clarion.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.clarion.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.clarion.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.clarion.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clarion.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUBafbshnnIQs9vn04YDHVguyflZswDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MB4XDTEyMTIxODE1MDc0N1oX
 DTMyMTIxODE1MDc0N1owGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MIIBIjAN
@@ -74,18 +74,18 @@ R/+XlwCtHu5YnWULAF6CiyS7z1KXj12fT8a4brLHLV1WGDYeOP3Wt0gF0lalQ+0x
 EnfRqvXvlWlxTuzRLDqKXzowjyAsGsxCItlvmIwANgYxn1SxDBTW0ZwMZ6lVR0F2
 8ergXvj+UYo/oR2H/HIprHaREQadi68xBDCSKMaZVqbdk/DfFzNiUEeOyQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clarion.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Clarion University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Clarion University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.clarion.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael Phillips</md:GivenName>
-      <md:EmailAddress>mphillips@clarion.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clarion.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Clarion University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Clarion University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.clarion.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael Phillips</md:GivenName>
+    <md:EmailAddress>mphillips@clarion.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml b/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml
index c7094444..44e231d9 100644
--- a/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml
+++ b/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cloud.rsmart.com/saml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.cloud.rsmart.com/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsmart.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RSmart</mdui:DisplayName>
+        <mdui:Description xml:lang="en">rSmart Corporate IdP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://rsmart.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://rsmart.com/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.cloud.rsmart.com/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsmart.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RSmart</mdui:DisplayName>
-          <mdui:Description xml:lang="en">rSmart Corporate IdP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://rsmart.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://rsmart.com/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDETCCAfmgAwIBAgIJAMOVQ66HI1iJMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
 BAMMFGlkcC5jbG91ZC5yc21hcnQuY29tMB4XDTE0MDgyMjAzMTA1NloXDTI0MDgy
 MTAzMTA1NlowHzEdMBsGA1UEAwwUaWRwLmNsb3VkLnJzbWFydC5jb20wggEiMA0G
@@ -40,22 +40,22 @@ rAUEqIn55+DJsvdRNWvLVHvTOSrONwH7F8GjNS/EqO1j/6OP0UR1eJwdnSA+5EfB
 hyZQAvr/QOSMv/csIOcNnq5bJ5rkMPUHC5+/BWO88iO5wMm+vxIYRnTB1flw/o0i
 cpX6/qZs7VVwnx5qd3n4+ZUKOzN4
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cloud.rsmart.com/saml/saml2/sso" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cloud.rsmart.com/saml/saml2/slo"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cloud.rsmart.com/saml/saml1/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cloud.rsmart.com/saml/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cloud.rsmart.com/saml/saml2/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>support@rsmart.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cloud.rsmart.com/saml/saml2/sso" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cloud.rsmart.com/saml/saml2/slo"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cloud.rsmart.com/saml/saml1/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cloud.rsmart.com/saml/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cloud.rsmart.com/saml/saml2/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>support@rsmart.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cmccd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cmccd.edu-idp-shibboleth.xml
index 9477d2cf..414f01c4 100644
--- a/swamid-interfederations-2.0/idp.cmccd.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cmccd.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cmccd.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmccd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Copper Mountain Community College District</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmccd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Copper Mountain Community College District</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKI9EfYj8jPt8HPgquZTPEO/HRR9MA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5jbWNjZC5lZHUwHhcNMTMwMzE1MTcxNzE2WhcN
 MzMwMzE1MTcxNzE2WjAYMRYwFAYDVQQDEw1pZHAuY21jY2QuZWR1MIIBIjANBgkq
@@ -37,20 +37,20 @@ yF/EGIitLeFXuY7P2M49Us0mdcbIZSzfTebqxqTgG207UaR2arAVQZuDSNaLvVyo
 Jrfe6UJDjGHingawgA01CW2UsPZ7h3qejWgJXYJt5eLtK9QOEq4t1t3zZxLxE1iW
 i3j/3rFKbIJybkgGLc7rklZ3y5Y1gmyT37kvrULuELsN+GGM
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cmccd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cmccd.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cmccd.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Copper Mountain Community College District</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Copper Mountain Community College District</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cmccd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy S. Jones</md:GivenName>
-      <md:EmailAddress>jjones@cmccd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cmccd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cmccd.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cmccd.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Copper Mountain Community College District</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Copper Mountain Community College District</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cmccd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy S. Jones</md:GivenName>
+    <md:EmailAddress>jjones@cmccd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
index 28a9084c..dce61b33 100644
--- a/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnous.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-05-11T16:41:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-05-11T16:41:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnous.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNOUS</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMJSAnKwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTYrMDI6MDDl3SQQAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.cnous.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CNOUS</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnous.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNOUS</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMJSAnKwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTYrMDI6MDDl3SQQAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.cnous.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CNOUS</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVAISouLAcDEdM79Z0SpsLrgjU/8rtMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjAeFw0xMjA1MDMxNTU4NTVaFw0z
 MjA1MDMxNTU4NTVaMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjCCASIwDQYJKoZI
@@ -37,26 +37,26 @@ HB02bxkRdxUUgdWRL7WuldON2M3vefzJYqYd+Pu5+gP8I6HvgiLXvySmGroTnb2f
 RC6L4jwyDgp7R4rULrUz94moM+7O7Y95uDRxszNoDpFdKdcwD2yjYhBUrV6dPHHy
 gMoijoNgZZc/CqICHEnTC2xx4c9HR/114ON1vrxiYR4=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnous.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CNOUS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNOUS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cnous.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christian Muller</md:SurName>
-      <md:EmailAddress>christian.muller@cnous.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>José tripet</md:SurName>
-      <md:EmailAddress>jose.tripet@cnous.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnous.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnous.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CNOUS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNOUS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cnous.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christian Muller</md:SurName>
+    <md:EmailAddress>christian.muller@cnous.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>José tripet</md:SurName>
+    <md:EmailAddress>jose.tripet@cnous.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
index 4e416b4f..e1b33912 100644
--- a/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Research Council (CNR)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for National Research Council (CNR) users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Consiglio Nazionale delle Ricerche (CNR)</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://utenti.cnr.it/utenti/info-idem.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.cnr.it/sitocnr/home.html</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Research Council (CNR)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for National Research Council (CNR) users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Consiglio Nazionale delle Ricerche (CNR)</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://utenti.cnr.it/utenti/info-idem.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.cnr.it/sitocnr/home.html</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUQn+v41WHgk0kt62N0i1wzsHc0TgwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmNuci5pdDAeFw0xMDAyMjQwODE1MTBaFw0zMDAy
 MjQwODE1MTBaMBUxEzARBgNVBAMTCmlkcC5jbnIuaXQwggEiMA0GCSqGSIb3DQEB
@@ -39,26 +39,26 @@ qYXCWIXhdSsaFnMN6lrjawxHOnFCL81KXoin971tbpEyHp10MeDUjEgVvU6K5FTV
 Mmm/TDBCUAo0neP/1zhO1oLqVcG0Of92sCIat4pJ3pz6c+Bu/VvSuY7WIWQ9ceUi
 VpIFeEz7cGIaIfECnuZZVeoum3xqc9k=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUQn+v41WHgk0kt62N0i1wzsHc0TgwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmNuci5pdDAeFw0xMDAyMjQwODE1MTBaFw0zMDAy
 MjQwODE1MTBaMBUxEzARBgNVBAMTCmlkcC5jbnIuaXQwggEiMA0GCSqGSIb3DQEB
@@ -77,27 +77,27 @@ qYXCWIXhdSsaFnMN6lrjawxHOnFCL81KXoin971tbpEyHp10MeDUjEgVvU6K5FTV
 Mmm/TDBCUAo0neP/1zhO1oLqVcG0Of92sCIat4pJ3pz6c+Bu/VvSuY7WIWQ9ceUi
 VpIFeEz7cGIaIfECnuZZVeoum3xqc9k=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">National Research Council (CNR)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.cnr.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.cnr.it/sitocnr/home.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Silvio Scipioni</md:SurName>
-      <md:EmailAddress>mailto:silvio.scipioni@cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:supporto.idp@cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Research Council (CNR)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.cnr.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.cnr.it/sitocnr/home.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Silvio Scipioni</md:SurName>
+    <md:EmailAddress>mailto:silvio.scipioni@cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:supporto.idp@cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml
index 42df4687..c0986090 100644
--- a/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnwl.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-22T16:13:14Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-22T16:13:14Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnwl.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnwl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUEJciO46aX1zd30VubLZW8mTbPWcwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLmNud2wuYWMudWswHhcNMTMwMjIyMTM0MTQ2WhcN
 						MzMwMjIyMTM0MTQ2WjAZMRcwFQYDVQQDEw5pZHAuY253bC5hYy51azCCASIwDQYJ
@@ -29,26 +29,26 @@
 						WzPw4pujvskfh9Hw6/3ghnooiV9ZYq3SrpCB8m+xj78CoSz6FPXKvFoQGEKPbOQn
 						8Ava86ENk3hQjKbGmaS8RNl6EtCrQNiAaBNYx1xlAoP3IZ+nO1h9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnwl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnwl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnwl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnwl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUEJciO46aX1zd30VubLZW8mTbPWcwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLmNud2wuYWMudWswHhcNMTMwMjIyMTM0MTQ2WhcN
 						MzMwMjIyMTM0MTQ2WjAZMRcwFQYDVQQDEw5pZHAuY253bC5hYy51azCCASIwDQYJ
@@ -67,25 +67,25 @@
 						WzPw4pujvskfh9Hw6/3ghnooiV9ZYq3SrpCB8m+xj78CoSz6FPXKvFoQGEKPbOQn
 						8Ava86ENk3hQjKbGmaS8RNl6EtCrQNiAaBNYx1xlAoP3IZ+nO1h9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">College of North West London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">College North West London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cnwl.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software </md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Overt Software </md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">College of North West London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">College North West London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cnwl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software </md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Overt Software </md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml
index 15ea9ddb..afd1b5e0 100644
--- a/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.colby.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://www.colby.edu/search_cs/search.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colby.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Colby College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Colby College Shibboleth Identity Provider Service</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.colby.edu/administration_cs/its/policies/index.cfm</mdui:InformationURL>
+        <mdui:Logo height="75" width="149" xml:lang="en">https://www.colby.edu/images/ColbyLogo_280_1.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://www.colby.edu/search_cs/search.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colby.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Colby College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Colby College Shibboleth Identity Provider Service</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.colby.edu/administration_cs/its/policies/index.cfm</mdui:InformationURL>
-          <mdui:Logo height="75" width="149" xml:lang="en">https://www.colby.edu/images/ColbyLogo_280_1.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDojCCAooCCQD+HsLeuS+i6TANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAk1FMRMwEQYDVQQHDApXYXRlcnZpbGxlMRYwFAYDVQQKDA1D
 b2xieSBDb2xsZWdlMQwwCgYDVQQLDANJVFMxFjAUBgNVBAMMDWlkcC5jb2xieS5l
@@ -43,13 +43,13 @@ Hpab4IvZysoebT5U//OQ3Ct5e0tyj8jZkEeBDGvyHQ15+uszE7N+fteM2ezplDU/
 1GuxzsqRMQG9RlzDIWJPv8kek9V7eBcMjg5q+28ahgx/lY1Fs4SbVqk3WbaPbdF0
 PK29MmCAAwy8UHLt802YOYiAxSCvTw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOjCCAiICCQDPAjl6rCMrhTANBgkqhkiG9w0BAQUFADBfMRYwFAYDVQQDDA1p
 ZHAuY29sYnkuZWR1MRYwFAYDVQQKDA1Db2xieSBDb2xsZWdlMQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCTUUxEzARBgNVBAcMCldhdGVydmlsbGUwHhcNMTIxMjE0MjAx
@@ -69,24 +69,24 @@ rTzqxMMsR9dpLWvTd5DVSXK204Hk6gL8ZWRAEZc/dMXfq+kOKAcsDHM4UHMklise
 pLPbEgpvIgAyy2liUsYhCCcvuR6b2IiDdtmyQwnfVqnZEXipGKvN4ZmN+Wk1wCw+
 kcpHik3So/cLW9CwMZ4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colby.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colby.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.colby.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.colby.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.colby.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.colby.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colby.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colby.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colby.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.colby.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.colby.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.colby.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.colby.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colby.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDojCCAooCCQD+HsLeuS+i6TANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAk1FMRMwEQYDVQQHDApXYXRlcnZpbGxlMRYwFAYDVQQKDA1D
 b2xieSBDb2xsZWdlMQwwCgYDVQQLDANJVFMxFjAUBgNVBAMMDWlkcC5jb2xieS5l
@@ -108,13 +108,13 @@ Hpab4IvZysoebT5U//OQ3Ct5e0tyj8jZkEeBDGvyHQ15+uszE7N+fteM2ezplDU/
 1GuxzsqRMQG9RlzDIWJPv8kek9V7eBcMjg5q+28ahgx/lY1Fs4SbVqk3WbaPbdF0
 PK29MmCAAwy8UHLt802YOYiAxSCvTw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOjCCAiICCQDPAjl6rCMrhTANBgkqhkiG9w0BAQUFADBfMRYwFAYDVQQDDA1p
 ZHAuY29sYnkuZWR1MRYwFAYDVQQKDA1Db2xieSBDb2xsZWdlMQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCTUUxEzARBgNVBAcMCldhdGVydmlsbGUwHhcNMTIxMjE0MjAx
@@ -134,23 +134,23 @@ rTzqxMMsR9dpLWvTd5DVSXK204Hk6gL8ZWRAEZc/dMXfq+kOKAcsDHM4UHMklise
 pLPbEgpvIgAyy2liUsYhCCcvuR6b2IiDdtmyQwnfVqnZEXipGKvN4ZmN+Wk1wCw+
 kcpHik3So/cLW9CwMZ4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colby.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colby.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Colby College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Colby College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.colby.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Colby College ITS PCSS</md:GivenName>
-      <md:EmailAddress>support@colby.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Colby College ITS Shibboleth</md:GivenName>
-      <md:EmailAddress>shibboleth@colby.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colby.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colby.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Colby College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Colby College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.colby.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Colby College ITS PCSS</md:GivenName>
+    <md:EmailAddress>support@colby.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Colby College ITS Shibboleth</md:GivenName>
+    <md:EmailAddress>shibboleth@colby.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml
index bbfbcd26..c57cd0b7 100644
--- a/swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.colchester.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colchester.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colchester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/colchester.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/colchester.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Colchester Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.colchester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/colchester.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/colchester.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Colchester Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.colchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml
index c3eca131..b4014d7b 100644
--- a/swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.colchsfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colchsfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colchsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/colchsfc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/colchsfc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Sixth Form College, Colchester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.colchsfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/colchsfc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/colchsfc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Sixth Form College, Colchester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.colchsfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml
index 33a591cb..749818a6 100644
--- a/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.coleggwent.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-17T13:52:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-17T13:52:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleggwent.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleggwent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAPoQhjG640bUBDqHyzpK76yMFB02MA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC5jb2xlZ2d3ZW50LmFjLnVrMB4XDTE0MDQyNTA4
 						MzYyM1oXDTM0MDQyNTA4MzYyM1owHzEdMBsGA1UEAxMUaWRwLmNvbGVnZ3dlbnQu
@@ -32,29 +32,29 @@
 						Nlbpu18iaBSCPJEjejsFcA3LTDD5Iu2DNjxLLL5gBlq/n2ad9k4GB5ImwlXwA+cM
 						zir7XsM02jLj1MPVeD9xgw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coleggwent.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleggwent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coleggwent.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleggwent.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAPoQhjG640bUBDqHyzpK76yMFB02MA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcC5jb2xlZ2d3ZW50LmFjLnVrMB4XDTE0MDQyNTA4
 						MzYyM1oXDTM0MDQyNTA4MzYyM1owHzEdMBsGA1UEAxMUaWRwLmNvbGVnZ3dlbnQu
@@ -74,27 +74,27 @@
 						Nlbpu18iaBSCPJEjejsFcA3LTDD5Iu2DNjxLLL5gBlq/n2ad9k4GB5ImwlXwA+cM
 						zir7XsM02jLj1MPVeD9xgw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coleg Gwent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg Gwent</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.coleggwent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Mugleston</md:SurName>
-      <md:EmailAddress>mailto:paul.mugleston@coleggwent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Mugleston</md:SurName>
-      <md:EmailAddress>mailto:paul.mugleston@coleggwent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coleg Gwent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg Gwent</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.coleggwent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Mugleston</md:SurName>
+    <md:EmailAddress>mailto:paul.mugleston@coleggwent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Mugleston</md:SurName>
+    <md:EmailAddress>mailto:paul.mugleston@coleggwent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml
index c952d1d6..1fb22053 100644
--- a/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.colegsirgar.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-22T15:44:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-22T15:44:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colegsirgar.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colegsirgar.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUcXEex5qLM9Uo7l8DfFXeVTtBhmYwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2FyLmFjLnVrMB4XDTE0MDQwOTEw
 						NDI0NloXDTM0MDQwOTEwNDI0NlowIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2Fy
@@ -32,26 +32,26 @@
 						T963ybvq+9CIZ0qvUFn/ammOGusgWgvc5IK51/Fjo1fYX9fDQCUK+3AXku3r/Hvs
 						wH9HtsMk6cu5RM+dfunpIVkgHg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.colegsirgar.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colegsirgar.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.colegsirgar.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colegsirgar.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUcXEex5qLM9Uo7l8DfFXeVTtBhmYwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2FyLmFjLnVrMB4XDTE0MDQwOTEw
 						NDI0NloXDTM0MDQwOTEwNDI0NlowIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2Fy
@@ -71,26 +71,26 @@
 						T963ybvq+9CIZ0qvUFn/ammOGusgWgvc5IK51/Fjo1fYX9fDQCUK+3AXku3r/Hvs
 						wH9HtsMk6cu5RM+dfunpIVkgHg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coleg Sir Gar</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg Sir Gar</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.colegsirgar.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Palmer</md:SurName>
-      <md:EmailAddress>mailto:simon.palmer@colegsirgar.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coleg Sir Gar</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg Sir Gar</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.colegsirgar.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Palmer</md:SurName>
+    <md:EmailAddress>mailto:simon.palmer@colegsirgar.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml
index bb6f6903..3e9a074a 100644
--- a/swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.collyers.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-14T14:42:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-14T14:42:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collyers.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collyers.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAIwzwFahDGtgvAo3yaV1wQYu8pOQMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51azAeFw0xNTAyMTcxNTEy
 						NDZaFw0zNTAyMTcxNTEyNDZaMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51
@@ -32,29 +32,29 @@
 						Q06WBiCxhbesDgUD9FtbRVYKYB6LSnEm8sPJXfLFI2LuvxHY0uz27MaBgb86NUQj
 						6CN0OPho9gU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.collyers.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collyers.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.collyers.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collyers.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAIwzwFahDGtgvAo3yaV1wQYu8pOQMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51azAeFw0xNTAyMTcxNTEy
 						NDZaFw0zNTAyMTcxNTEyNDZaMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51
@@ -74,25 +74,25 @@
 						Q06WBiCxhbesDgUD9FtbRVYKYB6LSnEm8sPJXfLFI2LuvxHY0uz27MaBgb86NUQj
 						6CN0OPho9gU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">College of Richard Collyer</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The College of Richard Collyer</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.collyers.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Collyer’s ITSupport</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@collyers.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Collyer’s ITSupport</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@collyers.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">College of Richard Collyer</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The College of Richard Collyer</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.collyers.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Collyer’s ITSupport</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@collyers.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Collyer’s ITSupport</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@collyers.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
index 848bba1a..e60ffd68 100644
--- a/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.company.ja.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">company.ja.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Janet</mdui:DisplayName>
+        <mdui:Logo height="100" width="220">https://www.ja.net/sites/all/themes/janetbootstrap/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.ja.net/sites/all/themes/janetbootstrap/favicon_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.62.83.0/24</mdui:IPHint>
+        <mdui:DomainHint>company.ja.net</mdui:DomainHint>
+        <mdui:DomainHint>ukerna.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.57732,-1.31070</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">company.ja.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Janet</mdui:DisplayName>
-          <mdui:Logo height="100" width="220">https://www.ja.net/sites/all/themes/janetbootstrap/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.ja.net/sites/all/themes/janetbootstrap/favicon_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.62.83.0/24</mdui:IPHint>
-          <mdui:DomainHint>company.ja.net</mdui:DomainHint>
-          <mdui:DomainHint>ukerna.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.57732,-1.31070</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
 						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
@@ -46,26 +46,26 @@
 						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
 						Wep0+6npqDM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.company.ja.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.company.ja.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.company.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.company.ja.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">company.ja.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.company.ja.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.company.ja.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.company.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.company.ja.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">company.ja.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
 						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
@@ -88,25 +88,25 @@
 						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
 						Wep0+6npqDM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Janet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Janet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
index 40b52ec0..66829c66 100644
--- a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.condorcet.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HEPH-Condorcet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students and Teachers from Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">HEPH-Condorcet</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et Enseignants de Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
+        <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-16x16.jpg</mdui:Logo>
+        <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-291x88.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
+        <mdui:DomainHint>condorcet.be</mdui:DomainHint>
+        <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">HEPH-Condorcet</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Students and Teachers from Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">HEPH-Condorcet</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants et Enseignants de Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
-          <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-16x16.jpg</mdui:Logo>
-          <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-291x88.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
-          <mdui:DomainHint>condorcet.be</mdui:DomainHint>
-          <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVALMBuiwacb0fss6ngQ0ewYTIrDGhMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE5
 WhcNMzUxMjAzMjIzOTE5WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
@@ -44,13 +44,13 @@ SLy2w40fyTB8FxmO3/ZONg/rcz58I6JhVSanp6S/OaqjNGe+B4KSwmDS75suq0bS
 h3K1osgFBrZ3YK6BxS9ByhIBkmqOU0lF+upb529Mqeg29IkS7aNDZlxh/ZhP4JNE
 2UBsrhGATLxuAYrFlUQ+Vf+LLt/MNpRoQ1lnp5A5QDPHaksm6LOdxcCY8gNlk/kf
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAPBmR/6jQO37H6ozLvBQxojFpGugMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
 WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
@@ -69,13 +69,13 @@ JKPMAY8gO2RTlBxQQ57bF7vgC1XxBgcynXCgsDr1UQWg9or9tXivzXR66wPpi1o7
 9fOjpyT43yy8NS6BxZLpbXJbLi2mDEthM3fyXkyi85LVHx+uwrhpy8MeGBhdqdiX
 aYNVyrYc5coxp6GPVBJv8YKHqNG3Dw9TqI4LTTyWcJA9Hwu/+qo6eh2nk5Ps9JVX
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAKzR+oWciVWzsTL99fnG6ihy4LtOMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
 WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
@@ -94,31 +94,31 @@ nkXipQ6HnTCtKaJxDMlrUvUBobOWWklvd8O4hCTUL26nOIqN+X66AtRP01lwiOng
 Qzo5DYd+FzazDipqCATv/67WjzZny4+/apNoKIrsh6zm/tOaeGx2h9TlLt+Rxqfd
 2KZ0zVbf8I3/d+fMjwQNaSKPKqQM4u+1Ji7o0czZdsegOS4V+m3NST/VR3mHpdcp
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.condorcet.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.condorcet.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVALMBuiwacb0fss6ngQ0ewYTIrDGhMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE5
 WhcNMzUxMjAzMjIzOTE5WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
@@ -137,13 +137,13 @@ SLy2w40fyTB8FxmO3/ZONg/rcz58I6JhVSanp6S/OaqjNGe+B4KSwmDS75suq0bS
 h3K1osgFBrZ3YK6BxS9ByhIBkmqOU0lF+upb529Mqeg29IkS7aNDZlxh/ZhP4JNE
 2UBsrhGATLxuAYrFlUQ+Vf+LLt/MNpRoQ1lnp5A5QDPHaksm6LOdxcCY8gNlk/kf
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAPBmR/6jQO37H6ozLvBQxojFpGugMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
 WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
@@ -162,13 +162,13 @@ JKPMAY8gO2RTlBxQQ57bF7vgC1XxBgcynXCgsDr1UQWg9or9tXivzXR66wPpi1o7
 9fOjpyT43yy8NS6BxZLpbXJbLi2mDEthM3fyXkyi85LVHx+uwrhpy8MeGBhdqdiX
 aYNVyrYc5coxp6GPVBJv8YKHqNG3Dw9TqI4LTTyWcJA9Hwu/+qo6eh2nk5Ps9JVX
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAKzR+oWciVWzsTL99fnG6ihy4LtOMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
 WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
@@ -187,25 +187,25 @@ nkXipQ6HnTCtKaJxDMlrUvUBobOWWklvd8O4hCTUL26nOIqN+X66AtRP01lwiOng
 Qzo5DYd+FzazDipqCATv/67WjzZny4+/apNoKIrsh6zm/tOaeGx2h9TlLt+Rxqfd
 2KZ0zVbf8I3/d+fMjwQNaSKPKqQM4u+1Ji7o0czZdsegOS4V+m3NST/VR3mHpdcp
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">High School from Province de Hainaut</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Enseignement Superieur de la Province de Hainaut</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">HEPH-Condorcet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">HEPH-Condorcet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.condorcet.be</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>webmaster@condorcet.be</md:EmailAddress>
-      <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">High School from Province de Hainaut</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Enseignement Superieur de la Province de Hainaut</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEPH-Condorcet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">HEPH-Condorcet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.condorcet.be</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>webmaster@condorcet.be</md:EmailAddress>
+    <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml
index 3e270d2e..c4b44523 100644
--- a/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml
+++ b/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cornwall.ac.uk/shibboleth-idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-05T14:38:25.779805Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-05T14:38:25.779805Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornwall.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornwall.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAOk7GwlKWRg+w8gK7LWBuLRrQts1MA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51azAeFw0xMzA5MDIxMDE4
 						MjdaFw0zMzA5MDIxMDE4MjdaMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51
@@ -32,26 +32,26 @@
 						roP2vsH3YT6V9Ecg5BeGCcLX1qjv5SYA7mPpmo8n9a75raAoRKYxdHLiB5RNCAfk
 						cbka+/2Fop4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cornwall.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornwall.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cornwall.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornwall.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAOk7GwlKWRg+w8gK7LWBuLRrQts1MA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51azAeFw0xMzA5MDIxMDE4
 						MjdaFw0zMzA5MDIxMDE4MjdaMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51
@@ -71,26 +71,26 @@
 						roP2vsH3YT6V9Ecg5BeGCcLX1qjv5SYA7mPpmo8n9a75raAoRKYxdHLiB5RNCAfk
 						cbka+/2Fop4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cornwall College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cornwall College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cornwall.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@cornwall.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Wright</md:SurName>
-      <md:EmailAddress>mailto:jon.wright@cornwall.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cornwall College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cornwall College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cornwall.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@cornwall.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Wright</md:SurName>
+    <md:EmailAddress>mailto:jon.wright@cornwall.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml
index 3dcfa8ce..77457e55 100644
--- a/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.coulsdon.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coulsdon.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coulsdon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEcTCCA1mgAwIBAgIQJOqN2v68Irpt7BTwM8+KxjANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDMyMTAwMDAwMFoXDTE3MDMyMDIzNTk1OVowQDEhMB8GA1UE
@@ -36,26 +36,26 @@
 						ehBx0xhazJ7MDpZJRO3txDvCmyy3MTxIJIOudwPYUOCwu4Tlk+6CGei1JxmpHFLf
 						LqhXBlXEMKCLqNZrOnwROhwtx7lCv2GG4iVldu9inS5XW3xFuA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coulsdon.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coulsdon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coulsdon.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coulsdon.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEcTCCA1mgAwIBAgIQJOqN2v68Irpt7BTwM8+KxjANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDMyMTAwMDAwMFoXDTE3MDMyMDIzNTk1OVowQDEhMB8GA1UE
@@ -81,27 +81,27 @@
 						ehBx0xhazJ7MDpZJRO3txDvCmyy3MTxIJIOudwPYUOCwu4Tlk+6CGei1JxmpHFLf
 						LqhXBlXEMKCLqNZrOnwROhwtx7lCv2GG4iVldu9inS5XW3xFuA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coulsdon College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coulsdon Sixth Form College in Croydon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.coulsdon.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Gullick</md:SurName>
-      <md:EmailAddress>mailto:nick.gullick@coulsdon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Gullick</md:SurName>
-      <md:EmailAddress>mailto:nick.gullick@coulsdon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coulsdon College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coulsdon Sixth Form College in Croydon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.coulsdon.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Gullick</md:SurName>
+    <md:EmailAddress>mailto:nick.gullick@coulsdon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Gullick</md:SurName>
+    <md:EmailAddress>mailto:nick.gullick@coulsdon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml
index 805a7bcd..716eb9a2 100644
--- a/swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.courtauld.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">courtauld.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">courtauld.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/courtauld.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/courtauld.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Courtauld Institute of Art</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.courtauld.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/courtauld.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/courtauld.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Courtauld Institute of Art</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.courtauld.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
index aa644238..1550a47d 100644
--- a/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cpe.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-05T09:34:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-05T09:34:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpe.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CPE Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABpElEQVQoz81SS0sbYRS936OZb0hmHB9RUURRdJFYoRT0F2QjdOFC7e8oCN0UXPQX+APcdWXxAa7ElfiCxoW4LFoTiamP6CSZmcw3M99cFxPqUnTVs73n3HPu4RJEhNeAvor9FgF/keG6ru/7jDHLsp4FrSjePK+fPcouPTWXrl1fVzUhAikdx6GMUUpzuVwiIIjoRXH6x2/gBAj5Pm7crH67KFXmFxcbdXty8v30zAznXNM0RCSEkKSluxBcqUYy7OT4IESay+dN00zMkzyMMUpp26FYLG5trBcKhe6erK7rCKCUEkJomqbr+j9lgrYDhtK2bQIYs1SXZQB9l4wb9oNseY7jKqV6BwZNs4MDwMrpfclTGU537lpHs/3T26WFwfS9VKMZPtEp1i6DMSNbk2rZ6Gi39LPi7s0OA8BCzXfCOEPhY4/40wjqgao0A47Yp5EvU9l2JkQc3bh48KNaK/q0U75qBksH1b9uWG4EiPj1sPrrxrv1wqoTICIiEkTcLTfLzRABPmTFkJG69aJ8t0jW7Vfc87qMAXROP09Yz0f/T8/3BDRyz7/Sk8ilAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwMveXGAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMEOqL6QAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.cpe.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CPE Lyon</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpe.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CPE Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABpElEQVQoz81SS0sbYRS936OZb0hmHB9RUURRdJFYoRT0F2QjdOFC7e8oCN0UXPQX+APcdWXxAa7ElfiCxoW4LFoTiamP6CSZmcw3M99cFxPqUnTVs73n3HPu4RJEhNeAvor9FgF/keG6ru/7jDHLsp4FrSjePK+fPcouPTWXrl1fVzUhAikdx6GMUUpzuVwiIIjoRXH6x2/gBAj5Pm7crH67KFXmFxcbdXty8v30zAznXNM0RCSEkKSluxBcqUYy7OT4IESay+dN00zMkzyMMUpp26FYLG5trBcKhe6erK7rCKCUEkJomqbr+j9lgrYDhtK2bQIYs1SXZQB9l4wb9oNseY7jKqV6BwZNs4MDwMrpfclTGU537lpHs/3T26WFwfS9VKMZPtEp1i6DMSNbk2rZ6Gi39LPi7s0OA8BCzXfCOEPhY4/40wjqgao0A47Yp5EvU9l2JkQc3bh48KNaK/q0U75qBksH1b9uWG4EiPj1sPrrxrv1wqoTICIiEkTcLTfLzRABPmTFkJG69aJ8t0jW7Vfc87qMAXROP09Yz0f/T8/3BDRyz7/Sk8ilAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwMveXGAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMEOqL6QAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.cpe.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CPE Lyon</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEJDCCAwygAwIBAgIJAIuC7i5giNpjMA0GCSqGSIb3DQEBBQUAMGkxEzARBgNV
 BAMTCmlkcC5jcGUuZnIxLjAsBgNVBAoTJUVDT0xFIFNVUCBDSElNSUUgUEhZUyBF
 TEVDVFJPTklRIExZT04xFTATBgNVBAcTDFZJTExFVVJCQU5ORTELMAkGA1UEBhMC
@@ -43,21 +43,21 @@ I/Ce+bYCmQLQokoxkd07B/tD6TE+A/wnfI6DzGvM5zxMJHJDe1v7PiRx6GdPRbNT
 zfGHWrfvbx7aQaJ07RVUo4o+AdqHYl0eWuQ3cy+3lXgxuaasrb+XbB/CL+5yisby
 h34f/9zZRRI=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cpe.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cpe.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CPE Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CPE Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cpe.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>webmaster@cpe.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cpe.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpe.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cpe.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CPE Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CPE Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cpe.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>webmaster@cpe.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml
index dea5add2..d433085b 100644
--- a/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cpp.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpp.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State Polytechnic University, Pomona</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpp.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State Polytechnic University, Pomona</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUcgDt3ZH+mG2Chj61P92XzVTNbBkwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAwwLaWRwLmNwcC5lZHUwHhcNMTQxMjE5MDM1ODMxWhcNMzQx
 MjE5MDM1ODMxWjAWMRQwEgYDVQQDDAtpZHAuY3BwLmVkdTCCASIwDQYJKoZIhvcN
@@ -40,19 +40,19 @@ w6C2piN3HPUa0+88hna1AN0dGGmpVKdR7Xkac6LIMCdEsAwlBpHzlWGNnilE4qEe
 wQmsBX7k7/eUcdm/yH1rGY7oJExcfp/868ns8xN9o8E1xXFnwTCni+3EmtrMCw6t
 B/i23als47eQ6V3GQjcS0HkMkF6kkuZhMEv0
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cpp.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpp.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State Polytechnic University, Pomona</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State Polytechnic University, Pomona</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cpp.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul Henson</md:GivenName>
-      <md:EmailAddress>henson@cpp.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cpp.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpp.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State Polytechnic University, Pomona</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State Polytechnic University, Pomona</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cpp.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul Henson</md:GivenName>
+    <md:EmailAddress>henson@cpp.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml
index ab7124b7..239be5f5 100644
--- a/swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.craven-college.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">craven-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">craven-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/craven-college.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/craven-college.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Craven College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.craven-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/craven-college.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/craven-college.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Craven College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.craven-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
index 2705c785..3aa34e23 100644
--- a/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.craw.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cra.wallonie.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CRA-W</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Centre Wallon de Recherches Agronomiques</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0UwQjlGOTUzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0UwQjlGOTYzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTBCOUY5MzM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTBCOUY5NDM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt40DxoAAAKESURBVHjajJJNTBNBFMff7G7brQ20Vr4hiHjQkEjgwAW9yMGPEyHxpjEaDh48cOqBaLw1US9GT97Vix64mBAVoigaDV8JCPiREJEiKIVaWrrd3c6M/ylL0igk7uaX2ex7//9782bY7WeN1OJn1BXUyJW01xMGreDN3wGN/u+5Crp3CxQNBGB7i++DOHB2Cxo6lIkC0aaQVOWzSRZfIpv7yZH6SYSveLmfSoWqoNIaqgVLchrIhiiVOk0uhOrf2apxailLtDvCUPku+KA+dE+YRturBUnFaIAJWsqHKD5/gagQIuI+Gq5vocGOeFhVQkdDWD9j1rTKJU3akhYhxrJtINBQULfJNHKUVzV0+9JyPmrmuFnj11x0pN20kDxqCZrDUUklZKqwN0QudYoG1uh4zRDcfEDvPRhcqys3rDMGafcWXPn6cZbTjCOLWzBKJm54Z5wuQHiqYYAmkp30O3N4vqd6ol4wPvjCEn1zjuyAqBVbMJH7DbwH6zsGx0AfuqiN+FPTRyNTMXPfxsuu2uHQg7SvIsnlCoQB5LwFsyAK2sFH8Irded6oGjoPYhrjwfV89WTUtxWVeuaERvI7I+0WzB/tcg+Uadgw9ZyEw0MkzbrC310XWmxyhH8055ZdS2SbxyJmkirNVRLyn0trg1/Gk4VesoVJy1uNU2n7gBEJJBc23Ug065bbtlXTWb9/+l1/W6wCg6+QUvsJUSVIgo3tC3VjbPukGe8BKyT1MDHRBGbw/xxxc6StamT98pG71yWxWinZEgQXdwwM0q2dltKgGcIM1i/gEFiGSQodjeN7BnUSXmyj9Bip5K43eMEf3h4xOO0rZpD3ac5Tm5tqkPnSQfwRYAD8LgMNnba3AAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAYAAABjqiWeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QjE2QUJENUUzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QjE2QUJENUYzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCMTZBQkQ1QzM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCMTZBQkQ1RDM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PorMSJ0AABA5SURBVHja7F0JdFTl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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.115.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:3960::/48</mdui:IPHint>
+        <mdui:DomainHint>CRA.WALLONIE.BE</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.5662,4.7247</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cra.wallonie.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CRA-W</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Centre Wallon de Recherches Agronomiques</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0UwQjlGOTUzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0UwQjlGOTYzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTBCOUY5MzM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTBCOUY5NDM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt40DxoAAAKESURBVHjajJJNTBNBFMff7G7brQ20Vr4hiHjQkEjgwAW9yMGPEyHxpjEaDh48cOqBaLw1US9GT97Vix64mBAVoigaDV8JCPiREJEiKIVaWrrd3c6M/ylL0igk7uaX2ex7//9782bY7WeN1OJn1BXUyJW01xMGreDN3wGN/u+5Crp3CxQNBGB7i++DOHB2Cxo6lIkC0aaQVOWzSRZfIpv7yZH6SYSveLmfSoWqoNIaqgVLchrIhiiVOk0uhOrf2apxailLtDvCUPku+KA+dE+YRturBUnFaIAJWsqHKD5/gagQIuI+Gq5vocGOeFhVQkdDWD9j1rTKJU3akhYhxrJtINBQULfJNHKUVzV0+9JyPmrmuFnj11x0pN20kDxqCZrDUUklZKqwN0QudYoG1uh4zRDcfEDvPRhcqys3rDMGafcWXPn6cZbTjCOLWzBKJm54Z5wuQHiqYYAmkp30O3N4vqd6ol4wPvjCEn1zjuyAqBVbMJH7DbwH6zsGx0AfuqiN+FPTRyNTMXPfxsuu2uHQg7SvIsnlCoQB5LwFsyAK2sFH8Irded6oGjoPYhrjwfV89WTUtxWVeuaERvI7I+0WzB/tcg+Uadgw9ZyEw0MkzbrC310XWmxyhH8055ZdS2SbxyJmkirNVRLyn0trg1/Gk4VesoVJy1uNU2n7gBEJJBc23Ug065bbtlXTWb9/+l1/W6wCg6+QUvsJUSVIgo3tC3VjbPukGe8BKyT1MDHRBGbw/xxxc6StamT98pG71yWxWinZEgQXdwwM0q2dltKgGcIM1i/gEFiGSQodjeN7BnUSXmyj9Bip5K43eMEf3h4xOO0rZpD3ac5Tm5tqkPnSQfwRYAD8LgMNnba3AAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAYAAABjqiWeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QjE2QUJENUUzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QjE2QUJENUYzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCMTZBQkQ1QzM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCMTZBQkQ1RDM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PorMSJ0AABA5SURBVHja7F0JdFTlFb5v9skKSVgDhC3sFRG0uAIWrB7EqoindWldTku1VdEqyvGcWrXWqnVBrFZrq7VQRMFKRQQREKKgrMpq2BMghJiNSTKZN2/ee7133p3wMkySGUjCzOS/OffM5M3/3ryZ973vLv/970i6roMQIW0pFvEVCBEgEyJAJkRIS2KL55N7aUVexO1+dCPHuS0w0iEFn8exXIF6HuozqG16phljDwgm62AyBHUu6nLUS9oaYILJOpa4UB9kzeRt1cJcCmktuZgsPOqYsO0dHmTCXLaOzEJdFQFgJCcEkwk5E0lHfQP1p82MKRcgE3K6koX6X9TLWhhXKkCWoHKWwzVisA9RL41i7BHhkyWgSKhl6lmF2T+iBJiMekyALAHFiigrC+jg08/KB/g16rQox5ahlgiQJehJV2sABxUdbFK7vnU31CdiGH8Q1StAlsCyza8D4gzaEWfTUbvEMH6HiI8SGGTEYMfRL9uBQHO0D8qcqLfEuM8mAbEEZzIC2gZZg6Pon7naHmjnoubHMB4NOmwWEEtwkNHJk7n8rF6HIgSavW2BNjbG8YdQ9wiIJcG0ErHZCU1HoGngQe4g0ymBjh8sNpVazrydE+OprUf1CYglydwlMVgtAmypVw0CjlIcBJlY1CZpkGGvw2OpTcGtb4yn9UlbfV4ibCt/blKHFOdEkCx3C33ZNSDDi8eHw8f77wJd8sd0r3Wy1cLIzCL4Td4yGJhSCj7NHn5dc2I4oAeMCfNWBRaxNrGCjHdBJd5UHryhvPi8AgOgKwXI2gtoOlQobthRPRCvhhzbFdQl+LLsfFhZPgLWXvh7SLP6IKBbzZFlagynsgZaIdMfYixiZnQ7oRgd0AoE12H0P8sRWKGqYHoQIGtXHw2/ciuymMUf+85WGQqr8+HtI+Nh5oDF4FFSQq+4UVNiONL8M/VhiLUoqDmGYNqHT0pUApYRshLoQuYyIa6JcEvDgeaHVw5dBbfmroVMmzfEZikxMBlNI318usxFwPEikvYjsHailiK4AroBrEQBVVI6/q37jShwuKY3fFI2ClJsDSY3jTUa+Q/7ZDGBK+S8b0SHa2GdCssxWi4J6A2vWUV0mWxAU+H14klBc2mRgo5P1yi/K0pZvBErc9E77EIHa1GdBl/JGtToBrBsUrtOmQmQtaOMQ3/OsaF6EOyuzcWLrdC2nlHu+x7q3uh8R+PL34sm8QNkLsrzlWO0aIfEZi3hk7X8XfwVdSpQTkzSzJFDXhT70/hnormrib3IFK5H00iPkAC5LgEykxheTMxXjJayzUO9HrUWjOVstabXB0dxjLfJ6rXkd1WhU/+NT4NCxUhB2KWOcfcmjaiaDbq5SsBp84CsIm4kLdpd/8kAC5GNi/Jmmt6AgCEt7E/L3p5s7kumM9mOqNqEPtcJnv7qCABLOp9M1a2Q4yqD7qlFSGn2aHejGrGfmf63g2519HRVQG93BaUwOkPL1RdUyHikKfaqQF/rY68GK9Hvogy9M0kc+g4JMjKVDqsM52RtQsRFBTJaEPJo2LYAQsCfgsfJsNUjA1mGQvOFijQR/kr4RmIpC5ciUdRYjL6XU+qYkVbSfWZZdcIl3T6DrLRDaKOcLQ2/ELV32DYFdIuc66oChyUAuh7sZdGU1DETKuHsVYqgWkIpCZ8eNJV2CTqsJB3INDSZGY5q+EnfuWCV1JaCgP4RtnnQXFaOy9oFLouf2HFSM/s/RK6Wmb0o57UFo8YPvQZ7OSSRJ0rKz+9T3TC262oY3W0VGr/UWAOfwwhV74j0YgJYb2a7SPIO6msh9iJTWImYpkx9gU9rAJ2QJL7JZM0N1/SZDxnuEsRMk/5Z1amOnXV7J1cljMo8SOU+V0PkOcsvUe8KoZTmFTei70VJ1UOK3uEc+w4LMkpnZGOkeVP+q3jF9abM5qktBFRHwaVoKvullEmKZvtFhH2opPpGmsd2BiNHCEaO69H3UgR7dSyQhcwmRZrDgtGmK9KQsDWRUi3S3ufTeqyncuxxuOGHYeOLUKfYJCixhHwvZC9a/2kXvlfHBFlIJuUuBsmiRGIzmtA+mbHVbCt7pZUcmdx1K9SrzplhY2mh7mRkrz1Vqg4feQ3fS4HknhJqDYn3jD9VP5SdaUpjUKcdyGYbYWc5+vDWRms7nI1uNNXx2p29V0GWveZKTyDlKtO4HThoKvpee3Yja61DcNVqEcFl45TIINQBHL3SZ6B8XBqjnNIeNWC0lNqPug+1kFlSFSBrfxkGxoLa1/ninIZI+KfBZT2WIcjG8nVuWCrS6STAnGuHdS5cfn/fJe461fWc6QCfoSm8FV2u0rUYOdJiYmvjCe1+YDRfmYB6Af/vjtWyM9jWoS4Do3y7UoCsfeRzMNY7bgVjAnoZX4xIRYHEFpmMIGKJhopDv+aC/Mxd0D3tAJTW9TOXZg80IkoLMcisPw6eD+l23x9rA64RnJqYg+bxoeKALq9B9qpQG8DVnXwzMBqvXASx1f9HEnIYR7D+Cozq2o84TbJOgKzt5c9glNE8j/oUGHOEx/lOD/AFzmKAhUBGr3+KOptAqesSpFprYUzXL2DJgYHmYxuOfSDl+RmDFqy7ttvGG2sC7gco6kQwPYCkNZ/AtYt7buA2Yqo7wZhMzznDz6Xw+ZM4oHEZGdWvTWelVU8voi4RIGtbobnB3WD0BevF2pxksl90M+oMYgRFd8DIrA2wtGhacFYAJJ18pGtASS2Y0H3Dw0/mL5joUx3z0DQuRDw9uE/Ri7bKxgIO3DYBI8rf4firYgyWNGZeKgHaycHDYTCqNmr55gE2r3Q+2WCs7yR/bjjr5azEaI8yuwuQtbKQgcrjnNZoMEpq7oxyX6qg+Bc53wHN9pdsZxnkuEuhrA4PJynTIeAqH99t0/WLzntuUopVfcyr2m5B07iAar0QZFS8eiWay3vA+NGHaIUAVIC6lIFRaDbdMUoGm9DxqDeA8bsA1EL0YQ4UBMhaScj87eULfR3qY6hzUB9BvZb9mZaEHPlqi6S9abQjsAwAJX3M4MwD4z8a86zFapHde2T7JbsUjcCVi+Caiuz1cwZ1tPI1+1CLUY+20mf3MFBJ/4Q6CvUOMJbcvcF+qgBZK8qn/EgMQUvOZrH5IFNC0z/U3rxHM+bs7wiywhRbXQHo1qxhOetun9r3Pd+2gBd2y44vqlR1KsJvGvpdVzADRiOUzP0fHRtaecV4E0IB0D38OW9DnclMfTyuTVE8/95lE7+tRH7KIjBKogls1CB4A19wNzvNnfi5nbdTL/0qBNn+ajmrskLuljMoc/tQJMmLalXnZWgXx1jN6YyWhaI/KtemitrvzuJX1I/N6bYZk4qKBJO1nuzkfNTLqDS3OJm305d8gJX8txo4Wa9Pla1dNd0yoLOzIi/HdbyXojlSqcjRGVu2fhez1lyIj/78B1m7CnPZ+uJhc7GKfZVcDg5IJzS3I5Voq3pMi850fp/X2TTKcfh9lMXzxUr0uct3ONf1N1M6oLWEGqZQvRjVk01EfT9OASYc/3YQiuTu4mjrtxyBdj4DRqBasYUcaJQLiAiQhUdelD97nP006qY0kk2pLYIJ9HBURsnSLQwu6vH6faPICIdaLYFgKTc9D2h2COhiTXRHBVlIitnMkaYxyMgxps48GgcEJ1gJUIoZUDqXA9mkANitMvgCKVDq7Q0Vck7weZ+0/dDVfQxsCDxVs4K/5cUqAmTJ8kGCfWKRbewWhcESnCqg6LIQmadQMzn8xEoWSTXtpwXBRdW0Nos/CLNj9b1gU9k42FY5Gkq8fUBVEUzIYE5HFfRKPQT90/fC4E7fwoCM7wSKkhFklqDpMh6DZgxBomgOqPR1gX2e4eDxd8L/7Qg4Pzit9dA7tQiyXGXQ2VmO4wNQKXfBMVkgq47gPObm8ovgBG7zISuNylkX3H/N0Sng9WcbFRu4D1gCQdKTA6mwv2ok7K+4ANa5x8Fjo+/D95DxOKIuNiFBZo/QLZGYp0bJDPpG1QiU495eUFTXH47W5UEJaj0BI1TSH8ozIwjS7R4Ykf01MlAhrDhyHXxfnws6tTEgcGiOBldtT+Vow6oSqGy1ESgTGdCqBttL2S2KQFCig+yl7Y+feo0RGOX13aFeTQUfmTA1JdjvlS56kHGs3ojGtEbJgPUlk2E9xQQNzARGvwxku9My0biv3eIXKEpkkO2rOjciYAyAaMYqpMgAoXnM28HIoSFV6ZuRgebg2G38OgUE0zhFsQKMQkGKRKm/2HIeQ6XTVCY01jgGfMNpkg3GyxrISjoc8AyBH2RvAq+SFgoaaDHwLznIoIpXKhGqCFl6MNpT0bSUuUELFT7ey/z7LhiVFkkjcT13KT1RcDq70QTybL5gq/mCEuioWpHKZWiuk+b8QtNPe/gi0w33NoOTqh0+ByPBS1NJ1AtjKP9P/cuMAkIMBOySH6b0mwsTcxdjYGEjM05zidtN53MrGNNQJDSZvxKMWv7+HAkDv34zP78YTqMadsak+K38STZvdTwYc5rV/JwuKq0RoNZPVLVBU0NUo0WZ+1pObVCOrA8YC0CeBaNKlca9xWCkpXHDmNXotafBmHgPml1Ft8MH+6bDm7tnQrWcTQ1fdpjYEKDxb2PeG/IS4eSPgVHiOFSvth6SoNw62UE2ix+pR8WasNeopuxVMOrzyZQ5mc3uB2MKicq6d/P22Qwqs+c/m1lvGOfeTIGAD7Ycvxxe+PbpYADisMhzTfsRSDOZSc0roG4z3RhdTIwmfLI4li5s9ggYi5sYE4ok8tic+plVzEvRKFk7j1luIrMgjaXCSS+EmuQZ+2WGolKw1UGVryfM3Xt3zYwRf1hqkQLlOlhyeMwENtkO0/vk8/GnmN73QwGy+AcZOfTfsbmMyu2DyP0LbmLmIpCQs+Ph58SCAXboyZR+3Wgvax0Ue4becLAmf/WQztuW+FXnbSaGDbGfZrIgtEimBz9fDkn6U9LJOK3kPEM34HzUfzOwrmBHXWP2Wsls6WDwXX3K3pp1d2l9LxietXWuySRewI/EnFSfT+VJVFRpLu9+R6Qw4l++Z2CQA98XIv/WJK3NVMDcmiAyixFIX+D0RkiIvepMvqzMjnojF9dqr4H8zJ0041DA5zDINIAi1pdQfxQG0CIGcFKKJclAtpZvnPsivJ7G+aee0HztWabJR4rEkk2Laoe89L3QM+UwBDQbvcf7YSPm8OPLYdsXwinNXwTI4lWeYqa6m1MNfRg0lHsq4At5gMFihci/y7A6lHpicyZxmoFWSY01+XKnim4PdhGySQ3NXRbAyQW834KxAh6YtTaafLR5kMSSbCD7CoxO1lTI+AibIUpNfAFGw7vbw6LISP01KOP+Fkeg9EP1+ziYGME5rDqI1BhFt4DbWQ4jszcGJ+dZKCm72cRiAROwQmxGdXDfJDPIktHxX8S+0o85TaBwFLjM5ItRFDeSXwsHDG27g9mFnHyqQ9vAppZWeGdAhHbqoLlgVM4K6JFSDPWNW4g+wIz4boTzpPYKWwBAT2aQxfW0khBhLoUIESATIkAmpIPI/wUYAHgWZETgx0vuAAAAAElFTkSuQmCC</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.115.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:06a8:3960::/48</mdui:IPHint>
-          <mdui:DomainHint>CRA.WALLONIE.BE</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.5662,4.7247</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
 MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
@@ -43,26 +43,26 @@ yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
 tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
 NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
                 	</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.craw.eu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">craw.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.craw.eu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">craw.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
 MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
@@ -81,22 +81,22 @@ yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
 tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
 NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
 			</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CRA-W</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CRA-W</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cra.wallonie.be</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mikhael</md:GivenName>
-      <md:SurName>Jacquemain</md:SurName>
-      <md:EmailAddress>maintenance@cra.wallonie.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CRA-W</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CRA-W</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cra.wallonie.be</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mikhael</md:GivenName>
+    <md:SurName>Jacquemain</md:SurName>
+    <md:EmailAddress>maintenance@cra.wallonie.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
index 9d7507c8..838a109a 100644
--- a/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crihan.fr/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-26T22:24:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-26T22:24:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crihan.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CRIHAN</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y2P8//8/A15w9boVw4ePoljltDVPMhI0ICF775N9B5ywScksnxvAxEAhYMEq+ueBMsP/P2wMDAwMDLkuy2WijfcgvPRF9EnfzEL8BrwJ2/X7+wMlBgYGBgYhKIYCVoaOKmSllHvhOcMv7U0Mr5JhAvoMvCctSDHgFcMvlYzOBrifustr5sAMYGXne8/AonkNRYegxBMZa8vDDAwMDAz8/G9Z8BrPanBuwos1F86+YjBAEo1nSPH6xcDAwFAvy/APvwEMDAwnXzIYrl65Cms6yNMNm4zdAGapJ6ycDAwMzOLPGRgYpPCGAbrA4u2bbJg8Jx1mYGC4qcbAeZ1kAy5duqRRfOmSBgMDA0N0VPReBgZH/LEgxcB2bW15ayU2SUkGjoeTbjKk4DVAlIHtdhCDeAcuBZMY8BtAMDdee89g9fEXA9bsrC3IcBIA1PliFBHj7mMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDAy95cYAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwQ6ovpAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crihan.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CRIHAN</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crihan.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CRIHAN</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y2P8//8/A15w9boVw4ePoljltDVPMhI0ICF775N9B5ywScksnxvAxEAhYMEq+ueBMsP/P2wMDAwMDLkuy2WijfcgvPRF9EnfzEL8BrwJ2/X7+wMlBgYGBgYhKIYCVoaOKmSllHvhOcMv7U0Mr5JhAvoMvCctSDHgFcMvlYzOBrifustr5sAMYGXne8/AonkNRYegxBMZa8vDDAwMDAz8/G9Z8BrPanBuwos1F86+YjBAEo1nSPH6xcDAwFAvy/APvwEMDAwnXzIYrl65Cms6yNMNm4zdAGapJ6ycDAwMzOLPGRgYpPCGAbrA4u2bbJg8Jx1mYGC4qcbAeZ1kAy5duqRRfOmSBgMDA0N0VPReBgZH/LEgxcB2bW15ayU2SUkGjoeTbjKk4DVAlIHtdhCDeAcuBZMY8BtAMDdee89g9fEXA9bsrC3IcBIA1PliFBHj7mMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDAy95cYAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwQ6ovpAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crihan.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CRIHAN</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEMDCCAxigAwIBAgIJALCJicfy3l9fMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
 BAYTAkZSMRIwEAYDVQQIEwlOb3JtYW5kaWUxITAfBgNVBAcTGFNhaW50LUV0aWVu
 bmUgZHUgUm91dnJheTEPMA0GA1UEChMGQ1JJQU5OMRYwFAYDVQQDEw1pZHAuY3Jp
@@ -43,13 +43,13 @@ cMxWulDqZ0MiWHl8vc3bUuu0mduSYnC+pyKgGn1UOMavTHt4NiNPZEPl1ybnVts8
 hhAgrOk7nLzUy5KGqQnfZx11bGfzVYGEYz6s8pQ/TtPmR/Ss9oxxL1DUL2i4Re9e
 m3xBa+Rq08OxM9OK2vxKdca6tuo=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDuTCCAqGgAwIBAgIJAOLMseq7bx2/MA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
 BAYTAkZSMRgwFgYDVQQIDA9IYXV0ZS1Ob3JtYW5kaWUxITAfBgNVBAcMGFNhaW50
 LUV0aWVubmUgZHUgUm91dnJheTEPMA0GA1UECgwGQ1JJSEFOMRYwFAYDVQQDDA1p
@@ -71,22 +71,22 @@ UlVpjCV44kLfXMuY6v6oN/tiyOtNCf20tt37h0O6PwEnbUWLlRXLo/tEMqXCQiGo
 TKaE/UzvPPpWoq0UNSlyvCM6BuzQnjnFVnN1pDTab+7MBvPLwet5hQ5CvoI5OmrW
 Ql1AtWmKiPR7Z3TUg7a1NbLmPHM1WvzuRGxvxvCzG4mMmJcGpbFGYl70P0tL
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crihan.fr/shib13/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CRIHAN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CRIHAN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crihan.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alain Bidaud</md:SurName>
-      <md:EmailAddress>alain.bidaud@crihan.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crihan.fr/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CRIHAN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CRIHAN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crihan.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alain Bidaud</md:SurName>
+    <md:EmailAddress>alain.bidaud@crihan.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
index 1fa34773..81a6bc74 100644
--- a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-antillesguyane.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-24T21:07:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-24T21:07:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-antillesguyane.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Antilles-Guyane</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-antillesguyane.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personnels</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Antilles-Guyane</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-antillesguyane.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Antilles-Guyane</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-antillesguyane.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Personnels</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Antilles-Guyane</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
@@ -47,23 +47,23 @@ BKSQcPTZ3CzfG17VTAb81JfX9z7Hw0hF7X8YEoENcraKUprpAuESEWfHE1FL96AD
 oMpSA1XVtEvkNZxECd5GZM4ivuqvuZ4ujrlceqO0vgcmvGYd8JLMLDqQSv8hmqRg
 Enlu3NfAgQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-antillesguyane.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-antillesguyane.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-antillesguyane.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-antillesguyane.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
@@ -90,19 +90,19 @@ BKSQcPTZ3CzfG17VTAb81JfX9z7Hw0hF7X8YEoENcraKUprpAuESEWfHE1FL96AD
 oMpSA1XVtEvkNZxECd5GZM4ivuqvuZ4ujrlceqO0vgcmvGYd8JLMLDqQSv8hmqRg
 Enlu3NfAgQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Antilles-Guyane</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Antilles-Guyane</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-antillesguyane.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>philippe.luce@crous-antillesguyane.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Antilles-Guyane</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Antilles-Guyane</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-antillesguyane.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>philippe.luce@crous-antillesguyane.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
index 9ff6feaf..ab6f0918 100644
--- a/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-besancon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-18T10:49:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-18T10:49:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-besancon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Besançon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-besancon.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Besançon</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-besancon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Besançon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-besancon.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Besançon</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQDCCAiigAwIBAgIVAJKYjj9OSC7KZE34z1uQZxmgaFj4MA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNhbmNvbi5mcjAeFw0xMzAxMTcx
 MDE2MjVaFw0zMzAxMTcxMDE2MjVaMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNh
@@ -38,23 +38,23 @@ X1zZFs+5KyGiROxd1qaYNX6NNL4o9Cvi3ABfPjYzUo6QQsxJ6AT6kWPfm68o9odZ
 gqLnE6GRTLSvQGXJQoV+S60pL2W2Sg8VCqzcy7rzcHWgVRuPduIZyHas5cUO9+hK
 +5m49wuMpzvHegwlKwKm9Ce8Jtk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-besancon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-besancon.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-besancon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-besancon.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQDCCAiigAwIBAgIVAJKYjj9OSC7KZE34z1uQZxmgaFj4MA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNhbmNvbi5mcjAeFw0xMzAxMTcx
 MDE2MjVaFw0zMzAxMTcxMDE2MjVaMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNh
@@ -74,20 +74,20 @@ X1zZFs+5KyGiROxd1qaYNX6NNL4o9Cvi3ABfPjYzUo6QQsxJ6AT6kWPfm68o9odZ
 gqLnE6GRTLSvQGXJQoV+S60pL2W2Sg8VCqzcy7rzcHWgVRuPduIZyHas5cUO9+hK
 +5m49wuMpzvHegwlKwKm9Ce8Jtk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-besancon.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Besançon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Besançon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-besancon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christophe GONZALEZ</md:SurName>
-      <md:EmailAddress>christophe.gonzalez@crous-besancon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-besancon.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Besançon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Besançon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-besancon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christophe GONZALEZ</md:SurName>
+    <md:EmailAddress>christophe.gonzalez@crous-besancon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml
index d215b246..42215fe4 100644
--- a/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-bordeaux.fr-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-bordeaux.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-03T12:40:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-03T12:40:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.local</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-test.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Bordeaux</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-bordeaux.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personnels Crous</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Bordeaux</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels Crous</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-bordeaux.local</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-test.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Bordeaux</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-bordeaux.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Personnels Crous</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Bordeaux</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels Crous</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUDt3bxzRJ9VeaaPgY1fFNSuTy8qMwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSaWRwLXRlc3QubnVvbmV0LmZyMB4XDTE2MDEyNjE0MTYw
 MVoXDTM2MDEyNjE0MTYwMVowHTEbMBkGA1UEAwwSaWRwLXRlc3QubnVvbmV0LmZy
@@ -41,13 +41,13 @@ ZTL9ow+uyZ7IvCo64fHDQV0xUNfTupztoj9a3F55y5ylzqYj+7lw1LRz9NR3mu3U
 vYGX0ypFWEQsGNF+7e+WMYj/mdlnmlbVyHMLGoViZtMF778QRWmG2eUA6e6f5XO3
 V1qshASPfg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQDCCAiigAwIBAgIVAOQhRzkgfr4mUbjdybfye+CwFu0OMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMMFWlkcC5jcm91cy1ib3JkZWF1eC5mcjAeFw0xNTA5MDMx
 MjA3MzJaFw0zNTA5MDMxMjA3MzJaMCAxHjAcBgNVBAMMFWlkcC5jcm91cy1ib3Jk
@@ -67,22 +67,22 @@ okLOG5FUO0VXkVyW5vk3P73e+/PXV+zDtx7AUaq3LrREyo02BKELEtQU4PLyXgVy
 1Rx7DL8vvMzvSEHyKJxaz7DvYO2Bpift/oivYI4iKParKuXxeEBui1H4vFSOYOvU
 jFe1mGLYUbAC+0MvhTbC1QZSxgw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-bordeaux.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-bordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-bordeaux.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Bordeaux</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Bordeaux</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-bordeaux.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>houelbec</md:SurName>
-      <md:EmailAddress>mickael.houelbec@crous-bordeaux.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-bordeaux.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-bordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-bordeaux.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Bordeaux</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Bordeaux</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-bordeaux.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>houelbec</md:SurName>
+    <md:EmailAddress>mickael.houelbec@crous-bordeaux.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
index bef29b95..c73710c4 100644
--- a/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-caen.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-01T14:27:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-01T14:27:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-caen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Crous Caen</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-caen.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">crous de caen staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Caen</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnels du crous de caen</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-caen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Crous Caen</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-caen.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">crous de caen staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Caen</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnels du crous de caen</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
@@ -46,23 +46,23 @@ e9tdPtPyG4JZnWgfWzhbdZy/0Ne4yB9UTdW1/x6jfnp7KiWqx8+mLctqIZsmGDmx
 XSnVGQ4FP9MQpvTptfEnS6/4wn0Op3gblHgfxmgzfbZMXGlv4gvLsbcf9VBdMkcx
 QbXCZZ1pDB4RQF2ix2wg6j8BRKFrMZk0nz5VF5UtUR3Yk9Tg
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-caen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-caen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-caen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-caen.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-caen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-caen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-caen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-caen.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
@@ -88,19 +88,19 @@ e9tdPtPyG4JZnWgfWzhbdZy/0Ne4yB9UTdW1/x6jfnp7KiWqx8+mLctqIZsmGDmx
 XSnVGQ4FP9MQpvTptfEnS6/4wn0Op3gblHgfxmgzfbZMXGlv4gvLsbcf9VBdMkcx
 QbXCZZ1pDB4RQF2ix2wg6j8BRKFrMZk0nz5VF5UtUR3Yk9Tg
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-caen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Caen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Caen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-caen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>service.informatique@crous-caen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-caen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Caen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Caen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-caen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>service.informatique@crous-caen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
index a669c719..d8c892a6 100644
--- a/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-clermont.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T15:26:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T15:26:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-clermont.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Clermont-Ferrand</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-clermont.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Clermont-Ferrand</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-clermont.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Clermont-Ferrand</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-clermont.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Clermont-Ferrand</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUSGgZ2BiSEkpo4LfpMRytX1Ewj7YwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJtb250LmZyMB4XDTEzMDIxMjA5
 MTIxNVoXDTMzMDIxMjA5MTIxNVowIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJt
@@ -37,23 +37,23 @@ wanyC1UVgvD9u8IHnKUgJ1zB0nEEhtc6i0gpGxireo0fAEPIRkJNYmOPWobj0k5u
 W2E7UTJHp3V5SlkS0nBj+hIa9UYTFtWpDWNooygEWKdJ6qtVNq0LCRoLwS1icdPB
 rQpa7Omoq1LaBUSMRTaVxentYQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-clermont.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-clermont.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-clermont.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-clermont.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUSGgZ2BiSEkpo4LfpMRytX1Ewj7YwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJtb250LmZyMB4XDTEzMDIxMjA5
 MTIxNVoXDTMzMDIxMjA5MTIxNVowIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJt
@@ -73,19 +73,19 @@ wanyC1UVgvD9u8IHnKUgJ1zB0nEEhtc6i0gpGxireo0fAEPIRkJNYmOPWobj0k5u
 W2E7UTJHp3V5SlkS0nBj+hIa9UYTFtWpDWNooygEWKdJ6qtVNq0LCRoLwS1icdPB
 rQpa7Omoq1LaBUSMRTaVxentYQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-clermont.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Clermont-Ferrand</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Clermont-Ferrand</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-clermont.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi@crous-clermont.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-clermont.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Clermont-Ferrand</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Clermont-Ferrand</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-clermont.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi@crous-clermont.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
index 3f8d1dd1..8d237965 100644
--- a/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-creteil.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-06T15:51:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-06T15:51:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-creteil.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Créteil</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-creteil.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Administratifs</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Créteil</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Administratifs</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-creteil.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Créteil</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-creteil.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Administratifs</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Créteil</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Administratifs</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdjCCA16gAwIBAgIRAJ5lMINLv4KL948DJ4za9FIwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xNzAzMDkyMzU5NTlaMEIxITAfBgNV
@@ -46,21 +46,21 @@ HAJ1OzN3e3zX8iuyXkZJVa+ddsWEeUPrS59CBvjk1Y8SYe2uHRNv+g8DX0wVkjKq
 laTKYcW1rY22QD6/RLQr0EpQ9BXoZbJq7CyGsBDPMs/K80DCYNaaOBxWyWNH1X9A
 Jb3ZR1qKEgKubKYH73VLMDHwl1IEyS+6D44aMSlHdTqE8OJfTRKMANX8
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-creteil.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Créteil</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Créteil</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-creteil.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@crous-creteil.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-creteil.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Créteil</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Créteil</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-creteil.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-creteil.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
index 172a4261..55f2ca49 100644
--- a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-dijon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-17T13:12:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-17T13:12:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Dijon - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-dijon.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Dijon - Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Dijon - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-dijon.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Dijon - Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUXZf8djanPtL+INJI961K5kFsBf8wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZyMB4XDTE1MDgyNDE0NTU1
 NFoXDTM1MDgyNDE0NTU1NFowHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZy
@@ -38,13 +38,13 @@ iO5xMR3wznB/kfmVpTvbEY8dsjZryxWnVsuFh23EbZc3r/W4JfE4cvfUNBVOJm0l
 T+zF8GLFgOT6h68tIL0eLGprCAKV1x0RF2y2hYQMlxMfVQCobgHEtJoEudpNj0kN
 AWeDYzsI0g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
@@ -72,23 +72,23 @@ WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
 B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
 iTNj
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-dijon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-dijon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUXZf8djanPtL+INJI961K5kFsBf8wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZyMB4XDTE1MDgyNDE0NTU1
 NFoXDTM1MDgyNDE0NTU1NFowHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZy
@@ -108,13 +108,13 @@ iO5xMR3wznB/kfmVpTvbEY8dsjZryxWnVsuFh23EbZc3r/W4JfE4cvfUNBVOJm0l
 T+zF8GLFgOT6h68tIL0eLGprCAKV1x0RF2y2hYQMlxMfVQCobgHEtJoEudpNj0kN
 AWeDYzsI0g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
@@ -142,19 +142,19 @@ WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
 B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
 iTNj
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-dijon.fr/idp/AA"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Dijon - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Dijon - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-dijon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi@crous-dijon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-dijon.fr/idp/AA"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Dijon - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Dijon - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-dijon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi@crous-dijon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
index 5a6e0de0..f9dd4d31 100644
--- a/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-grenoble.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-08T22:14:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-08T22:14:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-grenoble.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Grenoble - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-grenoble.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-grenoble.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Grenoble - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-grenoble.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Grenoble - Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdzCCA1+gAwIBAgIQJXNY9IPVDDkw5l9yCMhrQTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDkxNTAwMDAwMFoXDTE3MDkxNDIzNTk1OVowQzEhMB8GA1UE
@@ -44,26 +44,26 @@ r3RAsxa5qG2yMzJRa0PiywpXd8q82JfFk2cHL9P4au0u5p9H9Hin+Cpvmn0StV51
 iEsqhPuQmD3oc87nHEra79A3QGjMSN1zaSbcadRvXZhHdZaez/C9h8yyPKkR9wM2
 rp/TCvQsQDOOiVfOsrZjqiF1nBI3Z/KLRoV9yz3wmtdG59CY0Pf+XM0plg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Grenoble - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Grenoble - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-grenoble.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Benoit LION</md:SurName>
-      <md:EmailAddress>benoit.lion@crous-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sébastien LEYRELOUP</md:SurName>
-      <md:EmailAddress>sebastien.leyreloup@crous-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Grenoble - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Grenoble - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-grenoble.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Benoit LION</md:SurName>
+    <md:EmailAddress>benoit.lion@crous-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sébastien LEYRELOUP</md:SurName>
+    <md:EmailAddress>sebastien.leyreloup@crous-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
index 749c4c0a..0c51bb52 100644
--- a/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-limoges.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-15T15:53:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-15T15:53:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS de Limoges</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-limoges.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Employees</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS de Limoges</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS de Limoges</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-limoges.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Employees</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS de Limoges</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
@@ -46,23 +46,23 @@ Xm2MIteZK1lI8FEoWX8qXg8EjL/NZdxu1v7dU/jSHL2HlNj8sNVWwh+aUQxL8qBe
 Myun/oIQkNnp0Pdk8+EGzL0g39mOz/aifvbBnk4nBg9YZhbX1PHPcsaTXReB9z48
 ZDIXns+y/xQLIh4KMx/XzIpQHZC0zvB3nMoYPiHZ3L/UUxNGQacmInYV
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-limoges.fr/cas/login"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-limoges.fr/cas/login"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
@@ -88,19 +88,19 @@ Xm2MIteZK1lI8FEoWX8qXg8EjL/NZdxu1v7dU/jSHL2HlNj8sNVWwh+aUQxL8qBe
 Myun/oIQkNnp0Pdk8+EGzL0g39mOz/aifvbBnk4nBg9YZhbX1PHPcsaTXReB9z48
 ZDIXns+y/xQLIh4KMx/XzIpQHZC0zvB3nMoYPiHZ3L/UUxNGQacmInYV
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-limoges.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS de Limoges</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS de Limoges</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-limoges.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@crous-limoges.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-limoges.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS de Limoges</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS de Limoges</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-limoges.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-limoges.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
index dc79e6d6..6a49d305 100644
--- a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-nancy-metz.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T10:43:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T10:43:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nancy-metz.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-nancy-metz.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nancy-metz.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-nancy-metz.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEfDCCA2SgAwIBAgIRAM5o4WD6O95qTaaU1z+tWw4wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzAzMjAwMDAwMDBaFw0xNjAzMTkyMzU5NTlaMEUxITAfBgNV
@@ -44,26 +44,26 @@ yC1aBqSGPHAkmFazWwFevwegau0rDil+QOhZfrMPJT+YTfFSmvym++tbrgIWyOTF
 FtoTzmdJCiKJa0dAguaETSDW9qY/9o3pzAQTehDm0Y0OCimTQNK9LlpYirHCxuig
 GLwPKwHbqAiA7alxm3xMxv+C38F2cIaVxgdXen4sWHqqXDc91gJjIXb9hW8uSo6Z
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nancy-metz.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Nancy-Metz Lorraine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-nancy-metz.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Bernard ZANGA</md:SurName>
-      <md:EmailAddress>bernard.zanga@crous-nancy-metz.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Bruno LIENARD</md:SurName>
-      <md:EmailAddress>bruno.lienard@crous-nancy-metz.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nancy-metz.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Nancy-Metz Lorraine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-nancy-metz.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Bernard ZANGA</md:SurName>
+    <md:EmailAddress>bernard.zanga@crous-nancy-metz.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Bruno LIENARD</md:SurName>
+    <md:EmailAddress>bruno.lienard@crous-nancy-metz.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
index eff2968a..3282f23b 100644
--- a/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-nantes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T09:50:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T09:50:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nantes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS of Nantes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-nantes.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Employees from CROUS of Nantes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS de Nantes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Administratifs CROUS Nantes</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nantes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS of Nantes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-nantes.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Employees from CROUS of Nantes</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS de Nantes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Administratifs CROUS Nantes</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAMI83efvzywvxHitZXX4VZlwTMCTMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC5jcm91cy1uYW50ZXMuZnIwHhcNMTQwNDEwMTI1
 NzAyWhcNMzQwNDEwMTI1NzAyWjAeMRwwGgYDVQQDExNpZHAuY3JvdXMtbmFudGVz
@@ -40,13 +40,13 @@ pM9wqeKv332VzQPVFERNYY2ZtngdmvALe7EGyMntjtYm6J1NFQGAl0w5dx7KRU59
 b4Va7oIyoH9QLAUtV8dUZNqUOwYBWmRcNKnI4tYCuL3HuIaQulLE9SUGPCotx3mQ
 WtPzHc/Z3g9j7+76
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdDCCA1ygAwIBAgIRALmCI9KfSplaBaEw3OkzCqswDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzEyMDQwMDAwMDBaFw0xNjEyMDMyMzU5NTlaMEExITAfBgNV
@@ -72,21 +72,21 @@ Y4Lshyv0lVcFjSQyQnYTAPJ9nfZDAAV82/IUlbGEZwO+KcX7DsY7LIfxlMwesRLV
 d3kCluVSx+IUBZZixpFu9/bCBlpuEzHrmXsU/by0WO0w49ICNX3lUCLUkWvMuSlN
 ri7ETEJpUukv03GWujd49DIGtCfo6+64k5DS9OpUUvAbsMfYlvudjQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nantes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS de Nantes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS de Nantes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-nantes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi.exploitation@crous-nantes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nantes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS de Nantes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS de Nantes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-nantes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi.exploitation@crous-nantes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
index e842cfc4..2adea4db 100644
--- a/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-nice.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-28T10:27:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-28T10:27:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nice.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS de Nice - Employee</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMSswMjowMBMCpV8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzErMDI6MDBiXx3jAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-nice.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Access to buisiness software via Identity Federation.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS de Nice - Personnels</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Accès aux applications métiers du CNOUS par la fédération d'identité.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nice.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS de Nice - Employee</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMSswMjowMBMCpV8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzErMDI6MDBiXx3jAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-nice.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Access to buisiness software via Identity Federation.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS de Nice - Personnels</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Accès aux applications métiers du CNOUS par la fédération d'identité.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEnTCCA4WgAwIBAgIRALWuRLNLEVeuImgWjTlsB5wwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -47,13 +47,13 @@ PlHy2rpfcKoBkxpuNOOvUOeo9cIzGqppXyMVrpRZcZK66DGLOaHx8LDxUBnwTR7M
 xSXuRsQd98MTvUs41HrExz459kOUv/w6RyW1OOCZhyl+1hFvIATcTdYYy7VWR6ed
 BOyEhdt1trDRK1pwnstRuxBk4KpHuLw1t5N/vnjMCxUQ
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
@@ -79,23 +79,23 @@ BDObTK/AxaaDCf754DBSS+C7OHTihGp4Be+8EbQvQb5drVCgrHdbtP7dd31XXCV1
 PK0bgjuS0OSSCCgiqBftO/Ym7RLAoYif9L8mQLCDcms/4wJzjssdLgnuqSk3VxPx
 tYzHJuh0PK935LA6t7Tt2AiGFlmfSUXmGwwHxCMalr3BgJBN
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-nice.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nice.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nice.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nice.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-nice.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nice.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nice.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nice.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEnTCCA4WgAwIBAgIRALWuRLNLEVeuImgWjTlsB5wwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -122,13 +122,13 @@ PlHy2rpfcKoBkxpuNOOvUOeo9cIzGqppXyMVrpRZcZK66DGLOaHx8LDxUBnwTR7M
 xSXuRsQd98MTvUs41HrExz459kOUv/w6RyW1OOCZhyl+1hFvIATcTdYYy7VWR6ed
 BOyEhdt1trDRK1pwnstRuxBk4KpHuLw1t5N/vnjMCxUQ
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
@@ -154,19 +154,19 @@ BDObTK/AxaaDCf754DBSS+C7OHTihGp4Be+8EbQvQb5drVCgrHdbtP7dd31XXCV1
 PK0bgjuS0OSSCCgiqBftO/Ym7RLAoYif9L8mQLCDcms/4wJzjssdLgnuqSk3VxPx
 tYzHJuh0PK935LA6t7Tt2AiGFlmfSUXmGwwHxCMalr3BgJBN
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-nice.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS de Nice - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS de Nice - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-nice.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin@crous-nice.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-nice.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS de Nice - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS de Nice - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-nice.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin@crous-nice.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
index 01550632..d34457a2 100644
--- a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-orleans-tours.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-02T15:51:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-02T15:51:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-orleans-tours.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-orleans-tours.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Crous Orléans-Tours staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Membres du personnel du Crous d'Orléans-Tours</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-orleans-tours.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-orleans-tours.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Crous Orléans-Tours staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Membres du personnel du Crous d'Orléans-Tours</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVDCCAjygAwIBAgIVAMl6t3QQN7SBNiEk1q64K1duI81gMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGmlkcC5jcm91cy1vcmxlYW5zLXRvdXJzLmZyMB4XDTE0
 MDUyNjEzNTUwNVoXDTM0MDUyNjEzNTUwNVowJTEjMCEGA1UEAxMaaWRwLmNyb3Vz
@@ -40,26 +40,26 @@ sPQWi85i0R4/y7BKoZ7IkdeBuFxYsT9hGKMYtPXFHu2oNAAF9n19MY48vuVxJse5
 6wPYkfBTz+RpN3vmE3nMLlNTMS0OaU0BhOaL8hNBJKmPnWE7yJDZCFRE4pP8SojZ
 w7nR324InrWagttK/tkzxBOggWr5VB7dXlu+mc/Bhicd+yCGgLK1tg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-orleans-tours.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Orléans-Tours - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-orleans-tours.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>LEROY Thierry</md:SurName>
-      <md:EmailAddress>thierry.leroy@crous-orleans-tours.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>VINCENT Régis</md:SurName>
-      <md:EmailAddress>regis.vincent@crous-orleans-tours.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-orleans-tours.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Orléans-Tours - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-orleans-tours.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LEROY Thierry</md:SurName>
+    <md:EmailAddress>thierry.leroy@crous-orleans-tours.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>VINCENT Régis</md:SurName>
+    <md:EmailAddress>regis.vincent@crous-orleans-tours.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
index 723cb9d3..491701bf 100644
--- a/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-paris.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T16:45:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T16:45:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-paris.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Paris</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-paris.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Employee</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Agents de la fonction publique</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-paris.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Paris</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-paris.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Employee</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Paris</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Agents de la fonction publique</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJTCCAg2gAwIBAgIVAJ53+W2DtR9vdwuQg+AhIFGFWSbXMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWlkcC5udW9uZXQuZnIwHhcNMTYwNTI0MDkzODQ0WhcN
 MzYwNTI0MDkzODQ0WjAYMRYwFAYDVQQDDA1pZHAubnVvbmV0LmZyMIIBIjANBgkq
@@ -38,13 +38,13 @@ mbxyd8sP8HKi2pCr0kdnrjokwKWUXrSLHtprLHLMo8bt9lj+Ejg0UYL5tf3z6UYx
 DM7LiKU9+CcADqOKzQwIuVr9I+WmNd8cz133l1hOVSMzQDJr3dQr3ORIRdcj7tA2
 bcKVwczsMp4mVDKowSyjtKF9pRwdKBKitmfXo48b+2JgW3QI95Kq5SM=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUC3qxigulZwbI9DWJOZsdPNwwYR0wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXBhcmlzLmZyMB4XDTEzMDYxNzE0NDEw
 M1oXDTMzMDYxNzE0NDEwM1owHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXBhcmlzLmZy
@@ -64,21 +64,21 @@ FicTUZlz3duoTqsrz/sNoTozpwtThMBvALu1w7yrMLWIZgEa0V+csm/2/cAc4qXt
 AxeOndV48MCF69J2kMLRrHCkAAV2UWaWXEUpCVg20rXNqnLK+xN9Qi/Pj+fuXIyC
 dvKcBjj1lA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-paris.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-paris.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Paris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Paris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-paris.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@crous-paris.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-paris.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-paris.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-paris.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-paris.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
index 0c1d5c10..aeb47e06 100644
--- a/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-poitiers.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T15:27:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T15:27:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS de Poitiers</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMSswMjowMBMCpV8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzErMDI6MDBiXx3jAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS de Poitiers</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS de Poitiers</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMSswMjowMBMCpV8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzErMDI6MDBiXx3jAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS de Poitiers</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdzCCA1+gAwIBAgIQN3OORXWc3cChLNqDZoOjGDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcxOTAwMDAwMFoXDTE2MDcxODIzNTk1OVowQzEhMB8GA1UE
@@ -44,21 +44,21 @@ oWltTXNqL752e4pY6MZyVkH1mOqbwnYAQoAxlT84lmnv5p58do2HqVTNikbigwXp
 cr+1iiW5RhIg3fiDuvvFXisB7MnGOJrwR1PDnEcm082UvdlErnvH0JZLvmW0uSJE
 6ybzwV5DMLR8VjRJBJU9KaoOA6dssc/ENDYdFaVc0cGdMhEXf/+KK0UWkg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS de Poitiers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS de Poitiers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS de Poitiers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS de Poitiers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
index 3d0c212b..2362c1ae 100644
--- a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-reims.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-08T17:28:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-08T17:28:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-reims.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Reims</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACAcAAAgHAAAAAAAAAAAAAD//////////////v/9////0M37/3Nz9f9CQO7/LCPv/ysl8P9CQO3/d3L1/8zJ+v/////////////////9//////////3//v///v//cW7z/wMA6f8EAev/EAjo/yQe7f8mHe//Egrr/wAA6/8CAur/b2vz//////////7///7////+//////z/VE/y/wAA5v8bEe3/JB/s/yQb7v8nG+//JBzr/ygd7/8oHuz/GhLr/wAA6P9RSu/////+////////////fHj2/wQA6f8hG+z/JRzu/yUd7P8mHu3/Ihns/xkQ7f8aEu3/GRPu/yAW7P8mHe//AADo/3h09f//////2tj8/wMA6v8bD+v/Ix7r/yQb7f8iHO3/IBju/ywk7f9BOu//OTTt/0M37/82LPD/Hhjr/xoS6/8BAOr/19P8/3178/8AAOr/JR/u/yIc7f8jHez/Jxvv/xMM6f8/Ou//f3rz/2xp9P91cPP/OjHs/wwE6/8TB+3/AgDo/2di8/9IQfD/DwXr/ycc7v8kG+7/Jhvt/yYd7/8UCez/V1Tw/2dh9v8sJ+7/KCDv/01I8f8wJu7/Uk3w/yUg7f9jXfL/LCPv/yYe7f8iHOv/Ix3u/yIc6/8UCur/UEzx/5SQ9/89Ou3/iYP0/5iW9v/Kyfv/nZ33/7e0+f+alvb/v7z6/yok7/8oHuz/JRzu/yQb7v8kG+3/Fgvr/0lF8v+UkfT/VVTy/1lV8P9rZfT/ZGHy/2Zd8/9LRfD/VlLx/3dy9f9KRPH/DQbr/yUc7v8jHez/Jhzr/yUd7P8QCuv/TkXw/2hg8/8UCev/CQPq/wwD7f8QCOn/Fwzs/wEA6v8zKe3/gn34/wQB6/8mHu3/JRzv/yId6v8iGvH/Jx/u/w8J6v8NBun/JRzu/yIb7v8mHOv/JRzu/yUh7P8BAOr/e3f0/9rc+v8GAOn/FxDt/ycd7P8iHO3/JBzr/yYc6/8mG+3/JRvx/yQc6/8jHO//Jhvt/yUd7P8bEuv/BgDq/9jX/v/9////gXz1/wIA6P8gGez/Jh3v/yEc7f8lHO7/Ix3u/yUc7v8lHuv/JBzr/yUe6/8hG+z/AADp/3549f/8//3////+//////9aUvP/AgDo/xoR6v8kH+z/Ix3s/yQb7f8kG+3/JBvu/ycf7v8XEez/AQHn/1RN8v/+/v7////////+/////v3//f///3N09P8JAOr/AAHp/xIH6v8lHez/JB/s/xIG7P8AAOv/BQHq/3Jv9P///v////////z//f/////////+/////v/9////0dD8/3t3+P9JQ/D/KyXu/yom8f9HQ/D/d3b2/9TP/P////7////+//3/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-reims.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Server Shibboleth</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Reims</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Serveur  Shibboleth fournisseur d'identitée</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-reims.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Reims</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACAcAAAgHAAAAAAAAAAAAAD//////////////v/9////0M37/3Nz9f9CQO7/LCPv/ysl8P9CQO3/d3L1/8zJ+v/////////////////9//////////3//v///v//cW7z/wMA6f8EAev/EAjo/yQe7f8mHe//Egrr/wAA6/8CAur/b2vz//////////7///7////+//////z/VE/y/wAA5v8bEe3/JB/s/yQb7v8nG+//JBzr/ygd7/8oHuz/GhLr/wAA6P9RSu/////+////////////fHj2/wQA6f8hG+z/JRzu/yUd7P8mHu3/Ihns/xkQ7f8aEu3/GRPu/yAW7P8mHe//AADo/3h09f//////2tj8/wMA6v8bD+v/Ix7r/yQb7f8iHO3/IBju/ywk7f9BOu//OTTt/0M37/82LPD/Hhjr/xoS6/8BAOr/19P8/3178/8AAOr/JR/u/yIc7f8jHez/Jxvv/xMM6f8/Ou//f3rz/2xp9P91cPP/OjHs/wwE6/8TB+3/AgDo/2di8/9IQfD/DwXr/ycc7v8kG+7/Jhvt/yYd7/8UCez/V1Tw/2dh9v8sJ+7/KCDv/01I8f8wJu7/Uk3w/yUg7f9jXfL/LCPv/yYe7f8iHOv/Ix3u/yIc6/8UCur/UEzx/5SQ9/89Ou3/iYP0/5iW9v/Kyfv/nZ33/7e0+f+alvb/v7z6/yok7/8oHuz/JRzu/yQb7v8kG+3/Fgvr/0lF8v+UkfT/VVTy/1lV8P9rZfT/ZGHy/2Zd8/9LRfD/VlLx/3dy9f9KRPH/DQbr/yUc7v8jHez/Jhzr/yUd7P8QCuv/TkXw/2hg8/8UCev/CQPq/wwD7f8QCOn/Fwzs/wEA6v8zKe3/gn34/wQB6/8mHu3/JRzv/yId6v8iGvH/Jx/u/w8J6v8NBun/JRzu/yIb7v8mHOv/JRzu/yUh7P8BAOr/e3f0/9rc+v8GAOn/FxDt/ycd7P8iHO3/JBzr/yYc6/8mG+3/JRvx/yQc6/8jHO//Jhvt/yUd7P8bEuv/BgDq/9jX/v/9////gXz1/wIA6P8gGez/Jh3v/yEc7f8lHO7/Ix3u/yUc7v8lHuv/JBzr/yUe6/8hG+z/AADp/3549f/8//3////+//////9aUvP/AgDo/xoR6v8kH+z/Ix3s/yQb7f8kG+3/JBvu/ycf7v8XEez/AQHn/1RN8v/+/v7////////+/////v3//f///3N09P8JAOr/AAHp/xIH6v8lHez/JB/s/xIG7P8AAOv/BQHq/3Jv9P///v////////z//f/////////+/////v/9////0dD8/3t3+P9JQ/D/KyXu/yom8f9HQ/D/d3b2/9TP/P////7////+//3/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-reims.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Server Shibboleth</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Reims</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Serveur  Shibboleth fournisseur d'identitée</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKDCCAhCgAwIBAgIJAOjHz8Rlt5DLMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEmlkcC5jcm91cy1yZWltcy5mcjAeFw0xNTEyMjIwNTIwMjRaFw0xODEyMjEw
 NTIwMjRaMB0xGzAZBgNVBAMTEmlkcC5jcm91cy1yZWltcy5mcjCCASIwDQYJKoZI
@@ -39,13 +39,13 @@ yme8Rjea2onN07ookIVgM+MbGVEL+eA+y0TGRk+/WR1wtN2cj/e+g9/GXvHcqQlP
 gXKNVq8c9yhEuK0mhtZ7n3AlCLrDQUKWetzGbaSvHFTNd/XYwYKc9lfVEu71II6a
 JRfS8xrL01pysyULxIGNBTU1zdajH4UHS3EqRRLKCm4gF5CU40pxLSEqm/E=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEajCCA1KgAwIBAgIQa6ko9Kashh39Z5Tcht03DzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDEwODAwMDAwMFoXDTE2MDEwODIzNTk1OVowQzELMAkGA1UE
@@ -71,21 +71,21 @@ tiitKXKTHYT+uxa3DqTpxYCHr5FtKPPhPKPIS7dyIVIxvkRAWOee+/spfUPC7Y8J
 quzYxmp0LyZyMdkQcCQ3FVJ+AxPgSJaRjjDOc8yEDIG2kkxnZf2qoctXs077A4XH
 LgLBAZ0NCQeidPwxsKvCoYW5xQKIBaqW2ZTmqAbG
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-reims.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-reims.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Reims</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Reims</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-reims.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@crous-reims.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-reims.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-reims.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Reims</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Reims</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-reims.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-reims.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
index 62b33e11..84156ab3 100644
--- a/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-rennes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T15:00:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T15:00:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Rennes - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-rennes.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Rennes - Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Rennes - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-rennes.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Rennes - Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdDCCA1ygAwIBAgIRAL5fVabkZawTDxzKI0ESjOYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzEyMDUwMDAwMDBaFw0xNjEyMDQyMzU5NTlaMEExITAfBgNV
@@ -44,26 +44,26 @@ BJ1R3SvSeovh8KBplnsI1v9nozPP3Yjc28BdMLs9p5Yeo+6htHVRTsec8SG4GjKQ
 VJWsJn9dlBNT8g9POrU7cyE7qnHs7ErkMFri0sPKSZbwD6vwBjViJ1KU3C9U9B9C
 1uRv0KqVOs4YO9ig3CbOEAszIIxNZvN6p++GOnm771PGXTWTF1DAfw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-rennes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Rennes - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Rennes - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-rennes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Louis Allier</md:SurName>
-      <md:EmailAddress>jean-louis.allier@crous-rennes.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Michel Gaigeard</md:SurName>
-      <md:EmailAddress>michel.gaigeard@crous-rennes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-rennes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Rennes - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Rennes - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-rennes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Louis Allier</md:SurName>
+    <md:EmailAddress>jean-louis.allier@crous-rennes.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Michel Gaigeard</md:SurName>
+    <md:EmailAddress>michel.gaigeard@crous-rennes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
index c610695d..49ed5bf2 100644
--- a/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-strasbourg.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-28T11:03:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-28T11:03:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-strasbourg.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Strasbourg</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCklEQVQ4y4WTXUhTYRjHf+ecjtuynBHEao5GluIHgRWjDwmShBJCTbHoIqUg8CbWXd0YQmB3XXsVfWEMM4OwaLvJi9nHvEiDhiiCJUyrzQ23c/ZxzttFMaq5+V4+7///e3j4P4/UNfDGYJPX73hFSG/k45orXxsdbAVALmU0ULDJaU4qAVqVCXRhKdCUBGimhWbbNKocAwQSIv8nNgOkhYpLXeFixQQg8TmzH+MvuRAlADmhYJFyeHfcxy5/ZT7dyOvkaWxyrgCw5X+zicx2WaPf/ghVyvI21cLjWBs/Uxm2WXOgloORxjAFiiwVAgQSlUocv3aCcKKGpflP6KsBwiE/GBl2H/Bw7OwVsiaUbTSCgsG3nIPp7GHCwTGuV08x6S3jxd1LyKbOQuglgQe3SOv6xiPkIXNTnFGec6FhF+kvQXLLdupq9tFw8BDdXZ3Yy8uKAwCWZ/0kKxMMjaosmXXUNnfzbLwTV5XzH10hQJJACIzYIhO6m+E7D7lx3IO1SKvCGP/EI6lbWY9H8TTVFzWHw3Mb7cFvgrP2KCur37ncdxVTFKrevf/AyMiT4pu4t6mNnQ4342M+OjvamZmZRdM04vE4Pp+P3t4+2jvOI5W6Rj0RIfj0NrHIIgCuqj1oqSQ/onEGh+4xcNNbPAUAa4WDlmvDrC1MEpkPsZ6I4qx2c6T+FC3negD4BdjWw757j+xjAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwtXWu6wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMMQoFlcAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous.u-strasbg.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Administrative staff CROUS</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Strasbourg</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnel administratif du CROUS</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-strasbourg.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Strasbourg</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCklEQVQ4y4WTXUhTYRjHf+ecjtuynBHEao5GluIHgRWjDwmShBJCTbHoIqUg8CbWXd0YQmB3XXsVfWEMM4OwaLvJi9nHvEiDhiiCJUyrzQ23c/ZxzttFMaq5+V4+7///e3j4P4/UNfDGYJPX73hFSG/k45orXxsdbAVALmU0ULDJaU4qAVqVCXRhKdCUBGimhWbbNKocAwQSIv8nNgOkhYpLXeFixQQg8TmzH+MvuRAlADmhYJFyeHfcxy5/ZT7dyOvkaWxyrgCw5X+zicx2WaPf/ghVyvI21cLjWBs/Uxm2WXOgloORxjAFiiwVAgQSlUocv3aCcKKGpflP6KsBwiE/GBl2H/Bw7OwVsiaUbTSCgsG3nIPp7GHCwTGuV08x6S3jxd1LyKbOQuglgQe3SOv6xiPkIXNTnFGec6FhF+kvQXLLdupq9tFw8BDdXZ3Yy8uKAwCWZ/0kKxMMjaosmXXUNnfzbLwTV5XzH10hQJJACIzYIhO6m+E7D7lx3IO1SKvCGP/EI6lbWY9H8TTVFzWHw3Mb7cFvgrP2KCur37ncdxVTFKrevf/AyMiT4pu4t6mNnQ4342M+OjvamZmZRdM04vE4Pp+P3t4+2jvOI5W6Rj0RIfj0NrHIIgCuqj1oqSQ/onEGh+4xcNNbPAUAa4WDlmvDrC1MEpkPsZ6I4qx2c6T+FC3negD4BdjWw757j+xjAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwtXWu6wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMMQoFlcAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous.u-strasbg.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Administrative staff CROUS</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Strasbourg</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnel administratif du CROUS</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEezCCA2OgAwIBAgIQeZpbhzUV4+gL9K3eNTs3hDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDMyNDAwMDAwMFoXDTE3MDMyMzIzNTk1OVowRTEhMB8GA1UE
@@ -46,21 +46,21 @@ FRhT0gAh4Ian/8DVfJTci9AyowV0vNo6jiolia3jrj7pT2JV0zi68D7ia7qCq+8W
 9Trm+VsJgWqE1qZ2MQ+IDhK8126oFKyh4s4HUWs789FtwQCpaDlGJeD0pyNDvabl
 3Is6+m8rCoctcDmdACGX08QdzxMKStXnVoM31v5H3CDiAroDNYunnrntdief2+I=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Strasbourg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Strasbourg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous.u-strasbg.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>serviceinfo@crous.u-strasbg.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Strasbourg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Strasbourg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous.u-strasbg.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>serviceinfo@crous.u-strasbg.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml
index b6d7d19b..d79e2bea 100644
--- a/swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.croydon.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">croydon.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">croydon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/croydon.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/croydon.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Croydon College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.croydon.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/croydon.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/croydon.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Croydon College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.croydon.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
index 8b6d96e7..b9ee2b38 100644
--- a/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-17T15:52:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-17T15:52:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Computer Science AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav informatiky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ICS AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UI AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ustavinformatiky.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ustavinformatiky.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ui-44.png</mdui:Logo>
+        <mdui:Logo height="400" width="450">https://jiftach.cas.cz/loga/logo-ui-400.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Computer Science AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav informatiky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider ICS AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UI AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ustavinformatiky.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ustavinformatiky.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ui-44.png</mdui:Logo>
-          <mdui:Logo height="400" width="450">https://jiftach.cas.cz/loga/logo-ui-400.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
 MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
@@ -51,29 +51,29 @@ V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
 DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cs.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cs.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
 MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
@@ -93,26 +93,26 @@ V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
 DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Computer Science Academy</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav informatiky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav informatiky AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ustavinformatiky.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ustavinformatiky.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Computer Science Academy</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav informatiky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav informatiky AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ustavinformatiky.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ustavinformatiky.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
index 72437eb3..bd450df8 100644
--- a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.unicam.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-09T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-09T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Camerino</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Camerino</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Camerino</mdui:Description>
+        <mdui:Description xml:lang="it">Università di Camerino</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idp.cs.unicam.it/idp/idem.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp.cs.unicam.it/idp/idem.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-16x16.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-50x50.png</mdui:Logo>
+        <mdui:Logo height="80" width="60" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Camerino</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Camerino</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Camerino</mdui:Description>
-          <mdui:Description xml:lang="it">Università di Camerino</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idp.cs.unicam.it/idp/idem.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp.cs.unicam.it/idp/idem.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-16x16.png</mdui:Logo>
-          <mdui:Logo height="50" width="50" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-50x50.png</mdui:Logo>
-          <mdui:Logo height="80" width="60" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
 MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
@@ -42,26 +42,26 @@ WIHRfSty/0uIzW/lN37GPo00dUxAi6YbG6ApMYqskVgjZF9HQRG2eLB8vnN5lVMW
 EzKjoTVzBIc5DFJYcngBLyEe8FTjjudAGErWuO34At65eltaicMvt+BoSTwlbqPY
 N+v+oW0soUwCiTs30w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cs.unicam.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.unicam.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.unicam.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.unicam.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cs.unicam.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.unicam.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.unicam.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.unicam.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCTCCAfGgAwIBAgIJAODqdYOcRuvYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMMEGlkcC5jcy51bmljYW0uaXQwHhcNMTYwMzI0MTExMTI0WhcNNDYwMzE3MTEx
 MTI0WjAbMRkwFwYDVQQDDBBpZHAuY3MudW5pY2FtLml0MIIBIjANBgkqhkiG9w0B
@@ -80,26 +80,26 @@ WIHRfSty/0uIzW/lN37GPo00dUxAi6YbG6ApMYqskVgjZF9HQRG2eLB8vnN5lVMW
 EzKjoTVzBIc5DFJYcngBLyEe8FTjjudAGErWuO34At65eltaicMvt+BoSTwlbqPY
 N+v+oW0soUwCiTs30w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli studi di Camerino</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Camerino</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Camerino</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Camerino</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unicam.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unicam.it/international/welcome/index.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:marco.maccari@unicam.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:support_idem@unicam.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli studi di Camerino</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Camerino</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Camerino</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Camerino</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unicam.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unicam.it/international/welcome/index.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:marco.maccari@unicam.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support_idem@unicam.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
index bc1e7626..c2e6502a 100644
--- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csc.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
+        <mdui:Logo height="256" width="256">https://idp.csc.fi/img/csc.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>csc.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
-          <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
-          <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
-          <mdui:Logo height="256" width="256">https://idp.csc.fi/img/csc.jpg</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>csc.fi</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDgxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmNzYy5m
@@ -67,30 +67,30 @@ nwl2FZsWJOQ/7kkplDs3Yjy+7kkQyUVZoiPcNVE9nRVJuX0J2pwq29dkDibgTiv1
 QsoRrRYbh+Ocsi72e5feCe/vY9ZjnwKQmfQsDmzU72PwaJ5AwHh2bHE+9Eoj7AiN
 OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
 yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janne</md:GivenName>
-      <md:SurName>Lauros</md:SurName>
-      <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
index 06999099..0183d03c 100644
--- a/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-12-10T10:15:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-12-10T10:15:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csp.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CSP - innovation in ICT</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CSP - innovazione nelle ICT</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users of CSP</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CSP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.csp.it/federation/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.csp.it/federation/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
+        <mdui:Logo height="80" width="80" xml:lang="en">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
+        <mdui:Logo height="80" width="80" xml:lang="it">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csp.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CSP - innovation in ICT</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">CSP - innovazione nelle ICT</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for users of CSP</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di CSP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.csp.it/federation/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.csp.it/federation/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-          <mdui:Logo height="80" width="80" xml:lang="en">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-          <mdui:Logo height="80" width="80" xml:lang="it">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiACCQCReOiXnCENdDANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJJ
 VDEPMA0GA1UECAwGSXRhbGlhMQ8wDQYDVQQHDAZUb3Jpbm8xGDAWBgNVBAoMD0NT
 UCBzLmMuIGEgci5sLjETMBEGA1UEAwwKaWRwLmNzcC5pdDAeFw0xNTA3MDYxMzQ2
@@ -46,27 +46,27 @@ ddapBkoj1jOH/wOkqr/5Z8+rD4KiZTlu1oePCR4VgmbvF7evBmbYt+QpFqDb+2ZI
 7XS6kqWgiX9aEs7nTyB8lEeaDCEIj5VaMc7LfBiJ/d5sPf5mr7wtxsfuQgZh8Sli
 lLa8jXRZC5nmEmQd
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csp.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csp.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csp.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csp.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csp.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csp.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csp.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csp.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csp.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csp.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiACCQCReOiXnCENdDANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJJ
 VDEPMA0GA1UECAwGSXRhbGlhMQ8wDQYDVQQHDAZUb3Jpbm8xGDAWBgNVBAoMD0NT
 UCBzLmMuIGEgci5sLjETMBEGA1UEAwwKaWRwLmNzcC5pdDAeFw0xNTA3MDYxMzQ2
@@ -86,23 +86,23 @@ ddapBkoj1jOH/wOkqr/5Z8+rD4KiZTlu1oePCR4VgmbvF7evBmbYt+QpFqDb+2ZI
 7XS6kqWgiX9aEs7nTyB8lEeaDCEIj5VaMc7LfBiJ/d5sPf5mr7wtxsfuQgZh8Sli
 lLa8jXRZC5nmEmQd
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csp.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSP - innovation in ICT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSP - innovation in ICT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.csp.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csp.it/?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:info-idem@csp.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csp.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSP - innovation in ICT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSP - innovation in ICT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.csp.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csp.it/?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:info-idem@csp.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
index 6f8c1fbf..8fff762b 100644
--- a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/sp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-02T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-02T14:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.csp.it/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WiFi Tower CSP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WiFi Tower CSP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Access to WiFi Tower provided by CSP</mdui:Description>
+        <mdui:Description xml:lang="it">Accesso alla rete WiFi Tower erogata da CSP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.csp.it/federation/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.csp.it/federation/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
+        <mdui:Logo height="80" width="80" xml:lang="en">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
+        <mdui:Logo height="80" width="80" xml:lang="it">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.csp.it/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WiFi Tower CSP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">WiFi Tower CSP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Access to WiFi Tower provided by CSP</mdui:Description>
-          <mdui:Description xml:lang="it">Accesso alla rete WiFi Tower erogata da CSP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.csp.it/federation/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.csp.it/federation/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-          <mdui:Logo height="80" width="80" xml:lang="en">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-          <mdui:Logo height="80" width="80" xml:lang="it">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC0DCCAbigAwIBAgIJAMxj7o7FT11OMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
 BAMTA2lkcDAeFw0xMzAyMjUxMDEwNTBaFw0yMzAyMjMxMDEwNTBaMA4xDDAKBgNV
 BAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBf7mmx56i5
@@ -44,41 +44,41 @@ bQLibp8moXN3SjxRvqufUJIgFeh/JoonndDaC3k6tQRbGXxQnDXa/RoDSDwSyRsE
 EkfeWh8XDP1T2B4AiP38KYZRsfnOi+jtS2Q44doZpNfQk+LFbBhh5V74LeKTaDE3
 LcBp9w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csp.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.csp.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csp.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.csp.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp.csp.it/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.csp.it/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp.csp.it/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">WiFi Tower CSP</md:ServiceName>
-        <md:ServiceName xml:lang="it">WiFi Tower CSP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Access to WiFi Tower provided by CSP</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Accesso alla rete WiFi Tower erogata da CSP</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSP - innovation in ICT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">WiFi Tower erogata da CSP</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">WiFi Tower provided by CSP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.csp.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csp.it/?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>System</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:info-idem@csp.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csp.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.csp.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csp.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.csp.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp.csp.it/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.csp.it/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp.csp.it/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">WiFi Tower CSP</md:ServiceName>
+      <md:ServiceName xml:lang="it">WiFi Tower CSP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Access to WiFi Tower provided by CSP</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Accesso alla rete WiFi Tower erogata da CSP</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSP - innovation in ICT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">WiFi Tower erogata da CSP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">WiFi Tower provided by CSP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.csp.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csp.it/?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>System</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:info-idem@csp.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml
index b97531f4..ae0f025e 100644
--- a/swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cssd.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cssd.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cssd.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cssd.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cssd.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Central School of Speech and Drama</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cssd.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cssd.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cssd.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Central School of Speech and Drama</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cssd.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml
index 0880f2bb..47df1a1b 100644
--- a/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csudh.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csudh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Dominguez Hills</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csudh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Dominguez Hills</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFizCCBHOgAwIBAgICAm0wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDgxMDE3NTMxNFoXDTExMDgx
@@ -50,23 +50,23 @@ r3cf52wnQAsbE5cXL4Mf9wDvAFOlK+pgkstgJvpibk/JfUesgSCvmZwGyrQGK1lR
 0wPmWZthqEjNQhZ6UVb1sSFijfYNnsrPZS+xujaKqzJrSXLR09VtAUYPuP20PY/N
 YzlLClhgY9axf7qCtv/2rUKxME2tnK8GLNnGXGkvTg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csudh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csudh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csudh.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csudh.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csudh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csudh.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csudh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csudh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csudh.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csudh.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csudh.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csudh.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFizCCBHOgAwIBAgICAm0wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDgxMDE3NTMxNFoXDTExMDgx
@@ -98,19 +98,19 @@ r3cf52wnQAsbE5cXL4Mf9wDvAFOlK+pgkstgJvpibk/JfUesgSCvmZwGyrQGK1lR
 0wPmWZthqEjNQhZ6UVb1sSFijfYNnsrPZS+xujaKqzJrSXLR09VtAUYPuP20PY/N
 YzlLClhgY9axf7qCtv/2rUKxME2tnK8GLNnGXGkvTg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csudh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csudh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Dominguez Hills</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Dominguez Hills</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csudh.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Edgar Lazarian</md:GivenName>
-      <md:EmailAddress>elazarian@csudh.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csudh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csudh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Dominguez Hills</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Dominguez Hills</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csudh.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Edgar Lazarian</md:GivenName>
+    <md:EmailAddress>elazarian@csudh.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml
index 63c124dd..9df731c6 100644
--- a/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csus.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.csus.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csus.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Sacramento</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.csus.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csus.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Sacramento</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFiTCCBHGgAwIBAgICAp8wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAxMzE3NTkwOFoXDTExMTAx
@@ -50,13 +50,13 @@ KivxKK2xGYlmJDEqbLu+k8Puta1AGfMNJq54xdv8bTKJMkxlR8ATJA7DlJd2YYy1
 ehMZ8k1NjYWDUUWO3GzrWr0L7ay9XgMSr6/5A3L2IVBaaPbhC2/XAVAl+YLpqaDw
 ZGqHp4D/LP3T5x1Tr5iE1zNrNAVeaetMeqA2PGI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAIrcLAZd2tlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5jc3VzLmVkdTAeFw0xMTEwMTExNTU1MzBaFw0yMTEwMDgxNTU1MzBa
 MBcxFTATBgNVBAMTDGlkcC5jc3VzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -75,24 +75,24 @@ fIctPqr43IlDuZqDDWbbCOPti49oTcMGDeVHJPfR6o2kGeM8qo+uQlHpU030mjtR
 Lgbeue9s2vlzQoPbAW2ZIjMtxkSztb4dXEiDz6jBf788NVKCfeKrL52TMF1kT/NM
 A4DxizdeC1TEfLUgq0gDwe8XIYYldlIDI2XAwlm69GmSAVWtw91I4TbeJGJT
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csus.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csus.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csus.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csus.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csus.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csus.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csus.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csus.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csus.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csus.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csus.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csus.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csus.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csus.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFiTCCBHGgAwIBAgICAp8wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAxMzE3NTkwOFoXDTExMTAx
@@ -124,13 +124,13 @@ KivxKK2xGYlmJDEqbLu+k8Puta1AGfMNJq54xdv8bTKJMkxlR8ATJA7DlJd2YYy1
 ehMZ8k1NjYWDUUWO3GzrWr0L7ay9XgMSr6/5A3L2IVBaaPbhC2/XAVAl+YLpqaDw
 ZGqHp4D/LP3T5x1Tr5iE1zNrNAVeaetMeqA2PGI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAIrcLAZd2tlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5jc3VzLmVkdTAeFw0xMTEwMTExNTU1MzBaFw0yMTEwMDgxNTU1MzBa
 MBcxFTATBgNVBAMTDGlkcC5jc3VzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -149,19 +149,19 @@ fIctPqr43IlDuZqDDWbbCOPti49oTcMGDeVHJPfR6o2kGeM8qo+uQlHpU030mjtR
 Lgbeue9s2vlzQoPbAW2ZIjMtxkSztb4dXEiDz6jBf788NVKCfeKrL52TMF1kT/NM
 A4DxizdeC1TEfLUgq0gDwe8XIYYldlIDI2XAwlm69GmSAVWtw91I4TbeJGJT
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csus.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csus.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Sacramento</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Sacramento</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csus.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brennan Pike</md:GivenName>
-      <md:EmailAddress>idm@csus.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csus.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csus.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Sacramento</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Sacramento</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csus.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brennan Pike</md:GivenName>
+    <md:EmailAddress>idm@csus.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml
index 18740469..e1654549 100644
--- a/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csusm.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csusm.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, San Marcos</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csusm.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, San Marcos</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIURBObONYB1aVZUkchbN9Vm7i8Il4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmNzdXNtLmVkdTAeFw0wOTA4MjQxNzQ1MDZaFw0y
 OTA4MjQxNzQ1MDZaMBgxFjAUBgNVBAMTDWlkcC5jc3VzbS5lZHUwggEiMA0GCSqG
@@ -37,24 +37,24 @@ IUnVPqjV3HQd+eTL4yQQM1s4NANaMsCoQ/u0C/j5C92ERrYmKZ3axgVh5iuEMcRI
 noZH8nkxLFKIpQhm5kJlWq5YOKrdyTUF9lF7lD3YqacBcK/gctKBxbAmHwPqn2kc
 erUVBDmnMbYvO+WkO29HAl4Q0MbsXjQOm0C8cdFfI7gnehE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csusm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csusm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csusm.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csusm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csusm.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csusm.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csusm.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csusm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csusm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csusm.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csusm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csusm.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csusm.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csusm.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIURBObONYB1aVZUkchbN9Vm7i8Il4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmNzdXNtLmVkdTAeFw0wOTA4MjQxNzQ1MDZaFw0y
 OTA4MjQxNzQ1MDZaMBgxFjAUBgNVBAMTDWlkcC5jc3VzbS5lZHUwggEiMA0GCSqG
@@ -73,23 +73,23 @@ IUnVPqjV3HQd+eTL4yQQM1s4NANaMsCoQ/u0C/j5C92ERrYmKZ3axgVh5iuEMcRI
 noZH8nkxLFKIpQhm5kJlWq5YOKrdyTUF9lF7lD3YqacBcK/gctKBxbAmHwPqn2kc
 erUVBDmnMbYvO+WkO29HAl4Q0MbsXjQOm0C8cdFfI7gnehE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csusm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csusm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, San Marcos</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, San Marcos</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csusm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>April Grommo</md:GivenName>
-      <md:EmailAddress>agrommo@csusm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Diane Petersen</md:GivenName>
-      <md:EmailAddress>kai@csusm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csusm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csusm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, San Marcos</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, San Marcos</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csusm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>April Grommo</md:GivenName>
+    <md:EmailAddress>agrommo@csusm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Diane Petersen</md:GivenName>
+    <md:EmailAddress>kai@csusm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
index 5e658597..ed84e697 100644
--- a/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cti.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CTI "Diophantus"</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Computer Technology Institute and Press "Diophantus"</mdui:Description>
+        <mdui:DisplayName xml:lang="el">ΙΤΥΕ "Διόφαντος"</mdui:DisplayName>
+        <mdui:Description xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</mdui:Description>
+        <mdui:Logo height="71" width="87" xml:lang="en">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
+        <mdui:Logo height="71" width="87" xml:lang="el">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>cti.gr</mdui:DomainHint>
+        <mdui:IPHint>150.140.0.0/17</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.291031,21.796414</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CTI "Diophantus"</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Computer Technology Institute and Press "Diophantus"</mdui:Description>
-          <mdui:DisplayName xml:lang="el">ΙΤΥΕ "Διόφαντος"</mdui:DisplayName>
-          <mdui:Description xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</mdui:Description>
-          <mdui:Logo height="71" width="87" xml:lang="en">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
-          <mdui:Logo height="71" width="87" xml:lang="el">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>cti.gr</mdui:DomainHint>
-          <mdui:IPHint>150.140.0.0/17</mdui:IPHint>
-          <mdui:GeolocationHint>geo:38.291031,21.796414</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDFDCCAfygAwIBAgIVAPDB3O4Jt71/WaU2UiNReDy9dbsIMA0GCSqGSIb3DQEB
                             CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE5WhcNMzUx
                             MDI3MTcwNzE5WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
@@ -45,13 +45,13 @@
                             CKL20oxVcOZjco6xEjM6oaiHI4dDr9wO9lF3TA+DcWSdRrCprSPalVzVn8HmUhOc
                             K/B20docwc7tKIOQGaEpjo2lmbquG/ib
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDFDCCAfygAwIBAgIVAKCs+DufmEJRT/Iei5Y37ZP32r4sMA0GCSqGSIb3DQEB
                             CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE2WhcNMzUx
                             MDI3MTcwNzE2WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
@@ -70,13 +70,13 @@
                             aZOQwUGSYAxOQ1t5ECcLon8toelZ4gPCBd65HRt9DRiHH3llPX0bhTLgEWJoJGXD
                             32KKXNIN34sD1e3mqloO1Xq0z6x8OgHD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDEzCCAfugAwIBAgIUSKHnO5Jifa6uUWyYYBAzykF1pmcwDQYJKoZIhvcNAQEL
                             BQAwFTETMBEGA1UEAwwKaWRwLmN0aS5ncjAeFw0xNTEwMjcxODA3MThaFw0zNTEw
                             MjcxNzA3MThaMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwggEiMA0GCSqGSIb3DQEB
@@ -95,27 +95,27 @@
                             laQD5tUeCkThxG23v8VCVdAFOwPnewoxqrD/Wyv6O7d/JF7nddS4f42XGxpQjReM
                             XKRoBZLikxPeZrLAGknFeSzOJHc13hU=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cti.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cti.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cti.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cti.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cti.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cti.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cti.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cti.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDFDCCAfygAwIBAgIVAPDB3O4Jt71/WaU2UiNReDy9dbsIMA0GCSqGSIb3DQEB
                             CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE5WhcNMzUx
                             MDI3MTcwNzE5WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
@@ -134,13 +134,13 @@
                             CKL20oxVcOZjco6xEjM6oaiHI4dDr9wO9lF3TA+DcWSdRrCprSPalVzVn8HmUhOc
                             K/B20docwc7tKIOQGaEpjo2lmbquG/ib
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDFDCCAfygAwIBAgIVAKCs+DufmEJRT/Iei5Y37ZP32r4sMA0GCSqGSIb3DQEB
                             CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE2WhcNMzUx
                             MDI3MTcwNzE2WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
@@ -159,13 +159,13 @@
                             aZOQwUGSYAxOQ1t5ECcLon8toelZ4gPCBd65HRt9DRiHH3llPX0bhTLgEWJoJGXD
                             32KKXNIN34sD1e3mqloO1Xq0z6x8OgHD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDEzCCAfugAwIBAgIUSKHnO5Jifa6uUWyYYBAzykF1pmcwDQYJKoZIhvcNAQEL
                             BQAwFTETMBEGA1UEAwwKaWRwLmN0aS5ncjAeFw0xNTEwMjcxODA3MThaFw0zNTEw
                             MjcxNzA3MThaMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwggEiMA0GCSqGSIb3DQEB
@@ -184,32 +184,32 @@
                             laQD5tUeCkThxG23v8VCVdAFOwPnewoxqrD/Wyv6O7d/JF7nddS4f42XGxpQjReM
                             XKRoBZLikxPeZrLAGknFeSzOJHc13hU=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cti.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.cti.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Giorgos</md:GivenName>
-      <md:SurName>Kokolakis</md:SurName>
-      <md:EmailAddress>kokolakis@cti.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-2610960319</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>CTI "Diophantus"</md:Company>
-      <md:EmailAddress>noc@cti.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-2610690300</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cti.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.cti.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Giorgos</md:GivenName>
+    <md:SurName>Kokolakis</md:SurName>
+    <md:EmailAddress>kokolakis@cti.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-2610960319</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>CTI "Diophantus"</md:Company>
+    <md:EmailAddress>noc@cti.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-2610690300</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml
index dd94a3c7..88496fac 100644
--- a/swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ctksfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ctksfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ctksfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ctksfc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ctksfc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Christ the King VI Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ctksfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ctksfc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ctksfc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Christ the King VI Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ctksfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
index 2005195f..e23deb23 100644
--- a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cue-lillenorddefrance.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-16T16:33:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-16T16:33:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cue-lillenorddefrance.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACWUlEQVQoz2WS0UtTcRTHz7m7d5u77m53t101m86cgYWz1cyXknpKoZf+A5+jxyCIwKCnHnqIIIQkiJCShN56KQhS1LA0NdzG0kpHurar0+vudu+dv9PDwHJ+nw7ncM73C+cDREREjDHTqjwffZUv6KzaIaoWNeKA7QEZCHYms/J6fHRpad6yLW17a2FxgYDgiJDsn18np0KRqEVchceGptDmRm5sbHzi4/TIyEgwIOPhBR4QVVXVdV1UJPEYTsy98biDgix4mptJkm0AZ60D0wG41dU1FIvJ3Pu5bzN+d+hU9JopxWcmF29dv+wDqGbjAAGAK6Lrh6YFW9vWN7OGZRKSZZv+gFzh+KJhufYBbUgup54MD+8TIwDH4L2bt4fu1otiLHZ2b6coVLwdofOK1OZwePvjndKa8ejO0O/C1tsP7wYG+p1ugbdNs7srKsvyrmZ4TKUncpIRf1wJlfOlsacvb/Rd7e29UBdRW7paSlBGxjse3n8QbgiVCkZ3++n1+bRdsIhzOUXJK/l5nvME6s5cjFoVTWmsf/ziWdkFyBgDgF29uDj7pU1uOhEOr2R/2U6htT28D5BOp7Ibq/463DF2BbUx0hnlABEQJa946Uqf7rAn5qe9iqzl//AA2/mcz+fdKZVml7/LwXCsI5ZPZ5ARAQACEBEBMkaJRCKZTCqKUkEKd7SWLTORSgUknxudPed6kKj2/0RklExN06Y+zcTjceBIkQOiKAqcA6vjo2KMzX6ey2xmjyLIATAAdnD7f58mVUWAA5YIgAC4Q5zgP9JUVcUa7gAA4C+Yj1Q/FwTkJgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.espe-lnf.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personnels, Formateurs et étudiants</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels, Formateurs et étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cue-lillenorddefrance.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACWUlEQVQoz2WS0UtTcRTHz7m7d5u77m53t101m86cgYWz1cyXknpKoZf+A5+jxyCIwKCnHnqIIIQkiJCShN56KQhS1LA0NdzG0kpHurar0+vudu+dv9PDwHJ+nw7ncM73C+cDREREjDHTqjwffZUv6KzaIaoWNeKA7QEZCHYms/J6fHRpad6yLW17a2FxgYDgiJDsn18np0KRqEVchceGptDmRm5sbHzi4/TIyEgwIOPhBR4QVVXVdV1UJPEYTsy98biDgix4mptJkm0AZ60D0wG41dU1FIvJ3Pu5bzN+d+hU9JopxWcmF29dv+wDqGbjAAGAK6Lrh6YFW9vWN7OGZRKSZZv+gFzh+KJhufYBbUgup54MD+8TIwDH4L2bt4fu1otiLHZ2b6coVLwdofOK1OZwePvjndKa8ejO0O/C1tsP7wYG+p1ugbdNs7srKsvyrmZ4TKUncpIRf1wJlfOlsacvb/Rd7e29UBdRW7paSlBGxjse3n8QbgiVCkZ3++n1+bRdsIhzOUXJK/l5nvME6s5cjFoVTWmsf/ziWdkFyBgDgF29uDj7pU1uOhEOr2R/2U6htT28D5BOp7Ibq/463DF2BbUx0hnlABEQJa946Uqf7rAn5qe9iqzl//AA2/mcz+fdKZVml7/LwXCsI5ZPZ5ARAQACEBEBMkaJRCKZTCqKUkEKd7SWLTORSgUknxudPed6kKj2/0RklExN06Y+zcTjceBIkQOiKAqcA6vjo2KMzX6ey2xmjyLIATAAdnD7f58mVUWAA5YIgAC4Q5zgP9JUVcUa7gAA4C+Yj1Q/FwTkJgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.espe-lnf.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Personnels, Formateurs et étudiants</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels, Formateurs et étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
@@ -47,26 +47,26 @@ Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
 k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
 pjRCf2fUkk8Bag==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cue-lillenorddefrance.fr/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cue-lillenorddefrance.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cue-lillenorddefrance.fr/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cue-lillenorddefrance.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
@@ -93,19 +93,19 @@ Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
 k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
 pjRCf2fUkk8Bag==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.espe-lnf.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>info-infra.dir@espe-lnf.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.espe-lnf.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>info-infra.dir@espe-lnf.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml
index b114e96a..f355cae0 100644
--- a/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cumbria.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cumbria.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cumbria.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAOXrI5dTcF3eJhiLgfzEAFQ4YYsBMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC5jdW1icmlhLmFjLnVrMB4XDTA5MDExNTE1NTIz
 						N1oXDTI5MDExNTE1NTIzN1owHDEaMBgGA1UEAxMRaWRwLmN1bWJyaWEuYWMudWsw
@@ -30,26 +30,26 @@
 						DQlpy9y9C7nh97jPpOF0dPVKnbaGRYwmHCfuI2iV4QllpGRnGzEDBIMHsaTlkE3o
 						yamQLw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cumbria.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cumbria.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAOXrI5dTcF3eJhiLgfzEAFQ4YYsBMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC5jdW1icmlhLmFjLnVrMB4XDTA5MDExNTE1NTIz
 						N1oXDTI5MDExNTE1NTIzN1owHDEaMBgGA1UEAxMRaWRwLmN1bWJyaWEuYWMudWsw
@@ -69,25 +69,25 @@
 						DQlpy9y9C7nh97jPpOF0dPVKnbaGRYwmHCfuI2iV4QllpGRnGzEDBIMHsaTlkE3o
 						yamQLw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cumbria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cumbria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cumbria.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:ictstechops@cumbria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:ictstechops@cumbria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cumbria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cumbria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cumbria.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:ictstechops@cumbria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:ictstechops@cumbria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.curie.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.curie.fr-idp-saml2-metadata.xml
index 3264282b..6d6741c5 100644
--- a/swamid-interfederations-2.0/idp.curie.fr-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.curie.fr-idp-saml2-metadata.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.curie.fr/idp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-05-23T11:36:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-05-23T11:36:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">curie.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institut Curie - Research center</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAADE3PoAQYzxAMvKyQDW1dMAbpzbAGyIsABZnPUA5+blAEZwqwCJuPcA09PRAMnIxwBPlvYAxcTCANDPzADz8/IA4OPmAPz9/wDF3PsA0dHPAKSyxQD19fUA9vX1AO3o4ADx8fAA5uPeAPP2+wATce4A0M/NANDi+wB1rfcAxsG7ADeH8QDw7+4A4ODfAG+o9QDh4N8A9Pj+AE+V8gAZdO4Azc3LAM7NywBzq/UA7e3sAN7e3QDf3t0AzuL8ACx/8ACBsO8AzMvJAP7+/gCdxPgA1OX8AN3c2wBEc7YAO4ryAN3Z0wD8/PwA+Pv/APn7/wCuz/oAQo3yACJ67wBZm/MA3uv8APr6+gBemegAxcPAAOzz/gAnfe8A+Pj4AEyT8gAVcu4ANoXxAOXl5ABvqfUA19bVAOHh3wC+2PoA9vb2ADpxvgDj7v0A///+APDw7wC+vboA9fn/ALvX/gDT0tEAoMX4AN7d2wCnzP0AwL+9APn8/wDD2/sAVpnzANvp/ADBwcAAzMzKAP///wAke+8Ak733ANjUzAAib9cA4d7ZAOz0/gB8sfkAgLL2AEqR8gC8u7kA7u7uANjV0gC90/IAqMv5APf6/gDJyMYAdKr1AOjo5wB2rfUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiD1NBYmJiYmJiYmJiYmIrCkxhQ2dvaSZeCR1iYmJKVE1iORkFNkIGICc+M2IWWxxiYmJaBB9lUmhOdWMALGx0YmJcPVYXVCFiYmJdcxMNQWJiUS88UnItYmJiYksTAjJiYkBFamIHImJiYjRrJDFiYmJVNwwyWRhiYjpHJkYpT2JiYjBmFDhiYiUjSHBibShXAw5gCFAaYl8/GyM7YmIVNWELbhBkHipJAVgRYmJiYmJiMmJiYkQSLnFiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.curie.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personal of Institut Curie</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Institut Curie - Centre de recherche</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel référencé dans les annuaires de l'Institut Curie pour le domaine curie.fr</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">curie.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institut Curie - Research center</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAADE3PoAQYzxAMvKyQDW1dMAbpzbAGyIsABZnPUA5+blAEZwqwCJuPcA09PRAMnIxwBPlvYAxcTCANDPzADz8/IA4OPmAPz9/wDF3PsA0dHPAKSyxQD19fUA9vX1AO3o4ADx8fAA5uPeAPP2+wATce4A0M/NANDi+wB1rfcAxsG7ADeH8QDw7+4A4ODfAG+o9QDh4N8A9Pj+AE+V8gAZdO4Azc3LAM7NywBzq/UA7e3sAN7e3QDf3t0AzuL8ACx/8ACBsO8AzMvJAP7+/gCdxPgA1OX8AN3c2wBEc7YAO4ryAN3Z0wD8/PwA+Pv/APn7/wCuz/oAQo3yACJ67wBZm/MA3uv8APr6+gBemegAxcPAAOzz/gAnfe8A+Pj4AEyT8gAVcu4ANoXxAOXl5ABvqfUA19bVAOHh3wC+2PoA9vb2ADpxvgDj7v0A///+APDw7wC+vboA9fn/ALvX/gDT0tEAoMX4AN7d2wCnzP0AwL+9APn8/wDD2/sAVpnzANvp/ADBwcAAzMzKAP///wAke+8Ak733ANjUzAAib9cA4d7ZAOz0/gB8sfkAgLL2AEqR8gC8u7kA7u7uANjV0gC90/IAqMv5APf6/gDJyMYAdKr1AOjo5wB2rfUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiD1NBYmJiYmJiYmJiYmIrCkxhQ2dvaSZeCR1iYmJKVE1iORkFNkIGICc+M2IWWxxiYmJaBB9lUmhOdWMALGx0YmJcPVYXVCFiYmJdcxMNQWJiUS88UnItYmJiYksTAjJiYkBFamIHImJiYjRrJDFiYmJVNwwyWRhiYjpHJkYpT2JiYjBmFDhiYiUjSHBibShXAw5gCFAaYl8/GyM7YmIVNWELbhBkHipJAVgRYmJiYmJiMmJiYkQSLnFiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.curie.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Personal of Institut Curie</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Institut Curie - Centre de recherche</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel référencé dans les annuaires de l'Institut Curie pour le domaine curie.fr</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+TCCAeGgAwIBAgIJALKmKAk5qq9WMA0GCSqGSIb3DQEBCwUAMBMxETAPBgNV
 BAMMCHdob2NhcmVzMB4XDTE2MDUxODE0MjUxNVoXDTI2MDUxNjE0MjUxNVowEzER
 MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -38,27 +38,27 @@ ZhEqXkZfL1td5kfO3A8IVjNVEStGLmSLQiGxbNpxThfjbCDeG3uwPiNPveOuRoM1
 Iy80QQU8+RcBstGvXnz9O0zEGPDqaqFwAzYqdy+YUE1ccc97CF66bxKNRui0p2DD
 KN7x3BLgQCRPi7tlXRhTq3EqVF66iAuIEXD3jkboMMny8mBw0J7eevFdbSB8
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.curie.fr/idp/saml2/slo"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.curie.fr/idp/saml2/slo"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.curie.fr/idp/saml2/slo/soap"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.curie.fr/idp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.curie.fr/idp/saml2/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institut Curie - Centre de recherche</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institut Curie - Centre de recherche</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.curie.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Gabriel Dick</md:SurName>
-      <md:EmailAddress>jean-gabriel.dick@curie.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sébastien Goud</md:SurName>
-      <md:EmailAddress>sebastien.goud@curie.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.curie.fr/idp/saml2/slo"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.curie.fr/idp/saml2/slo"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.curie.fr/idp/saml2/slo/soap"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.curie.fr/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.curie.fr/idp/saml2/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institut Curie - Centre de recherche</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institut Curie - Centre de recherche</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.curie.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Gabriel Dick</md:SurName>
+    <md:EmailAddress>jean-gabriel.dick@curie.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sébastien Goud</md:SurName>
+    <md:EmailAddress>sebastien.goud@curie.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
index bd892051..14f00c75 100644
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cvgz.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-06T13:35:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-06T13:35:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvgz.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Global Change Research Institute CAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider GCRI AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚVGZ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
+        <mdui:Logo height="44" width="119">https://jiftach.cas.cz/loga/logo-uvgz-44.png</mdui:Logo>
+        <mdui:Logo height="137" width="371">https://jiftach.cas.cz/loga/logo-uvgz-137.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvgz.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Global Change Research Institute CAS</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider GCRI AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚVGZ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
-          <mdui:Logo height="44" width="119">https://jiftach.cas.cz/loga/logo-uvgz-44.png</mdui:Logo>
-          <mdui:Logo height="137" width="371">https://jiftach.cas.cz/loga/logo-uvgz-137.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
 Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
@@ -51,29 +51,29 @@ UM+tjeQUjPgXPeezWIm7VketDNfa3jiwmCMorKalCq1A7ZAqrQ9PfWS3rLWpKL8G
 Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cvgz.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvgz.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cvgz.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvgz.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
 Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
@@ -93,26 +93,26 @@ UM+tjeQUjPgXPeezWIm7VketDNfa3jiwmCMorKalCq1A7ZAqrQ9PfWS3rLWpKL8G
 Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Global Change Research Institute CAS</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav výzkumu globální změny AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Global Change Research Institute CAS, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Global Change Research Institute CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav výzkumu globální změny AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Global Change Research Institute CAS, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml
index d0d86bae..5cba0470 100644
--- a/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cwc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-26T10:27:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-26T10:27:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUGMUEvqcH0AW3uF4F0/urAdo29hQwDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLmN3Yy5hYy51azAeFw0xMzA5MTgxMTIwNDJaFw0z
 						MzA5MTgxMTIwNDJaMBgxFjAUBgNVBAMTDWlkcC5jd2MuYWMudWswggEiMA0GCSqG
@@ -31,29 +31,29 @@
 						mqhLbqrMAQbaSkLiOHbN8ZZ+c/2q2Yv5HEdgvrsxXCpgINSA9zcMIEl9rAADbOOG
 						K3oBkLQYth/QakEkMIiItL8GzAU0TNWO+72vhyYn7qm5W+M=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cwc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cwc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUGMUEvqcH0AW3uF4F0/urAdo29hQwDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLmN3Yy5hYy51azAeFw0xMzA5MTgxMTIwNDJaFw0z
 						MzA5MTgxMTIwNDJaMBgxFjAUBgNVBAMTDWlkcC5jd2MuYWMudWswggEiMA0GCSqG
@@ -72,27 +72,27 @@
 						mqhLbqrMAQbaSkLiOHbN8ZZ+c/2q2Yv5HEdgvrsxXCpgINSA9zcMIEl9rAADbOOG
 						K3oBkLQYth/QakEkMIiItL8GzAU0TNWO+72vhyYn7qm5W+M=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City of Westminster College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City of Westminster College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cwc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Yves</md:GivenName>
-      <md:SurName>Bozzo-Rey</md:SurName>
-      <md:EmailAddress>mailto:yves_bozzo-rey@cwc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Yves</md:GivenName>
-      <md:SurName>Bozzo-Rey</md:SurName>
-      <md:EmailAddress>mailto:yves_bozzo-rey@cwc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City of Westminster College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City of Westminster College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cwc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Yves</md:GivenName>
+    <md:SurName>Bozzo-Rey</md:SurName>
+    <md:EmailAddress>mailto:yves_bozzo-rey@cwc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yves</md:GivenName>
+    <md:SurName>Bozzo-Rey</md:SurName>
+    <md:EmailAddress>mailto:yves_bozzo-rey@cwc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml
index 35344afc..15040f21 100644
--- a/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cwu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Central Washington University</mdui:DisplayName>
+        <mdui:Logo height="50" width="153" xml:lang="en">https://idp.cwu.edu/images/cwulogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Central Washington University</mdui:DisplayName>
-          <mdui:Logo height="50" width="153" xml:lang="en">https://idp.cwu.edu/images/cwulogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPt8x8FtcfDVuV6N/QbiW4L+1GRpMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5jd3UuZWR1MB4XDTEzMTIwOTE3NDEyMVoXDTMz
 MTIwOTE3NDEyMVowFjEUMBIGA1UEAxMLaWRwLmN3dS5lZHUwggEiMA0GCSqGSIb3
@@ -38,24 +38,24 @@ XvhjWr8zU3ZEJPyUIub9bVyhDhX6RxPZU1oelWxaU3+9LI7bShYb6FMnbZh4dDvC
 3jj2YybUOSZmNTOILtnCYiSVeTKwVvGEuzLk1ipBjR+L1ACsmT2WBeKraszHpDMr
 uh7Ac/yv6fmgKvc2SYn3Z6ZzsAmMrUUZyQ4A4g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cwu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cwu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cwu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cwu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPt8x8FtcfDVuV6N/QbiW4L+1GRpMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5jd3UuZWR1MB4XDTEzMTIwOTE3NDEyMVoXDTMz
 MTIwOTE3NDEyMVowFjEUMBIGA1UEAxMLaWRwLmN3dS5lZHUwggEiMA0GCSqGSIb3
@@ -74,18 +74,18 @@ XvhjWr8zU3ZEJPyUIub9bVyhDhX6RxPZU1oelWxaU3+9LI7bShYb6FMnbZh4dDvC
 3jj2YybUOSZmNTOILtnCYiSVeTKwVvGEuzLk1ipBjR+L1ACsmT2WBeKraszHpDMr
 uh7Ac/yv6fmgKvc2SYn3Z6ZzsAmMrUUZyQ4A4g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Central Washington University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Central Washington University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cwu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>CWU Identity Provider Administrators</md:GivenName>
-      <md:EmailAddress>idp-admins@networks.cwu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Central Washington University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Central Washington University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cwu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CWU Identity Provider Administrators</md:GivenName>
+    <md:EmailAddress>idp-admins@networks.cwu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
index be58db40..b7a60d47 100644
--- a/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dante.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.dante.net/idp/images/geant_logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/geant_logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>dante.net</mdui:DomainHint>
+        <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GÉANT plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.dante.net/idp/images/geant_logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/geant_logo-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>dante.net</mdui:DomainHint>
-          <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
 						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
@@ -46,29 +46,29 @@
 						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
 						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dante.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dante.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
 						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
@@ -90,25 +90,25 @@
 						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
 						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Staff Identity Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DANTE Support</md:GivenName>
-      <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DANTE Support</md:GivenName>
-      <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Staff Identity Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml
index 0c8af001..ada9f81a 100644
--- a/swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.davidsonccc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidsonccc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Davidson County Community College</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.davidsonccc.edu/about-dccc/consumer-information</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidsonccc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Davidson County Community College</mdui:DisplayName>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.davidsonccc.edu/about-dccc/consumer-information</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAOPBqGh9irD58qMJrkXkh/ezrjfMMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC5kYXZpZHNvbmNjYy5lZHUwHhcNMTQwNDEwMTUz
 NDA4WhcNMzQwNDEwMTUzNDA4WjAeMRwwGgYDVQQDExNpZHAuZGF2aWRzb25jY2Mu
@@ -39,26 +39,26 @@ qC2o1XXHUUwLwPgrSOcGIJw6C59R6EljLEKdGh7y+w+ilOgYg124WsGfU3d8Fl3w
 F6ZaB5MM41/G/pJ4M3CEOhOKVa4H/0+IGBf+K6pNcBGbCqXz0GDPgBGlsiU/7yfS
 F3CFoqtbWNwbBjfZ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.davidsonccc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidsonccc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.davidsonccc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidsonccc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAOPBqGh9irD58qMJrkXkh/ezrjfMMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC5kYXZpZHNvbmNjYy5lZHUwHhcNMTQwNDEwMTUz
 NDA4WhcNMzQwNDEwMTUzNDA4WjAeMRwwGgYDVQQDExNpZHAuZGF2aWRzb25jY2Mu
@@ -78,18 +78,18 @@ qC2o1XXHUUwLwPgrSOcGIJw6C59R6EljLEKdGh7y+w+ilOgYg124WsGfU3d8Fl3w
 F6ZaB5MM41/G/pJ4M3CEOhOKVa4H/0+IGBf+K6pNcBGbCqXz0GDPgBGlsiU/7yfS
 F3CFoqtbWNwbBjfZ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Davidson County Community College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Davidson County Community College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.davidsonccc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Donald Beck</md:GivenName>
-      <md:EmailAddress>donald_beck@davidsonccc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Davidson County Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Davidson County Community College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.davidsonccc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Donald Beck</md:GivenName>
+    <md:EmailAddress>donald_beck@davidsonccc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml
index d58b5bc9..f4a97e9b 100644
--- a/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.delval.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">delval.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Delaware Valley University</mdui:DisplayName>
+        <mdui:Logo height="100" width="900" xml:lang="en">https://idp.delval.edu/identity/servlet/logo</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">delval.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Delaware Valley University</mdui:DisplayName>
-          <mdui:Logo height="100" width="900" xml:lang="en">https://idp.delval.edu/identity/servlet/logo</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUDCCAjgCCQCCO+P3N8He3TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCUEExEzARBgNVBAcMCkRveWxlc3Rvd24xIDAeBgNVBAoMF0Rl
 bGF3YXJlIFZhbGxleSBDb2xsZWdlMRcwFQYDVQQDDA5pZHAuZGVsdmFsLmVkdTAe
@@ -39,23 +39,23 @@ wPniAvPRS3QU9fqinSDPLwrjTrTdwgyXODK/7+nQx5C/qtoIee4BsPYlbqsxvBNB
 1TMWJUVw23yBL0hC7l0gxswxbrIxAwKA7aWQyM1apS9ke9x9Xghw6Zk1g+UqW+3C
 9nVqTm0Sk6c7D6fSOhfvXFNGOQGYAUZLRWAQx7V6nwmQ8Xx1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.delval.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.delval.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.delval.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.delval.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.delval.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">delval.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.delval.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.delval.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.delval.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.delval.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.delval.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">delval.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUDCCAjgCCQCCO+P3N8He3TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCUEExEzARBgNVBAcMCkRveWxlc3Rvd24xIDAeBgNVBAoMF0Rl
 bGF3YXJlIFZhbGxleSBDb2xsZWdlMRcwFQYDVQQDDA5pZHAuZGVsdmFsLmVkdTAe
@@ -75,31 +75,31 @@ wPniAvPRS3QU9fqinSDPLwrjTrTdwgyXODK/7+nQx5C/qtoIee4BsPYlbqsxvBNB
 1TMWJUVw23yBL0hC7l0gxswxbrIxAwKA7aWQyM1apS9ke9x9Xghw6Zk1g+UqW+3C
 9nVqTm0Sk6c7D6fSOhfvXFNGOQGYAUZLRWAQx7V6nwmQ8Xx1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.delval.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.delval.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Delaware Valley University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Delaware Valley University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.delval.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Davis</md:GivenName>
-      <md:EmailAddress>michael.davis@delval.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Charles Scally</md:GivenName>
-      <md:EmailAddress>charles.scally@delval.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Michael Davis</md:GivenName>
-      <md:EmailAddress>michael.davis@delval.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Shriver</md:GivenName>
-      <md:EmailAddress>chris.shriver@delval.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.delval.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.delval.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Delaware Valley University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Delaware Valley University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.delval.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Davis</md:GivenName>
+    <md:EmailAddress>michael.davis@delval.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Charles Scally</md:GivenName>
+    <md:EmailAddress>charles.scally@delval.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Michael Davis</md:GivenName>
+    <md:EmailAddress>michael.davis@delval.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Shriver</md:GivenName>
+    <md:EmailAddress>chris.shriver@delval.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml
index 33bb181a..8ec1cdfc 100644
--- a/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.derby-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-04T12:29:50Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-04T12:29:50Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUcC6CXJaCoz2x+pFU5TLdMtrg238wDQYJKoZIhvcNAQEF
 						BQAwIjEgMB4GA1UEAxMXaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWswHhcNMTMwMjI3
 						MTQ1MjI3WhcNMzMwMjI3MTQ1MjI3WjAiMSAwHgYDVQQDExdpZHAuZGVyYnktY29s
@@ -30,26 +30,26 @@
 						mQf6rM44WGIuo+CX4bDORSxyyv8iQ8L2G07CxC8+Cc0eh+WKH83V0zCXKMJYNkaP
 						TBvmtDKuzTAZk6ZEZ+7qKvpc/kVYTqFBqyD0
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.derby-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.derby-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUcC6CXJaCoz2x+pFU5TLdMtrg238wDQYJKoZIhvcNAQEF
 						BQAwIjEgMB4GA1UEAxMXaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWswHhcNMTMwMjI3
 						MTQ1MjI3WhcNMzMwMjI3MTQ1MjI3WjAiMSAwHgYDVQQDExdpZHAuZGVyYnktY29s
@@ -69,27 +69,27 @@
 						mQf6rM44WGIuo+CX4bDORSxyyv8iQ8L2G07CxC8+Cc0eh+WKH83V0zCXKMJYNkaP
 						TBvmtDKuzTAZk6ZEZ+7qKvpc/kVYTqFBqyD0
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Derby College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Derby College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.derby-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>De Ville</md:SurName>
-      <md:EmailAddress>mailto:Tim.DeVille@derby-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>De Ville</md:SurName>
-      <md:EmailAddress>mailto:Tim.DeVille@derby-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Derby College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Derby College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.derby-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>De Ville</md:SurName>
+    <md:EmailAddress>mailto:Tim.DeVille@derby-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>De Ville</md:SurName>
+    <md:EmailAddress>mailto:Tim.DeVille@derby-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.devsnc.com-openam.xml b/swamid-interfederations-2.0/idp.devsnc.com-openam.xml
index eea34584..4b223858 100644
--- a/swamid-interfederations-2.0/idp.devsnc.com-openam.xml
+++ b/swamid-interfederations-2.0/idp.devsnc.com-openam.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.devsnc.com/openam">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">servicenow.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ServiceNow</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IdP DevSNC OpenAM</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">servicenow.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ServiceNow</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IdP DevSNC OpenAM</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYDCCAkigAwIBAgIEUv1eqjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJV
 UzELMAkGA1UECBMCQ0ExFDASBgNVBAcTC1NhbnRhIENsYXJhMRMwEQYDVQQKEwpT
 ZXJ2aWNlTm93MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEVMBMGA1UEAxMMV2FsbGFj
@@ -40,26 +40,26 @@ wTGjcOEw8I4GgES7mOVHfmvRGK2q+yQtagYyyKp4qtOdqIpNFO0jpNzIuQH2Af4Q
 PVv4KGpczHsOlYles0VAmQLOhON2gVMIiYg9C/3/cybnhL48K+OjqFwxbGH0jvu4
 Rx+sUg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.devsnc.com/openam/SSORedirect/metaAlias/idp"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ServiceNow</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ServiceNow</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.servicenow.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Wallace Peng</md:GivenName>
-      <md:EmailAddress>wallace.peng@servicenow.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Aamir Siddiqui</md:GivenName>
-      <md:EmailAddress>aamir.siddiqui@servicenow.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Aparna Ganti</md:GivenName>
-      <md:EmailAddress>aparna.ganti@servicenow.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.devsnc.com/openam/SSORedirect/metaAlias/idp"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ServiceNow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ServiceNow</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.servicenow.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wallace Peng</md:GivenName>
+    <md:EmailAddress>wallace.peng@servicenow.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Aamir Siddiqui</md:GivenName>
+    <md:EmailAddress>aamir.siddiqui@servicenow.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Aparna Ganti</md:GivenName>
+    <md:EmailAddress>aparna.ganti@servicenow.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
index 7c434498..3011994a 100644
--- a/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn-cert.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DFN-CERT Services GmbH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DFN-CERT Services GmbH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
+        <mdui:Description xml:lang="en">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.dfn-cert.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dfn-cert.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DFN-CERT Services GmbH</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DFN-CERT Services GmbH</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
-          <mdui:Description xml:lang="en">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.dfn-cert.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.dfn-cert.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
 REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
 Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
@@ -55,15 +55,15 @@ TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
 piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
 PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
 REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
 Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
@@ -95,28 +95,28 @@ TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
 piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
 PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
 REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
 Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
@@ -148,15 +148,15 @@ TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
 piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
 PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
 REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
 Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
@@ -188,30 +188,30 @@ TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
 piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
 PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e16</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e16</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">DFN-CERT Services GmbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.dfn-cert.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.dfn-cert.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Reimer</md:GivenName>
-      <md:SurName>Karlsen-Masur</md:SurName>
-      <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Reimer</md:GivenName>
-      <md:SurName>Karlsen-Masur</md:SurName>
-      <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e16</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e16</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">DFN-CERT Services GmbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.dfn-cert.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dfn-cert.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Reimer</md:GivenName>
+    <md:SurName>Karlsen-Masur</md:SurName>
+    <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Reimer</md:GivenName>
+    <md:SurName>Karlsen-Masur</md:SurName>
+    <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
index a3c1e2f1..1d49acb8 100644
--- a/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DFN-Verein Geschäftsstelle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DFN Office</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
+        <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
+        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DFN-Verein Geschäftsstelle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DFN Office</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
-          <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
-          <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
 ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
 NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
@@ -68,33 +68,33 @@ XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
 t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
 OcCmF2VZ92umABiw
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.dfn.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
 ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
 NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
@@ -131,36 +131,36 @@ XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
 t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
 OcCmF2VZ92umABiw
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e15</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e15</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.dfn.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.dfn.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ulrich</md:GivenName>
-      <md:SurName>Kähler</md:SurName>
-      <md:EmailAddress>mailto:kaehler@dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Raoul</md:GivenName>
-      <md:SurName>Borenius</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e15</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e15</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.dfn.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dfn.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ulrich</md:GivenName>
+    <md:SurName>Kähler</md:SurName>
+    <md:EmailAddress>mailto:kaehler@dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Raoul</md:GivenName>
+    <md:SurName>Borenius</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
index 0efe768c..0e78a5c6 100644
--- a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dias.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-11-15T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-11-15T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dias.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dublin Institute for Advanced Studies</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dias.ie</mdui:InformationURL>
+        <mdui:Logo height="112" width="136">https://edugate.heanet.ie/rr3/logos/dias_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dias.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dublin Institute for Advanced Studies</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.dias.ie</mdui:InformationURL>
-          <mdui:Logo height="112" width="136">https://edugate.heanet.ie/rr3/logos/dias_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUD82Rv6ZhMvwGESzIOJRkEtryOk4wDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmRpYXMuaWUwHhcNMTMxMTE1MTAxODExWhcNMzMx
 MTE1MTAxODExWjAWMRQwEgYDVQQDEwtpZHAuZGlhcy5pZTCCASIwDQYJKoZIhvcN
@@ -36,41 +36,41 @@ GphiaINCWGdfHDfbsuc6fLoJp4WzSQHxGQEkkHE/XO6zWQLXPNuO9eU3MWwqw+or
 LlHiaoyxj0hM9NnJIllv1huBF7CHL4EadiizxS/nK2mx0vZgJVvQAOG6Kir3lbME
 h8KMdglIpPQmLF1/JtTN3QNn8SZmE7iel3kB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/Logout"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/Logout"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/Logout"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dias.ie/idp/profile/Logout"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dias.ie/idp/profile/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dias.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dias.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jean Francois</md:GivenName>
-      <md:SurName>Bucas</md:SurName>
-      <md:EmailAddress>mailto:jfbucas@stp.dias.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jean Francois</md:GivenName>
-      <md:SurName>Bucas</md:SurName>
-      <md:EmailAddress>mailto:jfbucas@stp.dias.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jean Francois</md:GivenName>
-      <md:SurName>Bucas</md:SurName>
-      <md:EmailAddress>mailto:jfbucas@stp.dias.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dias.ie/idp/profile/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dias.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dias.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jean Francois</md:GivenName>
+    <md:SurName>Bucas</md:SurName>
+    <md:EmailAddress>mailto:jfbucas@stp.dias.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jean Francois</md:GivenName>
+    <md:SurName>Bucas</md:SurName>
+    <md:EmailAddress>mailto:jfbucas@stp.dias.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jean Francois</md:GivenName>
+    <md:SurName>Bucas</md:SurName>
+    <md:EmailAddress>mailto:jfbucas@stp.dias.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
index 09c2b0e7..71d9ecf5 100644
--- a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dir.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
 DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
@@ -41,26 +41,26 @@ lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
 pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
 5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dir.garr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dir.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
 DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
@@ -79,23 +79,23 @@ lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
 pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
 5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
index 00dabcc7..c617035d 100644
--- a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-06T23:00:00Z"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-06T23:00:00Z"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
+        <mdui:Logo height="124" width="124" xml:lang="en">data:image/png;base64,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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
+        <mdui:DomainHint>dit.ie</mdui:DomainHint>
+        <mdui:IPHint>147.252.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.1.28.0/24</mdui:IPHint>
+        <mdui:IPHint>193.186.8.0/29</mdui:IPHint>
+        <mdui:IPHint>193.1.186.8/29</mdui:IPHint>
+        <mdui:IPHint>2001:0770:0068::/48</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
-          <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
-          <mdui:Logo height="124" width="124" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
-          <mdui:DomainHint>dit.ie</mdui:DomainHint>
-          <mdui:IPHint>147.252.0.0/16</mdui:IPHint>
-          <mdui:IPHint>193.1.28.0/24</mdui:IPHint>
-          <mdui:IPHint>193.186.8.0/29</mdui:IPHint>
-          <mdui:IPHint>193.1.186.8/29</mdui:IPHint>
-          <mdui:IPHint>2001:0770:0068::/48</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5kaXQuaWUwHhcNMTAwNjIyMTExNTAwWhcNMzAw
 NjIyMTExNTAwWjAVMRMwEQYDVQQDEwppZHAuZGl0LmllMIIBIjANBgkqhkiG9w0B
@@ -51,34 +51,34 @@ N2vAFMBh3uxWVlSDbivRfNXflXOMYtDqAG1BPHff1UMArvYiSxxiVwM5tNBxmgZy
 N8bWLtABtkfUyrU6ay6E7h6qReHu30iU46r8xDyZkHjLa6iakvGjobWlTBTAF24P
 mANH8mJhMI+endx1YgUmOJJXylP/VAbC
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dublin Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dublin Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dit.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Liam</md:GivenName>
-      <md:SurName>Duffy</md:SurName>
-      <md:EmailAddress>mailto:liam.duffy@dit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NOC</md:SurName>
-      <md:EmailAddress>mailto:noc@dit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tracey</md:GivenName>
-      <md:SurName>Roche</md:SurName>
-      <md:EmailAddress>mailto:tracey.roche@dit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dublin Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dublin Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Liam</md:GivenName>
+    <md:SurName>Duffy</md:SurName>
+    <md:EmailAddress>mailto:liam.duffy@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tracey</md:GivenName>
+    <md:SurName>Roche</md:SurName>
+    <md:EmailAddress>mailto:tracey.roche@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
index b33dd854..705f219e 100644
--- a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dkit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
+        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
+        <mdui:Logo height="98" width="155" xml:lang="en">data:image/png;base64,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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
+        <mdui:DomainHint>dkit.ie</mdui:DomainHint>
+        <mdui:IPHint>193.1.40.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:0770:0028::/48</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
-          <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
-          <mdui:Logo height="98" width="155" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
-          <mdui:DomainHint>dkit.ie</mdui:DomainHint>
-          <mdui:IPHint>193.1.40.0/21</mdui:IPHint>
-          <mdui:IPHint>2001:0770:0028::/48</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUXWnVlumk2ydwS9DRW7Xoxc2vfvcwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmRraXQuaWUwHhcNMDkwODExMTAyNTQ3WhcNMjkw
 ODExMTAyNTQ3WjAWMRQwEgYDVQQDEwtpZHAuZGtpdC5pZTCCASIwDQYJKoZIhvcN
@@ -42,30 +42,30 @@ QW48Aoz0QReQV0oYglj3D9zNUfpnshQqcv45i9+toGTLTdkQfFm/4DUMEWQXM/IE
 +hxh2RRIl0wE/qVYfd5hahptuNWfhjSbTtUB4iPaY18z1TMG3JfgQvtKszQeHRa9
 LKIUf4wMQHssUFNv5TXV1zu1W4f9ctYYLexH
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dkit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dkit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dkit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dundalk Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dundalk Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dkit.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Deenihan</md:SurName>
-      <md:EmailAddress>mailto:michael.denihan@dkit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Brady</md:SurName>
-      <md:EmailAddress>mailto:frank.brady@dkit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dkit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dkit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dkit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dundalk Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dundalk Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dkit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Deenihan</md:SurName>
+    <md:EmailAddress>mailto:michael.denihan@dkit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Brady</md:SurName>
+    <md:EmailAddress>mailto:frank.brady@dkit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml
index f5624a6a..28531098 100644
--- a/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.drew.edu/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drew.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Drew University</mdui:DisplayName>
+        <mdui:Logo height="40" width="171" xml:lang="en">https://www.drew.edu/wp-content/themes/drew-v8/images/drew.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drew.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Drew University</mdui:DisplayName>
-          <mdui:Logo height="40" width="171" xml:lang="en">https://www.drew.edu/wp-content/themes/drew-v8/images/drew.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFcDCCBFigAwIBAgIkAhwR/6UpY1+NpltpnhnZa/x7S0A+G7lu0QhsucXUAgIiSVXDMA0GCSqG
 SIb3DQEBBQUAMDIxGjAYBgNVBAsTEU9yZ2FuaXphdGlvbmFsIENBMRQwEgYDVQQKFAtmcmlkZ2Vf
 dHJlZTAeFw0xNTEwMjcwMTUxMzVaFw0yNDAxMjcwMjUxMzVaMH0xFTATBgNVBAMTDGlkcC5kcmV3
@@ -46,34 +46,34 @@ iLXNxJMzPhbQFmZJQ14jZGoW7s876YdLGlj86p4QxUoY+m5cR+vOnf6a3yAU7v1Z/n1sjs3wPplz
 H7xmsk1TgDb04z+fo4dPJo31XGKXgD45/6WqhFC1+JJ625C7Pv0X6vcbdOSaE9XeBlkRdB6twTwR
 KcA2ygevOdEnii3nfZPpOW5q6at9iJ8GNzCphQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.drew.edu/nidp/saml2/soap" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.drew.edu/nidp/saml2/slo"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.drew.edu/nidp/saml2/slo"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.drew.edu/nidp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.drew.edu/nidp/saml2/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Drew University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Drew University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.drew.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>E. Axel Larsson</md:GivenName>
-      <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>E. Axel Larsson</md:GivenName>
-      <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>E. Axel Larsson</md:GivenName>
-      <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>E. Axel Larsson</md:GivenName>
-      <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.drew.edu/nidp/saml2/soap" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.drew.edu/nidp/saml2/slo"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.drew.edu/nidp/saml2/slo"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.drew.edu/nidp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.drew.edu/nidp/saml2/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Drew University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Drew University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.drew.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>E. Axel Larsson</md:GivenName>
+    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>E. Axel Larsson</md:GivenName>
+    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E. Axel Larsson</md:GivenName>
+    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>E. Axel Larsson</md:GivenName>
+    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml
index d1920a60..5db157aa 100644
--- a/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dudleycol.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dudleycol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dudleycol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/dudleycol.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/dudleycol.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dudley College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dudleycol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/dudleycol.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/dudleycol.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dudley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dudleycol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml
index 1fc4f180..c759f3b6 100644
--- a/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dundee.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-13T11:16:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-13T11:16:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Dundee</mdui:DisplayName>
+        <mdui:Logo height="60" width="85">https://idp.dundee.ac.uk/DundeeUniversityCrest.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Dundee</mdui:DisplayName>
-          <mdui:Logo height="60" width="85">https://idp.dundee.ac.uk/DundeeUniversityCrest.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbTCCA1WgAwIBAgIQV2n6T3aZYb1/Q1TOgutwUDANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPjEhMB8GA1UE
@@ -42,26 +42,26 @@
 						R6x32NTkq6tL+Okm4fMv7U0m4YN3QCYzAkNz40Z6uuJAWzQo8Ny4aZp2/bQZMVzd
 						1fy9pk0OX0CO+CoX2G2EJWz1abxjt5NLB4GwIM3g7bjE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dundee.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dundee.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbTCCA1WgAwIBAgIQV2n6T3aZYb1/Q1TOgutwUDANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPjEhMB8GA1UE
@@ -87,26 +87,26 @@
 						R6x32NTkq6tL+Okm4fMv7U0m4YN3QCYzAkNz40Z6uuJAWzQo8Ny4aZp2/bQZMVzd
 						1fy9pk0OX0CO+CoX2G2EJWz1abxjt5NLB4GwIM3g7bjE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Dundee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Dundee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dundee.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ICS Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:ics-servicedesk@dundee.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Swiffin</md:SurName>
-      <md:EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Dundee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Dundee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dundee.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICS Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:ics-servicedesk@dundee.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Swiffin</md:SurName>
+    <md:EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml
index 04faa50e..5e223998 100644
--- a/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dunstable.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dunstable.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dunstable.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/dunstable.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/dunstable.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Central Bedfordshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dunstable.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/dunstable.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/dunstable.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Central Bedfordshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dunstable.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml
index 4ba16890..dcdd4aa0 100644
--- a/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eastridingcollege.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastridingcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastridingcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/eastridingcollege.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/eastridingcollege.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">East Riding College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eastridingcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/eastridingcollege.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/eastridingcollege.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">East Riding College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eastridingcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
index f7fdd151..71eb165e 100644
--- a/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ebi.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T10:43:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T10:43:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ebi.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">European Molecular Biology Laboratory - EMBL-EBI</mdui:DisplayName>
+        <mdui:Logo height="30" width="95">https://idp.ebi.ac.uk/images/EMBL_EBI_logo_95x30.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.ebi.ac.uk/images/EMBL_EBI_icon_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ebi.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">European Molecular Biology Laboratory - EMBL-EBI</mdui:DisplayName>
-          <mdui:Logo height="30" width="95">https://idp.ebi.ac.uk/images/EMBL_EBI_logo_95x30.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.ebi.ac.uk/images/EMBL_EBI_icon_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
 						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
@@ -36,26 +36,26 @@
 						xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
 						TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ebi.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ebi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ebi.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ebi.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
 						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
@@ -74,27 +74,27 @@
 						xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
 						TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">European Molecular Biology Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">European Molecular Biology Laboratory - EMBL-EBI</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Barker</md:SurName>
-      <md:EmailAddress>mailto:jbarker@ebi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Barker</md:SurName>
-      <md:EmailAddress>mailto:jbarker@ebi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">European Molecular Biology Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">European Molecular Biology Laboratory - EMBL-EBI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Barker</md:SurName>
+    <md:EmailAddress>mailto:jbarker@ebi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Barker</md:SurName>
+    <md:EmailAddress>mailto:jbarker@ebi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
index 163b34a0..afbbc09e 100644
--- a/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ec-lille.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-02T09:29:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-02T09:29:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lille.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig2i.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Centrale de LILLE</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ec-lille.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole Centrale de LILLE</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lille.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig2i.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Centrale de LILLE</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ec-lille.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole Centrale de LILLE</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEmDCCA4CgAwIBAgIQcy0ZZwSdmc+3hWilVNQxZzANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -45,22 +45,22 @@ lOmT/ktPTXy+RT89JlL+Qx/89eRXDQuyZFBsSh3XMULUaR3KIR6mamS/O4rxOvGa
 CdxKtn2kD2HvpO5vJdrfiXRa9unqJZaT9Dx9huACKUTnXFPx5sOq659EvjN23Htt
 mSbHEPZCcinNQ9WAP2AgelqpJ6dm3OxPuWFe+w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ec-lille.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ec-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ec-lille.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Centrale de LILLE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de LILLE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ec-lille.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jonathan Chatriot</md:SurName>
-      <md:EmailAddress>jonathan.chatriot@ec-lille.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ec-lille.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ec-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ec-lille.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Centrale de LILLE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de LILLE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ec-lille.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jonathan Chatriot</md:SurName>
+    <md:EmailAddress>jonathan.chatriot@ec-lille.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
index 21c2ae9e..ff827e20 100644
--- a/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ecam.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T18:14:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T18:14:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecam.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ECAM Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABL0lEQVQoz2P8//8/AymAiSTVDAwMLAwMDNeuPH/86D0zMyMedf/+/RcQ4DKzVGBhYGDYuvlqV9VpfmGWv3/+//2J3YXffvz1ClVYBNHAxsosJsvGycUsJsEtJs7z7x8WPX/+/NPQEoU6CQI+f/hb32nq629ArKcZGRm+fvlFlKcxwZaNl30Dtsixs8JF/v787xOvOGNBCHYNikrCE3vMWVmZoc5gZrx35/3bN99x2qCtK6WtK4Uscu7MkwmdB3FqePni851br5mYoT5kZma8dP4ZCxsTVMM/jNRx/OjdwJC1DAxsyILx4SpQDcLCnL9+/GNmRoSYpZXykYOJyCL//v/n4+NgYGBg+P///5cvv5QFengZWhcvOP6fEGCAUF+//l69/My1q88IamAkNXkDAGPws0KPMnsoAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMyKzAyOjAwIuq/wgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMFO3B34AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ecam.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Utilisateurs ECAM</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ECAM Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Utilisateurs ECAM</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecam.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ECAM Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABL0lEQVQoz2P8//8/AymAiSTVDAwMLAwMDNeuPH/86D0zMyMedf/+/RcQ4DKzVGBhYGDYuvlqV9VpfmGWv3/+//2J3YXffvz1ClVYBNHAxsosJsvGycUsJsEtJs7z7x8WPX/+/NPQEoU6CQI+f/hb32nq629ArKcZGRm+fvlFlKcxwZaNl30Dtsixs8JF/v787xOvOGNBCHYNikrCE3vMWVmZoc5gZrx35/3bN99x2qCtK6WtK4Uscu7MkwmdB3FqePni851br5mYoT5kZma8dP4ZCxsTVMM/jNRx/OjdwJC1DAxsyILx4SpQDcLCnL9+/GNmRoSYpZXykYOJyCL//v/n4+NgYGBg+P///5cvv5QFengZWhcvOP6fEGCAUF+//l69/My1q88IamAkNXkDAGPws0KPMnsoAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMyKzAyOjAwIuq/wgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMFO3B34AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ecam.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Utilisateurs ECAM</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ECAM Lyon</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Utilisateurs ECAM</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
 NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
@@ -39,23 +39,23 @@ j64hF1f32hVfNw1lfF3WwUPD7+ePFAsDZ5X0Z6rTlK0pRm/MKfzU+ASmYyJMbbwc
 7o8Ug2yRh/zIA5hfS5mxYt/1anKXSXxB6DIozsy5rWBZdGKTTFiqVZmFPQjOAOQn
 wuRoN+B/HWXuO2OFERHORHrZqV90QV5Sciud
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ecam.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecam.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecam.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecam.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ecam.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecam.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecam.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecam.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
 NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
@@ -74,19 +74,19 @@ j64hF1f32hVfNw1lfF3WwUPD7+ePFAsDZ5X0Z6rTlK0pRm/MKfzU+ASmYyJMbbwc
 7o8Ug2yRh/zIA5hfS5mxYt/1anKXSXxB6DIozsy5rWBZdGKTTFiqVZmFPQjOAOQn
 wuRoN+B/HWXuO2OFERHORHrZqV90QV5Sciud
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ecam.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ECAM Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ECAM Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ecam.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sysadmin@ecam.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ecam.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ECAM Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ECAM Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ecam.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sysadmin@ecam.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml
index 57adad73..bdcfaf1e 100644
--- a/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ecole-navale.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-12T14:48:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-12T14:48:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecole-navale.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Navale</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ecole-navale.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Ecole Navale</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Navale</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ecole Navale</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecole-navale.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Navale</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ecole-navale.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Ecole Navale</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Navale</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Ecole Navale</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIHFDCCBfygAwIBAgIRAN/99OwB6bXHosvP+tqCI94wDQYJKoZIhvcNAQEFBQAw                                                                                                          
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B                                                                                                          
 IFNTTCBDQTAeFw0xNDA0MTgwMDAwMDBaFw0xNzA0MTcyMzU5NTlaMEExITAfBgNV                                                                                                          
@@ -59,22 +59,22 @@ dG8EUqxt7PuyvbYm/f5/QbM/Xy/1y078y7wgElgS4j+Sls9FKe6soQuQP+1KIAbF
 94YNbKlwTl4fjBHo0j4uvMoSjvfg6NBeNDjix2WlKqyhQ8A0HT3qz6EJAwdJLl7J
 ONfoXgNShfdvleuZQiM4FXhXxPY28yXrGT0cc7dSZe2HVJdgMU1Lcw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ecole-navale.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecole-navale.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecole-navale.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Navale</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Navale</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ecole-navale.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>postmaster</md:SurName>
-      <md:EmailAddress>postmaster@ecole-navale.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ecole-navale.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecole-navale.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecole-navale.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Navale</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Navale</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ecole-navale.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>postmaster</md:SurName>
+    <md:EmailAddress>postmaster@ecole-navale.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
index 7be68cca..92a8c46c 100644
--- a/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Edinburgh</mdui:DisplayName>
+        <mdui:Logo height="70" width="315">https://idp.ed.ac.uk/university.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:55.9213,-3.1726</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Edinburgh</mdui:DisplayName>
-          <mdui:Logo height="70" width="315">https://idp.ed.ac.uk/university.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:55.9213,-3.1726</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
 						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
 						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
@@ -38,26 +38,26 @@
 						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
 						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
 						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
 						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
@@ -76,26 +76,26 @@
 						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
 						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="gd">Oilthigh Dhùn Èideann</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:IS.Helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>shibboleth@ed.ac.uk</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="gd">Oilthigh Dhùn Èideann</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:IS.Helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>shibboleth@ed.ac.uk</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
index 548afa35..e3abfa99 100644
--- a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.edina.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-24T17:03:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-24T17:03:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDINA (staff and trials)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDINA-internal IdP</mdui:Description>
+        <mdui:Logo height="57" width="113">https://dlib-idp.edina.ac.uk/img/edina.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://dlib-idp.edina.ac.uk/img/edina-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EDINA (staff and trials)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDINA-internal IdP</mdui:Description>
-          <mdui:Logo height="57" width="113">https://dlib-idp.edina.ac.uk/img/edina.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://dlib-idp.edina.ac.uk/img/edina-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUZ8boiTD4RixSt29es15v8YO8F34wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAwwUZGxpYi1pZHAuZWRpbmEuYWMudWswHhcNMTUwNDE1MTQz
 						MjQ0WhcNMzUwNDE1MTQzMjQ0WjAfMR0wGwYDVQQDDBRkbGliLWlkcC5lZGluYS5h
@@ -39,27 +39,27 @@
 						bFwFjyGIOmTeUTfN4ekLZ596U7/IHoJRqIzWRtgKhIq9UgQpRNijkIjyEXxnIU4b
 						TJoGlwD1bfDo3vnukwHI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUZ8boiTD4RixSt29es15v8YO8F34wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAwwUZGxpYi1pZHAuZWRpbmEuYWMudWswHhcNMTUwNDE1MTQz
 						MjQ0WhcNMzUwNDE1MTQzMjQ0WjAfMR0wGwYDVQQDDBRkbGliLWlkcC5lZGluYS5h
@@ -79,29 +79,29 @@
 						bFwFjyGIOmTeUTfN4ekLZ596U7/IHoJRqIzWRtgKhIq9UgQpRNijkIjyEXxnIU4b
 						TJoGlwD1bfDo3vnukwHI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA (staff and trials)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>EDINA Infrastructure</md:GivenName>
-      <md:EmailAddress>mailto:edina.infrastructure@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UK federation infrastructure</md:GivenName>
-      <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA (staff and trials)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>EDINA Infrastructure</md:GivenName>
+    <md:EmailAddress>mailto:edina.infrastructure@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UK federation infrastructure</md:GivenName>
+    <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml
index 595c928f..485bb72e 100644
--- a/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.edinburghcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T13:40:35Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T13:40:35Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburghcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburghcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEgTCCA2mgAwIBAgIQK6upqHeZFTtRMqjw0pSkmzANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMTAxNDAwMDAwMFoXDTE2MTAxMzIzNTk1OVowSDEhMB8GA1UE
@@ -37,26 +37,26 @@
 						y9m05ArSqVX/R92evdM8ajQRyzw8Y8zndJen0Ird3BTeYP0Qzuk5N4rccgAgUgyx
 						JlE9suQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.edinburghcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburghcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.edinburghcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburghcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEgTCCA2mgAwIBAgIQK6upqHeZFTtRMqjw0pSkmzANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMTAxNDAwMDAwMFoXDTE2MTAxMzIzNTk1OVowSDEhMB8GA1UE
@@ -83,37 +83,37 @@
 						y9m05ArSqVX/R92evdM8ajQRyzw8Y8zndJen0Ird3BTeYP0Qzuk5N4rccgAgUgyx
 						JlE9suQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Edinburgh College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edinburgh College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.edinburghcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lindsey</md:GivenName>
-      <md:SurName>Parish</md:SurName>
-      <md:EmailAddress>mailto:Lindsey.parish@edinburghcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gordon</md:GivenName>
-      <md:SurName>Hope</md:SurName>
-      <md:EmailAddress>mailto:gordon.hope@edinburghcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Julian</md:GivenName>
-      <md:SurName>Ward</md:SurName>
-      <md:EmailAddress>mailto:julian.ward@edinburghcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Archer</md:SurName>
-      <md:EmailAddress>mailto:paul.archer@edinburghcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Edinburgh College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edinburgh College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.edinburghcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lindsey</md:GivenName>
+    <md:SurName>Parish</md:SurName>
+    <md:EmailAddress>mailto:Lindsey.parish@edinburghcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gordon</md:GivenName>
+    <md:SurName>Hope</md:SurName>
+    <md:EmailAddress>mailto:gordon.hope@edinburghcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Julian</md:GivenName>
+    <md:SurName>Ward</md:SurName>
+    <md:EmailAddress>mailto:julian.ward@edinburghcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Archer</md:SurName>
+    <md:EmailAddress>mailto:paul.archer@edinburghcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml
index 20cf58bb..5a935407 100644
--- a/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.educause.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educause.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDUCAUSE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDUCAUSE IdP server</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="57" width="225" xml:lang="en">https://idp.educause.edu/idp/images/educause_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educause.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EDUCAUSE</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDUCAUSE IdP server</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="57" width="225" xml:lang="en">https://idp.educause.edu/idp/images/educause_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAJNPiKyEc5HKN8RKL24zsWZeSSk0MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMMEGlkcC5lZHVjYXVzZS5lZHUwHhcNMTUxMTA1MDAzMzUz
 WhcNMzUxMTA1MDAzMzUzWjAbMRkwFwYDVQQDDBBpZHAuZWR1Y2F1c2UuZWR1MIIB
@@ -41,26 +41,26 @@ K1yH/FHWh0PWngLrDAjxi4tMy3B+DNoyIZeMAA5ZYJ8bzcYs9FJW+1Tcz483U2Ub
 1QwAk4MHPT7KZ8+9A9cH7rLsHjnslO31Mv9mQC9IBVg77h0v92CbzVV7I497kkFZ
 eyM2CkBFPjiindy5cUI/vzdn+zrf7DSh4VH2s5sBBaGT6oMkNpSpU7wa7NN5AuPI
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.educause.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.educause.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.educause.edu/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.educause.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.educause.edu/idp/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.educause.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.educause.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.educause.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educause.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.educause.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.educause.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.educause.edu/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.educause.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.educause.edu/idp/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.educause.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.educause.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.educause.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educause.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAJNPiKyEc5HKN8RKL24zsWZeSSk0MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMMEGlkcC5lZHVjYXVzZS5lZHUwHhcNMTUxMTA1MDAzMzUz
 WhcNMzUxMTA1MDAzMzUzWjAbMRkwFwYDVQQDDBBpZHAuZWR1Y2F1c2UuZWR1MIIB
@@ -79,30 +79,30 @@ K1yH/FHWh0PWngLrDAjxi4tMy3B+DNoyIZeMAA5ZYJ8bzcYs9FJW+1Tcz483U2Ub
 1QwAk4MHPT7KZ8+9A9cH7rLsHjnslO31Mv9mQC9IBVg77h0v92CbzVV7I497kkFZ
 eyM2CkBFPjiindy5cUI/vzdn+zrf7DSh4VH2s5sBBaGT6oMkNpSpU7wa7NN5AuPI
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.educause.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex Chaux</md:GivenName>
-      <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDUCAUSE IT Support</md:GivenName>
-      <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>EDUCAUSE IT Administrative Support</md:GivenName>
-      <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>EDUCAUSE IT Support</md:GivenName>
-      <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.educause.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Chaux</md:GivenName>
+    <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDUCAUSE IT Support</md:GivenName>
+    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>EDUCAUSE IT Administrative Support</md:GivenName>
+    <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>EDUCAUSE IT Support</md:GivenName>
+    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
index dd6d9295..97ea08f7 100644
--- a/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eduhainaut.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduHainaut</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students and Teachers from Secondary Schools of Province de Hainaut</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">eduHainaut</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement Secondaire de la Province de Hainaut</mdui:Description>
+        <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-16x16.jpg</mdui:Logo>
+        <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-291x88.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
+        <mdui:DomainHint>eduhainaut.be</mdui:DomainHint>
+        <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">eduHainaut</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Students and Teachers from Secondary Schools of Province de Hainaut</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">eduHainaut</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement Secondaire de la Province de Hainaut</mdui:Description>
-          <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-16x16.jpg</mdui:Logo>
-          <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-291x88.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
-          <mdui:DomainHint>eduhainaut.be</mdui:DomainHint>
-          <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUenYDsKxgJAPyGsM4iuM30gfFOzUwDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUwHhcNMTUxMDI2MjEzMDQw
 WhcNMzUxMDI2MjAzMDQwWjAcMRowGAYDVQQDDBFpZHAuZWR1aGFpbmF1dC5iZTCC
@@ -45,13 +45,13 @@ dCWzqSHBZiWc3dxV/Ftw6om/Un117Jo1nsw1JkiibgpxKaUrfCsUNckyYaQo8DWz
 Z76DYvVYsUda8q0eNnaxDthEU9q6MLWI4reu5OVFzIduzA3al83RhoilmF5khZLg
 IKAB
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAP1gRpy9QjNBjUFGEadtET7Yz08HMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
 OFoXDTM1MTAyNjIwMzAzOFowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
@@ -71,13 +71,13 @@ RfJ+zhFfIsYhN9ykL08GvfYDkThrOPn/i2cd/NjLajUXAr2UXla0HRpr3dr2L/0Q
 Ub1iY5BW/4fmTkmnIU/L/t/vH+aFBrdhRpT6T+icOC6/pN1sOU+iymNhmZNeq5Oj
 YY+sLg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAITAPpgbgYKWacifpIzYiDCLJilfMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
 OVoXDTM1MTAyNjIwMzAzOVowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
@@ -97,31 +97,31 @@ LR/to7vufiLAWBELcYxGqPvuaETJDZ2msYwnaWp9uWn4IzadH5WeS16yKxBsJAnY
 JbvCJSPArtmzQsUC6GSq/Col1DpLLbkqxE01S0Zg4Evi8jImwyhTYnNdLIB2tvgZ
 M5p59Q==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eduhainaut.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eduhainaut.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUenYDsKxgJAPyGsM4iuM30gfFOzUwDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUwHhcNMTUxMDI2MjEzMDQw
 WhcNMzUxMDI2MjAzMDQwWjAcMRowGAYDVQQDDBFpZHAuZWR1aGFpbmF1dC5iZTCC
@@ -141,13 +141,13 @@ dCWzqSHBZiWc3dxV/Ftw6om/Un117Jo1nsw1JkiibgpxKaUrfCsUNckyYaQo8DWz
 Z76DYvVYsUda8q0eNnaxDthEU9q6MLWI4reu5OVFzIduzA3al83RhoilmF5khZLg
 IKAB
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAP1gRpy9QjNBjUFGEadtET7Yz08HMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
 OFoXDTM1MTAyNjIwMzAzOFowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
@@ -167,13 +167,13 @@ RfJ+zhFfIsYhN9ykL08GvfYDkThrOPn/i2cd/NjLajUXAr2UXla0HRpr3dr2L/0Q
 Ub1iY5BW/4fmTkmnIU/L/t/vH+aFBrdhRpT6T+icOC6/pN1sOU+iymNhmZNeq5Oj
 YY+sLg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAITAPpgbgYKWacifpIzYiDCLJilfMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
 OVoXDTM1MTAyNjIwMzAzOVowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
@@ -193,23 +193,23 @@ LR/to7vufiLAWBELcYxGqPvuaETJDZ2msYwnaWp9uWn4IzadH5WeS16yKxBsJAnY
 JbvCJSPArtmzQsUC6GSq/Col1DpLLbkqxE01S0Zg4Evi8jImwyhTYnNdLIB2tvgZ
 M5p59Q==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Enseignement Secondaire de la Province de Hainaut</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">eduHainaut</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eduhainaut.be</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>webmaster@eduhainaut.be</md:EmailAddress>
-      <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Enseignement Secondaire de la Province de Hainaut</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduHainaut</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduhainaut.be</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>webmaster@eduhainaut.be</md:EmailAddress>
+    <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
index 684d1cf2..58994baf 100644
--- a/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.efc.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.efc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-11T12:54:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-11T12:54:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Epping Forest College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Epping Forest College Shibboleth IdP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Epping Forest College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Epping Forest College Shibboleth IdP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
 						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
@@ -35,13 +35,13 @@
 						txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
 						FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
 						NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
@@ -60,13 +60,13 @@
 						P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
 						k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
 						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
@@ -85,30 +85,30 @@
 						HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
 						fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.efc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.efc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.efc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.efc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJFRmkgwhw52LYLRaMPn4753oNLdMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
 						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
@@ -127,13 +127,13 @@
 						txchHGxkg1bMiMIjEv+sfkrQm1Vvk5p71nqcBdb+i0/u1zBDQR6fPtn7dzqGR5jx
 						FESrzA5BMELrUJnQ3KIkLgFEGDGnWM9gSQwnfMhMRvuLMqy6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUOXBO8f5f0h/99rHsjUGvuzOOJCwwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNaWRwLmVmYy5hYy51azAeFw0xNjAzMTcxMTQzMzdaFw0z
 						NjAzMTcxMTQzMzdaMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswggEiMA0GCSqG
@@ -152,13 +152,13 @@
 						P9e8ihxbhKaN/zpepysWoPpTh8GjPnz6Z4OOVtvZNvFaPk5uQcotBVdW3B3IvGe3
 						k5Yp5NSOAwlFfg9z/Xil7SQY8qxGi3ubkN5uRIoo0aay6/Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAP6ohCGvdEG1dnh4PrjWIjzXKARGMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5lZmMuYWMudWswHhcNMTYwMzE3MTE0MzM5WhcN
 						MzYwMzE3MTE0MzM5WjAYMRYwFAYDVQQDDA1pZHAuZWZjLmFjLnVrMIIBIjANBgkq
@@ -177,34 +177,34 @@
 						HQSlmxxBb+6hFpDrrOq7cW+mG/niWbp0vh118CM21W8xUWeU+7Is2JuHhic5oImZ
 						fme2bStBabIJQ5C7qVD0H+E6Hoa3Qe80s5fsVerqwK0KaW7s
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Epping Forest College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Epping Forest College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.efc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Laryea</md:SurName>
-      <md:EmailAddress>mailto:RLARYEA@efc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Naeem</md:GivenName>
-      <md:SurName>Rehman</md:SurName>
-      <md:EmailAddress>mailto:nrehman@efc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Laryea</md:SurName>
-      <md:EmailAddress>mailto:RLARYEA@efc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Naeem</md:GivenName>
-      <md:SurName>Rehman</md:SurName>
-      <md:EmailAddress>mailto:nrehman@efc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.efc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Epping Forest College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Epping Forest College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.efc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Laryea</md:SurName>
+    <md:EmailAddress>mailto:RLARYEA@efc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Naeem</md:GivenName>
+    <md:SurName>Rehman</md:SurName>
+    <md:EmailAddress>mailto:nrehman@efc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Laryea</md:SurName>
+    <md:EmailAddress>mailto:RLARYEA@efc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Naeem</md:GivenName>
+    <md:SurName>Rehman</md:SurName>
+    <md:EmailAddress>mailto:nrehman@efc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml
index 319487ec..7d197ee9 100644
--- a/swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ehesp.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ehesp.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-22T17:13:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-22T17:13:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehesp.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EHESP - Ecole des hautes études en santé publique</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAIAEBAAAAEACABoBQAAJgAAABAQEAABAAQAKAEAAI4FAAAoAAAAEAAAACAAAAABAAgAAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAA////AMz//wCZ//8AZv//ADP//wAA//8A/8z/AMzM/wCZzP8AZsz/ADPM/wAAzP8A/5n/AMyZ/wCZmf8AZpn/ADOZ/wAAmf8A/2b/AMxm/wCZZv8AZmb/ADNm/wAAZv8A/zP/AMwz/wCZM/8AZjP/ADMz/wAAM/8A/wD/AMwA/wCZAP8AZgD/ADMA/wAAAP8A///MAMz/zACZ/8wAZv/MADP/zAAA/8wA/8zMAMzMzACZzMwAZszMADPMzAAAzMwA/5nMAMyZzACZmcwAZpnMADOZzAAAmcwA/2bMAMxmzACZZswAZmbMADNmzAAAZswA/zPMAMwzzACZM8wAZjPMADMzzAAAM8wA/wDMAMwAzACZAMwAZgDMADMAzAAAAMwA//+ZAMz/mQCZ/5kAZv+ZADP/mQAA/5kA/8yZAMzMmQCZzJkAZsyZADPMmQAAzJkA/5mZAMyZmQCZmZkAZpmZADOZmQAAmZkA/2aZAMxmmQCZZpkAZmaZADNmmQAAZpkA/zOZAMwzmQCZM5kAZjOZADMzmQAAM5kA/wCZAMwAmQCZAJkAZgCZADMAmQAAAJkA//9mAMz/ZgCZ/2YAZv9mADP/ZgAA/2YA/8xmAMzMZgCZzGYAZsxmADPMZgAAzGYA/5lmAMyZZgCZmWYAZplmADOZZgAAmWYA/2ZmAMxmZgCZZmYAZmZmADNmZgAAZmYA/zNmAMwzZgCZM2YAZjNmADMzZgAAM2YA/wBmAMwAZgCZAGYAZgBmADMAZgAAAGYA//8zAMz/MwCZ/zMAZv8zADP/MwAA/zMA/8wzAMzMMwCZzDMAZswzADPMMwAAzDMA/5kzAMyZMwCZmTMAZpkzADOZMwAAmTMA/2YzAMxmMwCZZjMAZmYzADNmMwAAZjMA/zMzAMwzMwCZMzMAZjMzADMzMwAAMzMA/wAzAMwAMwCZADMAZgAzADMAMwAAADMA//8AAMz/AACZ/wAAZv8AADP/AAAA/wAA/8wAAMzMAACZzAAAZswAADPMAAAAzAAA/5kAAMyZAACZmQAAZpkAADOZAAAAmQAA/2YAAMxmAACZZgAAZmYAADNmAAAAZgAA/zMAAMwzAACZMwAAZjMAADMzAAAAMwAA/wAAAMwAAACZAAAAZgAAADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACp5nSoAAAAAAAAAAAAAAAB4o515AAAAAAAAAAAAAAAATp2dTgAAAAAAAFbPpQAAAAAqKgAAAAClz1bQ1tBVAAAAAAAAAABV0M/Qz8/QKwAAAAAAAAAAK9bQzyt6KwAAACqdnSoAAABPVisAAAAAAACjnHl5AAAAAAAAAAAAAAAAeZ2inQAAAAAAACpOKgAAAE55nSoAAAAqTip5op0qAAAAAAAAAAAqnaKdnZ2dKgAAAAAAAAAAKp2deU55eAAAAAAxTwAAAAB4eU4AAAAAAAB60NVWAAAAAAAAAAAAAAAApdXQpQAAAAAAAAAAAAAAAE/Qz08AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAABAAAAAgAAAAAQAEAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAAgICAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAXcQAAAAAAAHZ3AAAAAAAAV3UAAADbIAABEAACvb+3AAAAAHu7u7EAAAAAH7scEAAXcQAF0QAAAGd3AAAAAAAAd2cAAAAVEABXcQABUXZxAAAAABdnd3EAAAAAF3dXcAAHUAAHdQAAAMstAAAAAAAAIrIAAAAAAABbtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ehesp.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Staff, Teacher, Student</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">EHESP - Ecole des hautes études en santé publique</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel, Enseignant, Apprenant</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehesp.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EHESP - Ecole des hautes études en santé publique</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ehesp.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Staff, Teacher, Student</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">EHESP - Ecole des hautes études en santé publique</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel, Enseignant, Apprenant</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIUVzjSNoGKH9lPNn7oKp8d2lcXhuAwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMaWRwLmVoZXNwLmZyMB4XDTE2MDExMjE1MjkxNFoXDTM2
 MDExMjE1MjkxNFowFzEVMBMGA1UEAwwMaWRwLmVoZXNwLmZyMIIBIjANBgkqhkiG
@@ -39,21 +39,21 @@ MhgDF7/WDOjFCkoayZRZs62w0cWmNt50KultyIFMs/IMg9aOMehAPVmqO/vpfnh9
 TyWMNEjH9obmy5REmLRtu9bL42FTSXyM1b/HOiC24aeROfFrQog1MiWyo7FBl75U
 m33fYbmm0U4kgBvAfCSgiAps20WITEaEgl1Xwvwepw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ehesp.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehesp.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehesp.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EHESP - Ecole des hautes études en santé publique</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EHESP - Ecole des hautes études en santé publique</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ehesp.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cap-dsit@ehesp.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ehesp.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehesp.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehesp.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EHESP - Ecole des hautes études en santé publique</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EHESP - Ecole des hautes études en santé publique</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ehesp.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cap-dsit@ehesp.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
index 1fb25896..eb06d7d3 100644
--- a/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ehess.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-12T16:19:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-12T16:19:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehess.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EHESS</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjklEQVQoz1XPy3LTSBhA4b9bre7WxbrYSIlsgicZLguGJyFF1dTwejxHii3FgkuxwXGoOMSETHAcJzK2ZKlbslrNgs3MWZ/Nh8bjEzIcyOll4PtxHH09n9qW5bru/ObG97z1ep0kiQYdR9G79x8Ggz5Wqn3seEophFFdb4PAPzjYZ4yGQTAcPoii6C5NdasBQCllWzYGAACglO7dv885E0JqrctS5JsNAGRZZtv27yfw/V6vi05PJ3EcCSm39TaK7mVZXpblYNBfrddlUVq21el05tfznd2d+fzGJAQzzvN8Qwximublv1er9Xp//48PHz8JIRhnQsijo9eNUm/evAWA8+k3DFozRj3PQwhms+vx+CTP89lsJoSsZEUM48mTx45je14nz/NuNyRKqU1R5pvC9zqu61gWn13PszyvqgpjZFLzN2A4HBLDOJ1MMKXU97zA97WGnZ243084Yy//+fter3d2dh5HUTcMHdv5PBpprU3TNJ4fHtZ1/Xl0TCk1DNy27c1icXHxnVFalIWQ8u4uZZy1qj2dTIhh4O22SZKk3+8/++vpYnG7WNy2rU6SZPrt4tGjh8vlMuyGUsjR8RgBiuOYcM4sy4L/16oWGxgj/OfBwfF4vLe39+LwuQZ9dfWDNI06n07DMACAoijCMKzr7eL2NtndHZ98GfQT1+0slz/TNNUapJTox2zmOk7TKEIMKSulFOe8bVuMUdM0GBuU0lEjjrMVAPQoI0qp1Wrtuk5V1VmWOY6TLlPOuG3bWZ7HUXSXpkfV6tXlVwB42vExaKCU1vUWADjnTdMEvs84a1vFGStL4brOf3kYIbQpNoyzuq4JIVprIaQQQsqqqmrHsVc/VwQhhg2GDRPjX3KEWNzfIhepAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAwhJ20dgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMPXADMoAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ehess.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">EHESS</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehess.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EHESS</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjklEQVQoz1XPy3LTSBhA4b9bre7WxbrYSIlsgicZLguGJyFF1dTwejxHii3FgkuxwXGoOMSETHAcJzK2ZKlbslrNgs3MWZ/Nh8bjEzIcyOll4PtxHH09n9qW5bru/ObG97z1ep0kiQYdR9G79x8Ggz5Wqn3seEophFFdb4PAPzjYZ4yGQTAcPoii6C5NdasBQCllWzYGAACglO7dv885E0JqrctS5JsNAGRZZtv27yfw/V6vi05PJ3EcCSm39TaK7mVZXpblYNBfrddlUVq21el05tfznd2d+fzGJAQzzvN8Qwximublv1er9Xp//48PHz8JIRhnQsijo9eNUm/evAWA8+k3DFozRj3PQwhms+vx+CTP89lsJoSsZEUM48mTx45je14nz/NuNyRKqU1R5pvC9zqu61gWn13PszyvqgpjZFLzN2A4HBLDOJ1MMKXU97zA97WGnZ243084Yy//+fter3d2dh5HUTcMHdv5PBpprU3TNJ4fHtZ1/Xl0TCk1DNy27c1icXHxnVFalIWQ8u4uZZy1qj2dTIhh4O22SZKk3+8/++vpYnG7WNy2rU6SZPrt4tGjh8vlMuyGUsjR8RgBiuOYcM4sy4L/16oWGxgj/OfBwfF4vLe39+LwuQZ9dfWDNI06n07DMACAoijCMKzr7eL2NtndHZ98GfQT1+0slz/TNNUapJTox2zmOk7TKEIMKSulFOe8bVuMUdM0GBuU0lEjjrMVAPQoI0qp1Wrtuk5V1VmWOY6TLlPOuG3bWZ7HUXSXpkfV6tXlVwB42vExaKCU1vUWADjnTdMEvs84a1vFGStL4brOf3kYIbQpNoyzuq4JIVprIaQQQsqqqmrHsVc/VwQhhg2GDRPjX3KEWNzfIhepAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAwhJ20dgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMPXADMoAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ehess.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">EHESS</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVALeCOqpROd3E1etW0cL7TxFT+Z3rMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjAeFw0xMTA3MjUxMDMxNThaFw0z
 MTA3MjUxMDMxNThaMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjCCASIwDQYJKoZI
@@ -37,21 +37,21 @@ OQdqKV2rfZSK5DN7cE5VeUlRfPOqcsYagK5PT0+JiKdBuJTnBFUub+SPLIW+pygx
 ftIG5eTG0zs+8JFROXmVnoVTk6dKHOcL4Ze1HNgC/RQGLQCyY5HY7IjlllWsTteF
 uq8R4YH10wMLWAk+39fV4VIZwj+rc6KKXaPjcpXt+RE=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ehess.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehess.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehess.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EHESS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EHESS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin@ehess.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ehess.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehess.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehess.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EHESS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EHESS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin@ehess.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml
index c208355d..dbd30467 100644
--- a/swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ekt.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekt.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Documentation Centre</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ekt.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.ekt.gr/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>194.177.214.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.973263,23.745396</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekt.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Documentation Centre</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ekt.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.ekt.gr/</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>194.177.214.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:37.973263,23.745396</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.ekt.gr</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ekt.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEizCCA3OgAwIBAgIQb1SWwkDV328A41lusr2JKzANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTA5MTEwOTAwMDAwMFoXDTEyMTEwODIzNTk1OVowbDELMAkGA1UE
@@ -56,28 +56,28 @@
                             ivmIXUACm7ISQ8obzJ6mm2QPGWHgl4/XHpMouNjrI9piCuoU7PxPf4wESiiH/qbT
                             KdYmP9TqxG7mvPfMZHTx
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ekt.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ekt.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ekt.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ekt.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ekt.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ekt.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekt.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.ekt.gr</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ekt.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ekt.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ekt.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ekt.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ekt.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ekt.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekt.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ekt.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEizCCA3OgAwIBAgIQb1SWwkDV328A41lusr2JKzANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTA5MTEwOTAwMDAwMFoXDTEyMTEwODIzNTk1OVowbDELMAkGA1UE
@@ -104,25 +104,25 @@
                             ivmIXUACm7ISQ8obzJ6mm2QPGWHgl4/XHpMouNjrI9piCuoU7PxPf4wESiiH/qbT
                             KdYmP9TqxG7mvPfMZHTx
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ekt.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ekt.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Documentation Centre</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Documentation Centre</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ekt.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.ekt.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>National Documentation Centre NOC</md:SurName>
-      <md:EmailAddress>noc@ekt.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ekt.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ekt.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Documentation Centre</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Documentation Centre</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ekt.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.ekt.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>National Documentation Centre NOC</md:SurName>
+    <md:EmailAddress>noc@ekt.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml
index e3b3e738..603f90b6 100644
--- a/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.elon.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elon.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Elon University</mdui:DisplayName>
+        <mdui:Logo height="45" width="130" xml:lang="en">https://idp.elon.edu/images/elon-signature-incommon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elon.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Elon University</mdui:DisplayName>
-          <mdui:Logo height="45" width="130" xml:lang="en">https://idp.elon.edu/images/elon-signature-incommon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUErCouPRaW5QGkEHS598bwC7vTI4wDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MB4XDTExMDQyNjE1MjgyM1oXDTMx
 MDQyNjE1MjgyM1owFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MIIBIjANBgkqhkiG
@@ -38,23 +38,23 @@ smWmOQNGuBMna6h+vWWNc7DDSCEkL47jn86mGMhfivdMEsWAsixio2Oqi8/bf64G
 nxN2pAEY7/jalr7ldm6HDj+Cq6DzsUKGeY+eUFwa2DDwhdkDZI6W56v+2/zVxV6d
 pPnfmAnNrKnsHEet6lA93TS62NXQGgBuT0K69ASB/w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.elon.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.elon.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.elon.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elon.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elon.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.elon.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.elon.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.elon.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elon.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elon.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUErCouPRaW5QGkEHS598bwC7vTI4wDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MB4XDTExMDQyNjE1MjgyM1oXDTMx
 MDQyNjE1MjgyM1owFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MIIBIjANBgkqhkiG
@@ -73,18 +73,18 @@ smWmOQNGuBMna6h+vWWNc7DDSCEkL47jn86mGMhfivdMEsWAsixio2Oqi8/bf64G
 nxN2pAEY7/jalr7ldm6HDj+Cq6DzsUKGeY+eUFwa2DDwhdkDZI6W56v+2/zVxV6d
 pPnfmAnNrKnsHEet6lA93TS62NXQGgBuT0K69ASB/w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.elon.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Elon University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Elon University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.elon.edu/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg Colby</md:GivenName>
-      <md:EmailAddress>gcolby@elon.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.elon.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Elon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Elon University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.elon.edu/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg Colby</md:GivenName>
+    <md:EmailAddress>gcolby@elon.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
index 6adc7fbb..86a3153d 100644
--- a/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.elte.hu/auth/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>elte</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>elte</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eötvös Loránd University Budapest</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Eötvös Loránd University Budapest</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elte.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Eötvös Loránd University Budapest</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:Description>
-          <mdui:Description xml:lang="en">Eötvös Loránd University Budapest</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elte.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFYzCCBEugAwIBAgIQLIaNDr+iCPZ0Iz6P3Q9VqTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuZWx0ZS5odTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANI/ii7DympWU2khMzlPc5m0zeArm9zB6yLik398aLncEEXj9uAXqmZlzD3PlmEehRV554zhjuzPxGS1poQHM/em9ctBQXH3sdcNmTi3aRUldO0nr3uH/g38SF2lfZdw+A8wlLYHu3e3nxHKrwIFxRR7pNdB1DitfWZ7VArrxt2djsaIOXsECEtos3AyEospySVC/pGwimJv/z3AgykdeBVpHB6X9ftn4ptuM+0/ZQgaN7ktP+sR2mcOdgu+ip28rxLS4hd2NNMmfsb1jy14YMKKD8ryWb0fI0yyaKKz3AC9DBdKB4o8i/jpBQTsjq0MppL6LT6iDEBb1IO7OagN0eAPTt+lMPmW2EPUg3HLZVPYKRHqsaUdE3+gMTTOd8HEc39oRDLaFjsD0H7hoLY9DL3Q/CcwYOyCNYbLdzXFn1Cj04T2Oxj94Xw0zAp2Pw0WE9iIzpi/izca7DW8WiEEFIPLCDVIqi80GY4AZWFEbTV+I3wDCTfF5lNY67XhH7pWhU5dWJaD5XPYahQd1kvejA1+hviqhMQkZvkRTmCMZHpv9amjmFg1CEgk7XGSO5/Rj7fNjSTZ5Ysuh2wjjDWdIn5sIe1UCVJEqEVCZj1iBU3WXvpDv6Kn6Vr2Zz2jgm4S9CjGOIpueB4MjInVoJFOHOsKB63tpuDNSJGj7E/XKCWlAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUb9JqTdA6YG8FiGd1gBUvIHMdjA8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5lbHRlLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQBOvYggdrH+sTjvU6TRdCOUAFs5YOK//s0xCbiC/E1rfb04dSPDSUdjLwOv6bP06N64EugFZakJIweWUPREy5lNP1F3d9JClPMmCJNYlbNJ7R750lWHudqTvJ1AU3emNED+Vgp2iBtdyYZHrHMHi+z296f4HxF3V95hhCswMCMaw3+NC4WTr7Y84ygGprMRQDWhQTwx06glpjl8h59UdtS9EjSB6KBjkgrG/+S37MMUrppeyFis715FtYLoBjz/oLvqNch2KYKThfoW1BrTQZpCq+sot1908yBhyUSJRsLqWra9NGM1E1Y+4NLbGwAHhPtuRMGIYDWks3zoyVFm6PvO</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.elte.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">ELTE</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ELTE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">ELTE</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ELTE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.elte.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.elte.hu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ELTE IIG Informatikai Szolgáltatási Osztály</md:SurName>
-      <md:EmailAddress>mailto:system@caesar.elte.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>ELTE IIG Informatikai Szolgáltatási Osztály</md:SurName>
-      <md:EmailAddress>mailto:system@caesar.elte.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>ELTE IIG Ügyféltámogatási Osztály</md:SurName>
-      <md:EmailAddress>mailto:operator@caesar.elte.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFYzCCBEugAwIBAgIQLIaNDr+iCPZ0Iz6P3Q9VqTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuZWx0ZS5odTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANI/ii7DympWU2khMzlPc5m0zeArm9zB6yLik398aLncEEXj9uAXqmZlzD3PlmEehRV554zhjuzPxGS1poQHM/em9ctBQXH3sdcNmTi3aRUldO0nr3uH/g38SF2lfZdw+A8wlLYHu3e3nxHKrwIFxRR7pNdB1DitfWZ7VArrxt2djsaIOXsECEtos3AyEospySVC/pGwimJv/z3AgykdeBVpHB6X9ftn4ptuM+0/ZQgaN7ktP+sR2mcOdgu+ip28rxLS4hd2NNMmfsb1jy14YMKKD8ryWb0fI0yyaKKz3AC9DBdKB4o8i/jpBQTsjq0MppL6LT6iDEBb1IO7OagN0eAPTt+lMPmW2EPUg3HLZVPYKRHqsaUdE3+gMTTOd8HEc39oRDLaFjsD0H7hoLY9DL3Q/CcwYOyCNYbLdzXFn1Cj04T2Oxj94Xw0zAp2Pw0WE9iIzpi/izca7DW8WiEEFIPLCDVIqi80GY4AZWFEbTV+I3wDCTfF5lNY67XhH7pWhU5dWJaD5XPYahQd1kvejA1+hviqhMQkZvkRTmCMZHpv9amjmFg1CEgk7XGSO5/Rj7fNjSTZ5Ysuh2wjjDWdIn5sIe1UCVJEqEVCZj1iBU3WXvpDv6Kn6Vr2Zz2jgm4S9CjGOIpueB4MjInVoJFOHOsKB63tpuDNSJGj7E/XKCWlAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUb9JqTdA6YG8FiGd1gBUvIHMdjA8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5lbHRlLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQBOvYggdrH+sTjvU6TRdCOUAFs5YOK//s0xCbiC/E1rfb04dSPDSUdjLwOv6bP06N64EugFZakJIweWUPREy5lNP1F3d9JClPMmCJNYlbNJ7R750lWHudqTvJ1AU3emNED+Vgp2iBtdyYZHrHMHi+z296f4HxF3V95hhCswMCMaw3+NC4WTr7Y84ygGprMRQDWhQTwx06glpjl8h59UdtS9EjSB6KBjkgrG/+S37MMUrppeyFis715FtYLoBjz/oLvqNch2KYKThfoW1BrTQZpCq+sot1908yBhyUSJRsLqWra9NGM1E1Y+4NLbGwAHhPtuRMGIYDWks3zoyVFm6PvO</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.elte.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">ELTE</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ELTE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">ELTE</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ELTE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.elte.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.elte.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ELTE IIG Informatikai Szolgáltatási Osztály</md:SurName>
+    <md:EmailAddress>mailto:system@caesar.elte.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>ELTE IIG Informatikai Szolgáltatási Osztály</md:SurName>
+    <md:EmailAddress>mailto:system@caesar.elte.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>ELTE IIG Ügyféltámogatási Osztály</md:SurName>
+    <md:EmailAddress>mailto:operator@caesar.elte.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml
index d8077075..a30718bd 100644
--- a/swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enac.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-25T17:15:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-25T17:15:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enac.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB8UlEQVQoz2P8//8/AymAiSTVDAwMLGj895++fvnyjZuL88v3H6wsLJKiAtg1fP359/XbD2s2HxASEWZnZeXl4fj05dvPX3+drHQUpURQNDx98XbGyt18PNx/fv/6/OW7mir/w6cvONhZf/z8JSYk+OLlO1YmBhkJhB6mq3ee/P3zT01Bcv/Jaw5W+k9fvr5+9/Hdx88ZGRjFRAWOn7+5avvJo+du3X/6FqKB8fq9ZyKCfP1z18tIiAgL8h8/f93dzkRFXvLVm3eHTl0VFRXg4eQQExK4df/pnccvEoOcGP///3/51sMJczb6ulkLC/B8+/Hz3YfPkT7WEPOu3np07d6zyzcfcrCxRfnbKkiJMP38/Xfa4m1hfo637z+5cuvhvmOXWFmYzcJr7zx8sfvY1UfP3zx/+SbO3+7v759yUiIMDAxMz168ZmRm5uHm0tdSNtdXYmNlVleS8bTU3nLgnLAAz7ZD51++/bR654m4IEdIlDGxsrJ8/vJdWU7URE+ZgYFJWV7y+at3ccFOdx8827z3lJe9sTA/t7gI//o9Z85ff8jAwMDw7///gubZe49f/v3n7/cfP2/cffLkxdtfv/+8+/j10bPX////f/fxy/efv2/ff/r85bv///8z/P////bDl/tPXv5PHGCkeeIjWQMAwd8TKvlXU44AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDCEnbR2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAw9cAMygAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enac.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students, Researchers and Staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENAC - Ecole Nationale de l'Aviation Civile</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Apprenants,Chercheurs et Personnels</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enac.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB8UlEQVQoz2P8//8/AymAiSTVDAwMLGj895++fvnyjZuL88v3H6wsLJKiAtg1fP359/XbD2s2HxASEWZnZeXl4fj05dvPX3+drHQUpURQNDx98XbGyt18PNx/fv/6/OW7mir/w6cvONhZf/z8JSYk+OLlO1YmBhkJhB6mq3ee/P3zT01Bcv/Jaw5W+k9fvr5+9/Hdx88ZGRjFRAWOn7+5avvJo+du3X/6FqKB8fq9ZyKCfP1z18tIiAgL8h8/f93dzkRFXvLVm3eHTl0VFRXg4eQQExK4df/pnccvEoOcGP///3/51sMJczb6ulkLC/B8+/Hz3YfPkT7WEPOu3np07d6zyzcfcrCxRfnbKkiJMP38/Xfa4m1hfo637z+5cuvhvmOXWFmYzcJr7zx8sfvY1UfP3zx/+SbO3+7v759yUiIMDAxMz168ZmRm5uHm0tdSNtdXYmNlVleS8bTU3nLgnLAAz7ZD51++/bR654m4IEdIlDGxsrJ8/vJdWU7URE+ZgYFJWV7y+at3ccFOdx8827z3lJe9sTA/t7gI//o9Z85ff8jAwMDw7///gubZe49f/v3n7/cfP2/cffLkxdtfv/+8+/j10bPX////f/fxy/efv2/ff/r85bv///8z/P////bDl/tPXv5PHGCkeeIjWQMAwd8TKvlXU44AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDCEnbR2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAw9cAMygAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enac.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students, Researchers and Staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENAC - Ecole Nationale de l'Aviation Civile</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Apprenants,Chercheurs et Personnels</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQDCCAiigAwIBAgIVALjMEvpFsfHdqv4aYoi82tdjMJg9MA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMMFWlkcC5yZWNoZXJjaGUuZW5hYy5mcjAeFw0xNDExMTcx
 NzMxMDNaFw0zNDExMTcxNzMxMDNaMCAxHjAcBgNVBAMMFWlkcC5yZWNoZXJjaGUu
@@ -40,26 +40,26 @@ eR5z1/IoEPIVcVuR/xWmpK95gcJ/DFgFrebwCE+FjS89pBjH5bHMS/QNzKef0tqY
 gd7OPw24Ut2oiKcpjkQjV8SBxAY/i5GnwUrt9E1J5p4IHiETJ0q9s9GVUTA2S1/U
 /e8nBK9EJdoDnEi1985qGA1FYp4=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enac.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enac.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enac.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enac.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Didier MAGRE</md:SurName>
-      <md:EmailAddress>didier.magre@enac.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alexandre COHEN</md:SurName>
-      <md:EmailAddress>alexandre.cohen@enac.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enac.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enac.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enac.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enac.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Didier MAGRE</md:SurName>
+    <md:EmailAddress>didier.magre@enac.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alexandre COHEN</md:SurName>
+    <md:EmailAddress>alexandre.cohen@enac.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
index 7f18f84f..52d726fe 100644
--- a/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enib.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-15T16:54:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-15T16:54:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enib.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABPUlEQVQoz92SMS9DURhAz3fvq0u1tBYLIjFJOjEZjBhIDLqbDEYmfoEw24WYGMTAQmJgsYgEaSWkJNKUlJZ6r+17fe/6DTZx5nO2I9ZafoP6lf1Xg0NhU1gXisec3VJvApwusCav3vv89cvJh89Jli3hIAMo3F5c6IT2NF6d1R0CMGkUSnRcq5gSqkme4PwO90GxNM3KJMlLesaIfJRi44i3KgkEm9CCslw57MPFMLt5h5kCpTLNA6odOAYb0grYfmYcpSWtlSZiaJapURoeuZJD9owCVG64KBJbxrcEEU2XDfSi7TVOQoE2BEJLGBmU6HlPGoooJNVHlKFUJmao5HFfg4m5oi/d7bFUoUTVxbSRGZDc/aMoMcbUPU9rG0FnPF5r+F2Vz+9kXMIwaLWS6e6v2ncYhoP9A/IPXvoBu+aAJu8X7C4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDCEnbR2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAw9cAMygAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enib.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Staff and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enib.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABPUlEQVQoz92SMS9DURhAz3fvq0u1tBYLIjFJOjEZjBhIDLqbDEYmfoEw24WYGMTAQmJgsYgEaSWkJNKUlJZ6r+17fe/6DTZx5nO2I9ZafoP6lf1Xg0NhU1gXisec3VJvApwusCav3vv89cvJh89Jli3hIAMo3F5c6IT2NF6d1R0CMGkUSnRcq5gSqkme4PwO90GxNM3KJMlLesaIfJRi44i3KgkEm9CCslw57MPFMLt5h5kCpTLNA6odOAYb0grYfmYcpSWtlSZiaJapURoeuZJD9owCVG64KBJbxrcEEU2XDfSi7TVOQoE2BEJLGBmU6HlPGoooJNVHlKFUJmao5HFfg4m5oi/d7bFUoUTVxbSRGZDc/aMoMcbUPU9rG0FnPF5r+F2Vz+9kXMIwaLWS6e6v2ncYhoP9A/IPXvoBu+aAJu8X7C4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDCEnbR2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAw9cAMygAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enib.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Staff and students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels et étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFzCCAf+gAwIBAgIUIH+7zKjLBFasnSwAkq7HW97UJBwwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmVuaWIuZnIwHhcNMTIxMjE0MTYyODAzWhcNMzIx
 MjE0MTYyODAzWjAWMRQwEgYDVQQDEwtpZHAuZW5pYi5mcjCCASIwDQYJKoZIhvcN
@@ -39,22 +39,22 @@ rxGJLLWkiCrieRzHbbYMGeFFaug8I1KdWhUfIxbvBaiFS9AbYWOlEpKKX1HwnXJ0
 ngTcqpSdbFthXhhfmqsWKknKcozQblzbtaOeQNoYMHhnlnYEimZn4CubKzwUqo3d
 x9rJLKhFd2hFQM0S0IQ8rMA5jvwxHgI4losj
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enib.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enib.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enib.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enib.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Corinne Le Moan</md:SurName>
-      <md:EmailAddress>corinne.lemoan@enib.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enib.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enib.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enib.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enib.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Corinne Le Moan</md:SurName>
+    <md:EmailAddress>corinne.lemoan@enib.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
index f074405b..d7c434f7 100644
--- a/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enit.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-08T16:39:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-08T16:39:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enit.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.enit.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enit.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.enit.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFzCCAf+gAwIBAgIUNCWmiXUxvGHYUEqaiw+kQmjPnKcwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwLmVuaXQuZnIwHhcNMTYwMzAyMTMyNzAxWhcNMzYw
 MzAyMTMyNzAxWjAWMRQwEgYDVQQDDAtpZHAuZW5pdC5mcjCCASIwDQYJKoZIhvcN
@@ -36,13 +36,13 @@ o2bWx+GbPlzS4PSFVXgGsjuv2/qewBGXIxhUNLawjrSH7oq71WdgtILHS4EP9P0a
 kd6UdaVOuEAAvuHMgXsD6egYms+/cssmyyjewVTVE067vgggo3t0rl6W8ab9JmVF
 jX7UGDVzBkRCz7RJLf3iOx0LnxPRwifm5n5Q
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGDCCAgCgAwIBAgIVAP4SLqi+2pminMR8C652zJZyirCyMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5lbml0LmZyMB4XDTExMDYyODEyNTYyMVoXDTMx
 MDYyODEyNTYyMVowFjEUMBIGA1UEAxMLaWRwLmVuaXQuZnIwggEiMA0GCSqGSIb3
@@ -61,26 +61,26 @@ sHNSMvsplcRaenBakuEP6IJ5+X73tg4BvnTXHF8gSE5zoE1Fvoo4j8WlzX5VFpnm
 ynWSKIvu7JYtfAV0YXTDZ1JWanatwUv2PFIeGBfg8jh3f+xU7+nOiGsC3sOfr4dK
 YcFtZchDCMTlBKAW8xGvvTVS6hZSzntZe4Z97w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enit.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enit.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enit.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enit.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Viret</md:SurName>
-      <md:EmailAddress>jean-marc.viret@enit.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Barriere</md:SurName>
-      <md:EmailAddress>jean-philippe.barriere@enit.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enit.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enit.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enit.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enit.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Viret</md:SurName>
+    <md:EmailAddress>jean-marc.viret@enit.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Barriere</md:SurName>
+    <md:EmailAddress>jean-philippe.barriere@enit.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
index d99d8277..f1081078 100644
--- a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enitab.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-15T13:59:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-15T13:59:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agro-bordeaux.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enitab.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bordeaux Sciences Agro</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjUlEQVQozzWSS0hUcRjFz/e/d+4dR1PHBA0netBoQgYuSoQiWhS5ibKsoNq0y4VBES4ipE1RbYKgiFBcSIaLXptQQyHIzBaaVGTjKwsf89ByZpy5r+9rMXoWZ/XjbM6PRARArkEg8FJqIpn8t2vLPhGdyGH4FAMQKEIOXQ/Lmqy1D9643I6bz3b8XBgS4a6+ts+Tr0VEvHWKWDwBlKgMkm1dF+ZWh4LBQGkB7wzUhXece9LTxChpvdi1N9QAAPAUhAEG4fbz1tFEn2kW+ojY03aFD9/vvqcXBlUAj160pJ0oBCKiiJSC/n588NXXx4a5CURwM5XljZO/aTw2bTlFhm6u2Isvh5+CAOhKhGzYs9npbWV7ddtgWLpTeLj2fPvbN6qgcDlTFMvqccvXP9aRwRIEioh+zP+41XGn+XirmQ7Y8qe28tRqFBPpT7oyI/P8bdG1EbLseGR+hBQUgJmlqZg2Ozo+c/poSyaNgzVnhyaG/UZeNGbMJ7NC+Yos23Bn4zMAFADHcfx+o2Ogc09VfXXJse1FlaO/vq+m/X9XsqSBRAi20rXlZAyADiAU3Eqsp4xE77uPV888BPKmFqOrcUARAUQEQBh5mgFAgbF7a/UmDgZ8+T0fugvMEKB+LcVyWwBEAIK4qNhcDUAJuNhf3FjX5Fk8Z3/5tvAdAGkmyAMAEgGzsE8L1oQPwIWCUgCunLxeLMGU5kSnpwBUloUhDti0yHY1K7Wcbj7yoAjl0KEEAKMir6zzWrvySuficQD7w9XI2tCynmWnEl5r471DVQ25p+EJiyvssAhHUpH+j70iMhAZRj1wYsvJu5dGFsZERBxhYRGBiMfCvO6im9M2w2sjvyf/rCXcDZF5A/kPEBuA6WS49/UAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enitab.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">students and staff of Bordeaux Sciences Agro</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Bordeaux Sciences Agro</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et personnels de Bordeaux Sciences Agro</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agro-bordeaux.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enitab.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bordeaux Sciences Agro</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjUlEQVQozzWSS0hUcRjFz/e/d+4dR1PHBA0netBoQgYuSoQiWhS5ibKsoNq0y4VBES4ipE1RbYKgiFBcSIaLXptQQyHIzBaaVGTjKwsf89ByZpy5r+9rMXoWZ/XjbM6PRARArkEg8FJqIpn8t2vLPhGdyGH4FAMQKEIOXQ/Lmqy1D9643I6bz3b8XBgS4a6+ts+Tr0VEvHWKWDwBlKgMkm1dF+ZWh4LBQGkB7wzUhXece9LTxChpvdi1N9QAAPAUhAEG4fbz1tFEn2kW+ojY03aFD9/vvqcXBlUAj160pJ0oBCKiiJSC/n588NXXx4a5CURwM5XljZO/aTw2bTlFhm6u2Isvh5+CAOhKhGzYs9npbWV7ddtgWLpTeLj2fPvbN6qgcDlTFMvqccvXP9aRwRIEioh+zP+41XGn+XirmQ7Y8qe28tRqFBPpT7oyI/P8bdG1EbLseGR+hBQUgJmlqZg2Ozo+c/poSyaNgzVnhyaG/UZeNGbMJ7NC+Yos23Bn4zMAFADHcfx+o2Ogc09VfXXJse1FlaO/vq+m/X9XsqSBRAi20rXlZAyADiAU3Eqsp4xE77uPV888BPKmFqOrcUARAUQEQBh5mgFAgbF7a/UmDgZ8+T0fugvMEKB+LcVyWwBEAIK4qNhcDUAJuNhf3FjX5Fk8Z3/5tvAdAGkmyAMAEgGzsE8L1oQPwIWCUgCunLxeLMGU5kSnpwBUloUhDti0yHY1K7Wcbj7yoAjl0KEEAKMir6zzWrvySuficQD7w9XI2tCynmWnEl5r471DVQ25p+EJiyvssAhHUpH+j70iMhAZRj1wYsvJu5dGFsZERBxhYRGBiMfCvO6im9M2w2sjvyf/rCXcDZF5A/kPEBuA6WS49/UAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enitab.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">students and staff of Bordeaux Sciences Agro</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Bordeaux Sciences Agro</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants et personnels de Bordeaux Sciences Agro</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUE3+YG/RODtnMAftUk+3SD6KCU4cwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmVuaXRhYi5mcjAeFw0xMDA3MDYxNDQzMjZaFw0z
 MDA3MDYxNDQzMjZaMBgxFjAUBgNVBAMTDWlkcC5lbml0YWIuZnIwggEiMA0GCSqG
@@ -40,26 +40,26 @@ OCuuoL5lcVnAieikeHHCSwqgj6RRMf+EWSMO+eW8YqTlpdMvavscMOAjr3Lqhrlw
 wBA6a+2VH2OCL4wwK43tVucNVmqIEl7ShfcO5MmdRDwvjA03MPIzYO8a415s/2g3
 iq+XHGvfQ2g2DFN4oXfSkv/A0TVmwWxiqyd8SJ77zNILG4o=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enitab.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enitab.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enitab.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bordeaux Sciences Agro</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bordeaux Sciences Agro</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enitab.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>MEUNIER Richard</md:SurName>
-      <md:EmailAddress>r-meunier@enitab.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>PRIOUX Pascal</md:SurName>
-      <md:EmailAddress>pascal.prioux@agro-bordeaux.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enitab.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enitab.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enitab.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bordeaux Sciences Agro</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bordeaux Sciences Agro</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enitab.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>MEUNIER Richard</md:SurName>
+    <md:EmailAddress>r-meunier@enitab.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>PRIOUX Pascal</md:SurName>
+    <md:EmailAddress>pascal.prioux@agro-bordeaux.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enorf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.enorf.ac.uk-shibboleth.xml
index fd97f986..8b11c6b9 100644
--- a/swamid-interfederations-2.0/idp.enorf.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enorf.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enorf.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-18T13:51:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-18T13:51:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enorf.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enorf.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -35,23 +35,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/enorf.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/enorf.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">East Norfolk Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enorf.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/enorf.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/enorf.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">East Norfolk Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enorf.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml
index baa44c7d..fe9226d3 100644
--- a/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ens-lyon.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ens-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-03T15:29:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-03T15:29:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENS de Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRFAAAA////pdmf3QAAACZJREFUeNpiYMAAjCiALAFGRgwlQEEGJAqXCrBuslWQ4XQ0ABBgAFz4AK1qB6hoAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ens-lyon.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Identification de la population interne globale de l'établissement (personnels, étudiants, enseignants, chercheurs).</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENS de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Identification de la population interne globale de l'établissement (personnels, étudiants, enseignants, chercheurs).</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENS de Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRFAAAA////pdmf3QAAACZJREFUeNpiYMAAjCiALAFGRgwlQEEGJAqXCrBuslWQ4XQ0ABBgAFz4AK1qB6hoAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ens-lyon.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Identification de la population interne globale de l'établissement (personnels, étudiants, enseignants, chercheurs).</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENS de Lyon</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Identification de la population interne globale de l'établissement (personnels, étudiants, enseignants, chercheurs).</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUCjo8NcX8SWH/BIutFKcHBN2SANwwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLmVucy1seW9uLmZyMB4XDTE1MTIwMjEwMTMxMloX
 DTM1MTIwMjEwMTMxMlowGjEYMBYGA1UEAwwPaWRwLmVucy1seW9uLmZyMIIBIjAN
@@ -39,13 +39,13 @@ JDfCWl7BhmHXy0hYNIh68qHirU+IT58GKMnzTYIo4KllfxdStkJevmAJppBIU5NF
 juVlrAL3JgI2g34uUXn/rbAK5B8/4Hq9+vlfGi1U3mv6Dmacp7WU+QQBfF0dtBi0
 wY3Iq8Pwz25k54GWyxAA4v0Tk4DmRxsLPCbz49pdjflECO6DV24J8go58g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKDCCAhCgAwIBAgIVAJByGytG/KTvT1AUmP+sgH8R3Q90MA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC5lbnMtbHlvbi5mcjAeFw0xNTEyMDIxMDEzMTNa
 Fw0zNTEyMDIxMDEzMTNaMBoxGDAWBgNVBAMMD2lkcC5lbnMtbHlvbi5mcjCCASIw
@@ -64,19 +64,19 @@ zMIDLN+/fiNyEL8GjkGk6AEHUrx4RgOBM/X1MyImWg5PI2AlYmocXYGC6eIMcBFH
 g/kniRNzxKUhoGI+AJN1AeEBVGTqm5OnS0rQGTtM3lHRqJXrhlm6C1Ae1RgBqn70
 zIykQBVWdeDI/sVOSYwmk9MsLXzUas8jniWGC8CTsrKyfp7HtsVctGzfNSA=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENS de Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ens-lyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin-system@ens-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENS de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ens-lyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin-system@ens-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
index 56d9a5f9..0e1560a1 100644
--- a/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
+++ b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ens.fr/idp/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-18T15:41:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-18T15:41:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole normale supérieure</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAACESURBVCjPzY8xCoNQEETfFytBSBHsgiiSTkjtabxQEHKOHMAbBNIJqexTpRAESx0L/WCifXzVsjMMM/B/jD0kgIEBdxJmxV267xyJCLejJCnTRxO17H+RUFAgHpQ4xOsOTx0IuOKTEnNed2h40ZNT0fIm2Vpx40TExQrmx9DJ+95v2A0jM8olr6uCeR8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDDmguK/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU5KzAyOjAwl99aAwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ens.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole normale supérieure</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole normale supérieure</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAACESURBVCjPzY8xCoNQEETfFytBSBHsgiiSTkjtabxQEHKOHMAbBNIJqexTpRAESx0L/WCifXzVsjMMM/B/jD0kgIEBdxJmxV267xyJCLejJCnTRxO17H+RUFAgHpQ4xOsOTx0IuOKTEnNed2h40ZNT0fIm2Vpx40TExQrmx9DJ+95v2A0jM8olr6uCeR8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDDmguK/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU5KzAyOjAwl99aAwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ens.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole normale supérieure</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEzCCAfugAwIBAgIUUlGCB1tXdKMlojKQasf9KdmcqBkwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmVucy5mcjAeFw0xMTA4MDMwOTIzMDdaFw0zMTA4
 MDMwOTIzMDdaMBUxEzARBgNVBAMTCmlkcC5lbnMuZnIwggEiMA0GCSqGSIb3DQEB
@@ -37,26 +37,26 @@ D2hRBVIDMR95A1pa4yFD2NrWQSLcpfzo3I1TyktpQsncW6LGr7DFi0WwiUAKXO2n
 xwVSXwnkIA97hjG91++g6nE8RqtobQ6nIiz3Gv/JjedaSpF5QuRNM8nJYS8Uhmpn
 W+Qzc6tGLNnwcdwm81JXYmMju+ipIhM=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole normale supérieure</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole normale supérieure</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ens.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Julien Moutel</md:SurName>
-      <md:EmailAddress>julien.moutel@ens.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-François Barbé</md:SurName>
-      <md:EmailAddress>jean-francois.barbe@ens.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole normale supérieure</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole normale supérieure</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ens.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Julien Moutel</md:SurName>
+    <md:EmailAddress>julien.moutel@ens.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-François Barbé</md:SurName>
+    <md:EmailAddress>jean-francois.barbe@ens.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml
index 88f46c48..c082ad36 100644
--- a/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ens2m.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-23T15:44:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-23T15:44:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens2m.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSMM Besançon - National School of Mechanical and Microtechnology</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAS1BMVEUpsnul38Y5nsbO7957vt7e7/dry6Vjstb3+/dCvoyt1+dKps6cz+f3+//O5/cxtoTW8+eEw97n8/97z61rttZSw5S12+9Sqs7///8a7shsAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAbElEQVQY01WOSRKAIAwEcVALFwyWC/n/SwXCZuCQajoZlKpFPAGITT4zvwJKDdZHUN7p4R0/Q/NdgCjugAASwYkgKeFedgXqjoC0RQaUZnJEMzT7Dd2OJ/26pdDFJ/oRZdj/jNke6I1Fm7GCD7ICBO10G0ltAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjQwKzAyOjAwv7Cn8gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowMM7tH04AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ens2m.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Identity provider for National School of Mechanical and Microtechnology (ENSMM) in Besançon (France).</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Fournisseur d'identités de l'Ecole Nationale Supérieure de Mécanique et des Microtechniques (ENSMM) de Besançon (France).</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens2m.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSMM Besançon - National School of Mechanical and Microtechnology</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAS1BMVEUpsnul38Y5nsbO7957vt7e7/dry6Vjstb3+/dCvoyt1+dKps6cz+f3+//O5/cxtoTW8+eEw97n8/97z61rttZSw5S12+9Sqs7///8a7shsAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAbElEQVQY01WOSRKAIAwEcVALFwyWC/n/SwXCZuCQajoZlKpFPAGITT4zvwJKDdZHUN7p4R0/Q/NdgCjugAASwYkgKeFedgXqjoC0RQaUZnJEMzT7Dd2OJ/26pdDFJ/oRZdj/jNke6I1Fm7GCD7ICBO10G0ltAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjQwKzAyOjAwv7Cn8gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowMM7tH04AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ens2m.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Identity provider for National School of Mechanical and Microtechnology (ENSMM) in Besançon (France).</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Fournisseur d'identités de l'Ecole Nationale Supérieure de Mécanique et des Microtechniques (ENSMM) de Besançon (France).</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIUCPhPfM614xhs9L5rQkMnQiu0FLEwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMB4XDTE1MDYxODEyMjMyOFoXDTM1
 MDYxODEyMjMyOFowFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMIIBIjANBgkqhkiG
@@ -39,23 +39,23 @@ smhsf28+MyQdS2YwI9Dd0AYr13lbpIG6gSM31pZcTlZgIcG8fpmpKOmSeI7OjON9
 IAHuePwMdXUtlSEjSNksGIsPneqPNxZAviKRYZSgreG1UfwjelD81/gaPq/YYnpd
 gxA3odPxwH4odsi5EqqsqUhod7C5oBdc5fgaYPNrPQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens2m.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens2m.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens2m.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens2m.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ens2m.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens2m.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens2m.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens2m.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIUCPhPfM614xhs9L5rQkMnQiu0FLEwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMB4XDTE1MDYxODEyMjMyOFoXDTM1
 MDYxODEyMjMyOFowFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMIIBIjANBgkqhkiG
@@ -74,19 +74,19 @@ smhsf28+MyQdS2YwI9Dd0AYr13lbpIG6gSM31pZcTlZgIcG8fpmpKOmSeI7OjON9
 IAHuePwMdXUtlSEjSNksGIsPneqPNxZAviKRYZSgreG1UfwjelD81/gaPq/YYnpd
 gxA3odPxwH4odsi5EqqsqUhod7C5oBdc5fgaYPNrPQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ens2m.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ens2m.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri@ens2m.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ens2m.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ens2m.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri@ens2m.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
index 1332ba7e..766c5594 100644
--- a/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensai.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-18T16:49:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-18T16:49:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensai.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ensai.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensai.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ensai.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIUBcH+nan7a+sFhj5CUOXlWAboLgAwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMB4XDTExMTExNjEwMDc0M1oXDTMx
 MTExNjEwMDc0M1owFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMIIBIjANBgkqhkiG
@@ -36,21 +36,21 @@ B4eJf9U+c24UGeDezM+BE4A3EarzD7k3X7KBO28w4LtNocZgxQ1bIwAnbjJxPL9K
 Ku0oBaOhZYXD5qoSkqQiWBn5DWsGQq5W/1USeHBmmtRHJ7zPGZ0JP9PQ5lzliwMJ
 xBqVx8zWoO5ejvsjqLMYbxXbqd/IdBVG97DCLWYSxA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ensai.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensai.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensai.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensai.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi@ensai.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ensai.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensai.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensai.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensai.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi@ensai.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
index 6583d68a..9d50919f 100644
--- a/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensait.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-06T17:33:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-06T17:33:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensait.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSAIT - Roubaix</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ensait.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSAIT - Roubaix</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensait.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSAIT - Roubaix</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ensait.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSAIT - Roubaix</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDOzCCAiOgAwIBAgIUQaof2K6agQCF8gpgtk0a0RLQaWQwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNhaXQuZnIwHhcNMTIwNTMwMjEz
 NDI0WhcNMzIwNTMwMjEzNDI0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmVuc2Fp
@@ -37,22 +37,22 @@ gpUgOIXaS2fcmAZ4s9BYnfGgBGlP6PXF1FKeJtmO8JOl4CLZbP5y70qoJjb2xdcV
 C43cpFxAJzzjvIOU2iZuq8VgOYfGJhy2JGN1/OcVTzGu0dk31yUz/l1OLvvoIHeh
 LL0sXjeiiyK6lcUES5UR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ensait.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensait.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensait.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSAIT - Roubaix</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSAIT - Roubaix</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensait.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Vincent Dubreu</md:SurName>
-      <md:EmailAddress>vincent.dubreu@ensait.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ensait.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensait.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensait.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSAIT - Roubaix</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSAIT - Roubaix</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensait.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Vincent Dubreu</md:SurName>
+    <md:EmailAddress>vincent.dubreu@ensait.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
index 3eddd0da..ba5b10b5 100644
--- a/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensma.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-05T14:28:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-05T14:28:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensma.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ensma.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensma.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ensma.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVAONDoCnsNCIcCqPLaGuGULtVfBEkMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjAeFw0xMzA5MDMxNTMzNDlaFw0z
 MzA5MDMxNTMzNDlaMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjCCASIwDQYJKoZI
@@ -36,26 +36,26 @@ E02BPdMEqjjPsPpcO7B0HfPQfTk75REehiQGC/i5lR1OJ/9orUpJ8kc/YxOngp0I
 5tAzXV2kr8vn71UxzT2V9Le8UTrbtj4pIusrH7ngHOOt1W733OwN5JJE8iAozyVN
 LsxS0mdANFdLn6+QSsxJcvgWdJIwcB6mBawpewLxXmw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ensma.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensma.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensma.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensma.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Edouard MOREAU</md:SurName>
-      <md:EmailAddress>edouard.moreau@ensma.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Patrice ALLARY</md:SurName>
-      <md:EmailAddress>patrice.allary@ensma.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ensma.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensma.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensma.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensma.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Edouard MOREAU</md:SurName>
+    <md:EmailAddress>edouard.moreau@ensma.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Patrice ALLARY</md:SurName>
+    <md:EmailAddress>patrice.allary@ensma.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
index b24b2250..23466289 100644
--- a/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enssib.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-09T10:26:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-09T10:26:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enssib.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSSIB</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA60lEQVQ4y52SsQ3CMBBFX0gQBQWK2ICOmp7KK2QFVvAKWSErZAUoGCCMQMECQTQIkCzTXKTD2CDlpBT2//fz774zRpTfbtdAQZZNijECl8fjeHVu6SCfjBF4ej9zkOM9MQcbwKjzAThpwmI6vbnXq7h7Pw8bO8BHvr3gyaoU+QzUgAUaoJf7PiWyUqQmgpeBSBkSGgHbhPj+3yhnAUPABn+2qfkH9dQyW3FSSjrml4ANllkpnpH7LhQYZuxVcx1Z1rCrr0XvVGOXiMoojongHy6szDykoMeKxQxityX+Cv8266pESMfXpmwDvAHzaWd4jzdWHAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowML+wp/IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDArMDI6MDDO7R9OAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enssib.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSSIB</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enssib.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSSIB</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA60lEQVQ4y52SsQ3CMBBFX0gQBQWK2ICOmp7KK2QFVvAKWSErZAUoGCCMQMECQTQIkCzTXKTD2CDlpBT2//fz774zRpTfbtdAQZZNijECl8fjeHVu6SCfjBF4ej9zkOM9MQcbwKjzAThpwmI6vbnXq7h7Pw8bO8BHvr3gyaoU+QzUgAUaoJf7PiWyUqQmgpeBSBkSGgHbhPj+3yhnAUPABn+2qfkH9dQyW3FSSjrml4ANllkpnpH7LhQYZuxVcx1Z1rCrr0XvVGOXiMoojongHy6szDykoMeKxQxityX+Cv8266pESMfXpmwDvAHzaWd4jzdWHAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowML+wp/IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDArMDI6MDDO7R9OAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enssib.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSSIB</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
 MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
@@ -37,23 +37,23 @@ VqN43TT+z6fLLkYYkaYCEFJiZ5vhA8dpOfwpqxy0DyThzABg4egUKQbK5GZBixdD
 4YhyZ0Jc32mvyEqTVh4GTyyWn2PK7b+GY9Fd6FCBN1EDNXv4P+m11hiqhABd3Djp
 rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enssib.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enssib.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enssib.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enssib.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.enssib.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enssib.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enssib.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enssib.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
 MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
@@ -72,24 +72,24 @@ VqN43TT+z6fLLkYYkaYCEFJiZ5vhA8dpOfwpqxy0DyThzABg4egUKQbK5GZBixdD
 4YhyZ0Jc32mvyEqTVh4GTyyWn2PK7b+GY9Fd6FCBN1EDNXv4P+m11hiqhABd3Djp
 rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.enssib.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSSIB</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSSIB</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enssib.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sébastien BOUTELIER</md:SurName>
-      <md:EmailAddress>sebastien.boutelier@enssib.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Isabelle RECH-LE-RECIS</md:SurName>
-      <md:EmailAddress>isabelle.rech-le-recis@enssib.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.enssib.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSSIB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSSIB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enssib.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sébastien BOUTELIER</md:SurName>
+    <md:EmailAddress>sebastien.boutelier@enssib.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Isabelle RECH-LE-RECIS</md:SurName>
+    <md:EmailAddress>isabelle.rech-le-recis@enssib.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
index f5dc9f25..ab4b563e 100644
--- a/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ent.dauphine.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T11:26:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T11:26:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dauphine.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Paris 9 - Dauphine</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/gif;base64,R0lGODlhEAAQAOeVAFGwxkiv+kO441S05Ee4+kLA8FrE0UnJ5mnE1o271XzKzHrI7mXT4obO5IbQ04fb/5He5p3b6qrX7pre56nh+Mji+brt/r709Mrz+d3w9sb3/vHx8efz//Tx//zv/+r46ef3//zx//T28fT37vz0///0+PX47//0+v/0/P/29/j4+OX9///2/v/2/+H///33///3+v/3+/T6///3/f/49fn5//H98f758/b87vH8///4//X7///5+fP8/+n////5+v75///5/f/5//b8/O//9Pr7/f/6+f/6+vD+/+7/+//6++3///L/8f/6/fD/+P/6//D/+vL/9u/////7+fr99PL/+PH/+//7+vD///f9//z8/Pv8//f+9/H///38+v/7//L///T/+vX/+P/8+fP////8+vX/+vX/+/T////8/ff/+P/8//X///b//f39/fn/9vr+/f/9+fj/+v/9+vr+//f///n/+vj//f7+9v/9/fz+/fj////9//z+//z/9vn///3+///++v/++/7+/vz/+v/+/P7+//7/9v/+/f//9Pz//f7/+P/+//z///7/+v//+P7/+/7//f//+/7//////f///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACwAAAAAEAAQAAAI/gBnnPgDBssfRlMEFYqkCE6jRkUo6WnESEcJSGYaAarE6MqYQIGcKEoB48ocSSLiGGmio8WLLGTq5OFxI4qVSS3SRDqTBIqaRzQqeXl0SA4aEGAkIeLDAoihPV34tKliQkiHBAAy9Piig4WSQItqDCHkqI+LBQICEChwgAEEDGD2PIkx6QKCAQ9scJnUJ0cFCRSYrJHRwICFJ0EqDXJTqbGKDU9WKIiwZccSPIoZN9aigoMDDTpIsKGSqPGgQY0bT8DiYc2jD2+OpJ5dyUeIPERw/PiCBHVq3y3u2PEjhqsU36bduBlRBg4dIXukoKCteNCbMHx0rGEkyI9p5JUCAQIAOw==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.dauphine.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Paris 9 - Dauphine</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dauphine.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Paris 9 - Dauphine</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/gif;base64,R0lGODlhEAAQAOeVAFGwxkiv+kO441S05Ee4+kLA8FrE0UnJ5mnE1o271XzKzHrI7mXT4obO5IbQ04fb/5He5p3b6qrX7pre56nh+Mji+brt/r709Mrz+d3w9sb3/vHx8efz//Tx//zv/+r46ef3//zx//T28fT37vz0///0+PX47//0+v/0/P/29/j4+OX9///2/v/2/+H///33///3+v/3+/T6///3/f/49fn5//H98f758/b87vH8///4//X7///5+fP8/+n////5+v75///5/f/5//b8/O//9Pr7/f/6+f/6+vD+/+7/+//6++3///L/8f/6/fD/+P/6//D/+vL/9u/////7+fr99PL/+PH/+//7+vD///f9//z8/Pv8//f+9/H///38+v/7//L///T/+vX/+P/8+fP////8+vX/+vX/+/T////8/ff/+P/8//X///b//f39/fn/9vr+/f/9+fj/+v/9+vr+//f///n/+vj//f7+9v/9/fz+/fj////9//z+//z/9vn///3+///++v/++/7+/vz/+v/+/P7+//7/9v/+/f//9Pz//f7/+P/+//z///7/+v//+P7/+/7//f//+/7//////f///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACwAAAAAEAAQAAAI/gBnnPgDBssfRlMEFYqkCE6jRkUo6WnESEcJSGYaAarE6MqYQIGcKEoB48ocSSLiGGmio8WLLGTq5OFxI4qVSS3SRDqTBIqaRzQqeXl0SA4aEGAkIeLDAoihPV34tKliQkiHBAAy9Piig4WSQItqDCHkqI+LBQICEChwgAEEDGD2PIkx6QKCAQ9scJnUJ0cFCRSYrJHRwICFJ0EqDXJTqbGKDU9WKIiwZccSPIoZN9aigoMDDTpIsKGSqPGgQY0bT8DiYc2jD2+OpJ5dyUeIPERw/PiCBHVq3y3u2PEjhqsU36bduBlRBg4dIXukoKCteNCbMHx0rGEkyI9p5JUCAQIAOw==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.dauphine.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Paris 9 - Dauphine</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAL8Gc+NXLeRBFscDZy7qdwGaAlMdMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC5lbnQuZGF1cGhpbmUuZnIwHhcNMTEwMTI0MTgw
 ODU4WhcNMzEwMTI0MTgwODU4WjAeMRwwGgYDVQQDExNpZHAuZW50LmRhdXBoaW5l
@@ -38,22 +38,22 @@ uy4IfdhPh/g3Z0/Xy+hcDYyw+jN4FfjemHHZ/y9No3OYrLBGH5YxpY5oRfEh1E2C
 uZUMXJWvgnx3iOoxoAAORWf106TxENjuBE4MbxOK0r7MOSmXjPINJrMTLue5hzZs
 +M9PCzhKsLPRd3lD
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ent.dauphine.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris 9 - Dauphine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris 9 - Dauphine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dauphine.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Lionel LENOBLE</md:SurName>
-      <md:EmailAddress>lionel.lenoble@dauphine.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ent.dauphine.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 9 - Dauphine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 9 - Dauphine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dauphine.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lionel LENOBLE</md:SurName>
+    <md:EmailAddress>lionel.lenoble@dauphine.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
index 6e77aff0..4428bf80 100644
--- a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.entpe.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-05T09:54:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-05T09:54:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENTPE - Vaulx en Velin</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbElEQVQoz22SX0hTcRTHz343Ze3CxHsnzgRRRviyXjYIroKGKPgYk2BPPfhgNIMMEnwxMgkGvRqUjEEzhnuZIhs97UE0GLIYXaFE6U52R7TrXeH+uXZ/93d60Mq07/P5HL7nfL+WhTX8XofL8nvrn96v9vT0jI6OIkJaAVmFe7cA8H/KZrOSJAUCAUrpjzrOxzEQwdpPRMSLAKV0ZWVFFMXZ2dlm0/hyhMNBXN5EhkgpPTw8/AcolUp+v7+lpWVpaclkbO0D3nyGG1lExEajkUgk8vn8X2B7e9vj8QiCsL6+Tk1c3kT3PG7tIyIqipJIJGRZZoydAclksqOjw+12y7L87RgfvEXPU5RVZIxlMpk3kcje3t7pJNRqtWAwKAjC+Pi4ph2lPuONJyg9x5yOlNJUKhUOh/Oq+scI+CYmrFbr4uJioWQ8jqHjIfpfYeUEq9VqMpmMRqO6rp+/E8rlsqZp+0WceIn8fVzYwJMm6roeiUTi8Xi1Wr3wRovJMJqG4DuoNeDFHfB5mSzLu7u7XV1dQ0NDra2tFwK1PFrF0BYMuOD1XbhmN9LptKIoLpdLkiSO4y434MrwdSb1wW2vhbMgIkHEkZGR7u5u+F0CQsiZewBCCHdS/Fj/mrFdtc7MzBiGoapqpVKZmpra2dkxTXNubi4Wi/X394+NjZXL5cHBQcJxXGdnp8PhaGtrC4VC7e3tPp/P6XROT0/zPC+KYi6XO93d29tHCCEAwPO8zWaTpAFN0w4ODs47LhaL4XDYbrcTQkRRAADCGDNNs1AoAODk5KSmaQBgmiallDHmdDq9Xi9jzDAMXdebzeYvcjfFs1cEA2EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.entpe.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENTPE - Vaulx en Velin</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENTPE - Vaulx en Velin</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbElEQVQoz22SX0hTcRTHz343Ze3CxHsnzgRRRviyXjYIroKGKPgYk2BPPfhgNIMMEnwxMgkGvRqUjEEzhnuZIhs97UE0GLIYXaFE6U52R7TrXeH+uXZ/93d60Mq07/P5HL7nfL+WhTX8XofL8nvrn96v9vT0jI6OIkJaAVmFe7cA8H/KZrOSJAUCAUrpjzrOxzEQwdpPRMSLAKV0ZWVFFMXZ2dlm0/hyhMNBXN5EhkgpPTw8/AcolUp+v7+lpWVpaclkbO0D3nyGG1lExEajkUgk8vn8X2B7e9vj8QiCsL6+Tk1c3kT3PG7tIyIqipJIJGRZZoydAclksqOjw+12y7L87RgfvEXPU5RVZIxlMpk3kcje3t7pJNRqtWAwKAjC+Pi4ph2lPuONJyg9x5yOlNJUKhUOh/Oq+scI+CYmrFbr4uJioWQ8jqHjIfpfYeUEq9VqMpmMRqO6rp+/E8rlsqZp+0WceIn8fVzYwJMm6roeiUTi8Xi1Wr3wRovJMJqG4DuoNeDFHfB5mSzLu7u7XV1dQ0NDra2tFwK1PFrF0BYMuOD1XbhmN9LptKIoLpdLkiSO4y434MrwdSb1wW2vhbMgIkHEkZGR7u5u+F0CQsiZewBCCHdS/Fj/mrFdtc7MzBiGoapqpVKZmpra2dkxTXNubi4Wi/X394+NjZXL5cHBQcJxXGdnp8PhaGtrC4VC7e3tPp/P6XROT0/zPC+KYi6XO93d29tHCCEAwPO8zWaTpAFN0w4ODs47LhaL4XDYbrcTQkRRAADCGDNNs1AoAODk5KSmaQBgmiallDHmdDq9Xi9jzDAMXdebzeYvcjfFs1cEA2EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.entpe.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENTPE - Vaulx en Velin</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
 MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
@@ -38,24 +38,24 @@ gPjZyS2WLKKQr3zO5RYT+D3Z2Cx+0buIdDWpfOawV8cMAVxkub7uvjgnt8LRddDn
 hz5Ka52K32oCM/oo9XNZsXDL7uA83DKl//sRCrRmbrtp0G1xUXzZa+vCbQ2ndUSX
 BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.entpe.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.entpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.entpe.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.entpe.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.entpe.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.entpe.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
 MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
@@ -74,20 +74,20 @@ gPjZyS2WLKKQr3zO5RYT+D3Z2Cx+0buIdDWpfOawV8cMAVxkub7uvjgnt8LRddDn
 hz5Ka52K32oCM/oo9XNZsXDL7uA83DKl//sRCrRmbrtp0G1xUXzZa+vCbQ2ndUSX
 BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.entpe.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENTPE - Vaulx en Velin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENTPE - Vaulx en Velin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.entpe.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christian GARDET</md:SurName>
-      <md:EmailAddress>christian.gardet@entpe.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.entpe.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENTPE - Vaulx en Velin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENTPE - Vaulx en Velin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.entpe.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christian GARDET</md:SurName>
+    <md:EmailAddress>christian.gardet@entpe.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
index 13a428b0..724e47a0 100644
--- a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T12:36:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://support-it.epfl.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-04-11T12:36:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">EPFL - EPF Lausanne</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">EPFL - EPF Lausanne</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">EPFL - EPF Lausanne</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Lausanne</mdui:Description>
+        <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Lausanne</mdui:Description>
+        <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Lausanne</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAe0lEQVQ4Ed2QUQqAMAxDq3j/K08ymhDKnGz4pSBLu/SRLuJXX8ttcPL3Bb1Hb5w2dJibWsa8Y19WAtQw4eYKkg0AXLpZl0UMPbMEZX5czgCPsR1FAMw+QI3Y1Dx9Pq6s6n5vtSBMoMaq+ATge64E6G+ym4Bv1AjYSdEhN3OaFRR7lkw7AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAhsSURBVHic7FtpjBRFFH471+7MLPd9ugEFkfsUCMilyOWuiIDArqAiKAiogOCBohGiIqeICkpE8EoMUQLEQIwxiMiRIP7wj/4QY2L0h/EEE5S1Puor+m0zwyE7dHrkJd/2dFV113tfv3r1qrpXKisr5TL+OwJXIOwIXIGwI3AFwo7AFQg7Alcg7AhcgbAjcAXCjsAVCDsCVyDsCFyBsEM+TRVX5hKfG7yZTK0oLCgQI/jzhYHpWX40qGFQwnPgCYN56nyonCnbWHfcoKXBI6o9zqUsFu97KMd2OeScQGPIifJ4oiWNH6WMnc0yP4Exg294fthHXgeDk6xbyTJNYEleEfiZwY5k+r161vsgu2nozwbJLARCHlZlvRWB61l2wqB53hMIIxYmCofRUHjhPzT0BUVKJgI7qrIlLEsZ/Mayber6/CXQxL+fekWjURr6gDL02nMQGDE4xrLtLBuj2o3NewL3GWxNpjen5Yzh+72IV5iFQMhRlu3l+Ws8/8ugOO8JPGjwdGHRVBoZN/iTRm6SqpKNwB9Y9iHPv+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhT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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>2001:620:618::/48</mdui:IPHint>
+        <mdui:IPHint>192.26.28.0/22</mdui:IPHint>
+        <mdui:IPHint>192.26.28.0/24</mdui:IPHint>
+        <mdui:IPHint>128.178.0.0/15</mdui:IPHint>
+        <mdui:IPHint>192.26.29.0/24</mdui:IPHint>
+        <mdui:IPHint>128.178.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.26.30.0/24</mdui:IPHint>
+        <mdui:IPHint>128.179.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.26.31.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.32.0/20</mdui:IPHint>
+        <mdui:IPHint>192.26.32.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.33.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.34.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.35.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.36.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.37.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.38.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.39.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.40.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.41.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.42.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.43.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.44.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.46.0/24</mdui:IPHint>
+        <mdui:IPHint>192.26.47.0/24</mdui:IPHint>
+        <mdui:IPHint>192.33.192.0/20</mdui:IPHint>
+        <mdui:IPHint>192.33.208.0/22</mdui:IPHint>
+        <mdui:DomainHint>epfl.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.520515,6.565576</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://support-it.epfl.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">EPFL - EPF Lausanne</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">EPFL - EPF Lausanne</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">EPFL - EPF Lausanne</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Lausanne</mdui:Description>
-          <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Lausanne</mdui:Description>
-          <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Lausanne</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAe0lEQVQ4Ed2QUQqAMAxDq3j/K08ymhDKnGz4pSBLu/SRLuJXX8ttcPL3Bb1Hb5w2dJibWsa8Y19WAtQw4eYKkg0AXLpZl0UMPbMEZX5czgCPsR1FAMw+QI3Y1Dx9Pq6s6n5vtSBMoMaq+ATge64E6G+ym4Bv1AjYSdEhN3OaFRR7lkw7AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAhsSURBVHic7FtpjBRFFH471+7MLPd9ugEFkfsUCMilyOWuiIDArqAiKAiogOCBohGiIqeICkpE8EoMUQLEQIwxiMiRIP7wj/4QY2L0h/EEE5S1Puor+m0zwyE7dHrkJd/2dFV113tfv3r1qrpXKisr5TL+OwJXIOwIXIGwI3AFwo7AFQg7Alcg7AhcgbAjcAXCjsAVCDsCVyDsCFyBsEM+TRVX5hKfG7yZTK0oLCgQI/jzhYHpWX40qGFQwnPgCYN56nyonCnbWHfcoKXBI6o9zqUsFu97KMd2OeScQGPIifJ4oiWNH6WMnc0yP4Exg294fthHXgeDk6xbyTJNYEleEfiZwY5k+r161vsgu2nozwbJLARCHlZlvRWB61l2wqB53hMIIxYmCofRUHjhPzT0BUVKJgI7qrIlLEsZ/Mayber6/CXQxL+fekWjURr6gDL02nMQGDE4xrLtLBuj2o3NewL3GWxNpjen5Yzh+72IV5iFQMhRlu3l+Ws8/8ugOO8JPGjwdGHRVBoZN/iTRm6SqpKNwB9Y9iHPv+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhT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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>2001:620:618::/48</mdui:IPHint>
-          <mdui:IPHint>192.26.28.0/22</mdui:IPHint>
-          <mdui:IPHint>192.26.28.0/24</mdui:IPHint>
-          <mdui:IPHint>128.178.0.0/15</mdui:IPHint>
-          <mdui:IPHint>192.26.29.0/24</mdui:IPHint>
-          <mdui:IPHint>128.178.0.0/16</mdui:IPHint>
-          <mdui:IPHint>192.26.30.0/24</mdui:IPHint>
-          <mdui:IPHint>128.179.0.0/16</mdui:IPHint>
-          <mdui:IPHint>192.26.31.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.32.0/20</mdui:IPHint>
-          <mdui:IPHint>192.26.32.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.33.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.34.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.35.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.36.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.37.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.38.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.39.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.40.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.41.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.42.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.43.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.44.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.46.0/24</mdui:IPHint>
-          <mdui:IPHint>192.26.47.0/24</mdui:IPHint>
-          <mdui:IPHint>192.33.192.0/20</mdui:IPHint>
-          <mdui:IPHint>192.33.208.0/22</mdui:IPHint>
-          <mdui:DomainHint>epfl.ch</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:46.520515,6.565576</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
 BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
 FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -78,27 +78,27 @@ CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
 q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
 pTA8OOnOcAQgmsJXODtWzw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.epfl.ch/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.epfl.ch/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.epfl.ch/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.epfl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.epfl.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.epfl.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.epfl.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.epfl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDDCCAfSgAwIBAgIJAM2y4eON2PnqMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
 BAMTC2lkcC5lcGZsLmNoMB4XDTE2MDMyOTEzMzQzM1oXDTE5MDMyOTEzMzQzM1ow
 FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -117,32 +117,32 @@ CH9vvkQUa54Z82a+lRLl/JXSGApYETFxBD/mxuL6DyhhcZ/eMniejll/iBZMs2TQ
 q4Uf4QOFWwomWhTzbJ9RoW5PqxmujfI4twlL0SAifiRur90Wd2+wm2QT5LHgEaLL
 pTA8OOnOcAQgmsJXODtWzw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">epfl.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">EPFL - EPF Lausanne</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">EPFL - EPF Lausanne</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">EPFL - EPF Lausanne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.epfl.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.epfl.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.epfl.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>AAI</md:GivenName>
-      <md:SurName>EPFL Team</md:SurName>
-      <md:EmailAddress>mailto:aai@epfl.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AAI</md:GivenName>
-      <md:SurName>EPFL Team</md:SurName>
-      <md:EmailAddress>mailto:aai@epfl.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">epfl.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">EPFL - EPF Lausanne</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">EPFL - EPF Lausanne</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">EPFL - EPF Lausanne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.epfl.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.epfl.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.epfl.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>EPFL Team</md:SurName>
+    <md:EmailAddress>mailto:aai@epfl.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>EPFL Team</md:SurName>
+    <md:EmailAddress>mailto:aai@epfl.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml
index e2056041..0ce38960 100644
--- a/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.es.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.es.net/idp/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ESnet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Energy Sciences Network </mdui:Description>
+        <mdui:Logo height="22" width="72" xml:lang="en">https://www.es.net/assets/Logos/ESnetFinalRGB.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.es.net/idp/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ESnet</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Energy Sciences Network </mdui:Description>
-          <mdui:Logo height="22" width="72" xml:lang="en">https://www.es.net/assets/Logos/ESnetFinalRGB.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAO4b4WF67Uq3LsXyIhUEBd7dB/JoMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5lcy5uZXQwHhcNMTExMjEzMjMwNTM4WhcNMzEx
 MjEzMjMwNTM4WjAVMRMwEQYDVQQDEwppZHAuZXMubmV0MIIBIjANBgkqhkiG9w0B
@@ -39,23 +39,23 @@ lVH5KPTu0rxTbbtx75SaPJ9FXmiHFe25kZd+hyZs/XB8ExN58jukXygMUOUgIuRP
 sb1TR90+G0WLUJlIxr1SeRpeHFUWcHkEmss3FIwgJrRVwfSQxwQgTRFRELJInRQI
 nciX8msJNoIgdL+nElSBTZ1kUT569c8d
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.es.net/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.es.net/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.es.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.es.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.es.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.es.net/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.es.net/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.es.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.es.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.es.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAO4b4WF67Uq3LsXyIhUEBd7dB/JoMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5lcy5uZXQwHhcNMTExMjEzMjMwNTM4WhcNMzEx
 MjEzMjMwNTM4WjAVMRMwEQYDVQQDEwppZHAuZXMubmV0MIIBIjANBgkqhkiG9w0B
@@ -74,22 +74,22 @@ lVH5KPTu0rxTbbtx75SaPJ9FXmiHFe25kZd+hyZs/XB8ExN58jukXygMUOUgIuRP
 sb1TR90+G0WLUJlIxr1SeRpeHFUWcHkEmss3FIwgJrRVwfSQxwQgTRFRELJInRQI
 nciX8msJNoIgdL+nElSBTZ1kUT569c8d
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.es.net/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ESnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ESnet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.es.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dhiva Muruganantham</md:GivenName>
-      <md:EmailAddress>dhiva@es.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ESnet Operations</md:GivenName>
-      <md:EmailAddress>trouble@es.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.es.net/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ESnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ESnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.es.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dhiva Muruganantham</md:GivenName>
+    <md:EmailAddress>dhiva@es.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ESnet Operations</md:GivenName>
+    <md:EmailAddress>trouble@es.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml
index 0e76c05d..86bab003 100644
--- a/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SUNY Empire State College</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.esc.edu/policies/?search=cid%3D35661</mdui:PrivacyStatementURL>
+        <mdui:Logo height="302" width="57" xml:lang="en">https://www.esc.edu/media/esc-website/style-assets/images/logos/esc-logo-orange-bkg.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SUNY Empire State College</mdui:DisplayName>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.esc.edu/policies/?search=cid%3D35661</mdui:PrivacyStatementURL>
-          <mdui:Logo height="302" width="57" xml:lang="en">https://www.esc.edu/media/esc-website/style-assets/images/logos/esc-logo-orange-bkg.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUJ2V9Z0LCoLuWMLmlW0TccM7q5bowDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmVzYy5lZHUwHhcNMTMwNzAyMDM1NDAyWhcNMzMw
 NzAyMDM1NDAyWjAWMRQwEgYDVQQDEwtpZHAuZXNjLmVkdTCCASIwDQYJKoZIhvcN
@@ -39,24 +39,24 @@ O+FO67Fjb0M3vJBtnzPE+yrHcs1X3ziXNfLiKBpMxd8F/doaBB1NsDyaZE1MvM8w
 Q3Xxxt1gOGGfIHd26VZaZAu2yQbStPmuE39wSd6qHdjhRANX/bvB9BwwWaViSwLL
 cpt9YIL8me3wWdKKULCHEj8ZjnvogpRWvrZm
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.esc.edu/cas/logout"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.esc.edu/cas/logout"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUJ2V9Z0LCoLuWMLmlW0TccM7q5bowDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmVzYy5lZHUwHhcNMTMwNzAyMDM1NDAyWhcNMzMw
 NzAyMDM1NDAyWjAWMRQwEgYDVQQDEwtpZHAuZXNjLmVkdTCCASIwDQYJKoZIhvcN
@@ -75,26 +75,26 @@ O+FO67Fjb0M3vJBtnzPE+yrHcs1X3ziXNfLiKBpMxd8F/doaBB1NsDyaZE1MvM8w
 Q3Xxxt1gOGGfIHd26VZaZAu2yQbStPmuE39wSd6qHdjhRANX/bvB9BwwWaViSwLL
 cpt9YIL8me3wWdKKULCHEj8ZjnvogpRWvrZm
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SUNY Empire State College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SUNY Empire State College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.esc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam Cross</md:GivenName>
-      <md:EmailAddress>adam.cross@esc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Koch</md:GivenName>
-      <md:EmailAddress>john.koch@esc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>AJ Lacomba</md:GivenName>
-      <md:EmailAddress>aj.lacomba@esc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNY Empire State College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNY Empire State College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.esc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam Cross</md:GivenName>
+    <md:EmailAddress>adam.cross@esc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Koch</md:GivenName>
+    <md:EmailAddress>john.koch@esc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>AJ Lacomba</md:GivenName>
+    <md:EmailAddress>aj.lacomba@esc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml
index 941cba25..4c5caaae 100644
--- a/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Ersta Sköndal Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ersta Sköndal University College</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Ersta Sköndal University College</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Ersta Sköndal Högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Ersta Sköndal University College</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Ersta Sköndal University College</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
@@ -39,26 +39,26 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
 9SqhISRU1eEjg6GtcLZCkvdVGag/E4qO
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
@@ -79,21 +79,21 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
 9SqhISRU1eEjg6GtcLZCkvdVGag/E4qO
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">Ersta Sköndal Högskola</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.esh.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Ersta Sköndal Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.esh.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml
index 959495d4..21386656 100644
--- a/swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esher.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-19T11:08:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-19T11:08:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esher.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Esher College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esher.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Esher College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUTqf68WmrG3w0sWAxe9mg3otFIZswDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMB4XDTE0MTIxNzEyMTMzNVoX
 						DTM0MTIxNzEyMTMzNVowGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMIIBIjAN
@@ -34,29 +34,29 @@
 						hetlcmrGJDayU8XF/HZYDRPIe+ZABsaaqkrFgLGjTHeHv95TNk9r7oVF3V+G4M2q
 						XTPQTiNsUr7+4LYPFUtOa6fi1GHeYLkqLiuuhX9v2GW8jXtV+XUA7+r1MQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esher.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esher.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esher.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esher.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esher.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esher.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esher.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esher.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUTqf68WmrG3w0sWAxe9mg3otFIZswDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMB4XDTE0MTIxNzEyMTMzNVoX
 						DTM0MTIxNzEyMTMzNVowGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMIIBIjAN
@@ -75,27 +75,27 @@
 						hetlcmrGJDayU8XF/HZYDRPIe+ZABsaaqkrFgLGjTHeHv95TNk9r7oVF3V+G4M2q
 						XTPQTiNsUr7+4LYPFUtOa6fi1GHeYLkqLiuuhX9v2GW8jXtV+XUA7+r1MQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Esher College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Esher College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.esher.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Loughlin</md:SurName>
-      <md:EmailAddress>mailto:operations@esher.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Loughlin</md:SurName>
-      <md:EmailAddress>mailto:operations@esher.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Esher College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Esher College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.esher.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Loughlin</md:SurName>
+    <md:EmailAddress>mailto:operations@esher.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Loughlin</md:SurName>
+    <md:EmailAddress>mailto:operations@esher.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
index 5f9ac8f7..aa846885 100644
--- a/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eso.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-22T16:13:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-22T16:13:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eso.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">ESO - European Southern Observatory</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ESO - European Southern Observatory</mdui:DisplayName>
+        <mdui:Description xml:lang="de">ESo baut und betreibt astronomische Teleskope</mdui:Description>
+        <mdui:Description xml:lang="en">ESO builds and operates astronomical telescopes</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.eso.org/images/eso-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="64" width="64">https://www.eso.org/images/eso-logo.ico</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.eso.org/public/germany/about-eso/esoglance/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.eso.org/public/about-eso/esoglance/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.eso.org/public/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eso.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">ESO - European Southern Observatory</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">ESO - European Southern Observatory</mdui:DisplayName>
-          <mdui:Description xml:lang="de">ESo baut und betreibt astronomische Teleskope</mdui:Description>
-          <mdui:Description xml:lang="en">ESO builds and operates astronomical telescopes</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.eso.org/images/eso-logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="64" width="64">https://www.eso.org/images/eso-logo.ico</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://www.eso.org/public/germany/about-eso/esoglance/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.eso.org/public/about-eso/esoglance/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.eso.org/public/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.eso.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.eso.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
 BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
 QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
 TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
@@ -61,31 +61,31 @@ xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
 qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
 26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eso.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eso.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eso.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.eso.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eso.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eso.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eso.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.eso.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
 BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
 QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
 TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
@@ -120,30 +120,30 @@ xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
 qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
 26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e446</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e446</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">ESO - European Organisation for Astronomical Research</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ESO - European Organisation for Astronomical Research</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.eso.org</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.eso.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Florian</md:GivenName>
-      <md:SurName>Heissenhuber</md:SurName>
-      <md:EmailAddress>mailto:fheissen@eso.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Florian</md:GivenName>
-      <md:SurName>Heissenhuber</md:SurName>
-      <md:EmailAddress>mailto:fheissen@eso.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e446</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e446</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">ESO - European Organisation for Astronomical Research</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ESO - European Organisation for Astronomical Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.eso.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.eso.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Florian</md:GivenName>
+    <md:SurName>Heissenhuber</md:SurName>
+    <md:EmailAddress>mailto:fheissen@eso.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Florian</md:GivenName>
+    <md:SurName>Heissenhuber</md:SurName>
+    <md:EmailAddress>mailto:fheissen@eso.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml
index 7349165f..7dfb46ad 100644
--- a/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esrc.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esrc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/esrc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/esrc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Economic &amp; Social Research Council</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.esrc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/esrc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/esrc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Economic &amp; Social Research Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.esrc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml
index 9830f82e..5c64e686 100644
--- a/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.essingtoncc.co.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-21T15:59:21Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-21T15:59:21Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCAroCCQCGyNfhukfamTANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxEjAQBgNVBAcMCUVzc2luZ3RvbjEr
 						MCkGA1UECgwiRXNzaW5ndG9uIENvbXB1dGVyIENvbnN1bHRhbmN5IEx0ZDEeMBwG
@@ -38,26 +38,26 @@
 						ZKkmrie5td8TdkKkn8UyJbGsbLcv6fFbFTCh9V/n8uBUCJTT+CQpKDNmPKNuRxSW
 						x1EIfHvBWWZhPjOeFVoyVrdxsAdnIA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCAroCCQCGyNfhukfamTANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxEjAQBgNVBAcMCUVzc2luZ3RvbjEr
 						MCkGA1UECgwiRXNzaW5ndG9uIENvbXB1dGVyIENvbnN1bHRhbmN5IEx0ZDEeMBwG
@@ -80,27 +80,27 @@
 						ZKkmrie5td8TdkKkn8UyJbGsbLcv6fFbFTCh9V/n8uBUCJTT+CQpKDNmPKNuRxSW
 						x1EIfHvBWWZhPjOeFVoyVrdxsAdnIA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Essington Computer Consultancy Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Essington Computer Consultancy Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml
index 2c292664..2120898b 100644
--- a/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.etrs.terre.defense.gouv.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-16T13:41:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-16T13:41:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etrs.terre.defense.gouv.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ETRS - Ecole des Transmissions</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBACAAEAAQCwAAAAFgAAACgAAAAQAAAAIAAAAAEAAQAAAAAAAAgAAAAAAAAAAAAAAgAAAAAAAACEIxoAfuP8APAPAAD4HwAA+B8AAPw/AAD8PwAA/D8AAPw/AAD8PwAA/D8AAPw/AAB8PgAAHDgAAAAAAAAAAAAAAAAAAH/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.etrs.terre.defense.gouv.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Staff and students of Ecole des Transmissions</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ETRS - Ecole des Transmissions</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et stagiaires de l'Ecole des Transmissions</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etrs.terre.defense.gouv.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ETRS - Ecole des Transmissions</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBACAAEAAQCwAAAAFgAAACgAAAAQAAAAIAAAAAEAAQAAAAAAAAgAAAAAAAAAAAAAAgAAAAAAAACEIxoAfuP8APAPAAD4HwAA+B8AAPw/AAD8PwAA/D8AAPw/AAD8PwAA/D8AAPw/AAB8PgAAHDgAAAAAAAAAAAAAAAAAAH/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.etrs.terre.defense.gouv.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Staff and students of Ecole des Transmissions</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ETRS - Ecole des Transmissions</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels et stagiaires de l'Ecole des Transmissions</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDZTCCAk2gAwIBAgIUJ8+wj9VvvaWkYWc7Lv9ZrozEz5wwDQYJKoZIhvcNAQEF
 BQAwKTEnMCUGA1UEAwweaWRwLmV0cnMudGVycmUuZGVmZW5zZS5nb3V2LmZyMB4X
 DTE1MDYwNDEyNDMzM1oXDTM1MDYwNDEyNDMzM1owKTEnMCUGA1UEAwweaWRwLmV0
@@ -41,22 +41,22 @@ CSaG+Q/uQK0g4lfhJr2ZvpDrAy+f5ZJcccgz4uPJk0hqdydB6gHGIbSYVt1X89vW
 WYYigdavCrEx/mzNsCIdNuvFCFWQxDTr62aRd9Ib9VdrTc4GL7w+Gi7Ne++PRgzX
 laUPwIb+uQ6Z
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ETRS - Ecole des Transmissions</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ETRS - Ecole des Transmissions</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.etrs.terre.defense.gouv.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Fabrice Pollet</md:SurName>
-      <md:EmailAddress>fabrice.pollet@etrs.terre.defense.gouv.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ETRS - Ecole des Transmissions</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ETRS - Ecole des Transmissions</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.etrs.terre.defense.gouv.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Fabrice Pollet</md:SurName>
+    <md:EmailAddress>fabrice.pollet@etrs.terre.defense.gouv.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml
index 97cefd7c..1a325b4c 100644
--- a/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eup.edinboro.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinboro.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Edinboro University of Pennsylvania</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinboro.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Edinboro University of Pennsylvania</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUFianlABIFtAs3u/76iVhSuuoZOwwDQYJKoZIhvcNAQEL
 BQAwHzEdMBsGA1UEAwwUaWRwLmV1cC5lZGluYm9yby5lZHUwHhcNMTUxMTAyMTYw
 OTEzWhcNMzUxMTAyMTUwOTEzWjAfMR0wGwYDVQQDDBRpZHAuZXVwLmVkaW5ib3Jv
@@ -38,31 +38,31 @@ zB/u9DYj/GrUTzuffJ4p4e4OQ+b43VUQqt/2V/jh7ZuAHFha+RaMEU0oKy+Gb3Zd
 Z1gkNL/ThIrfbDze5fC0/hfEFbUOksDJarAyckTgJ2y04gEg+rXTHou780DtxSuK
 aujsroEAboRTQ/jskvQa
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eup.edinboro.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eup.edinboro.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Edinboro University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edinboro University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.edinboro.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ralph Boyles</md:GivenName>
-      <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ralph Boyles</md:GivenName>
-      <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ralph Boyles</md:GivenName>
-      <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Ralph Boyles</md:GivenName>
-      <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eup.edinboro.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eup.edinboro.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Edinboro University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edinboro University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.edinboro.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ralph Boyles</md:GivenName>
+    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ralph Boyles</md:GivenName>
+    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ralph Boyles</md:GivenName>
+    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Ralph Boyles</md:GivenName>
+    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
index 14646a4f..71a3e320 100644
--- a/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eurecom.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-20T18:45:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-20T18:45:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eurecom.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EURECOM</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABD0lEQVQ4y+2RPUoDURCAv3nv7SYqWFlYqFHQQlJYaRG9RzyH5/AMggfwHFFEPIHFyrZKwNWQ5L0Zi82yRNQT5KuGYfjmD1aImRlAURQktX+LD/Z7iMhSLjRBWZYAVJ2KL93jNWwud/IZ/UoQATMY5DPWOnk9gaq2ZoPe7TNmnqCtICK8b7TSariDuFALkiqj0SOgTELGNGTYQmpmiAhBJ5yfndYdgPUkeB/aGzRMqNi9+eQjj3iD1KxsgkrCIzhXMb48Ine+FjzcPxFjBKArb0x1G41dNMyZkQEwuDjGDPIkuAS+++MLDS8Kh3dj/DziVEFcPcCiKrnE1Ynnur/1uyCpoQjB/fFSFSQZZMKKmm+AtoEKVdONaAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MiswMjowMCgvttsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDIrMDI6MDBZcg5nAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.eurecom.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Any student, researcher and personal users authenticated by directory server of EURECOM.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">EURECOM</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Tout utilisateur de type étudiant, chercheur et personnel authentifié par l'annuaire d'EURECOM.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eurecom.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EURECOM</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABD0lEQVQ4y+2RPUoDURCAv3nv7SYqWFlYqFHQQlJYaRG9RzyH5/AMggfwHFFEPIHFyrZKwNWQ5L0Zi82yRNQT5KuGYfjmD1aImRlAURQktX+LD/Z7iMhSLjRBWZYAVJ2KL93jNWwud/IZ/UoQATMY5DPWOnk9gaq2ZoPe7TNmnqCtICK8b7TSariDuFALkiqj0SOgTELGNGTYQmpmiAhBJ5yfndYdgPUkeB/aGzRMqNi9+eQjj3iD1KxsgkrCIzhXMb48Ine+FjzcPxFjBKArb0x1G41dNMyZkQEwuDjGDPIkuAS+++MLDS8Kh3dj/DziVEFcPcCiKrnE1Ynnur/1uyCpoQjB/fFSFSQZZMKKmm+AtoEKVdONaAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MiswMjowMCgvttsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDIrMDI6MDBZcg5nAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.eurecom.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Any student, researcher and personal users authenticated by directory server of EURECOM.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">EURECOM</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Tout utilisateur de type étudiant, chercheur et personnel authentifié par l'annuaire d'EURECOM.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAL0+FcNd+RBrqwXsGlutpKVVG5BzMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5ldXJlY29tLmZyMB4XDTEzMTIxMjA5NTcyN1oX
 DTMzMTIxMjA5NTcyN1owGTEXMBUGA1UEAxMOaWRwLmV1cmVjb20uZnIwggEiMA0G
@@ -39,21 +39,21 @@ yQVYEVSEnTGb6XI/Lk/bF5t5KZPhnNWM3cVC+4qLwcuJTKcO9/mJyU3y0QczeCaR
 DCkMZEunkZO+fnPbVEaY4/a7rRKebhMty9gcJASrTF9seG5IfME0Nz61+Mbjre9V
 wYMMzOpBYP7tCdxld40eG8UXU7Hzw9smDW1QErZqbMYm3Z7Qss1p0Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eurecom.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eurecom.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eurecom.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EURECOM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EURECOM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eurecom.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@eurecom.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eurecom.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eurecom.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eurecom.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EURECOM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EURECOM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eurecom.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@eurecom.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
index e0b5b3b7..02453e0d 100644
--- a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.exe-coll.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Exeter College</mdui:DisplayName>
+        <mdui:Logo height="80" width="60">https://www.exe-coll.ac.uk/Images/ukfederation/eclogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Exeter College</mdui:DisplayName>
-          <mdui:Logo height="80" width="60">https://www.exe-coll.ac.uk/Images/ukfederation/eclogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAOBgSoILoqxp6Sd97P44EOTJO6BmMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
 						NTBaFw0zNTEwMDUxNDQ4NTBaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
@@ -36,13 +36,13 @@
 						EEwb4NmJVaB29/9uUdGVA7AWh5HnuGgc5mGXx7TGwFx8/xE7qk8XjwyT24BbFJ0A
 						Ldsw0D2RloY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUBbXkHi70ulJrjIlvWCIzdMBJiHEwDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVrMB4XDTE1MTAwNTE0NDg0
 						OFoXDTM1MTAwNTE0NDg0OFowHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVr
@@ -62,13 +62,13 @@
 						VbqI3mpvBerOgVstriPdd4rGSb6qfF+cZYiwroaQ6zEri+sVrV8qZ/w4+Xt4ncu0
 						jr+x5aa4EQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAKrBnUGd75sXdnSjpLBrMHUL9Z7hMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
 						NDlaFw0zNTEwMDUxNDQ4NDlaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
@@ -88,26 +88,26 @@
 						ZySpPoJYHPmJimQ7K8FRBhRuiXinhoQm9Pi/5VbPO4fZmX2rYFTUHE+6zDB2gJjN
 						/F0mlEEmxK8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.exe-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.exe-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAOBgSoILoqxp6Sd97P44EOTJO6BmMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
 						NTBaFw0zNTEwMDUxNDQ4NTBaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
@@ -127,13 +127,13 @@
 						EEwb4NmJVaB29/9uUdGVA7AWh5HnuGgc5mGXx7TGwFx8/xE7qk8XjwyT24BbFJ0A
 						Ldsw0D2RloY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUBbXkHi70ulJrjIlvWCIzdMBJiHEwDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVrMB4XDTE1MTAwNTE0NDg0
 						OFoXDTM1MTAwNTE0NDg0OFowHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVr
@@ -153,13 +153,13 @@
 						VbqI3mpvBerOgVstriPdd4rGSb6qfF+cZYiwroaQ6zEri+sVrV8qZ/w4+Xt4ncu0
 						jr+x5aa4EQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAKrBnUGd75sXdnSjpLBrMHUL9Z7hMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
 						NDlaFw0zNTEwMDUxNDQ4NDlaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
@@ -179,27 +179,27 @@
 						ZySpPoJYHPmJimQ7K8FRBhRuiXinhoQm9Pi/5VbPO4fZmX2rYFTUHE+6zDB2gJjN
 						/F0mlEEmxK8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Exeter College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Exeter College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exe-coll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:itserivces@exe-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nigel</md:GivenName>
-      <md:SurName>Burrows</md:SurName>
-      <md:EmailAddress>mailto:NigelBurrows@exe-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IdP Admin</md:GivenName>
-      <md:EmailAddress>mailto:idpadmin@exe-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Exeter College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Exeter College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exe-coll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:itserivces@exe-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nigel</md:GivenName>
+    <md:SurName>Burrows</md:SurName>
+    <md:EmailAddress>mailto:NigelBurrows@exe-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IdP Admin</md:GivenName>
+    <md:EmailAddress>mailto:idpadmin@exe-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-openathens.xml
index fe59b0a4..4a96f15e 100644
--- a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-openathens.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.exe-coll.ac.uk/openathens">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exe-coll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -38,23 +38,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/exe-coll.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/exe-coll.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Exeter College (For testing only - please do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exe-coll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/exe-coll.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/exe-coll.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Exeter College (For testing only - please do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exe-coll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml
index b9333000..bdcaf898 100644
--- a/swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fareham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fareham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fareham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/fareham.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/fareham.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Fareham College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fareham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/fareham.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/fareham.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Fareham College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fareham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml
index 5d7aeea1..70b990c7 100644
--- a/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.farn-ct.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-12T11:59:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-12T11:59:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">farn-ct.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">farn-ct.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuACCQDiBNfRRk2CeTANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
 						R0IxEjAQBgNVBAgMCUhhbXBzaGlyZTEUMBIGA1UEBwwLRmFybmJvcm91Z2gxKjAo
 						BgNVBAoMIUZhcm5ib3JvdWdoIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEUMBIGA1UE
@@ -36,26 +36,26 @@
 						Bqgu4cXU7lk5y1nreWIF8soBdlqgGwIngb+obZjG/cWsP4wGoVyFPgdHbpqTZVaf
 						TgP5ojXtIFXiNKGS
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.farn-ct.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">farn-ct.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.farn-ct.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">farn-ct.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuACCQDiBNfRRk2CeTANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
 						R0IxEjAQBgNVBAgMCUhhbXBzaGlyZTEUMBIGA1UEBwwLRmFybmJvcm91Z2gxKjAo
 						BgNVBAoMIUZhcm5ib3JvdWdoIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEUMBIGA1UE
@@ -79,27 +79,27 @@
 						Bqgu4cXU7lk5y1nreWIF8soBdlqgGwIngb+obZjG/cWsP4wGoVyFPgdHbpqTZVaf
 						TgP5ojXtIFXiNKGS
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Farnborough College of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Farnborough College of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.farn-ct.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Pat</md:GivenName>
-      <md:SurName>Knight</md:SurName>
-      <md:EmailAddress>mailto:p.knight@farn-ct.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ted</md:GivenName>
-      <md:SurName>Hancock</md:SurName>
-      <md:EmailAddress>mailto:e.hancock@farn-ct.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Farnborough College of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Farnborough College of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.farn-ct.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Pat</md:GivenName>
+    <md:SurName>Knight</md:SurName>
+    <md:EmailAddress>mailto:p.knight@farn-ct.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ted</md:GivenName>
+    <md:SurName>Hancock</md:SurName>
+    <md:EmailAddress>mailto:e.hancock@farn-ct.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml
index 79a94e31..e798d654 100644
--- a/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.farnborough.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-23T16:06:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-23T16:06:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">farnboroughsfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">farnboroughsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcDCCAligAwIBAgIIL2mEl0oUtHAwDQYJKoZIhvcNAQEFBQAwTzErMCkGA1UE
 						CgwiVGhlIFNpeHRoIEZvcm0gQ29sbGVnZSBGYXJuYm9yb3VnaDEgMB4GA1UEAwwX
 						bG9naW4uZmFybmJvcm91Z2guYWMudWswHhcNMTMwMjA4MTU0NDEwWhcNMjMwMjA4
@@ -33,25 +33,25 @@
 						hQZM94Sfx+/GBTyMsBHnXGmwzQcPF+50REkOgz4NRihK849CiSBV4Il3geGvpWzm
 						XV1TX8+5LwiT8F8J8CFKgoB2RnI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.farnborough.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.farnborough.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Sixth Form College, Farnborough</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Sixth Form College Farnborough</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.farnborough.ac.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Pollard</md:SurName>
-      <md:EmailAddress>mailto:apollard@farnborough.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Pollard</md:SurName>
-      <md:EmailAddress>mailto:apollard@farnborough.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.farnborough.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.farnborough.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Sixth Form College, Farnborough</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Sixth Form College Farnborough</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.farnborough.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Pollard</md:SurName>
+    <md:EmailAddress>mailto:apollard@farnborough.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Pollard</md:SurName>
+    <md:EmailAddress>mailto:apollard@farnborough.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml
index 161f0969..9018d8f3 100644
--- a/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fashionretailacademy.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fashionretailacademy.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fashionretailacademy.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/fashionretailacademy.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/fashionretailacademy.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Fashion Retail Academy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fashionretailacademy.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/fashionretailacademy.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/fashionretailacademy.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Fashion Retail Academy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fashionretailacademy.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml
index 0a76a71a..9f82fe3a 100644
--- a/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fccn.pt/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt" registrationInstant="2011-12-16T09:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt" registrationInstant="2011-12-16T09:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fccn.pt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FCT|FCCN</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">FCT|FCCN</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.fccn.pt/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt">https://www.fccn.pt</mdui:InformationURL>
+        <mdui:Logo height="55" width="300">https://rctsaai-rr.fccn.pt/rr/logos/FCT-FCCN_cmyk.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:38.7591742762959,-9.142287969589233</mdui:GeolocationHint>
+        <mdui:DomainHint>fccn.pt</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fccn.pt</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">FCT|FCCN</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt">FCT|FCCN</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.fccn.pt/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt">https://www.fccn.pt</mdui:InformationURL>
-          <mdui:Logo height="55" width="300">https://rctsaai-rr.fccn.pt/rr/logos/FCT-FCCN_cmyk.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:38.7591742762959,-9.142287969589233</mdui:GeolocationHint>
-          <mdui:DomainHint>fccn.pt</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUGjtxtRHoicZCdPTxK6N9BrR1vZ8wDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLmZjY24ucHQwHhcNMTExMjE1MTUzOTExWhcNMzEx
 MjE1MTUzOTExWjAWMRQwEgYDVQQDEwtpZHAuZmNjbi5wdDCCASIwDQYJKoZIhvcN
@@ -40,32 +40,32 @@ bLam1wEq+9o8TKYrw4C0pBGa8nY9gDjB1yzbT04VAuqctQL0+Sw+cXFDEk2JLbCl
 Bo4JbRU3T37aRSPJmLSx/lEQMBKP3cqlq+eig/e6thk3SA494XDUFlO6V+0XQF+u
 G5N6VkL0FX4oQt/9e14FaHZtwfb5uf02x6oO
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fccn.pt/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fccn.pt/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fccn.pt/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fccn.pt/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pt">FCCN - unidade da FCT I.P.</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">FCCN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="pt">FCCN - unidade da FCT I.P.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">FCCN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="pt">https://www.fccn.pt</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.fccn.pt</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Esmeralda</md:GivenName>
-      <md:SurName>Pires</md:SurName>
-      <md:EmailAddress>mailto:rctsaai@fccn.pt</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Equipa</md:GivenName>
-      <md:SurName>RCTSaai</md:SurName>
-      <md:EmailAddress>mailto:rctsaai@fccn.pt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fccn.pt/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fccn.pt/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fccn.pt/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fccn.pt/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pt">FCCN - unidade da FCT I.P.</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">FCCN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="pt">FCCN - unidade da FCT I.P.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">FCCN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pt">https://www.fccn.pt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.fccn.pt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Esmeralda</md:GivenName>
+    <md:SurName>Pires</md:SurName>
+    <md:EmailAddress>mailto:rctsaai@fccn.pt</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Equipa</md:GivenName>
+    <md:SurName>RCTSaai</md:SurName>
+    <md:EmailAddress>mailto:rctsaai@fccn.pt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index f1e26a16..46986810 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,485 +1,485 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
+        <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
+        <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ansgarhogskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balsfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bardu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berlevag.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bi.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birkenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bodo.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boe.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bygland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bykle.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmi.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">danielsen-skoler.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dovreskulane.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">e-h.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekrehagen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fagerhaugoppvekst.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.akademiet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.egms.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.harstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.heltberg.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ski.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhs.mil.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folkeuniversitetet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fosnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fossumkollektivet.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">framnes.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">friskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fyresdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gausdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gratangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grue.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.orskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hammerfest.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hasvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hof.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holmestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inderoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">innfjorden.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iveland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karasjok.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karlsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kautokeino.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvalsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvanangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesjaskulane.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillehammer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lomskulane.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loppa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loten.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lunner.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">metisutdanning.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mhs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namdalseid.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nannestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">narvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nb.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-ak.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesseby.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nifu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nissedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nome.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-odal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordkapp.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordreisa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntg.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overhalla.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oya.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oyer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsgrunn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rakkestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ralingen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">re.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rendalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringsaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saltdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sami.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samisk.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seljord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selskolene.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sigdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sintef.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skanland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjaakskulane.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjervoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sonans.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">songdalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-odal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sortland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spydeberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">storfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">time.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tolga.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">toppidrettsgymnaset.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trogstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tynset.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulstein.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unis.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valle.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vanylven.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vennesla.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">verran.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vid.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vindafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vinje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wang.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westerdals.no</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
-          <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
-          <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alvdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andebu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ansgarhogskole.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balsfjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bardu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berlevag.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bi.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birkenes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bodo.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boe.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bygland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bykle.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmi.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">danielsen-skoler.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dovreskulane.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">e-h.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsvoll.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekrehagen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fagerhaugoppvekst.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.akademiet.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.egms.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.harstad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.heltberg.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ski.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhs.mil.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folkeuniversitetet.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folldal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fosnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fossumkollektivet.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">framnes.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">friskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fyresdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gausdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gratangen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grue.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.orskog.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hammerfest.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hasvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemne.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hof.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holmestrand.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurum.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvaler.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inderoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">innfjorden.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iveland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kafjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karasjok.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karlsoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kautokeino.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvafjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvalsund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvanangen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavangen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesjaskulane.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillehammer.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lomskulane.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loppa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loten.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lunner.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">metisutdanning.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mhs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midsund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modum.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namdalseid.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nannestad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">narvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nb.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-ak.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesseby.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nifu.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nissedal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nome.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-odal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordkapp.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordreisa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntg.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overhalla.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oya.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oyer.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsgrunn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rakkestad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ralingen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">re.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rendalen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rindal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringsaker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salangen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saltdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sami.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samisk.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauherad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seljord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selskolene.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sigdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sintef.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skanland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjaakskulane.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjervoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sonans.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">songdalen.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-fron.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-odal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sortland.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spydeberg.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">storfjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tana.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">time.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tolga.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonsberg.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">toppidrettsgymnaset.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trogstad.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tynset.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensaker.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulstein.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unis.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valle.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vanylven.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vennesla.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">verran.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vid.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vik.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vindafjord.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vinje.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wang.no</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westerdals.no</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
-      <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Feide Support</md:GivenName>
-      <md:EmailAddress>support@feide.no</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
index dc744ace..3ceb2573 100644
--- a/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fgu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-29T13:36:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-29T13:36:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Physiology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Fyziologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider  IOP AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FGÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fgu.cas.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fgu.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="282">https://jiftach.cas.cz/loga/logo-fgu-44.png</mdui:Logo>
+        <mdui:Logo height="153" width="980">https://jiftach.cas.cz/loga/logo-fgu-153.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Physiology AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Fyziologický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider  IOP AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FGÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fgu.cas.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.fgu.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="282">https://jiftach.cas.cz/loga/logo-fgu-44.png</mdui:Logo>
-          <mdui:Logo height="153" width="980">https://jiftach.cas.cz/loga/logo-fgu-153.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
 MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
 4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fgu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fgu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
 MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
 4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Physiology</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Fyziologický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Physiology, Public Research Institution</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Fyziologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fgu.cas.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.fgu.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Physiology</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Fyziologický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Physiology, Public Research Institution</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Fyziologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fgu.cas.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.fgu.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
index 1065d69f..3228917e 100644
--- a/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-joanneum.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-02-16T10:29:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-02-16T10:29:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-joanneum.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">FH Joanneum</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">FH Joanneum</mdui:DisplayName>
+        <mdui:Logo width="218" height="47">https://www.fh-joanneum.at/custom/images/logo_1001.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://www.fh-joanneum.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>fh-joanneum.at</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.06931,15.40799</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.45431,15.33112</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.87544,15.90241</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-joanneum.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">FH Joanneum</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">FH Joanneum</mdui:DisplayName>
-          <mdui:Logo width="218" height="47">https://www.fh-joanneum.at/custom/images/logo_1001.png</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://www.fh-joanneum.at/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>fh-joanneum.at</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:47.06931,15.40799</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.45431,15.33112</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:46.87544,15.90241</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIULPWP1POqPuJKTnkDdlx69nSwI/owDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0MB4XDTE0MTEwNjA4MjY0
 OVoXDTM0MTEwNjA4MjY0OVowHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0
@@ -49,29 +49,29 @@ KT1bQbbDmXXzzvxnkEUcWIs/r3GRE45GnSVUAcZQqvheF9ELKUFzd8C36glQ98D4
 CpiRk275uQjBfzjFS7xpOuNR8tqe+sx7bxNoFL6aHHr8zJ8RWLmXc8S3xLtDTpgT
 FaM76TBX0JxWOxqWce24DPI/3UTL/iGk+WE61+ar5rD+jAdtgHFhc9UMvxdZYJmz
 8zYGzVn2IQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-joanneum.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-joanneum.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-joanneum.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-joanneum.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIULPWP1POqPuJKTnkDdlx69nSwI/owDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0MB4XDTE0MTEwNjA4MjY0
 OVoXDTM0MTEwNjA4MjY0OVowHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0
@@ -90,31 +90,31 @@ KT1bQbbDmXXzzvxnkEUcWIs/r3GRE45GnSVUAcZQqvheF9ELKUFzd8C36glQ98D4
 CpiRk275uQjBfzjFS7xpOuNR8tqe+sx7bxNoFL6aHHr8zJ8RWLmXc8S3xLtDTpgT
 FaM76TBX0JxWOxqWce24DPI/3UTL/iGk+WE61+ar5rD+jAdtgHFhc9UMvxdZYJmz
 8zYGzVn2IQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">FH Joanneum Ges.m.b.H</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">FH Joanneum Ges.m.b.H</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">FH Joanneum</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">FH Joanneum</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fh-joanneum.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fh-joanneum.at/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ZIT</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@fh-joanneum.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ZIT</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@fh-joanneum.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">FH Joanneum Ges.m.b.H</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">FH Joanneum Ges.m.b.H</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FH Joanneum</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">FH Joanneum</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fh-joanneum.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fh-joanneum.at/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ZIT</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@fh-joanneum.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ZIT</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@fh-joanneum.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
index 98f7b4f3..4232e97a 100644
--- a/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-kaernten.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2012-02-24T17:43:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2012-02-24T17:43:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Fachhochschule Kärnten</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Carinthia University of Applied Sciences</mdui:DisplayName>
+        <mdui:Logo height="54" width="200">https://www3.fh-kaernten.at/logo_fh_kaernten.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www3.fh-kaernten.at/favicon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Fachhochschule Kärnten</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Carinthia University of Applied Sciences</mdui:DisplayName>
-          <mdui:Logo height="54" width="200">https://www3.fh-kaernten.at/logo_fh_kaernten.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www3.fh-kaernten.at/favicon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
 MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
@@ -42,13 +42,13 @@ vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
 +w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
 8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
 CKMOmy35Xw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
 MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
@@ -66,31 +66,31 @@ vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
 +w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
 8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
 CKMOmy35Xw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www3.fh-kaernten.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www3.fh-kaernten.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
 MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
@@ -108,13 +108,13 @@ vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
 +w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
 8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
 CKMOmy35Xw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
 MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
@@ -132,30 +132,30 @@ vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
 +w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
 8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
 CKMOmy35Xw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Fachhochschule Kärnten</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Fachhochschule Kärnten</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fh-kaernten.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fh-kaernten.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:shib@fh-kaernten.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Helpdesk</md:SurName>
-      <md:TelephoneNumber>+43 5 90500 7575</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Fachhochschule Kärnten</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Kärnten</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fh-kaernten.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fh-kaernten.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:shib@fh-kaernten.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Helpdesk</md:SurName>
+    <md:TelephoneNumber>+43 5 90500 7575</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
index 4012e71b..957b27fa 100644
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-rosenheim.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-17T07:15:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-17T07:15:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-rosenheim.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Rosenheim</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Rosenheim</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Hochschule Rosenheim</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the University of Applied Sciences Rosenheim</mdui:Description>
+        <mdui:Logo height="40" width="40">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo_klein.jpg</mdui:Logo>
+        <mdui:Logo height="75" width="75">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-rosenheim.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Hochschule Rosenheim</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Applied Sciences Rosenheim</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Hochschule Rosenheim</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of the University of Applied Sciences Rosenheim</mdui:Description>
-          <mdui:Logo height="40" width="40">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo_klein.jpg</mdui:Logo>
-          <mdui:Logo height="75" width="75">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
 Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
 MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
@@ -55,15 +55,15 @@ TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
 Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
 9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
 Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
 MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
@@ -95,33 +95,33 @@ TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
 Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
 9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-rosenheim.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-rosenheim.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-rosenheim.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-rosenheim.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
 Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
 MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
@@ -153,15 +153,15 @@ TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
 Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
 9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
 Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
 MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
@@ -193,31 +193,31 @@ TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
 Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
 9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e360</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e360</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Meier</md:SurName>
-      <md:EmailAddress>mailto:robert.meier@fh-rosenheim.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Meier</md:SurName>
-      <md:EmailAddress>mailto:idm-support@fh-rosenheim.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e360</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e360</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Meier</md:SurName>
+    <md:EmailAddress>mailto:robert.meier@fh-rosenheim.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Meier</md:SurName>
+    <md:EmailAddress>mailto:idm-support@fh-rosenheim.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml
index 9bd55c73..0be823ed 100644
--- a/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fife.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-21T13:01:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-21T13:01:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fife.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fife.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Fife College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Fife College</mdui:Description>
+        <mdui:Logo height="58" width="191">https://www.fife.ac.uk/Style%20Library/Images/ASC/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fife.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fife.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Fife College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Fife College</mdui:Description>
-          <mdui:Logo height="58" width="191">https://www.fife.ac.uk/Style%20Library/Images/ASC/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAMSH7t+3wR8HvHhTV60wiQbeGyS9MA0GCSqGSIb3DQEB
 						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzN1oX
 						DTM1MDgxODEzNTUzN1owGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
@@ -37,13 +37,13 @@
 						ZE6B8vB7q83XEaN04YQ3MoQuLZvAK8MAKI2XS5pOIysDZiLFXdHoW3ZcBT13NB3F
 						d4dRnvjAIVLYNByna61xG/WJVi5siHSmGZBoGt7qEl0LBQqv6V0txw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAL6RCJkK1lwbxWiAZtEZ4gUt74gZMA0GCSqGSIb3DQEB
 						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzNVoX
 						DTM1MDgxODEzNTUzNVowGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
@@ -62,13 +62,13 @@
 						VZvWsWhxkzf2C/EoORlAR/bdf/jHdVqJos/b+pDYixhpuYggrUqUEHzo2yCFxh57
 						m9piTkbs/Wlkejr7HQmExiq37uFjZR62Pyp9nzTj20VFz8Pdca7G0Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIURu5IcL5iFuwZvk3l1cGg1/CZ/eYwDQYJKoZIhvcNAQEL
 						BQAwGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswHhcNMTUwODE4MTM1NTM2WhcN
 						MzUwODE4MTM1NTM2WjAZMRcwFQYDVQQDDA5pZHAuZmlmZS5hYy51azCCASIwDQYJ
@@ -87,27 +87,27 @@
 						7qRSPgZKsX/P0D5zgX1ul8I0WaKhlb4q/eWw+p0EtJHgL+R6vO9mu+FalYW+CtXW
 						Vg3hbcA7wQhdcxyFQemk4H24VNtDXOP1KQOm5Gd2EgLi+OaTo3/Z
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fife.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fife.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fife.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fife.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fife.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fife.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fife.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fife.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fife.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fife.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fife.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fife.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAMSH7t+3wR8HvHhTV60wiQbeGyS9MA0GCSqGSIb3DQEB
 						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzN1oX
 						DTM1MDgxODEzNTUzN1owGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
@@ -126,13 +126,13 @@
 						ZE6B8vB7q83XEaN04YQ3MoQuLZvAK8MAKI2XS5pOIysDZiLFXdHoW3ZcBT13NB3F
 						d4dRnvjAIVLYNByna61xG/WJVi5siHSmGZBoGt7qEl0LBQqv6V0txw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAL6RCJkK1lwbxWiAZtEZ4gUt74gZMA0GCSqGSIb3DQEB
 						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzNVoX
 						DTM1MDgxODEzNTUzNVowGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
@@ -151,13 +151,13 @@
 						VZvWsWhxkzf2C/EoORlAR/bdf/jHdVqJos/b+pDYixhpuYggrUqUEHzo2yCFxh57
 						m9piTkbs/Wlkejr7HQmExiq37uFjZR62Pyp9nzTj20VFz8Pdca7G0Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIURu5IcL5iFuwZvk3l1cGg1/CZ/eYwDQYJKoZIhvcNAQEL
 						BQAwGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswHhcNMTUwODE4MTM1NTM2WhcN
 						MzUwODE4MTM1NTM2WjAZMRcwFQYDVQQDDA5pZHAuZmlmZS5hYy51azCCASIwDQYJ
@@ -176,24 +176,24 @@
 						7qRSPgZKsX/P0D5zgX1ul8I0WaKhlb4q/eWw+p0EtJHgL+R6vO9mu+FalYW+CtXW
 						Vg3hbcA7wQhdcxyFQemk4H24VNtDXOP1KQOm5Gd2EgLi+OaTo3/Z
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Fife College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Fife College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fife.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Campbell</md:SurName>
-      <md:EmailAddress>mailto:paulcampbell@fife.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alastair</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:alastairsmith@fife.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Fife College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Fife College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fife.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Campbell</md:SurName>
+    <md:EmailAddress>mailto:paulcampbell@fife.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alastair</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:alastairsmith@fife.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml
index 6c2a4f84..a1f538e6 100644
--- a/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fnal.gov/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://pingprod.fnal.gov:9031/files/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fnal.gov</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Fermi National Accelerator Laboratory</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Fermilab's Production IdP Server</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fnal.gov/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.fnal.gov/pub/disclaim.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="90" width="597" xml:lang="en">https://pingprod.fnal.gov:9031/files/flogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://pingprod.fnal.gov:9031/files/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fnal.gov</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Fermi National Accelerator Laboratory</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Fermilab's Production IdP Server</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fnal.gov/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.fnal.gov/pub/disclaim.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="90" width="597" xml:lang="en">https://pingprod.fnal.gov:9031/files/flogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtDCCApygAwIBAgIGAU5qDxk/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYDVQQGEwJVUzELMAkG
 A1UECBMCSUwxEDAOBgNVBAcTB0JhdGF2aWExLjAsBgNVBAoTJUZlcm1pIE5hdGlvbmFsIEFjY2Vs
 ZXJhdG9yIExhYm9yYXRvcnkxIDAeBgNVBAsTF0F1dGhlbnRpY2F0aW9uIFNlcnZpY2VzMRowGAYD
@@ -41,25 +41,25 @@ WTtRUQRiv3JtTsRyNBDJeY1EJGlxnAoeGk1shSc9wbqXXm/XbhUTiZa9/NOG9jlq/7EWaaCaTRa7
 vmLXS1toaIkjZd90Pvl5MkNQ7k7YXYaOJThjpXOBDyNdPGanCcaJQItGS6EG3dbKRdOqLxhYym42
 63F3WI6GgeS6dTHvrYMBaR6B5dDX7xa2rdsSp8pkSE3xk3OwvbJePw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingprod.fnal.gov:9031/idp/ARS.ssaml2" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingprod.fnal.gov:9031/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingprod.fnal.gov:9031/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-test.fnal.gov/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-prod.fnal.gov/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-prod.fnal.gov/idp-krb/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-test.fnal.gov/idp-krb/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fnal.gov</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingprod.fnal.gov:9031/idp/ARS.ssaml2" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingprod.fnal.gov:9031/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingprod.fnal.gov:9031/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-test.fnal.gov/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-prod.fnal.gov/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-prod.fnal.gov/idp-krb/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-test.fnal.gov/idp-krb/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fnal.gov</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtDCCApygAwIBAgIGAU5qDxk/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYDVQQGEwJVUzELMAkG
 A1UECBMCSUwxEDAOBgNVBAcTB0JhdGF2aWExLjAsBgNVBAoTJUZlcm1pIE5hdGlvbmFsIEFjY2Vs
 ZXJhdG9yIExhYm9yYXRvcnkxIDAeBgNVBAsTF0F1dGhlbnRpY2F0aW9uIFNlcnZpY2VzMRowGAYD
@@ -78,30 +78,30 @@ WTtRUQRiv3JtTsRyNBDJeY1EJGlxnAoeGk1shSc9wbqXXm/XbhUTiZa9/NOG9jlq/7EWaaCaTRa7
 vmLXS1toaIkjZd90Pvl5MkNQ7k7YXYaOJThjpXOBDyNdPGanCcaJQItGS6EG3dbKRdOqLxhYym42
 63F3WI6GgeS6dTHvrYMBaR6B5dDX7xa2rdsSp8pkSE3xk3OwvbJePw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingprod.fnal.gov:9031/idp/attrsvc.ssaml2"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Fermi National Accelerator Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Fermi National Accelerator Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fnal.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Olga Terlyga</md:GivenName>
-      <md:EmailAddress>terlyga@fnal.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Al Lilianstrom</md:GivenName>
-      <md:EmailAddress>lilstrom@fnal.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mine Altunay</md:GivenName>
-      <md:EmailAddress>maltunay@fnal.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Art Lee</md:GivenName>
-      <md:EmailAddress>artlee@fnal.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingprod.fnal.gov:9031/idp/attrsvc.ssaml2"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Fermi National Accelerator Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Fermi National Accelerator Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fnal.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olga Terlyga</md:GivenName>
+    <md:EmailAddress>terlyga@fnal.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Al Lilianstrom</md:GivenName>
+    <md:EmailAddress>lilstrom@fnal.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mine Altunay</md:GivenName>
+    <md:EmailAddress>maltunay@fnal.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Art Lee</md:GivenName>
+    <md:EmailAddress>artlee@fnal.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
index 84d480a9..15a2c5f0 100644
--- a/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fzu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-18T10:07:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-18T10:07:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fzu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Physics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider FZU AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FZÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fzu.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fzu.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://jiftach.cas.cz/loga/logo-fzu-40.png</mdui:Logo>
+        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-fzu-100.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fzu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Physics AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider FZU AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FZÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fzu.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.fzu.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://jiftach.cas.cz/loga/logo-fzu-40.png</mdui:Logo>
-          <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-fzu-100.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
 DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
@@ -51,30 +51,30 @@ NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
 ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fzu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fzu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
 DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
@@ -94,25 +94,25 @@ NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
 ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Physics AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fzu.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.fzu.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Physics AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fzu.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.fzu.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
index 74630507..720ae10a 100644
--- a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gakunin.nii.ac.jp/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2011-04-13T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2011-04-13T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gakunin.nii.ac.jp</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="ja">学認IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">GakuNin IdP</mdui:DisplayName>
+        <mdui:Logo height="64" width="64">https://idp.gakunin.nii.ac.jp/images/gakunin64.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:35.692558,139.757999</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gakunin.nii.ac.jp</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="ja">学認IdP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">GakuNin IdP</mdui:DisplayName>
-          <mdui:Logo height="64" width="64">https://idp.gakunin.nii.ac.jp/images/gakunin64.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:35.692558,139.757999</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFFjCCA/6gAwIBAgIIQvhX//m5bm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFjCCA/6gAwIBAgIIQvhX//m5bm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
 BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
 dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
 IC0gRzQwHhcNMTUwMjA0MDgwNzAzWhcNMTcwMzA2MDgwNzAzWjCBqTELMAkGA1UE
@@ -50,23 +50,23 @@ OD7MqWIlsOAMu+DuNRUgp7pb378ZWIAUjl8EkTrQxEPkkoLhq9DW5lgzL7ZnLEyf
 MpBaL5qG7KNpHy8CCU1wNjs1HOcwgHGs9KSxbNGjANe9zaaO8MjjTtWbLIOGKhmb
 VUx4Q0xL6Qh+DGRS32KKmGkY8/7O/mdjT1O7rFqFgDgZJSThq5fnDpZm1vIoOPJh
 w7tfpr+kkFoj6Q==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gakunin.nii.ac.jp/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gakunin.nii.ac.jp</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFFjCCA/6gAwIBAgIIQvhX//m5bm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gakunin.nii.ac.jp/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gakunin.nii.ac.jp</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFjCCA/6gAwIBAgIIQvhX//m5bm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
 BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
 dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
 IC0gRzQwHhcNMTUwMjA0MDgwNzAzWhcNMTcwMzA2MDgwNzAzWjCBqTELMAkGA1UE
@@ -94,23 +94,23 @@ OD7MqWIlsOAMu+DuNRUgp7pb378ZWIAUjl8EkTrQxEPkkoLhq9DW5lgzL7ZnLEyf
 MpBaL5qG7KNpHy8CCU1wNjs1HOcwgHGs9KSxbNGjANe9zaaO8MjjTtWbLIOGKhmb
 VUx4Q0xL6Qh+DGRS32KKmGkY8/7O/mdjT1O7rFqFgDgZJSThq5fnDpZm1vIoOPJh
 w7tfpr+kkFoj6Q==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institute of Informatics</md:OrganizationName>
-      <md:OrganizationName xml:lang="ja">国立情報学研究所</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GakuNin IdP</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="ja">学認IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.gakunin.jp/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GakuNin Office</md:GivenName>
-      <md:EmailAddress>mailto:gakunin-help@nii.ac.jp</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institute of Informatics</md:OrganizationName>
+    <md:OrganizationName xml:lang="ja">国立情報学研究所</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GakuNin IdP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ja">学認IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.gakunin.jp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GakuNin Office</md:GivenName>
+    <md:EmailAddress>mailto:gakunin-help@nii.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
index caa4465d..8b61b7a3 100644
--- a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gallaudet.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.gallaudet.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gallaudet.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gallaudet University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gallaudet University IDP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.gallaudet.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gallaudet.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gallaudet University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Gallaudet University IDP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
 YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
@@ -43,24 +43,24 @@ Z8YfHrIc/AOFSxSRuhgFxfmySBMxU+TUcp0aJfKCaiCyp7efsLYtJIxECsjjurH8
 DayK/60bhdYbIxZzr88h48yaz99WJf/5Y2Yc5f8G5kaldFI56yVjx4dxSuD1SfhQ
 mzisXEBrL04=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gallaudet.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gallaudet.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gallaudet.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gallaudet.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID9DCCAtwCCQCbiUruOaohoTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAkRDMRMwEQYDVQQHDApXYXNoaW5ndG9uMR0wGwYDVQQKDBRH
 YWxsYXVkZXQgVW5pdmVyc2l0eTEmMCQGA1UECwwdR2FsbGF1ZGV0IFRlY2hub2xv
@@ -84,27 +84,27 @@ Z8YfHrIc/AOFSxSRuhgFxfmySBMxU+TUcp0aJfKCaiCyp7efsLYtJIxECsjjurH8
 DayK/60bhdYbIxZzr88h48yaz99WJf/5Y2Yc5f8G5kaldFI56yVjx4dxSuD1SfhQ
 mzisXEBrL04=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Gallaudet University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gallaudet University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gallaudet.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Earl Parks</md:GivenName>
-      <md:EmailAddress>earl.parks@gallaudet.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hatim Vali</md:GivenName>
-      <md:EmailAddress>hatim.vali@gallaudet.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mohib</md:GivenName>
-      <md:EmailAddress>mohib@gluu.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Gallaudet University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gallaudet University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gallaudet.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Earl Parks</md:GivenName>
+    <md:EmailAddress>earl.parks@gallaudet.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hatim Vali</md:GivenName>
+    <md:EmailAddress>hatim.vali@gallaudet.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mohib</md:GivenName>
+    <md:EmailAddress>mohib@gluu.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml
index f7fea7c3..9d2f53f0 100644
--- a/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gatech.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gatech.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Georgia Institute of Technology</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gatech.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Georgia Institute of Technology</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJeYp1xfzkkooZfwaJ6PLVzxpUOYMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5nYXRlY2guZWR1MB4XDTEwMDcxOTE5MDQwMloX
 DTMwMDcxOTE5MDQwMlowGTEXMBUGA1UEAxMOaWRwLmdhdGVjaC5lZHUwggEiMA0G
@@ -40,23 +40,23 @@ R3Zj5VQNnX1b9qEo4rttcogIWcvyJd2vaFfeWgQs+RR2tRE5gibvxxGssjCrf1yV
 OtgZkTz+hoiGXSRnHFjmp/H6Bh27Vgx8sNTKIFffNZ4wNH7efgV5V3mib57YL050
 mFIG3ks+6YbZokQ+i6nzRLwk9JxbsVJl1tzraBmxUNWT+HtiNJ6fzw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gatech.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gatech.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gatech.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gatech.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gatech.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gatech.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gatech.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gatech.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gatech.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gatech.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gatech.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gatech.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJeYp1xfzkkooZfwaJ6PLVzxpUOYMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5nYXRlY2guZWR1MB4XDTEwMDcxOTE5MDQwMloX
 DTMwMDcxOTE5MDQwMlowGTEXMBUGA1UEAxMOaWRwLmdhdGVjaC5lZHUwggEiMA0G
@@ -75,26 +75,26 @@ R3Zj5VQNnX1b9qEo4rttcogIWcvyJd2vaFfeWgQs+RR2tRE5gibvxxGssjCrf1yV
 OtgZkTz+hoiGXSRnHFjmp/H6Bh27Vgx8sNTKIFffNZ4wNH7efgV5V3mib57YL050
 mFIG3ks+6YbZokQ+i6nzRLwk9JxbsVJl1tzraBmxUNWT+HtiNJ6fzw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gatech.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Georgia Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Georgia Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gatech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eric Buckhalt</md:GivenName>
-      <md:EmailAddress>eric.buckhalt@oit.gatech.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert Viduya</md:GivenName>
-      <md:EmailAddress>robert.viduya@oit.gatech.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Georgia Tech Cyber Security</md:GivenName>
-      <md:EmailAddress>ask@security.gatech.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gatech.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Georgia Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Georgia Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gatech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eric Buckhalt</md:GivenName>
+    <md:EmailAddress>eric.buckhalt@oit.gatech.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert Viduya</md:GivenName>
+    <md:EmailAddress>robert.viduya@oit.gatech.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Georgia Tech Cyber Security</md:GivenName>
+    <md:EmailAddress>ask@security.gatech.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml
index 0cbd62e8..bec4dcca 100644
--- a/swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gateshead.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gateshead.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gateshead.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gateshead.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gateshead.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gateshead College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gateshead.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gateshead.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gateshead.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gateshead College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gateshead.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.geant.org.xml b/swamid-interfederations-2.0/idp.geant.org.xml
index d517b202..87833e10 100644
--- a/swamid-interfederations-2.0/idp.geant.org.xml
+++ b/swamid-interfederations-2.0/idp.geant.org.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.geant.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">GÉANT Staff Identity Provider (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider (new)</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">GÉANT Staff Identity Provider (new)</mdui:Description>
+        <mdui:Description xml:lang="en">GÉANT Staff Identity Provider (new)</mdui:Description>
+        <mdui:Logo height="156" width="324">https://static.surfconext.nl/logos/idp/geant.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">GÉANT Staff IdP Identity Provider</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">GÉANT Staff IdP Identity Provider</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">GÉANT Staff Identity Provider (new)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider (new)</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">GÉANT Staff Identity Provider (new)</mdui:Description>
-          <mdui:Description xml:lang="en">GÉANT Staff Identity Provider (new)</mdui:Description>
-          <mdui:Logo height="156" width="324">https://static.surfconext.nl/logos/idp/geant.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">GÉANT Staff IdP Identity Provider</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">GÉANT Staff IdP Identity Provider</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4199f5c4be494124a673c1618cf5c55c"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4199f5c4be494124a673c1618cf5c55c"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml b/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml
index d9841acd..ee6807dd 100644
--- a/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml
+++ b/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.geo-zs.si/idp/20110325">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-07T14:11:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-07T14:11:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geo-zs.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gological Survey of Slovenia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Geološki zavod Slovenije</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Gological Survey of Slovenia</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Geološki zavod Slovenije</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization Gological Survey of Slovenia</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Geološki zavod Slovenije</mdui:Keywords>
+        <mdui:Logo height="150" width="129">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.geo-zs.si/eng/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.geo-zs.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geo-zs.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gological Survey of Slovenia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Geološki zavod Slovenije</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization Gological Survey of Slovenia</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Geološki zavod Slovenije</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization Gological Survey of Slovenia</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Geološki zavod Slovenije</mdui:Keywords>
-          <mdui:Logo height="150" width="129">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.geo-zs.si/eng/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.geo-zs.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFljCCA36gAwIBAgIGElFy1KcxMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQDA+BgNVBAMMN0dlb2xvc2tpIHphdm9kIFNsb3ZlbmlqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMDI4MjA1NzQwWhcNMzQwNzE1MjA1NzQwWjBjMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUAwPgYDVQQDDDdHZW9sb3NraSB6YXZvZCBTbG92ZW5pamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs4icY7e4QJ3C3daJA2b6m0WJbQ0HebtKR0wXYukm/xxJPDGmUf92eCVljnQVJyvMcDuSCzttELGX8ro/bEjlmAyGWMrqknIPKaZT+oeLIVRf71XOA55D8HapOrBUW/2hWYThBhzbrnW3Q4aKCAofJyU5DLg07iPXtxWnAAIvXSxaNNcI1PNZbK4wNPaCpgRCFhjf8PSyd2ybXkPFYwHtxHFMG2MgSo9a6gsEPMfnbkMNSZI17mc+BhCLAc42E3Vix5IzzLB2zweFmzATs57ZiTfQXNlaOS+EYYkpjRwhmcNUPxIaTrgXkPU6ZSkERFkLZIofpCnxZd9/vJmnYXgJEt2Yazhnbx3XgQ4ISoLRQyf58Tq0FVydOqZmFCoy6WJ/NRwka66vDYmA1Ii6E4uSx0SahueQUkFL9ADB1IdIx7RO597yr+KxJP0ygoEnlABMKLkbtR+iK9f6ZgxKNMPVV3Cn5n1QSl7YNsxDbUrCj31Xxx6Hq9jM2/PbsHHx5DYViumuvxKJIbDj9W5iR8uiNJwn5KHu2+VGZSmmOsrN01u4Cw7oemhrNjDYJMLx6DFMB13C9WE7K53AD6ZgNQIXBC66Gjk6PCou1gy2O9F4OaiNKhxvJv/2C+H0Ik/4ixnzQuDhKufYN32QqDDTYPnhG/vnClpc91Sijzm93wLVOpsCAwEAAaNQME4wHQYDVR0OBBYEFNffgevYxBGO5L1E0BUspXFrWK+jMB8GA1UdIwQYMBaAFNffgevYxBGO5L1E0BUspXFrWK+jMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAEmvLJpxYwz3xweIDSoQAv6DgWptBrxmhq2CPpmzKfnnB2w1pNVpYLKMuA/WMcA5p3KUSf0UG2ALdBlS2g2wjPEqFCmOh6xcFzt35dzEJZXXdzw8yCufQ2TQx4SG0/AxBTBUqVFt7rVcDuIPCGx1CHLoaSONilrty6XCalXdWl5zjxa29TZRQhyTswyAWZkEdpGobTbNXOpXYzId0kff5sWJc/DvZ2tz4cbyy8mZ7JxXz/4KijUTrrsFrXLMo7wwDnO+NH5NBJCD3NFw+ctB7OBlOK30LnLH9T+IqXKGiII9w/fiY6l2nGS3DHK0wiwncFDg2W8kcsXCtLtwn9DF0qVHYFFrZ5ndcXRPKpFEHv6NhDt1ZoLV6VdZ6CVtmvDFroRCnuaJcUUpgraM56NIjtMDWTZSWqBTWfBStlfRTXcW5dkxUyqLICtpZcYYe7WOjaQdiYmhR/te1tsc7SXaB8a2R7sfJvi12rTv6ZgnIP5jVqD/u68xJ8S/T8t1OnC6X+0MLvP3uX/S/LkYi+mlhrxqcW+x2p7RJBaPvAJOxgF+OvTxR/uU2JxN8q64wE/1ySkh/tNqAZ9y47IoKTbCmAJ/1EPBv5HjYHATFMYJXREkRvXOunHeTg9mMMfGU2KWMSVJo8wntFzKKHC252gFI50XaLDGH4JdneO3Vy4wMu5U</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFljCCA36gAwIBAgIGElFy1KcxMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQDA+BgNVBAMMN0dlb2xvc2tpIHphdm9kIFNsb3ZlbmlqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMDI4MjA1NzQwWhcNMzQwNzE1MjA1NzQwWjBjMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUAwPgYDVQQDDDdHZW9sb3NraSB6YXZvZCBTbG92ZW5pamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs4icY7e4QJ3C3daJA2b6m0WJbQ0HebtKR0wXYukm/xxJPDGmUf92eCVljnQVJyvMcDuSCzttELGX8ro/bEjlmAyGWMrqknIPKaZT+oeLIVRf71XOA55D8HapOrBUW/2hWYThBhzbrnW3Q4aKCAofJyU5DLg07iPXtxWnAAIvXSxaNNcI1PNZbK4wNPaCpgRCFhjf8PSyd2ybXkPFYwHtxHFMG2MgSo9a6gsEPMfnbkMNSZI17mc+BhCLAc42E3Vix5IzzLB2zweFmzATs57ZiTfQXNlaOS+EYYkpjRwhmcNUPxIaTrgXkPU6ZSkERFkLZIofpCnxZd9/vJmnYXgJEt2Yazhnbx3XgQ4ISoLRQyf58Tq0FVydOqZmFCoy6WJ/NRwka66vDYmA1Ii6E4uSx0SahueQUkFL9ADB1IdIx7RO597yr+KxJP0ygoEnlABMKLkbtR+iK9f6ZgxKNMPVV3Cn5n1QSl7YNsxDbUrCj31Xxx6Hq9jM2/PbsHHx5DYViumuvxKJIbDj9W5iR8uiNJwn5KHu2+VGZSmmOsrN01u4Cw7oemhrNjDYJMLx6DFMB13C9WE7K53AD6ZgNQIXBC66Gjk6PCou1gy2O9F4OaiNKhxvJv/2C+H0Ik/4ixnzQuDhKufYN32QqDDTYPnhG/vnClpc91Sijzm93wLVOpsCAwEAAaNQME4wHQYDVR0OBBYEFNffgevYxBGO5L1E0BUspXFrWK+jMB8GA1UdIwQYMBaAFNffgevYxBGO5L1E0BUspXFrWK+jMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAEmvLJpxYwz3xweIDSoQAv6DgWptBrxmhq2CPpmzKfnnB2w1pNVpYLKMuA/WMcA5p3KUSf0UG2ALdBlS2g2wjPEqFCmOh6xcFzt35dzEJZXXdzw8yCufQ2TQx4SG0/AxBTBUqVFt7rVcDuIPCGx1CHLoaSONilrty6XCalXdWl5zjxa29TZRQhyTswyAWZkEdpGobTbNXOpXYzId0kff5sWJc/DvZ2tz4cbyy8mZ7JxXz/4KijUTrrsFrXLMo7wwDnO+NH5NBJCD3NFw+ctB7OBlOK30LnLH9T+IqXKGiII9w/fiY6l2nGS3DHK0wiwncFDg2W8kcsXCtLtwn9DF0qVHYFFrZ5ndcXRPKpFEHv6NhDt1ZoLV6VdZ6CVtmvDFroRCnuaJcUUpgraM56NIjtMDWTZSWqBTWfBStlfRTXcW5dkxUyqLICtpZcYYe7WOjaQdiYmhR/te1tsc7SXaB8a2R7sfJvi12rTv6ZgnIP5jVqD/u68xJ8S/T8t1OnC6X+0MLvP3uX/S/LkYi+mlhrxqcW+x2p7RJBaPvAJOxgF+OvTxR/uU2JxN8q64wE/1ySkh/tNqAZ9y47IoKTbCmAJ/1EPBv5HjYHATFMYJXREkRvXOunHeTg9mMMfGU2KWMSVJo8wntFzKKHC252gFI50XaLDGH4JdneO3Vy4wMu5U</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.geo-zs.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.geo-zs.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Geološki zavod Slovenije</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Geološki zavod Slovenije</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Geološki zavod Slovenije</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Geološki zavod Slovenije</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geo-zs.si/eng/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.geo-zs.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marko</md:GivenName>
-      <md:SurName>Komac</md:SurName>
-      <md:EmailAddress>mailto:marko.komac@geo-zs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@geo-zs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mitja</md:GivenName>
-      <md:SurName>Požar</md:SurName>
-      <md:EmailAddress>mailto:mitja.pozar@geo-zs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jasna</md:GivenName>
-      <md:SurName>Sinigoj</md:SurName>
-      <md:EmailAddress>mailto:jasna.sinigoj@geo-zs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jasna</md:GivenName>
-      <md:SurName>Šinigoj</md:SurName>
-      <md:EmailAddress>mailto:jasna.sinigoj@geo-zs.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFljCCA36gAwIBAgIGElFy1KcxMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQDA+BgNVBAMMN0dlb2xvc2tpIHphdm9kIFNsb3ZlbmlqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMDI4MjA1NzQwWhcNMzQwNzE1MjA1NzQwWjBjMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUAwPgYDVQQDDDdHZW9sb3NraSB6YXZvZCBTbG92ZW5pamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs4icY7e4QJ3C3daJA2b6m0WJbQ0HebtKR0wXYukm/xxJPDGmUf92eCVljnQVJyvMcDuSCzttELGX8ro/bEjlmAyGWMrqknIPKaZT+oeLIVRf71XOA55D8HapOrBUW/2hWYThBhzbrnW3Q4aKCAofJyU5DLg07iPXtxWnAAIvXSxaNNcI1PNZbK4wNPaCpgRCFhjf8PSyd2ybXkPFYwHtxHFMG2MgSo9a6gsEPMfnbkMNSZI17mc+BhCLAc42E3Vix5IzzLB2zweFmzATs57ZiTfQXNlaOS+EYYkpjRwhmcNUPxIaTrgXkPU6ZSkERFkLZIofpCnxZd9/vJmnYXgJEt2Yazhnbx3XgQ4ISoLRQyf58Tq0FVydOqZmFCoy6WJ/NRwka66vDYmA1Ii6E4uSx0SahueQUkFL9ADB1IdIx7RO597yr+KxJP0ygoEnlABMKLkbtR+iK9f6ZgxKNMPVV3Cn5n1QSl7YNsxDbUrCj31Xxx6Hq9jM2/PbsHHx5DYViumuvxKJIbDj9W5iR8uiNJwn5KHu2+VGZSmmOsrN01u4Cw7oemhrNjDYJMLx6DFMB13C9WE7K53AD6ZgNQIXBC66Gjk6PCou1gy2O9F4OaiNKhxvJv/2C+H0Ik/4ixnzQuDhKufYN32QqDDTYPnhG/vnClpc91Sijzm93wLVOpsCAwEAAaNQME4wHQYDVR0OBBYEFNffgevYxBGO5L1E0BUspXFrWK+jMB8GA1UdIwQYMBaAFNffgevYxBGO5L1E0BUspXFrWK+jMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAEmvLJpxYwz3xweIDSoQAv6DgWptBrxmhq2CPpmzKfnnB2w1pNVpYLKMuA/WMcA5p3KUSf0UG2ALdBlS2g2wjPEqFCmOh6xcFzt35dzEJZXXdzw8yCufQ2TQx4SG0/AxBTBUqVFt7rVcDuIPCGx1CHLoaSONilrty6XCalXdWl5zjxa29TZRQhyTswyAWZkEdpGobTbNXOpXYzId0kff5sWJc/DvZ2tz4cbyy8mZ7JxXz/4KijUTrrsFrXLMo7wwDnO+NH5NBJCD3NFw+ctB7OBlOK30LnLH9T+IqXKGiII9w/fiY6l2nGS3DHK0wiwncFDg2W8kcsXCtLtwn9DF0qVHYFFrZ5ndcXRPKpFEHv6NhDt1ZoLV6VdZ6CVtmvDFroRCnuaJcUUpgraM56NIjtMDWTZSWqBTWfBStlfRTXcW5dkxUyqLICtpZcYYe7WOjaQdiYmhR/te1tsc7SXaB8a2R7sfJvi12rTv6ZgnIP5jVqD/u68xJ8S/T8t1OnC6X+0MLvP3uX/S/LkYi+mlhrxqcW+x2p7RJBaPvAJOxgF+OvTxR/uU2JxN8q64wE/1ySkh/tNqAZ9y47IoKTbCmAJ/1EPBv5HjYHATFMYJXREkRvXOunHeTg9mMMfGU2KWMSVJo8wntFzKKHC252gFI50XaLDGH4JdneO3Vy4wMu5U</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFljCCA36gAwIBAgIGElFy1KcxMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQDA+BgNVBAMMN0dlb2xvc2tpIHphdm9kIFNsb3ZlbmlqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMDI4MjA1NzQwWhcNMzQwNzE1MjA1NzQwWjBjMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUAwPgYDVQQDDDdHZW9sb3NraSB6YXZvZCBTbG92ZW5pamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs4icY7e4QJ3C3daJA2b6m0WJbQ0HebtKR0wXYukm/xxJPDGmUf92eCVljnQVJyvMcDuSCzttELGX8ro/bEjlmAyGWMrqknIPKaZT+oeLIVRf71XOA55D8HapOrBUW/2hWYThBhzbrnW3Q4aKCAofJyU5DLg07iPXtxWnAAIvXSxaNNcI1PNZbK4wNPaCpgRCFhjf8PSyd2ybXkPFYwHtxHFMG2MgSo9a6gsEPMfnbkMNSZI17mc+BhCLAc42E3Vix5IzzLB2zweFmzATs57ZiTfQXNlaOS+EYYkpjRwhmcNUPxIaTrgXkPU6ZSkERFkLZIofpCnxZd9/vJmnYXgJEt2Yazhnbx3XgQ4ISoLRQyf58Tq0FVydOqZmFCoy6WJ/NRwka66vDYmA1Ii6E4uSx0SahueQUkFL9ADB1IdIx7RO597yr+KxJP0ygoEnlABMKLkbtR+iK9f6ZgxKNMPVV3Cn5n1QSl7YNsxDbUrCj31Xxx6Hq9jM2/PbsHHx5DYViumuvxKJIbDj9W5iR8uiNJwn5KHu2+VGZSmmOsrN01u4Cw7oemhrNjDYJMLx6DFMB13C9WE7K53AD6ZgNQIXBC66Gjk6PCou1gy2O9F4OaiNKhxvJv/2C+H0Ik/4ixnzQuDhKufYN32QqDDTYPnhG/vnClpc91Sijzm93wLVOpsCAwEAAaNQME4wHQYDVR0OBBYEFNffgevYxBGO5L1E0BUspXFrWK+jMB8GA1UdIwQYMBaAFNffgevYxBGO5L1E0BUspXFrWK+jMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAEmvLJpxYwz3xweIDSoQAv6DgWptBrxmhq2CPpmzKfnnB2w1pNVpYLKMuA/WMcA5p3KUSf0UG2ALdBlS2g2wjPEqFCmOh6xcFzt35dzEJZXXdzw8yCufQ2TQx4SG0/AxBTBUqVFt7rVcDuIPCGx1CHLoaSONilrty6XCalXdWl5zjxa29TZRQhyTswyAWZkEdpGobTbNXOpXYzId0kff5sWJc/DvZ2tz4cbyy8mZ7JxXz/4KijUTrrsFrXLMo7wwDnO+NH5NBJCD3NFw+ctB7OBlOK30LnLH9T+IqXKGiII9w/fiY6l2nGS3DHK0wiwncFDg2W8kcsXCtLtwn9DF0qVHYFFrZ5ndcXRPKpFEHv6NhDt1ZoLV6VdZ6CVtmvDFroRCnuaJcUUpgraM56NIjtMDWTZSWqBTWfBStlfRTXcW5dkxUyqLICtpZcYYe7WOjaQdiYmhR/te1tsc7SXaB8a2R7sfJvi12rTv6ZgnIP5jVqD/u68xJ8S/T8t1OnC6X+0MLvP3uX/S/LkYi+mlhrxqcW+x2p7RJBaPvAJOxgF+OvTxR/uU2JxN8q64wE/1ySkh/tNqAZ9y47IoKTbCmAJ/1EPBv5HjYHATFMYJXREkRvXOunHeTg9mMMfGU2KWMSVJo8wntFzKKHC252gFI50XaLDGH4JdneO3Vy4wMu5U</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.geo-zs.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.geo-zs.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Geološki zavod Slovenije</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Geološki zavod Slovenije</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Geološki zavod Slovenije</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Geološki zavod Slovenije</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geo-zs.si/eng/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.geo-zs.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marko</md:GivenName>
+    <md:SurName>Komac</md:SurName>
+    <md:EmailAddress>mailto:marko.komac@geo-zs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@geo-zs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mitja</md:GivenName>
+    <md:SurName>Požar</md:SurName>
+    <md:EmailAddress>mailto:mitja.pozar@geo-zs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jasna</md:GivenName>
+    <md:SurName>Sinigoj</md:SurName>
+    <md:EmailAddress>mailto:jasna.sinigoj@geo-zs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jasna</md:GivenName>
+    <md:SurName>Šinigoj</md:SurName>
+    <md:EmailAddress>mailto:jasna.sinigoj@geo-zs.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml
index c5375941..700c5d8b 100644
--- a/swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.george-monoux.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">george-monoux.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">george-monoux.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/george-monoux.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/george-monoux.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sir George Monoux College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.george-monoux.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/george-monoux.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/george-monoux.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sir George Monoux College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.george-monoux.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml
index 719a1c4d..5ad9b309 100644
--- a/swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gla.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-19T15:05:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-19T15:05:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Glasgow</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://milngavie.cent.gla.ac.uk/UoG_colour_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.209.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>gla.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.8719,4.2875</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Glasgow</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://milngavie.cent.gla.ac.uk/UoG_colour_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>130.209.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>gla.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:55.8719,4.2875</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIJALu/c0dZr5HvMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51azAeFw0xNTA3MDgwOTMwMDRaFw0y
 						NTA3MDUwOTMwMDRaMCMxITAfBgNVBAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51
@@ -42,26 +42,26 @@
 						RlkVhC02pga9ohbCFw4Hv0ZfqMvRxDS5J+KsZpudx17DXrPjkBxTHWtZ02t/WOyS
 						37U4ys02cmPuuNCVlsTarDiF2R1ZNCMt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://milngavie.cent.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://milngavie.cent.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIJALu/c0dZr5HvMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51azAeFw0xNTA3MDgwOTMwMDRaFw0y
 						NTA3MDUwOTMwMDRaMCMxITAfBgNVBAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51
@@ -81,26 +81,26 @@
 						RlkVhC02pga9ohbCFw4Hv0ZfqMvRxDS5J+KsZpudx17DXrPjkBxTHWtZ02t/WOyS
 						37U4ys02cmPuuNCVlsTarDiF2R1ZNCMt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Glasgow</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User Support</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@it.gla.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:d.anderson@compserv.gla.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Glasgow</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User Support</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@it.gla.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:d.anderson@compserv.gla.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
index c4148bfa..d4351dee 100644
--- a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.glasgowkelvin.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-22T14:18:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-22T14:18:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glasgowkelvin.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Glasgow Kelvin College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glasgowkelvin.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Glasgow Kelvin College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIIEcxlhYHW7FYwDQYJKoZIhvcNAQEFBQAwQzEfMB0GA1UE
 						CgwWR2xhc2dvdyBLZWx2aW4gQ29sbGVnZTEgMB4GA1UEAwwXaWRwLmdsYXNnb3dr
 						ZWx2aW4uYWMudWswHhcNMTQwODI5MTMyODUyWhcNMjQwODI5MTMyODUyWjBDMR8w
@@ -35,13 +35,13 @@
 						l2RyOBeMBakzxmb2R6y3nWcxAidG42LV8DLVUbqwoEcIg4Mt5jbZDrlEhPvW4zal
 						TWIuR+MKKnSlSNym/jSdIEVMIQ/mmLy8Pmqg/bdX5zgOHNLQEtGgpX0ReOo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIIEcxlhYHW7FYwDQYJKoZIhvcNAQEFBQAwQzEfMB0GA1UE
 						CgwWR2xhc2dvdyBLZWx2aW4gQ29sbGVnZTEgMB4GA1UEAwwXaWRwLmdsYXNnb3dr
 						ZWx2aW4uYWMudWswHhcNMTQwODI5MTMyODUyWhcNMjQwODI5MTMyODUyWjBDMR8w
@@ -61,25 +61,25 @@
 						l2RyOBeMBakzxmb2R6y3nWcxAidG42LV8DLVUbqwoEcIg4Mt5jbZDrlEhPvW4zal
 						TWIuR+MKKnSlSNym/jSdIEVMIQ/mmLy8Pmqg/bdX5zgOHNLQEtGgpX0ReOo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Glasgow Kelvin College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glasgow Kelvin College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glasgowkelvin.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Campbell</md:SurName>
-      <md:EmailAddress>mailto:MCampbell@glasgowkelvin.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>McBride</md:SurName>
-      <md:EmailAddress>mailto:amcbride@glasgowkelvin.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Glasgow Kelvin College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow Kelvin College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glasgowkelvin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Campbell</md:SurName>
+    <md:EmailAddress>mailto:MCampbell@glasgowkelvin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McBride</md:SurName>
+    <md:EmailAddress>mailto:amcbride@glasgowkelvin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
index 1e840467..94d75255 100644
--- a/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gli.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-09T14:17:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-09T14:17:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gli.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Geology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Geologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider GLI AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GLÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.gli.cas.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.gli.cas.cz/cs</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-gli-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-gli-633.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gli.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Geology AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Geologický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider GLI AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GLÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.gli.cas.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.gli.cas.cz/cs</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-gli-44.png</mdui:Logo>
-          <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-gli-633.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
 DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
 7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gli.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gli.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gli.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gli.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
 DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
 7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Geology AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Geologický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Geology AS CR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Geologický ústav AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gli.cas.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.gli.cas.cz/cs</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Geology AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Geologický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Geology AS CR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Geologický ústav AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gli.cas.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.gli.cas.cz/cs</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml
index 07bd36ba..e8e1747c 100644
--- a/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gmit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-03T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta na Gaillimhe-Maigh Eo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Galway-Mayo Institute of Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.gmit.ie</mdui:InformationURL>
+        <mdui:Logo height="69" width="220">https://edugate.heanet.ie/rr3/logos/gmit.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.2777683,-9.014748</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta na Gaillimhe-Maigh Eo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Galway-Mayo Institute of Technology</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.gmit.ie</mdui:InformationURL>
-          <mdui:Logo height="69" width="220">https://edugate.heanet.ie/rr3/logos/gmit.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.2777683,-9.014748</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAK1VqQ01fdIHdnIs7Fwl1MsmJPtwMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5nbWl0LmllMB4XDTEwMTExNjE2NTAwM1oXDTMw
 MTExNjE2NTAwM1owFjEUMBIGA1UEAxMLaWRwLmdtaXQuaWUwggEiMA0GCSqGSIb3
@@ -40,25 +40,25 @@ we2aIVIPuAArSitpWyiZ+betcnUQSV6vq6SEZrlb9SG1hMd3ckBd9t5xj0cd61Cx
 VRvGY2BZumdJim91SBMiwBI51Xv44nkEUtrIwVRipdAshJAynpRHPVEyJQmxn4sR
 Sg5aRgRfZLgvyxogDq0OlqHMA3nOustdeietHQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gmit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gmit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gmit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Galway-Mayo Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Galway-Mayo Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gmit.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Donal</md:GivenName>
-      <md:SurName>McGinty</md:SurName>
-      <md:EmailAddress>mailto:dmcginty@gmit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gmit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gmit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gmit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Galway-Mayo Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Galway-Mayo Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gmit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Donal</md:GivenName>
+    <md:SurName>McGinty</md:SurName>
+    <md:EmailAddress>mailto:dmcginty@gmit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml
index 0447554c..89bfe16d 100644
--- a/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.godalming.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-06T17:13:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-06T17:13:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">godalming.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">godalming.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjwCCQDYuaHlo6w4dTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlHb2RhbG1pbmcxGjAYBgNVBAoT
 						EUdvZGFsbWluZyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuZ29kYWxtaW5nLmFjLnVr
@@ -32,26 +32,26 @@
 						BfhIQnUh08BVlrphQmoeTxMvRQ4onNp4uy0UtoFfD6WGEIwfzckosJcEkukGNfUJ
 						3PcXdcBw5DL6rHdWkpNGnyuWj4w/csNAa8/ie/hWF5FgVJduilLWXA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.godalming.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">godalming.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.godalming.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">godalming.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjwCCQDYuaHlo6w4dTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlHb2RhbG1pbmcxGjAYBgNVBAoT
 						EUdvZGFsbWluZyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuZ29kYWxtaW5nLmFjLnVr
@@ -71,25 +71,25 @@
 						BfhIQnUh08BVlrphQmoeTxMvRQ4onNp4uy0UtoFfD6WGEIwfzckosJcEkukGNfUJ
 						3PcXdcBw5DL6rHdWkpNGnyuWj4w/csNAa8/ie/hWF5FgVJduilLWXA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Godalming College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Godalming College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.godalming.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:ITSupport@godalming.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:ITSupport@godalming.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Godalming College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Godalming College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.godalming.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:ITSupport@godalming.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:ITSupport@godalming.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
index 6de29048..30053159 100644
--- a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.goldsmiths.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-21T11:02:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-21T11:02:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gold.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Goldsmiths, University of London</mdui:DisplayName>
+        <mdui:Logo height="66" width="180">https://www.gold.ac.uk/static/images/gold/logo_goldsmiths.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.gold.ac.uk/static/images/g-16x16.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gold.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Goldsmiths, University of London</mdui:DisplayName>
-          <mdui:Logo height="66" width="180">https://www.gold.ac.uk/static/images/gold/logo_goldsmiths.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.gold.ac.uk/static/images/g-16x16.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF/TCCBOWgAwIBAgIUMqPz7osmzn9Ev8smgoB4KL4/2zgwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYxODEwMTMy
@@ -52,26 +52,26 @@
 						XjNUc3WA20A5xtfJa3B4RHmSp1zlvwxvPOU+DC/TPIfe9fz923/qDhMgCKylFbpP
 						VA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goldsmiths.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gold.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goldsmiths.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gold.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF/TCCBOWgAwIBAgIUMqPz7osmzn9Ev8smgoB4KL4/2zgwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYxODEwMTMy
@@ -106,26 +106,26 @@
 						XjNUc3WA20A5xtfJa3B4RHmSp1zlvwxvPOU+DC/TPIfe9fz923/qDhMgCKylFbpP
 						VA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Goldsmiths' College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Goldsmiths, University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.goldsmiths.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@gold.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>George</md:GivenName>
-      <md:SurName>Thompson</md:SurName>
-      <md:EmailAddress>mailto:g.thompson@gold.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Goldsmiths' College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Goldsmiths, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goldsmiths.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@gold.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>George</md:GivenName>
+    <md:SurName>Thompson</md:SurName>
+    <md:EmailAddress>mailto:g.thompson@gold.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml b/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml
index fd366d65..9e50e7c3 100644
--- a/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml
+++ b/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.goodwin.edu/idp/saml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">goodwin.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Goodwin College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">goodwin.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Goodwin College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBzCCAe+gAwIBAgIJANwMbYMK70vwMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMMD2lkcC5nb29kd2luLmVkdTAeFw0xMzA4MTIxNDQ2NTJaFw0yMzA4MTIxNDQ2
 NTJaMBoxGDAWBgNVBAMMD2lkcC5nb29kd2luLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -37,24 +37,24 @@ Zr+Vr8S5ZCVqxbBpIOO/hB+cLQnFzt13cdc60L/YVV2UpCrFx+wOoanPpStFiRWL
 CIiU7ZioGEoYcgH4XdXKLBZfS8PQqwNFlAtHZ59KLl6Mbtzd9dZcdHS5toIbot4V
 mftEeS74CI/fFwQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goodwin.edu/saml/saml2/slo"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goodwin.edu/saml/saml1/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goodwin.edu/saml/saml2/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Goodwin College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Goodwin College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.goodwin.edu/default_flash.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon Lee</md:GivenName>
-      <md:EmailAddress>simon@9starresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marilyn Nowlan</md:GivenName>
-      <md:EmailAddress>Mnowlan@goodwin.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goodwin.edu/saml/saml2/slo"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goodwin.edu/saml/saml1/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goodwin.edu/saml/saml2/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Goodwin College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Goodwin College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goodwin.edu/default_flash.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon Lee</md:GivenName>
+    <md:EmailAddress>simon@9starresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marilyn Nowlan</md:GivenName>
+    <md:EmailAddress>Mnowlan@goodwin.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml
index f8848727..e6759f29 100644
--- a/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.goucher.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">goucher.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Goucher College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">goucher.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Goucher College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAigCCQD9EXATFfpNHTANBgkqhkiG9w0BAQUFADBiMRgwFgYDVQQDDA9p
 ZHAuZ291Y2hlci5lZHUxGDAWBgNVBAoMD0dvdWNoZXIgQ29sbGVnZTELMAkGA1UE
 BhMCVVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUwHhcNMTIwMjAy
@@ -38,13 +38,13 @@ iCflXm96nzl+CxorqVb0yJB2jmRd6WAAOunl4dIL8J7lkkrqBv42TaKExkUcf3eT
 yosKfff3G3KPsQzaU1kDWVGhbhS322uy7gjy929RALCmoUD6QQXRidkRYacCMHXC
 oL1bvJlGv+az8jFu7bFvQ6WA7Lc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhDCCAmwCCQDipYp7QAFE6DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUxGDAWBgNVBAoMD0dv
 dWNoZXIgQ29sbGVnZTEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEY
@@ -65,24 +65,24 @@ ucIe40Y2h8mhtRsWqMH8e220dYf2QMueJo7zt9xruOUTT7Jn+mGQUtH2tYlhOREU
 D6X8ax3ngFyLz8Cte0qDYPQpZU93xd8tuQTWRBeGA+AxJMQ3/Gn78uKZJDNUqdhf
 U9RfcD99MmNTz6iedYMFbAIs1113GJVjiRe15qyz74tLxexzwiPxXA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goucher.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goucher.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goucher.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goucher.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goucher.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goucher.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">goucher.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goucher.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goucher.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goucher.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goucher.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goucher.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goucher.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">goucher.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAigCCQD9EXATFfpNHTANBgkqhkiG9w0BAQUFADBiMRgwFgYDVQQDDA9p
 ZHAuZ291Y2hlci5lZHUxGDAWBgNVBAoMD0dvdWNoZXIgQ29sbGVnZTELMAkGA1UE
 BhMCVVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUwHhcNMTIwMjAy
@@ -102,13 +102,13 @@ iCflXm96nzl+CxorqVb0yJB2jmRd6WAAOunl4dIL8J7lkkrqBv42TaKExkUcf3eT
 yosKfff3G3KPsQzaU1kDWVGhbhS322uy7gjy929RALCmoUD6QQXRidkRYacCMHXC
 oL1bvJlGv+az8jFu7bFvQ6WA7Lc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhDCCAmwCCQDipYp7QAFE6DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUxGDAWBgNVBAoMD0dv
 dWNoZXIgQ29sbGVnZTEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEY
@@ -129,23 +129,23 @@ ucIe40Y2h8mhtRsWqMH8e220dYf2QMueJo7zt9xruOUTT7Jn+mGQUtH2tYlhOREU
 D6X8ax3ngFyLz8Cte0qDYPQpZU93xd8tuQTWRBeGA+AxJMQ3/Gn78uKZJDNUqdhf
 U9RfcD99MmNTz6iedYMFbAIs1113GJVjiRe15qyz74tLxexzwiPxXA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goucher.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goucher.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Goucher College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Goucher College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://goucher.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Rob Pfeffer</md:GivenName>
-      <md:EmailAddress>rpfeffer@goucher.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob Pfeffer</md:GivenName>
-      <md:EmailAddress>rpfeffer@goucher.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goucher.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goucher.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Goucher College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Goucher College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://goucher.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Rob Pfeffer</md:GivenName>
+    <md:EmailAddress>rpfeffer@goucher.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob Pfeffer</md:GivenName>
+    <md:EmailAddress>rpfeffer@goucher.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml
index ecc50a28..5e6c5630 100644
--- a/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gowercollegeswansea.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gowercollegeswansea.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gowercollegeswansea.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYTCCAkmgAwIBAgIVAPaKVO7qjn5iTZ8Gic6gQPWYymlgMA0GCSqGSIb3DQEB
 						BQUAMCgxJjAkBgNVBAMTHWlkcC5nb3dlcmNvbGxlZ2Vzd2Fuc2VhLmFjLnVrMB4X
 						DTExMDgyNDEyNDQ1NloXDTMxMDgyNDEyNDQ1NlowKDEmMCQGA1UEAxMdaWRwLmdv
@@ -31,26 +31,26 @@
 						lCgXikLauknBHaF7kl1iiuMIyNn3KATJn53IQnYEhIe3eweTHTwXiAVOOnn2MXd3
 						VUkeVwI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gowercollegeswansea.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gowercollegeswansea.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYTCCAkmgAwIBAgIVAPaKVO7qjn5iTZ8Gic6gQPWYymlgMA0GCSqGSIb3DQEB
 						BQUAMCgxJjAkBgNVBAMTHWlkcC5nb3dlcmNvbGxlZ2Vzd2Fuc2VhLmFjLnVrMB4X
 						DTExMDgyNDEyNDQ1NloXDTMxMDgyNDEyNDQ1NlowKDEmMCQGA1UEAxMdaWRwLmdv
@@ -71,27 +71,27 @@
 						lCgXikLauknBHaF7kl1iiuMIyNn3KATJn53IQnYEhIe3eweTHTwXiAVOOnn2MXd3
 						VUkeVwI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Gower College Swansea</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gower College Swansea</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gowercollegeswansea.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Parkhouse</md:SurName>
-      <md:EmailAddress>mailto:ian.parkhouse@gowercollegeswansea.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Parkhouse</md:SurName>
-      <md:EmailAddress>mailto:ian.parkhouse@gowercollegeswansea.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Gower College Swansea</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gower College Swansea</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gowercollegeswansea.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Parkhouse</md:SurName>
+    <md:EmailAddress>mailto:ian.parkhouse@gowercollegeswansea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Parkhouse</md:SurName>
+    <md:EmailAddress>mailto:ian.parkhouse@gowercollegeswansea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
index 62bbbca7..4601db57 100644
--- a/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
+++ b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gpiran.si/idp/20110919">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-03-09T08:03:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-03-09T08:03:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gpiran.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.gpiran.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gymnasium Piran</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Keywords>
+        <mdui:Logo height="299" width="300">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.gpiran.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.gpiran.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gpiran.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.gpiran.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gymnasium Piran</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Keywords>
-          <mdui:Logo height="299" width="300">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.gpiran.si</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.gpiran.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Gymnasium Piran</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gymnasium Piran</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gpiran.si</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.gpiran.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Borut</md:GivenName>
-      <md:SurName>Butinar</md:SurName>
-      <md:EmailAddress>mailto:ravnatelj@gpiran.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Igor</md:GivenName>
-      <md:SurName>Kralj</md:SurName>
-      <md:EmailAddress>mailto:igor.kralj1@guest.arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Igor</md:GivenName>
-      <md:SurName>Kralj</md:SurName>
-      <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Gymnasium Piran</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gymnasium Piran</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gpiran.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.gpiran.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Borut</md:GivenName>
+    <md:SurName>Butinar</md:SurName>
+    <md:EmailAddress>mailto:ravnatelj@gpiran.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Igor</md:GivenName>
+    <md:SurName>Kralj</md:SurName>
+    <md:EmailAddress>mailto:igor.kralj1@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Igor</md:GivenName>
+    <md:SurName>Kralj</md:SurName>
+    <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml
index a099d1e9..f170638e 100644
--- a/swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.grantham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grantham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grantham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/grantham.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/grantham.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Grantham College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.grantham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/grantham.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/grantham.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Grantham College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.grantham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml
index b3dcc207..5c4b161e 100644
--- a/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gre.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-01T09:20:51Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-01T09:20:51Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gre.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gre.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIIZQXHbuQMihkwDQYJKoZIhvcNAQEFBQAwOjEgMB4GA1UE
 						CgwXVW5pdmVyc2l0eSBvZiBHcmVlbndpY2gxFjAUBgNVBAMMDWlkcC5ncmUuYWMu
 						dWswHhcNMTMwNjA2MTIzMDE5WhcNMjMwNjA2MTIzMDE5WjA6MSAwHgYDVQQKDBdV
@@ -30,13 +30,13 @@
 						i4v7/IIqQEnbyG6PZ5CmgZLw5kz1RaQHxfeDomry3wDksX3X3fJUszF3NFBuuPyU
 						+w4TA7Ns7GKZQL7rjKJD7Q35wrF/KnjuwCo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIIZQXHbuQMihkwDQYJKoZIhvcNAQEFBQAwOjEgMB4GA1UE
 						CgwXVW5pdmVyc2l0eSBvZiBHcmVlbndpY2gxFjAUBgNVBAMMDWlkcC5ncmUuYWMu
 						dWswHhcNMTMwNjA2MTIzMDE5WhcNMjMwNjA2MTIzMDE5WjA6MSAwHgYDVQQKDBdV
@@ -56,25 +56,25 @@
 						i4v7/IIqQEnbyG6PZ5CmgZLw5kz1RaQHxfeDomry3wDksX3X3fJUszF3NFBuuPyU
 						+w4TA7Ns7GKZQL7rjKJD7Q35wrF/KnjuwCo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gre.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gre.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Greenwich</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Greenwich - OpenAthens</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gre.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nadine</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:n.c.edwards@gre.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Geoff</md:GivenName>
-      <md:SurName>Hunter</md:SurName>
-      <md:EmailAddress>mailto:g.j.hunter@gre.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gre.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gre.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Greenwich</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Greenwich - OpenAthens</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gre.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nadine</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:n.c.edwards@gre.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoff</md:GivenName>
+    <md:SurName>Hunter</md:SurName>
+    <md:EmailAddress>mailto:g.j.hunter@gre.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml
index 1054792e..10190394 100644
--- a/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.greatplains.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.greatplains.net/idp-errorURL.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">greatplains.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GPN (Great Plains Network)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.greatplains.net/idp-errorURL.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">greatplains.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GPN (Great Plains Network)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUFkE64moFaIhXMDCjOYF/pXt+myEwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTaWRwLmdyZWF0cGxhaW5zLm5ldDAeFw0xMjA4MjgxODA4
 MTVaFw0zMjA4MjgxODA4MTVaMB4xHDAaBgNVBAMTE2lkcC5ncmVhdHBsYWlucy5u
@@ -41,23 +41,23 @@ nLo/T26nCpBMgsgy02vDr7mrjW7MlTONGkyFO3nSv8rkdDMM+55YG8j+JwsMZLij
 O9bdKwzjyxN8V1LdoKcQnW6pgSNaw7TXudUNyLDr7WhXLny2RmDpVgljo7HYm6wH
 UgsT6cj2ibjVHHo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.greatplains.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.greatplains.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.greatplains.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.greatplains.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.greatplains.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">greatplains.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.greatplains.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.greatplains.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.greatplains.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.greatplains.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.greatplains.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">greatplains.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUFkE64moFaIhXMDCjOYF/pXt+myEwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTaWRwLmdyZWF0cGxhaW5zLm5ldDAeFw0xMjA4MjgxODA4
 MTVaFw0zMjA4MjgxODA4MTVaMB4xHDAaBgNVBAMTE2lkcC5ncmVhdHBsYWlucy5u
@@ -77,27 +77,27 @@ nLo/T26nCpBMgsgy02vDr7mrjW7MlTONGkyFO3nSv8rkdDMM+55YG8j+JwsMZLij
 O9bdKwzjyxN8V1LdoKcQnW6pgSNaw7TXudUNyLDr7WhXLny2RmDpVgljo7HYm6wH
 UgsT6cj2ibjVHHo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.greatplains.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.greatplains.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GPN (Great Plains Network)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GPN (Great Plains Network)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.greatplains.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kate Adams</md:GivenName>
-      <md:EmailAddress>kate@greatplains.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Denis Hancock</md:GivenName>
-      <md:EmailAddress>HancockDC@missouri.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Greg Monaco</md:GivenName>
-      <md:EmailAddress>greg@greatplains.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.greatplains.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.greatplains.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GPN (Great Plains Network)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GPN (Great Plains Network)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.greatplains.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kate Adams</md:GivenName>
+    <md:EmailAddress>kate@greatplains.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Denis Hancock</md:GivenName>
+    <md:EmailAddress>HancockDC@missouri.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Greg Monaco</md:GivenName>
+    <md:EmailAddress>greg@greatplains.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
index 4b90eea8..e8e2fc35 100644
--- a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.grena.ge/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2016-05-11T15:04:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2016-05-11T15:04:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GRENA Identity Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GRENA Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://gif.grena.ge</mdui:InformationURL>
+        <mdui:Logo width="375" height="156" xml:lang="en">https://idp.grena.ge/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:41.70478,44.78696</mdui:GeolocationHint>
+        <mdui:IPHint>217.147.239.162/32</mdui:IPHint>
+        <mdui:DomainHint>idp.grena.ge</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GRENA Identity Provider</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GRENA Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://gif.grena.ge</mdui:InformationURL>
-          <mdui:Logo width="375" height="156" xml:lang="en">https://idp.grena.ge/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:41.70478,44.78696</mdui:GeolocationHint>
-          <mdui:IPHint>217.147.239.162/32</mdui:IPHint>
-          <mdui:DomainHint>idp.grena.ge</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID6zCCAtOgAwIBAgIJAMK8nCcQGikvMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
 VQQGEwJHRTEQMA4GA1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8G
 A1UECgw4R2VvcmdpYW4gUmVzZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtp
@@ -45,13 +45,13 @@ axaYXy3vCjkqxEKT+yG4EglBVKn2sZAPK4sZAOM3rQo1h4edQ8y4EO9U/CqvqLjY
 qM2ADO+fHzadaRenQyRaUz5HtKKJjDpbXSAvPpQVdcX18Ci8lrkTEcxHcEguviQb
 0GPUicJISIenHlfwmQyRZpxfi4EtvvSl8Eyr2EiOHgUjI/4MspHWuVEkQDaQGoE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID6zCCAtOgAwIBAgIJAMK8nCcQGikvMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
 VQQGEwJHRTEQMA4GA1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8G
 A1UECgw4R2VvcmdpYW4gUmVzZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtp
@@ -74,21 +74,21 @@ axaYXy3vCjkqxEKT+yG4EglBVKn2sZAPK4sZAOM3rQo1h4edQ8y4EO9U/CqvqLjY
 qM2ADO+fHzadaRenQyRaUz5HtKKJjDpbXSAvPpQVdcX18Ci8lrkTEcxHcEguviQb
 0GPUicJISIenHlfwmQyRZpxfi4EtvvSl8Eyr2EiOHgUjI/4MspHWuVEkQDaQGoE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://grena.ge/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Temur</md:GivenName>
-      <md:SurName>Maisuradze</md:SurName>
-      <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://grena.ge/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Temur</md:GivenName>
+    <md:SurName>Maisuradze</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml
index f65df07b..91febe63 100644
--- a/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.grimsby.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:44:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:44:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimsby.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimsby.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 							MIIDhDCCAmygAwIBAgIIH70XfscAcqYwDQYJKoZIhvcNAQEFBQAwWTE7MDkGA1UE
 							CgwyR3JpbXNieSBJbnN0aXR1dGUgZm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVj
 							YXRpb24xGjAYBgNVBAMMEWlkcC5ncmltc2J5LmFjLnVrMB4XDTE0MDYwMzEzMjky
@@ -38,13 +38,13 @@
 							lDzym0z/+t36nVPVTlYDzeOXN/e9B2LLzJwRmLG87VZj+pA3pjBKIu341QzZ1pz+
 							nWsg1LPp3/B6n72ejbSVL5kmuwr5dWE4gcD9xLNAz2LrGPyA/ziZhw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 							MIIDhDCCAmygAwIBAgIIH70XfscAcqYwDQYJKoZIhvcNAQEFBQAwWTE7MDkGA1UE
 							CgwyR3JpbXNieSBJbnN0aXR1dGUgZm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVj
 							YXRpb24xGjAYBgNVBAMMEWlkcC5ncmltc2J5LmFjLnVrMB4XDTE0MDYwMzEzMjky
@@ -65,25 +65,25 @@
 							lDzym0z/+t36nVPVTlYDzeOXN/e9B2LLzJwRmLG87VZj+pA3pjBKIu341QzZ1pz+
 							nWsg1LPp3/B6n72ejbSVL5kmuwr5dWE4gcD9xLNAz2LrGPyA/ziZhw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.grimsby.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grimsby.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Grimsby Institute of Further and Higher Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Grimsby Institute of Further &amp; Higher Education (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.grimsby.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Fiona</md:GivenName>
-      <md:SurName>Lilley</md:SurName>
-      <md:EmailAddress>mailto:lilleyf@grimsby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barry</md:GivenName>
-      <md:SurName>Clarkson</md:SurName>
-      <md:EmailAddress>mailto:clarksonbc@grimsby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.grimsby.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grimsby.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Grimsby Institute of Further and Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Grimsby Institute of Further &amp; Higher Education (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.grimsby.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Fiona</md:GivenName>
+    <md:SurName>Lilley</md:SurName>
+    <md:EmailAddress>mailto:lilleyf@grimsby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barry</md:GivenName>
+    <md:SurName>Clarkson</md:SurName>
+    <md:EmailAddress>mailto:clarksonbc@grimsby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml b/swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml
index babcbc72..01554205 100644
--- a/swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gsm.org.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-26T10:55:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-26T10:55:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsm.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsm.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -35,23 +35,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gsm.org.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gsm.org.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GSM London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gsm.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gsm.org.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gsm.org.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GSM London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gsm.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml
index 0a9c6564..e1c48eb6 100644
--- a/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gsmd.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsmd.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsmd.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gsmd.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gsmd.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Guildhall School of Music &amp; Drama</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gsmd.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gsmd.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gsmd.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Guildhall School of Music &amp; Drama</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gsmd.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml b/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
index 01ea6356..a854af7c 100644
--- a/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
+++ b/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gssk.si/idp/20141130">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-02T11:12:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-02T11:12:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gssk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.gssk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijak.gssk.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gimnazija in srednja šola Kočevje</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Gimnazija in srednja šola Kočevje</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Gimnazija in srednja šola Kočevje</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet Gimnazija in srednja šola Kočevje</mdui:Description>
+        <mdui:Keywords xml:lang="en">identity provider idp Gimnazija in srednja šola Kočevje</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">ponudink identitet idp Gimnazija in srednja šola Kočevje</mdui:Keywords>
+        <mdui:Logo height="115" width="120">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.gssk.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.gssk.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gssk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.gssk.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijak.gssk.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Gimnazija in srednja šola Kočevje</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Gimnazija in srednja šola Kočevje</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for Gimnazija in srednja šola Kočevje</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet Gimnazija in srednja šola Kočevje</mdui:Description>
-          <mdui:Keywords xml:lang="en">identity provider idp Gimnazija in srednja šola Kočevje</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">ponudink identitet idp Gimnazija in srednja šola Kočevje</mdui:Keywords>
-          <mdui:Logo height="115" width="120">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.gssk.si</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.gssk.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gssk.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gssk.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gssk.si</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.gssk.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Meta</md:GivenName>
-      <md:SurName>Kamšek</md:SurName>
-      <md:EmailAddress>mailto:meta.kamsek@guest.arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:info@gssk.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Toni</md:GivenName>
-      <md:SurName>Mihelič</md:SurName>
-      <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Anton</md:GivenName>
-      <md:SurName>Mihelic</md:SurName>
-      <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tomaž</md:GivenName>
-      <md:SurName>Ferbežar</md:SurName>
-      <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anton</md:GivenName>
-      <md:SurName>Mihelic</md:SurName>
-      <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gssk.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gssk.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gssk.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.gssk.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Meta</md:GivenName>
+    <md:SurName>Kamšek</md:SurName>
+    <md:EmailAddress>mailto:meta.kamsek@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:info@gssk.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Toni</md:GivenName>
+    <md:SurName>Mihelič</md:SurName>
+    <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anton</md:GivenName>
+    <md:SurName>Mihelic</md:SurName>
+    <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomaž</md:GivenName>
+    <md:SurName>Ferbežar</md:SurName>
+    <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anton</md:GivenName>
+    <md:SurName>Mihelic</md:SurName>
+    <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml
index 1e4f9ad2..6765f3ad 100644
--- a/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.gsu.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Georgia State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Georgia State University is located in the heart of downtown Atlanta. Georgia State is one of the country's leading urban research universities.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.gsu.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Georgia State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Georgia State University is located in the heart of downtown Atlanta. Georgia State is one of the country's leading urban research universities.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDiDCCAnACCQCrY2VVpigyOTANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
 A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
@@ -40,13 +40,13 @@ bjfhewGhe4cfwJlWByoS9RDQUVrHGl6MgMvk/l2wXIFn4I+6DqJYsHAWl/e1m9Zh
 tN0DE2kMdJnP9uo3P2zbnx1OjnhEKq8USicqfJ0WURaAf3pvB2CQlfHJpLyTk4su
 MaNh4Mq+DwonONJ2IrxNOVDGr1OizMya+fiAPFA2l+XvfveCYE4qgQrBubA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDiDCCAnACCQDgmtUnSYaEQzANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
 A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
@@ -67,24 +67,24 @@ Xz3sw2sFRwZfMd1Ir2BFufxHwyR1wDMISkLW4KIh2Y/A4T5PJnyr1gvqCuGFBmVa
 bnsCGHbhR1ukH8bdVEe3cfowAMDJEJHVZGEJYruqe0hjIa/ZDKXFWaDuyaknM5OD
 BCoW3mMYc0Wvo936Rx/CEhxnkL8hh/p+qdyWRZOJy3H1eHEP91+c5Uy+T7U=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gsu.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gsu.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gsu.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gsu.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDiDCCAnACCQCrY2VVpigyOTANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
 A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
@@ -105,13 +105,13 @@ bjfhewGhe4cfwJlWByoS9RDQUVrHGl6MgMvk/l2wXIFn4I+6DqJYsHAWl/e1m9Zh
 tN0DE2kMdJnP9uo3P2zbnx1OjnhEKq8USicqfJ0WURaAf3pvB2CQlfHJpLyTk4su
 MaNh4Mq+DwonONJ2IrxNOVDGr1OizMya+fiAPFA2l+XvfveCYE4qgQrBubA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDiDCCAnACCQDgmtUnSYaEQzANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
 A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
@@ -132,27 +132,27 @@ Xz3sw2sFRwZfMd1Ir2BFufxHwyR1wDMISkLW4KIh2Y/A4T5PJnyr1gvqCuGFBmVa
 bnsCGHbhR1ukH8bdVEe3cfowAMDJEJHVZGEJYruqe0hjIa/ZDKXFWaDuyaknM5OD
 BCoW3mMYc0Wvo936Rx/CEhxnkL8hh/p+qdyWRZOJy3H1eHEP91+c5Uy+T7U=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gsu.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gsu.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Georgia State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Georgia State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ron Reddish</md:GivenName>
-      <md:EmailAddress>rreddish@gsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joel Burke</md:GivenName>
-      <md:EmailAddress>burke@gsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy Mullins</md:GivenName>
-      <md:EmailAddress>mullins@gsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gsu.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gsu.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Georgia State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Georgia State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ron Reddish</md:GivenName>
+    <md:EmailAddress>rreddish@gsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joel Burke</md:GivenName>
+    <md:EmailAddress>burke@gsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy Mullins</md:GivenName>
+    <md:EmailAddress>mullins@gsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml
index b7404c9e..f8e4dc5b 100644
--- a/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gyc.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gyc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gyc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gyc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gyc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Great Yarmouth College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gyc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gyc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gyc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Great Yarmouth College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gyc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml
index 92c15be6..7db36291 100644
--- a/swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hackney.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hackney.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hackney.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hackney.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hackney.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hackney Community College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hackney.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hackney.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hackney.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hackney Community College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hackney.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml
index 2a688d1b..ed2d2434 100644
--- a/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hadlow.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-19T15:03:35Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-19T15:03:35Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadlow.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadlow.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUUn7bQ0XDWcr3Co/oK0CMHoqS5fowDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAxMQaWRwLmhhZGxvdy5hYy51azAeFw0xMzA4MTkwODU3MTBa
 						Fw0zMzA4MTkwODU3MTBaMBsxGTAXBgNVBAMTEGlkcC5oYWRsb3cuYWMudWswggEi
@@ -29,29 +29,29 @@
 						+RrN+5fIqWtyTCU3m5GS6DWkMniRDCH6GyvScizqAKlmO+T/YHI4HbXCv16kdoh2
 						U0KM6sPHjZWhRj2/g5+7WpHT5b8olPEUoWArqU3fl/u5A2obzw7p2fOEt7adcak=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hadlow.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadlow.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hadlow.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadlow.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUUn7bQ0XDWcr3Co/oK0CMHoqS5fowDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAxMQaWRwLmhhZGxvdy5hYy51azAeFw0xMzA4MTkwODU3MTBa
 						Fw0zMzA4MTkwODU3MTBaMBsxGTAXBgNVBAMTEGlkcC5oYWRsb3cuYWMudWswggEi
@@ -70,25 +70,25 @@
 						+RrN+5fIqWtyTCU3m5GS6DWkMniRDCH6GyvScizqAKlmO+T/YHI4HbXCv16kdoh2
 						U0KM6sPHjZWhRj2/g5+7WpHT5b8olPEUoWArqU3fl/u5A2obzw7p2fOEt7adcak=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hadlow College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hadlow College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://hadlow.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software Solutions Ltd</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hadlow College Computer Services</md:GivenName>
-      <md:EmailAddress>mailto:IT.support@hadlow.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hadlow College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hadlow College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://hadlow.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software Solutions Ltd</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hadlow College Computer Services</md:GivenName>
+    <md:EmailAddress>mailto:IT.support@hadlow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
index f8cf52ba..72769773 100644
--- a/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hainaut-PromSoc</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students and Teachers from Social Promotion Schools of Province de Hainaut</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Hainaut-PromSoc</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement de Promotion Sociale de la Province de Hainaut</mdui:Description>
+        <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-hps-16x16.jpg</mdui:Logo>
+        <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-hps-291x88.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
+        <mdui:DomainHint>hainaut-promsoc.be</mdui:DomainHint>
+        <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hainaut-PromSoc</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Students and Teachers from Social Promotion Schools of Province de Hainaut</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Hainaut-PromSoc</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement de Promotion Sociale de la Province de Hainaut</mdui:Description>
-          <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-hps-16x16.jpg</mdui:Logo>
-          <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-hps-291x88.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
-          <mdui:DomainHint>hainaut-promsoc.be</mdui:DomainHint>
-          <mdui:GeolocationHint>50.41719089999999,4.448670300000003</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAN68rKymbP0przSDvaG0eMoh/UGiMA0GCSqGSIb3DQEB
 CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
 MTIxMTQ0WhcNMzUxMjAzMTIxMTQ0WjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
@@ -45,13 +45,13 @@ Du+vSV7PfHKMdpMYJLFmT+Ry3bjrNA/WibJkQ4Hf9OtuOQ4M5k3VodWj2LCO4Ybh
 lGfxo5nF26RIBrY4mtTninIvP75nJjAJoS029RDpoYpl8Mh8t+lxsY0tisaYoJgF
 FgGl1jbigT4J3Bxxv1wcRfblufkR5grP
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAPLtvCrrYfdTvxrnQNxT4wh/M2m9MA0GCSqGSIb3DQEB
 CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
 MTIxMTQyWhcNMzUxMjAzMTIxMTQyWjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
@@ -71,13 +71,13 @@ RVL+pTLN5MhbSF6izeLcpvI/xhneStzW3b3IhHS+rPikg3GufLhM++5A45qAAqAz
 VRQosvXh6gvNKUDJpqCMK+m4b/Ue9rOBqtV9g8peJfZ9TQ9CKwDB0UbPPCfEEI/7
 MilG31thHKJnTIULp8CAkF+DIFtOcpk6
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUcuiw7sw3OSPjhIvrmbLChEBZ60AwDQYJKoZIhvcNAQEL
 BQAwITEfMB0GA1UEAwwWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZTAeFw0xNTEyMDMx
 MjExNDJaFw0zNTEyMDMxMjExNDJaMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXBy
@@ -97,31 +97,31 @@ kXjj5QdTeFZqiqhfLGzAbN2PT8m9ooeompaKdXPPPE6lGxBbkxb7oaiTbhQ2Vq2a
 ThgBAs9l2+KxbBZMSIKonHuNy4rabps8OlUROSbh9uwTGfK/wP540Ig3zmKlNJ2n
 yre8A56stjeXAkdXHlOhm0/9YlW1hHQ=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hainaut-promsoc.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hainaut-promsoc.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAN68rKymbP0przSDvaG0eMoh/UGiMA0GCSqGSIb3DQEB
 CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
 MTIxMTQ0WhcNMzUxMjAzMTIxMTQ0WjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
@@ -141,13 +141,13 @@ Du+vSV7PfHKMdpMYJLFmT+Ry3bjrNA/WibJkQ4Hf9OtuOQ4M5k3VodWj2LCO4Ybh
 lGfxo5nF26RIBrY4mtTninIvP75nJjAJoS029RDpoYpl8Mh8t+lxsY0tisaYoJgF
 FgGl1jbigT4J3Bxxv1wcRfblufkR5grP
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAPLtvCrrYfdTvxrnQNxT4wh/M2m9MA0GCSqGSIb3DQEB
 CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
 MTIxMTQyWhcNMzUxMjAzMTIxMTQyWjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
@@ -167,13 +167,13 @@ RVL+pTLN5MhbSF6izeLcpvI/xhneStzW3b3IhHS+rPikg3GufLhM++5A45qAAqAz
 VRQosvXh6gvNKUDJpqCMK+m4b/Ue9rOBqtV9g8peJfZ9TQ9CKwDB0UbPPCfEEI/7
 MilG31thHKJnTIULp8CAkF+DIFtOcpk6
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUcuiw7sw3OSPjhIvrmbLChEBZ60AwDQYJKoZIhvcNAQEL
 BQAwITEfMB0GA1UEAwwWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZTAeFw0xNTEyMDMx
 MjExNDJaFw0zNTEyMDMxMjExNDJaMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXBy
@@ -193,23 +193,23 @@ kXjj5QdTeFZqiqhfLGzAbN2PT8m9ooeompaKdXPPPE6lGxBbkxb7oaiTbhQ2Vq2a
 ThgBAs9l2+KxbBZMSIKonHuNy4rabps8OlUROSbh9uwTGfK/wP540Ig3zmKlNJ2n
 yre8A56stjeXAkdXHlOhm0/9YlW1hHQ=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Enseignement de Promotion Sociale de la Province de Hainaut</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hainaut-PromSoc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hainaut-promsoc.be</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>webmaster@hainaut-promsoc.be</md:EmailAddress>
-      <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Enseignement de Promotion Sociale de la Province de Hainaut</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hainaut-PromSoc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hainaut-promsoc.be</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>webmaster@hainaut-promsoc.be</md:EmailAddress>
+    <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml
index 8955b57d..308a139a 100644
--- a/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hampshire.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hampshire.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hampshire College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hampshire.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hampshire College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVALwMcFu6yCQI/NKTFc9rDbEYlS9FMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC5oYW1wc2hpcmUuZWR1MB4XDTEwMTIxNjIxNDgz
 OVoXDTMwMTIxNjIxNDgzOVowHDEaMBgGA1UEAxMRaWRwLmhhbXBzaGlyZS5lZHUw
@@ -38,23 +38,23 @@ UZAFtHU9eEIgBF2K8BXrgOJlFdafpO+BvnddSDulD1arCNR4v5m/AUQgbjzOTIb5
 VvX8muYzljIcbhSKscHFh9jTgF3tS1Q+X1Jg3E3kC8CVgHP3wvPX6Z+I0bmfSvRo
 CnVcoA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hampshire.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hampshire.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hampshire.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hampshire.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hampshire.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hampshire.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hampshire.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hampshire.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hampshire.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hampshire.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hampshire.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hampshire.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVALwMcFu6yCQI/NKTFc9rDbEYlS9FMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC5oYW1wc2hpcmUuZWR1MB4XDTEwMTIxNjIxNDgz
 OVoXDTMwMTIxNjIxNDgzOVowHDEaMBgGA1UEAxMRaWRwLmhhbXBzaGlyZS5lZHUw
@@ -74,26 +74,26 @@ UZAFtHU9eEIgBF2K8BXrgOJlFdafpO+BvnddSDulD1arCNR4v5m/AUQgbjzOTIb5
 VvX8muYzljIcbhSKscHFh9jTgF3tS1Q+X1Jg3E3kC8CVgHP3wvPX6Z+I0bmfSvRo
 CnVcoA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hampshire.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hampshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hampshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hampshire.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Kitzmiller</md:GivenName>
-      <md:EmailAddress>ckitzmiller@hampshire.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Josiah Erikson</md:GivenName>
-      <md:EmailAddress>wjeNS@hampshire.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Becca Groveman</md:GivenName>
-      <md:EmailAddress>bgroveman@hampshire.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hampshire.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hampshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hampshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hampshire.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Kitzmiller</md:GivenName>
+    <md:EmailAddress>ckitzmiller@hampshire.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Josiah Erikson</md:GivenName>
+    <md:EmailAddress>wjeNS@hampshire.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Becca Groveman</md:GivenName>
+    <md:EmailAddress>bgroveman@hampshire.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml
index e0f68d73..e7e0d3f4 100644
--- a/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.harrow.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">harrow.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">harrow.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAIAV6r9T9UOFBwHmuFZHQ/Zrx7aPMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5oYXJyb3cuYWMudWswHhcNMTIwMjA4MDk0MjIw
 						WhcNMzIwMjA4MDk0MjIwWjAbMRkwFwYDVQQDExBpZHAuaGFycm93LmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						nzqETopxqXGh+VtCAGvaHN2sO9Td+s03xE8YO3DSIdt8ykhOQh/yYRhRrREHAqTg
 						D6jRZoljE6KqZDICisJHSEinDErpP8g07mv2HH62e25QQikqxYKRNGb/7SpAIR9o
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.harrow.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">harrow.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.harrow.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">harrow.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAIAV6r9T9UOFBwHmuFZHQ/Zrx7aPMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5oYXJyb3cuYWMudWswHhcNMTIwMjA4MDk0MjIw
 						WhcNMzIwMjA4MDk0MjIwWjAbMRkwFwYDVQQDExBpZHAuaGFycm93LmFjLnVrMIIB
@@ -67,27 +67,27 @@
 						nzqETopxqXGh+VtCAGvaHN2sO9Td+s03xE8YO3DSIdt8ykhOQh/yYRhRrREHAqTg
 						D6jRZoljE6KqZDICisJHSEinDErpP8g07mv2HH62e25QQikqxYKRNGb/7SpAIR9o
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Harrow College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Harrow College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.harrow.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Biggs</md:SurName>
-      <md:EmailAddress>mailto:dbiggs@harrow.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Biggs</md:SurName>
-      <md:EmailAddress>mailto:dbiggs@harrow.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Harrow College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Harrow College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.harrow.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Biggs</md:SurName>
+    <md:EmailAddress>mailto:dbiggs@harrow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Biggs</md:SurName>
+    <md:EmailAddress>mailto:dbiggs@harrow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml
index 7d7299ed..469ffc42 100644
--- a/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hartlepoolfe.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartlepoolfe.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartlepoolfe.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hartlepoolfe.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hartlepoolfe.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hartlepool College of FE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hartlepoolfe.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hartlepoolfe.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hartlepoolfe.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hartlepool College of FE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hartlepoolfe.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml
index b0e26e23..e0dd1c13 100644
--- a/swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.havant.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">havant.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">havant.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havant.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havant.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Havant College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.havant.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havant.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havant.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Havant College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.havant.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml
index 7505002a..39a019fb 100644
--- a/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.havering-college.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">havering-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">havering-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havering-college.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havering-college.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Havering College of Further &amp; Higher Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.havering-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havering-college.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havering-college.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Havering College of Further &amp; Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.havering-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml
index 01ffe622..cd99e431 100644
--- a/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.havering-sfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">havering-sfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">havering-sfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havering-sfc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havering-sfc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Havering Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.havering-sfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havering-sfc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havering-sfc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Havering Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.havering-sfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml
index 964dbc62..a156574d 100644
--- a/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hawaii.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hawaii.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Hawaii</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UH Web Login Service</mdui:Description>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://idp.hawaii.edu/UH_System_Logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hawaii.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Hawaii</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UH Web Login Service</mdui:Description>
-          <mdui:Logo height="50" width="50" xml:lang="en">https://idp.hawaii.edu/UH_System_Logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUbG6AsWJKVFL4BChkxcf2t9iBajMwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmhhd2FpaS5lZHUwHhcNMTAwNjA4MDE0ODI4WhcN
 MzAwNjA4MDE0ODI4WjAZMRcwFQYDVQQDEw5pZHAuaGF3YWlpLmVkdTCCASIwDQYJ
@@ -42,23 +42,23 @@ aXeO5QDC+tC6HB7NSofJV7IcJLs5cZjqSRf3grbSWMugafBVbIvJuhs7uTYVZJby
 +jxLLXON7aWQGK5hhCLuzDL0zq6pX6THeEoNssY75ZTX0mWIaMwDQnvnA+5E2ca3
 lcsojI5PrsQEZo8UhgHFafO6bTiv+g2a2j0mVhWU1YJGOscK2Awq
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hawaii.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hawaii.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Hawaii</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Hawaii</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hawaii.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UH ITS Identity and Access Management</md:GivenName>
-      <md:EmailAddress>its-iam-help@lists.hawaii.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Hodges</md:GivenName>
-      <md:EmailAddress>mhodges@hawaii.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hawaii.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hawaii.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Hawaii</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Hawaii</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hawaii.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UH ITS Identity and Access Management</md:GivenName>
+    <md:EmailAddress>its-iam-help@lists.hawaii.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Hodges</md:GivenName>
+    <md:EmailAddress>mhodges@hawaii.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml
index 69a4a783..c1b199b5 100644
--- a/swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hca.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hca.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hca.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hca.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hca.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hereford College of Arts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hca.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hca.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hca.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hereford College of Arts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hca.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
index 1327b147..bb9d8bd7 100644
--- a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T04:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://edugate.heanet.ie/rr3/p/page/HEAnetInternalEC</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T04:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://edugate.heanet.ie/rr3/p/page/HEAnetInternalEC</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heanet.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HEAnet Staff</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
+        <mdui:Logo height="82" width="200" xml:lang="en">data:image/png;base64,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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
+        <mdui:DomainHint>heanet.ie</mdui:DomainHint>
+        <mdui:IPHint>193.1.228.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:770:f0:10::/64</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heanet.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">HEAnet Staff</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
-          <mdui:Logo height="82" width="200" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
-          <mdui:DomainHint>heanet.ie</mdui:DomainHint>
-          <mdui:IPHint>193.1.228.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:770:f0:10::/64</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmhlYW5ldC5pZTAeFw0xMDA0MzAxMDU0MzZaFw0z
 MDA0MzAxMDU0MzZaMBgxFjAUBgNVBAMTDWlkcC5oZWFuZXQuaWUwggEiMA0GCSqG
@@ -51,35 +51,35 @@ O1D15tXmi7abFTXObJbvnNrQZJ4+wZAk+wGIfjEd5uKGIMgxET35RJLoUcgQnVxe
 Z0nveWuA2Iu/d6B+48I2J+I0vto6XneJrsVIt8MovKtbjFRs0fAZoD+UtthT+ZVz
 rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.heanet.ie/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.heanet.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HEAnet Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Glenn Wearen</md:SurName>
-      <md:EmailAddress>mailto:glenn.wearen@heanet.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Janusz Ulanowski</md:SurName>
-      <md:EmailAddress>mailto:janusz.ulanowski@heanet.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NOC</md:SurName>
-      <md:EmailAddress>mailto:noc-middleware@heanet.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.heanet.ie/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.heanet.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HEAnet Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Glenn Wearen</md:SurName>
+    <md:EmailAddress>mailto:glenn.wearen@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Janusz Ulanowski</md:SurName>
+    <md:EmailAddress>mailto:janusz.ulanowski@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc-middleware@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml b/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
index 98170027..97ca6f0d 100644
--- a/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
+++ b/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hebis.de/uni-frankfurt">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-08-11T07:07:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-08-11T07:07:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Frankfurt</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Frankfurt</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.uni-frankfurt.de/de?locale=de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-frankfurt.de/en?locale=en</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Frankfurt</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Frankfurt</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of the Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.uni-frankfurt.de/de?locale=de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-frankfurt.de/en?locale=en</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGNzCCBR+gAwIBAgIHGFx3pTtgCDANBgkqhkiG9w0BAQsFADCBoTELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGNzCCBR+gAwIBAgIHGFx3pTtgCDANBgkqhkiG9w0BAQsFADCBoTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
 aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
 MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
@@ -58,32 +58,32 @@ ojbuWH+kSD4sRA5eWgtLj8nbBimO/IdsgB2Ytbl4azRwUl9EWALgzU8bk6sGx4y2
 DQXMmdFBkY9JHcxY7nGJXXGHQ26SFFV3dveQE+GAtG/jIFCsxm9D9NmVQxd9W3i5
 bRTKhSFui7ClOO0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ub.uni-frankfurt.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGNzCCBR+gAwIBAgIHGFx3pTtgCDANBgkqhkiG9w0BAQsFADCBoTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ub.uni-frankfurt.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGNzCCBR+gAwIBAgIHGFx3pTtgCDANBgkqhkiG9w0BAQsFADCBoTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
 aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
 MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
@@ -118,31 +118,31 @@ ojbuWH+kSD4sRA5eWgtLj8nbBimO/IdsgB2Ytbl4azRwUl9EWALgzU8bk6sGx4y2
 DQXMmdFBkY9JHcxY7nGJXXGHQ26SFFV3dveQE+GAtG/jIFCsxm9D9NmVQxd9W3i5
 bRTKhSFui7ClOO0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e35</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e35</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Johann Wolfgang Goethe-Universität Frankfurt am Main</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Johann Wolfgang Goethe-Universität Frankfurt am Main</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-frankfurt.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Axel</md:GivenName>
-      <md:SurName>Doerrer</md:SurName>
-      <md:EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Axel</md:GivenName>
-      <md:SurName>Doerrer</md:SurName>
-      <md:EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e35</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e35</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Johann Wolfgang Goethe-Universität Frankfurt am Main</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Johann Wolfgang Goethe-Universität Frankfurt am Main</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-frankfurt.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Axel</md:GivenName>
+    <md:SurName>Doerrer</md:SurName>
+    <md:EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Axel</md:GivenName>
+    <md:SurName>Doerrer</md:SurName>
+    <md:EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
index a4abe128..d84944af 100644
--- a/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hec.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-30T17:41:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-30T17:41:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HEC Paris</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUklEQVQoz2P8//8/AymAiSTVKBp+/v5z6sq9S7cfo6m4cf/ZqSt3v/34BeX/h4EfP3+JOWZHVkz9jwpKepdzWSS///wVwkXYwMTExMTEyMbKgmYDOxsLEyMjCxMTxX5ABv8ZGP79/w8JQHERfglhfkZGRogUI8Rlr99/Pnn5bmz1TH5eTi1F6c9fv3/+/vPPn78szEy83JxyEkJWBqrWBmo6KjIsh87ePHL+poy4kKaSNDsbi72JxoLGNAZGhr9//33/8evD52+NMzcs3nLk+ZuPNVPXLmhKY9FUkrQ1UmNkZPz95y8TEyMTIyMTEyMDAwMTCzMrDycfD6ekCD87G8vmSYX//v3/9/8/i6ggH5He5ePhpF4oEaXh9+8/7Kysv37/QVPx8/cfbk72nzBxRnhq/ffv/5fvP5gYGXm4OJA1fP3+8+/ff9xc7MxMTCgaiAQAn/KfpHDvcnoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.hec.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">hec.fr</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">HEC Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">hec.fr</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">HEC Paris</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUklEQVQoz2P8//8/AymAiSTVKBp+/v5z6sq9S7cfo6m4cf/ZqSt3v/34BeX/h4EfP3+JOWZHVkz9jwpKepdzWSS///wVwkXYwMTExMTEyMbKgmYDOxsLEyMjCxMTxX5ABv8ZGP79/w8JQHERfglhfkZGRogUI8Rlr99/Pnn5bmz1TH5eTi1F6c9fv3/+/vPPn78szEy83JxyEkJWBqrWBmo6KjIsh87ePHL+poy4kKaSNDsbi72JxoLGNAZGhr9//33/8evD52+NMzcs3nLk+ZuPNVPXLmhKY9FUkrQ1UmNkZPz95y8TEyMTIyMTEyMDAwMTCzMrDycfD6ekCD87G8vmSYX//v3/9/8/i6ggH5He5ePhpF4oEaXh9+8/7Kysv37/QVPx8/cfbk72nzBxRnhq/ffv/5fvP5gYGXm4OJA1fP3+8+/ff9xc7MxMTCgaiAQAn/KfpHDvcnoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.hec.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">hec.fr</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">HEC Paris</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">hec.fr</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFDCCAfygAwIBAgIVAIBa5+GwoumXjRKqli33Kv809ka2MA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oZWMuZnIwHhcNMTQwNTI2MTI1MjQ1WhcNMzQw
 NTI2MTI1MjQ1WjAVMRMwEQYDVQQDEwppZHAuaGVjLmZyMIIBIjANBgkqhkiG9w0B
@@ -40,21 +40,21 @@ E78mIpl/HazMsw7Hi5drLGi5hl0D4QWg1FlCtEdQlLizzwTA1fQpFR4B8V7Pi7BD
 urLe9BfmSB9pKYM38V5hbcPoZWXMHASiOsWem0KLofPQe+uLd3SS//aqJJy7tWna
 yR8iVSZb+1XrsdYfsXmZIJjw/OfeN3eA
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hec.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hec.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hec.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HEC Paris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">HEC Paris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hec.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sysrxadm@hec.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hec.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hec.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hec.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HEC Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEC Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hec.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sysrxadm@hec.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.herts.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.herts.ac.uk-shibboleth.xml
index 2f9cd67d..3a0f9357 100644
--- a/swamid-interfederations-2.0/idp.herts.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.herts.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.herts.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herts.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/herts.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/herts.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Hertfordshire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.herts.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/herts.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/herts.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Hertfordshire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.herts.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
index 2c903070..d75e621b 100644
--- a/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hesam.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-04-22T13:40:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-04-22T13:40:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hesam.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACTUlEQVQozy2RTW9UdRjFz3nuvZ25M50OgynQaYxsWCklIRC1hLelrYatW2JMXLLgA1Bd6I7vYWTDBzCmISFpTdRahAJlBtJO36S2vfPWmft/jovp4iRn8cs5OTl0d5CAUyaCAuiAQR5oEQBBECmJJI0gFAgDAAnASKJFcMFBJykZSQCUhBNqlO1A7AgKaLVaQ2GsVA7SYHA8ffqDUlqIgRyIBZCATCAJQ4QIhULS39mOtzaSQjw8aPsnHyM9Y0IsBfKkgeSordPpkTx35izJLMvK5XKSJAA46A/NLEoAt9EQR7CjTjeOARwHL46PHw/zJImLQkRYt58t/PD94uKTYP587cXe7nZ4/Et3eTFN04P/3tcqpXdr/zRfPNt4+SoyCIhhUa1Wfba6svrH30t//X7p08+/u3ghipNWs/ngpx+vXL5arUy8aa43Gut3734zOztrvU7/5q1rc/Pzr96sl4rp1FQ9+fB84c+nr3/7tbm9u7b2/ObtG1/OfTUzM9Nutx3CcNBtS5mrJ63sH+5K7tL+fke+1Hi3etBuuw6zo9bG5sFhJhdzhajRwNu3qE9iLPWdzZBWh+W01OurPsluX9MfkZEACqJzsLq89cWsTU7ZeMWHvbhYFfL8372x+rRNnc9+flS7f+/UwkNIBEXEUe1c5etvhaDsSJWJqFrJ9/bGPHB8gowm7swVP7tOAKDolFESBDloDhpCLosIQkIekMSgC0bkUCyCrkCYIxgijH6DOWSg4AAIA9xBAwEYYRA4ooUAG+0DwBN65AlB0v/Y2TfAeC+JywAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMyswMjowMGtf30gAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzMrMDI6MDAaAmf0AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hesam.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACTUlEQVQozy2RTW9UdRjFz3nuvZ25M50OgynQaYxsWCklIRC1hLelrYatW2JMXLLgA1Bd6I7vYWTDBzCmISFpTdRahAJlBtJO36S2vfPWmft/jovp4iRn8cs5OTl0d5CAUyaCAuiAQR5oEQBBECmJJI0gFAgDAAnASKJFcMFBJykZSQCUhBNqlO1A7AgKaLVaQ2GsVA7SYHA8ffqDUlqIgRyIBZCATCAJQ4QIhULS39mOtzaSQjw8aPsnHyM9Y0IsBfKkgeSordPpkTx35izJLMvK5XKSJAA46A/NLEoAt9EQR7CjTjeOARwHL46PHw/zJImLQkRYt58t/PD94uKTYP587cXe7nZ4/Et3eTFN04P/3tcqpXdr/zRfPNt4+SoyCIhhUa1Wfba6svrH30t//X7p08+/u3ghipNWs/ngpx+vXL5arUy8aa43Gut3734zOztrvU7/5q1rc/Pzr96sl4rp1FQ9+fB84c+nr3/7tbm9u7b2/ObtG1/OfTUzM9Nutx3CcNBtS5mrJ63sH+5K7tL+fke+1Hi3etBuuw6zo9bG5sFhJhdzhajRwNu3qE9iLPWdzZBWh+W01OurPsluX9MfkZEACqJzsLq89cWsTU7ZeMWHvbhYFfL8372x+rRNnc9+flS7f+/UwkNIBEXEUe1c5etvhaDsSJWJqFrJ9/bGPHB8gowm7swVP7tOAKDolFESBDloDhpCLosIQkIekMSgC0bkUCyCrkCYIxgijH6DOWSg4AAIA9xBAwEYYRA4ooUAG+0DwBN65AlB0v/Y2TfAeC+JywAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMyswMjowMGtf30gAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzMrMDI6MDAaAmf0AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
 MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
@@ -37,23 +37,23 @@ fJe5PTSZ3SGmR0yPPTVQpLqbYLVdWBhE46JP84qFZlsZomBnoVRlCSURARHgJIcF
 q4+smXBAWAFRltJUEQ7hjQKaNCKApYnAdWReOTEhkMkVZZNqbkFYSSeQ1cxlabLV
 3usSDArcclPgsgS25qfJ4XUmUJadJhyAZIJ9zluU0Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hesam.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hesam.eu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hesam.eu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hesam.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hesam.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hesam.eu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hesam.eu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hesam.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
 MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
@@ -72,19 +72,19 @@ fJe5PTSZ3SGmR0yPPTVQpLqbYLVdWBhE46JP84qFZlsZomBnoVRlCSURARHgJIcF
 q4+smXBAWAFRltJUEQ7hjQKaNCKApYnAdWReOTEhkMkVZZNqbkFYSSeQ1cxlabLV
 3usSDArcclPgsgS25qfJ4XUmUJadJhyAZIJ9zluU0Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hesam.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-paris1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-paris1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hesam.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-paris1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-paris1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
index 5f9c70a9..061cfeda 100644
--- a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hig.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
+        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hig.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
+        <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
-          <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>hig.se</mdui:DomainHint>
-          <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
-          <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
-          <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
 OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
@@ -56,26 +56,26 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
 +eeRni4ggtByVTzg9fALQjDJydWcw0Oy
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
 OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
@@ -95,36 +95,36 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
 +eeRni4ggtByVTzg9fALQjDJydWcw0Oy
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HIG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>University of Gävle</md:Company>
-      <md:SurName>Network Operations</md:SurName>
-      <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Gävle</md:Company>
-      <md:SurName>Operations</md:SurName>
-      <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Gävle</md:Company>
-      <md:SurName>IT Support</md:SurName>
-      <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HIG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Gävle</md:Company>
+    <md:SurName>Network Operations</md:SurName>
+    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Gävle</md:Company>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Gävle</md:Company>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml
index b1d5940b..016ae98c 100644
--- a/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.highbury.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-20T12:09:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-20T12:09:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">highbury.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">highbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUQBVfv1Tnt7N17RL6y6sE8mngYOYwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aDIuaGlnaGJ1cnkuYWMudWswHhcNMTQx
 						MjE3MDk0NDEzWhcNMjQxMjE3MDk0NDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
@@ -32,26 +32,26 @@
 						++RNvHw5/Gy8oAgdLUWga8jTEy9814Omh+CZ1aD57edykSPBYqVgPbp4+qe6qHjP
 						W7hlXIP3zSHP9R17i+v25+UsbOTujB09Q1480Yte2Urglnv7umRs
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.highbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">highbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.highbury.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">highbury.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUQBVfv1Tnt7N17RL6y6sE8mngYOYwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aDIuaGlnaGJ1cnkuYWMudWswHhcNMTQx
 						MjE3MDk0NDEzWhcNMjQxMjE3MDk0NDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
@@ -71,31 +71,31 @@
 						++RNvHw5/Gy8oAgdLUWga8jTEy9814Omh+CZ1aD57edykSPBYqVgPbp4+qe6qHjP
 						W7hlXIP3zSHP9R17i+v25+UsbOTujB09Q1480Yte2Urglnv7umRs
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Highbury College, Portsmouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Highbury College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.highbury.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Butcher</md:SurName>
-      <md:EmailAddress>mailto:paul.butcher@highbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>College IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@highbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Whitehead</md:SurName>
-      <md:EmailAddress>mailto:ian.whitehead@highbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Highbury College, Portsmouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Highbury College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.highbury.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Butcher</md:SurName>
+    <md:EmailAddress>mailto:paul.butcher@highbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>College IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@highbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Whitehead</md:SurName>
+    <md:EmailAddress>mailto:ian.whitehead@highbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
index 15ebc63e..9d900fe7 100644
--- a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.his.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">his.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.his.se/en/</mdui:InformationURL>
+        <mdui:Logo height="196" width="193">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="196" width="206">https://idp.his.se/his_se_rubin.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="196" width="193">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">skövde his</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">skövde his</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>his.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.176.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.184.0/23</mdui:IPHint>
+        <mdui:IPHint>193.11.96.0/22</mdui:IPHint>
+        <mdui:IPHint>212.25.128.0/23</mdui:IPHint>
+        <mdui:IPHint>212.25.134.0/23</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.39,13.85</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:58.39412,13.85542</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">his.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.his.se/en/</mdui:InformationURL>
-          <mdui:Logo height="196" width="193">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="196" width="206">https://idp.his.se/his_se_rubin.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="196" width="193">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">skövde his</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">skövde his</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>his.se</mdui:DomainHint>
-          <mdui:IPHint>193.10.176.0/21</mdui:IPHint>
-          <mdui:IPHint>193.10.184.0/23</mdui:IPHint>
-          <mdui:IPHint>193.11.96.0/22</mdui:IPHint>
-          <mdui:IPHint>212.25.128.0/23</mdui:IPHint>
-          <mdui:IPHint>212.25.134.0/23</mdui:IPHint>
-          <mdui:GeolocationHint>geo:58.39,13.85</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:58.39412,13.85542</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
 NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
@@ -55,26 +55,26 @@ hNY1IDFKGebFhCWmlG7MMPDm/omu6mBurSE9EAhVTretr0YXxmkfFrOvDysPOYWj
 drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">his.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.his.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.his.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">his.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
 NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
@@ -94,36 +94,36 @@ hNY1IDFKGebFhCWmlG7MMPDm/omu6mBurSE9EAhVTretr0YXxmkfFrOvDysPOYWj
 drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HIS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Skövde</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.his.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>University of Skövde</md:Company>
-      <md:SurName>HiS Netadmin</md:SurName>
-      <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Skövde</md:Company>
-      <md:SurName>HiS Netadmin</md:SurName>
-      <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Skövde</md:Company>
-      <md:SurName>IT Helpdesk Högskolan i Skövde</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@his.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Skövde</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.his.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Skövde</md:Company>
+    <md:SurName>HiS Netadmin</md:SurName>
+    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Skövde</md:Company>
+    <md:SurName>HiS Netadmin</md:SurName>
+    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Skövde</md:Company>
+    <md:SurName>IT Helpdesk Högskolan i Skövde</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@his.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml
index 8254b977..238adf4b 100644
--- a/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hiu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-01-20T09:24:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-01-20T09:24:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of History of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Historický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IH AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance HÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.hiu.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.hiu.cas.cz/cs/</mdui:InformationURL>
+        <mdui:Logo height="44" width="61">https://jiftach.cas.cz/loga/logo-hiu-44.png</mdui:Logo>
+        <mdui:Logo height="530" width="740">https://jiftach.cas.cz/loga/logo-hiu-530.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of History of the ASCR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Historický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IH AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance HÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.hiu.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.hiu.cas.cz/cs/</mdui:InformationURL>
-          <mdui:Logo height="44" width="61">https://jiftach.cas.cz/loga/logo-hiu-44.png</mdui:Logo>
-          <mdui:Logo height="530" width="740">https://jiftach.cas.cz/loga/logo-hiu-530.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAI8MkDWeW/BNLq24Uo6mRe3luCklMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5oaXUuY2FzLmN6MB4XDTE0MDgxNDA2MjM1OFoX
 DTM0MDgxNDA2MjM1OFowGTEXMBUGA1UEAxMOaWRwLmhpdS5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ OrR2dRjjHPiKAaxqQ8S7GY25pTYIn0Fz/3MlEV86VP7ez+9WT5sV8+teCDiFcQLj
 InEf51JhjceyxF/6DmYwakFJHeZ4IPBQMBAy2Z02wwmKDQ/ESYAWig==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hiu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hiu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAI8MkDWeW/BNLq24Uo6mRe3luCklMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5oaXUuY2FzLmN6MB4XDTE0MDgxNDA2MjM1OFoX
 DTM0MDgxNDA2MjM1OFowGTEXMBUGA1UEAxMOaWRwLmhpdS5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ OrR2dRjjHPiKAaxqQ8S7GY25pTYIn0Fz/3MlEV86VP7ez+9WT5sV8+teCDiFcQLj
 InEf51JhjceyxF/6DmYwakFJHeZ4IPBQMBAy2Z02wwmKDQ/ESYAWig==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of History of the ASCR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Historický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of History of the ASCR, Public Research Institution</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Historický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hiu.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.hiu.cas.cz/cs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of History of the ASCR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Historický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of History of the ASCR, Public Research Institution</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Historický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hiu.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.hiu.cas.cz/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
index d9425483..3b66c142 100644
--- a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hkr.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hkr.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
+        <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hkr.se</mdui:DomainHint>
+        <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
+        <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
+        <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hkr.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
-          <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>hkr.se</mdui:DomainHint>
-          <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
-          <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
-          <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
-          <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
@@ -59,26 +59,26 @@ qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
 kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hkr.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hkr.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
@@ -99,37 +99,37 @@ qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
 kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HKR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.hkr.se</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Högskolan Kristianstad</md:Company>
-      <md:SurName>Service desk 3030</md:SurName>
-      <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Högskolan Kristianstad</md:Company>
-      <md:SurName>Service desk 3030</md:SurName>
-      <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Högskolan Kristianstad</md:Company>
-      <md:SurName>Service desk 3030</md:SurName>
-      <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HKR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hkr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Högskolan Kristianstad</md:Company>
+    <md:SurName>Service desk 3030</md:SurName>
+    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Högskolan Kristianstad</md:Company>
+    <md:SurName>Service desk 3030</md:SurName>
+    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Högskolan Kristianstad</md:Company>
+    <md:SurName>Service desk 3030</md:SurName>
+    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml
index c34b5721..073f01c3 100644
--- a/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.holborncollege.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holborncollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holborncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/holborncollege.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/holborncollege.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Holborn College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.holborncollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/holborncollege.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/holborncollege.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Holborn College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.holborncollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml
index 11ba01df..67f75565 100644
--- a/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.holycross.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T11:07:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T11:07:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holycross.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holycross.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjwCCQDPBZyVuDlkujANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTGFuY2FzaGlyZTENMAsGA1UEBxMEQnVyeTEbMBkGA1UEChMS
 						SG9seSBDcm9zcyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuaG9seWNyb3NzLmFjLnVr
@@ -32,26 +32,26 @@
 						WWZqc/Tnz6A60KnEbChH/UnymSArytLz6Zfk47Xzxs+Mq9NzPZ9XPif+Dw04pm69
 						qAp30iOD9pcAPq2kyLUGxrT4XraJjaw/JV+lVPY6QYCcJoj0kKteRA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.holycross.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holycross.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.holycross.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holycross.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjwCCQDPBZyVuDlkujANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTGFuY2FzaGlyZTENMAsGA1UEBxMEQnVyeTEbMBkGA1UEChMS
 						SG9seSBDcm9zcyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuaG9seWNyb3NzLmFjLnVr
@@ -71,27 +71,27 @@
 						WWZqc/Tnz6A60KnEbChH/UnymSArytLz6Zfk47Xzxs+Mq9NzPZ9XPif+Dw04pm69
 						qAp30iOD9pcAPq2kyLUGxrT4XraJjaw/JV+lVPY6QYCcJoj0kKteRA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Holy Cross College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Holy Cross College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.holycross.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:raw@holycross.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:raw@holycross.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Holy Cross College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Holy Cross College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.holycross.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:raw@holycross.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:raw@holycross.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
index 0bd9d343..2c2cc34a 100644
--- a/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.howcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-16T10:12:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-16T10:12:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">howcollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Heart of Worcestershire College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Bromsgrove, Redditch and Worcester campuses</mdui:Description>
+        <mdui:Logo height="60" width="60">https://idp.howcollege.ac.uk/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">howcollege.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Heart of Worcestershire College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Bromsgrove, Redditch and Worcester campuses</mdui:Description>
-          <mdui:Logo height="60" width="60">https://idp.howcollege.ac.uk/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUIV/bMP5LUHhSHK2H/ftaUcnV+bswDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
 						ODMxWhcNMzUwNzExMDkyODMxWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
@@ -37,13 +37,13 @@
 						R52x5YYvbFA6i2Y+iO7O16yCyP08ufkCs8RPqJTaSUCyK1LMAYPln7IwmTvXdwJs
 						MSdGAdy5DQAjICnCqVDR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUVFOr40s9jvy9xnBpp6lJY7DLRdcwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
 						ODMwWhcNMzUwNzExMDkyODMwWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
@@ -63,13 +63,13 @@
 						DB5yJZ2YZkqn58Fmt6GuX8Hl+gVvHtVn1/iQvLAawKOPlqoMHOdbgsgqmIH98hFW
 						3ZQeGMhHjAVi/GYJNeCA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVALdi+04fUwNvm/vp9Breq3GSxYrsMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFGlkcC5ob3djb2xsZWdlLmFjLnVrMB4XDTE1MDcxMTA5
 						MjgzMVoXDTM1MDcxMTA5MjgzMVowHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2Uu
@@ -89,26 +89,26 @@
 						YiJSWzeJD6IRS7rBo04zbII63+d/IqWEtWpumfHi4tcbBZJa8pLs30YrcPzpNtq9
 						iI5BW+3hvx2Iw5bpU//9+g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.howcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">howcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.howcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">howcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUIV/bMP5LUHhSHK2H/ftaUcnV+bswDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
 						ODMxWhcNMzUwNzExMDkyODMxWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
@@ -128,13 +128,13 @@
 						R52x5YYvbFA6i2Y+iO7O16yCyP08ufkCs8RPqJTaSUCyK1LMAYPln7IwmTvXdwJs
 						MSdGAdy5DQAjICnCqVDR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUVFOr40s9jvy9xnBpp6lJY7DLRdcwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
 						ODMwWhcNMzUwNzExMDkyODMwWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
@@ -154,13 +154,13 @@
 						DB5yJZ2YZkqn58Fmt6GuX8Hl+gVvHtVn1/iQvLAawKOPlqoMHOdbgsgqmIH98hFW
 						3ZQeGMhHjAVi/GYJNeCA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVALdi+04fUwNvm/vp9Breq3GSxYrsMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFGlkcC5ob3djb2xsZWdlLmFjLnVrMB4XDTE1MDcxMTA5
 						MjgzMVoXDTM1MDcxMTA5MjgzMVowHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2Uu
@@ -180,23 +180,23 @@
 						YiJSWzeJD6IRS7rBo04zbII63+d/IqWEtWpumfHi4tcbBZJa8pLs30YrcPzpNtq9
 						iI5BW+3hvx2Iw5bpU//9+g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Heart of Worcestershire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.howcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:ITServices@howcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Edmund</md:GivenName>
-      <md:SurName>Haworth</md:SurName>
-      <md:EmailAddress>mailto:EHaworth@howcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Heart of Worcestershire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.howcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:ITServices@howcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Edmund</md:GivenName>
+    <md:SurName>Haworth</md:SurName>
+    <md:EmailAddress>mailto:EHaworth@howcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml
index 7a607d71..c43b2b51 100644
--- a/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-emden-leer.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-12-02T06:52:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/ndsidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-12-02T06:52:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/ndsidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-emden-leer.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Emden/Leer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Emden/Leer</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IDP der Hochschule Emden/Leer</mdui:Description>
+        <mdui:Description xml:lang="en">IDP of the University of Applied Sciences Emden/Leer</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-emden-leer.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Hochschule Emden/Leer</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Applied Sciences Emden/Leer</mdui:DisplayName>
-          <mdui:Description xml:lang="de">IDP der Hochschule Emden/Leer</mdui:Description>
-          <mdui:Description xml:lang="en">IDP of the University of Applied Sciences Emden/Leer</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.hs-emden-leer.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.hs-emden-leer.de,OU=Rechenzentrum,O=Hochschule Emden/Leer,L=Emden,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF8TCCBNmgAwIBAgIHF2YO9TQKfTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.hs-emden-leer.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.hs-emden-leer.de,OU=Rechenzentrum,O=Hochschule Emden/Leer,L=Emden,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF8TCCBNmgAwIBAgIHF2YO9TQKfTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQG
 EwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjEeMBwGA1UEChMVSG9jaHNjaHVs
 ZSBFbWRlbi9MZWVyMREwDwYDVQQDEwhIUy1FTCBDQTEjMCEGCSqGSIb3DQEJARYU
 cGtpQGhzLWVtZGVuLWxlZXIuZGUwHhcNMTQwNDEwMTI0MTA5WhcNMTkwNDA5MTI0
@@ -59,32 +59,32 @@ yTPWiLOgIi1biiQXbGPjdeqb4MkrORRXsJTzKMj/RzxrSbFOHVG2dRXGkNDgJfFC
 KI6KoWF8UHUJ0CfutHB1PxWjIcbGGFTglnIcdQRo/N228uw++vAhj5+DdEG6JiQj
 IM1biUq8Xi0kRMiKUCmA6SItkZNrtAgav/JmjITPj8vFR7/JzQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-emden-leer.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-emden-leer.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.hs-emden-leer.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.hs-emden-leer.de,OU=Rechenzentrum,O=Hochschule Emden/Leer,L=Emden,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF8TCCBNmgAwIBAgIHF2YO9TQKfTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-emden-leer.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-emden-leer.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.hs-emden-leer.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.hs-emden-leer.de,OU=Rechenzentrum,O=Hochschule Emden/Leer,L=Emden,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF8TCCBNmgAwIBAgIHF2YO9TQKfTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQG
 EwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjEeMBwGA1UEChMVSG9jaHNjaHVs
 ZSBFbWRlbi9MZWVyMREwDwYDVQQDEwhIUy1FTCBDQTEjMCEGCSqGSIb3DQEJARYU
 cGtpQGhzLWVtZGVuLWxlZXIuZGUwHhcNMTQwNDEwMTI0MTA5WhcNMTkwNDA5MTI0
@@ -117,31 +117,31 @@ yTPWiLOgIi1biiQXbGPjdeqb4MkrORRXsJTzKMj/RzxrSbFOHVG2dRXGkNDgJfFC
 KI6KoWF8UHUJ0CfutHB1PxWjIcbGGFTglnIcdQRo/N228uw++vAhj5+DdEG6JiQj
 IM1biUq8Xi0kRMiKUCmA6SItkZNrtAgav/JmjITPj8vFR7/JzQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e391</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e391</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Hochschule Emden/Leer</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Emden/Leer</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.hs-emden-leer.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hs-emden-leer.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nils</md:GivenName>
-      <md:SurName>van Loh</md:SurName>
-      <md:EmailAddress>mailto:nils.van.loh@hs-emden-leer.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nils</md:GivenName>
-      <md:SurName>van Loh</md:SurName>
-      <md:EmailAddress>mailto:nils.van.loh@hs-emden-leer.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e391</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e391</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Hochschule Emden/Leer</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Emden/Leer</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.hs-emden-leer.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hs-emden-leer.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nils</md:GivenName>
+    <md:SurName>van Loh</md:SurName>
+    <md:EmailAddress>mailto:nils.van.loh@hs-emden-leer.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nils</md:GivenName>
+    <md:SurName>van Loh</md:SurName>
+    <md:EmailAddress>mailto:nils.van.loh@hs-emden-leer.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
index 143500cf..1402a365 100644
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-esslingen.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-04T16:29:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-04T16:29:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Esslingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Esslingen University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
+        <mdui:Description xml:lang="en">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www2.hs-esslingen.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="89" width="210">https://www2.hs-esslingen.de/rz/images/he_logo_gross_dfn-aai-metadaten.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.hs-esslingen.de/de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hs-esslingen.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Hochschule Esslingen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Esslingen University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
-          <mdui:Description xml:lang="en">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www2.hs-esslingen.de/favicon.ico</mdui:Logo>
-          <mdui:Logo height="89" width="210">https://www2.hs-esslingen.de/rz/images/he_logo_gross_dfn-aai-metadaten.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.hs-esslingen.de/de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hs-esslingen.de/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGATCCBOmgAwIBAgIHGIM+H7hHgTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGATCCBOmgAwIBAgIHGIM+H7hHgTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQG
 EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
 Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MTExMjIwMTgy
 M1oXDTE3MTExMTIwMTgyM1owgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
@@ -64,30 +64,30 @@ qo2dqCB91xOpkmTY3B0c2ppcAFLXOR7W3a3w2lkV7otX8NQsC1uii+UcYfrbrxS0
 DLo4uxN9cGPqt+1YQpfWvvCc9JewYHekdpNhoH6Wdw5C8MUq8TDRK3FFy0IpJKS/
 AZ2Qfhc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-esslingen.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGATCCBOmgAwIBAgIHGIM+H7hHgTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-esslingen.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGATCCBOmgAwIBAgIHGIM+H7hHgTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQG
 EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
 Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MTExMjIwMTgy
 M1oXDTE3MTExMTIwMTgyM1owgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
@@ -121,31 +121,31 @@ qo2dqCB91xOpkmTY3B0c2ppcAFLXOR7W3a3w2lkV7otX8NQsC1uii+UcYfrbrxS0
 DLo4uxN9cGPqt+1YQpfWvvCc9JewYHekdpNhoH6Wdw5C8MUq8TDRK3FFy0IpJKS/
 AZ2Qfhc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e192</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e192</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Hochschule Esslingen</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Schmid</md:SurName>
-      <md:EmailAddress>mailto:admin@hs-esslingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>HE AAI</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:aai-support@hs-esslingen.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e192</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e192</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Hochschule Esslingen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Schmid</md:SurName>
+    <md:EmailAddress>mailto:admin@hs-esslingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HE AAI</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:aai-support@hs-esslingen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml
index 4f3db75f..88618c0c 100644
--- a/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-karlsruhe.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-05-31T12:34:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-05-31T12:34:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-karlsruhe.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Karlsruhe</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Hochschule Karlsruhe</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of University of Applied Sciences Karlsruhe</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_favicon.jpg</mdui:Logo>
+        <mdui:Logo height="80" width="232">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_RGB_small.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.hs-karlsruhe.de/impressum.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.hs-karlsruhe.de/en/footer-navigation/legal-notice.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-karlsruhe.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Applied Sciences Karlsruhe</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Hochschule Karlsruhe</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of University of Applied Sciences Karlsruhe</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_favicon.jpg</mdui:Logo>
-          <mdui:Logo height="80" width="232">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_RGB_small.jpg</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.hs-karlsruhe.de/impressum.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.hs-karlsruhe.de/en/footer-navigation/legal-notice.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
 bHNydWhlMTYwNAYDVQQKEy1Ib2Noc2NodWxlIEthcmxzcnVoZSAtIFRlY2huaWsg
 dW5kIFdpcnRzY2hhZnQxEDAOBgNVBAMTB0hTS0EtQ0ExJDAiBgkqhkiG9w0BCQEW
@@ -67,30 +67,30 @@ fDwQtyU0j2ANmOeoI5qsSO+dr5Kpl8OVqM2kRKF6YCPAHsT0B4944/uhtLPj8+jC
 HauQDCp2XZgqAAGn3j+JVQ8JrIga6WTi0LahPGjMjCFhtjJ65cIQZ6eHv0lXb7ly
 fSqu+5mEPB9XF5S/2w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-karlsruhe.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-karlsruhe.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
 bHNydWhlMTYwNAYDVQQKEy1Ib2Noc2NodWxlIEthcmxzcnVoZSAtIFRlY2huaWsg
 dW5kIFdpcnRzY2hhZnQxEDAOBgNVBAMTB0hTS0EtQ0ExJDAiBgkqhkiG9w0BCQEW
@@ -125,35 +125,35 @@ fDwQtyU0j2ANmOeoI5qsSO+dr5Kpl8OVqM2kRKF6YCPAHsT0B4944/uhtLPj8+jC
 HauQDCp2XZgqAAGn3j+JVQ8JrIga6WTi0LahPGjMjCFhtjJ65cIQZ6eHv0lXb7ly
 fSqu+5mEPB9XF5S/2w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e339</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e339</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Karlsruhe</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.hs-karlsruhe.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hs-karlsruhe.de/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>User</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Günther</md:GivenName>
-      <md:SurName>Schreiner</md:SurName>
-      <md:EmailAddress>mailto:guenther.schreiner@hs-karlsruhe.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e339</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e339</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Karlsruhe</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.hs-karlsruhe.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hs-karlsruhe.de/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>User</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Günther</md:GivenName>
+    <md:SurName>Schreiner</md:SurName>
+    <md:EmailAddress>mailto:guenther.schreiner@hs-karlsruhe.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
index 645a0080..9400584c 100644
--- a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-03T15:19:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://hotline.hslu.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-03T15:19:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">HSLU - Hochschule Luzern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Hochschule Luzern</mdui:Description>
+        <mdui:Description xml:lang="en">Lucerne University of Applied Sciences and Arts</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAADVJREFUeJxi+P//PwMlmCLN1DHAxcXlPyV4OBgw8LGQNnPmf2LxcDVg4GOBUgMAAAAA//8DAA5inxcVtjGTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAt8SURBVHic7JmHV5RXGsbzz2Sz2c2m7e7ZmE1MTGJiw4KoUYMtRhHUYIkxqFEjRqOigEBAaSIdpAxlaENvAwxl6L333ssMsr/vu2RETPacJEpykPfcM+fO+917v/e597lvmXlh5jmTF/5oAxZalgAvdlkCvNhlCfBilyXAi12WAC92eV4Bd/f2dfX0/qqZja1tE5OTTW3t4xOTQtM/OPRLgweHh0fHxqZ0uicfqQu0AQrlr3r175FZwLmFxXlFJUPDI02t7XVNzZW19dn5RTUNTbEpGdX1jZl5BblFJdGJqe1d3clZuQUl5UyJTEjuHxiMT83kUWRCSllVLZ2SyurGljamM7GqriFNrQFPUVmltrwyIiEZZUVNHQN6+wdGRsfi07JKq2pc/YIZ+QcAVudrG5pbMSIsVuUTGjk8MuoREBoYEROlSgF8VGJKem6+d0iE0z0/xjAF/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://english.hslu.ch/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.hslu.ch/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>147.88.219.232/29</mdui:IPHint>
+        <mdui:IPHint>147.88.220.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.221.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.217.218/31</mdui:IPHint>
+        <mdui:IPHint>147.88.222.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.224.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.225.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.226.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.228.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.230.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.231.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.232.0/22</mdui:IPHint>
+        <mdui:IPHint>147.88.236.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.237.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.217.220/30</mdui:IPHint>
+        <mdui:IPHint>147.88.217.224/27</mdui:IPHint>
+        <mdui:IPHint>147.88.238.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.218.0/25</mdui:IPHint>
+        <mdui:IPHint>147.88.240.0/21</mdui:IPHint>
+        <mdui:IPHint>147.88.254.64/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.72/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.80/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.96/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.112/29</mdui:IPHint>
+        <mdui:IPHint>2001:620:110::/48</mdui:IPHint>
+        <mdui:IPHint>147.88.218.128/25</mdui:IPHint>
+        <mdui:IPHint>147.88.219.200/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.208/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.216/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.224/29</mdui:IPHint>
+        <mdui:IPHint>147.88.0.0/16</mdui:IPHint>
+        <mdui:IPHint>147.88.216.0/26</mdui:IPHint>
+        <mdui:IPHint>147.88.217.0/25</mdui:IPHint>
+        <mdui:DomainHint>hslu.ch</mdui:DomainHint>
+        <mdui:DomainHint>hochschuleluzern.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.046681,8.314912</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.013434,8.305034</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.174274,8.512537</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.060845,8.322106</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.048388,8.309762</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.048096,8.314655</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.054246,8.295853</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://hotline.hslu.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">HSLU - Hochschule Luzern</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Hochschule Luzern</mdui:Description>
-          <mdui:Description xml:lang="en">Lucerne University of Applied Sciences and Arts</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAADVJREFUeJxi+P//PwMlmCLN1DHAxcXlPyV4OBgw8LGQNnPmf2LxcDVg4GOBUgMAAAAA//8DAA5inxcVtjGTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAt8SURBVHic7JmHV5RXGsbzz2Sz2c2m7e7ZmE1MTGJiw4KoUYMtRhHUYIkxqFEjRqOigEBAaSIdpAxlaENvAwxl6L333ssMsr/vu2RETPacJEpykPfcM+fO+917v/e597lvmXlh5jmTF/5oAxZalgAvdlkCvNhlCfBilyXAi12WAC92eV4Bd/f2dfX0/qqZja1tE5OTTW3t4xOTQtM/OPRLgweHh0fHxqZ0uicfqQu0AQrlr3r175FZwLmFxXlFJUPDI02t7XVNzZW19dn5RTUNTbEpGdX1jZl5BblFJdGJqe1d3clZuQUl5UyJTEjuHxiMT83kUWRCSllVLZ2SyurGljamM7GqriFNrQFPUVmltrwyIiEZZUVNHQN6+wdGRsfi07JKq2pc/YIZ+QcAVudrG5pbMSIsVuUTGjk8MuoREBoYEROlSgF8VGJKem6+d0iE0z0/xjAF/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://english.hslu.ch/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="de">http://www.hslu.ch/</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>147.88.219.232/29</mdui:IPHint>
-          <mdui:IPHint>147.88.220.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.221.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.217.218/31</mdui:IPHint>
-          <mdui:IPHint>147.88.222.0/23</mdui:IPHint>
-          <mdui:IPHint>147.88.224.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.225.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.226.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.228.0/23</mdui:IPHint>
-          <mdui:IPHint>147.88.230.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.231.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.232.0/22</mdui:IPHint>
-          <mdui:IPHint>147.88.236.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.237.0/24</mdui:IPHint>
-          <mdui:IPHint>147.88.217.220/30</mdui:IPHint>
-          <mdui:IPHint>147.88.217.224/27</mdui:IPHint>
-          <mdui:IPHint>147.88.238.0/23</mdui:IPHint>
-          <mdui:IPHint>147.88.218.0/25</mdui:IPHint>
-          <mdui:IPHint>147.88.240.0/21</mdui:IPHint>
-          <mdui:IPHint>147.88.254.64/29</mdui:IPHint>
-          <mdui:IPHint>147.88.254.72/29</mdui:IPHint>
-          <mdui:IPHint>147.88.254.80/29</mdui:IPHint>
-          <mdui:IPHint>147.88.254.96/29</mdui:IPHint>
-          <mdui:IPHint>147.88.254.112/29</mdui:IPHint>
-          <mdui:IPHint>2001:620:110::/48</mdui:IPHint>
-          <mdui:IPHint>147.88.218.128/25</mdui:IPHint>
-          <mdui:IPHint>147.88.219.200/29</mdui:IPHint>
-          <mdui:IPHint>147.88.219.208/29</mdui:IPHint>
-          <mdui:IPHint>147.88.219.216/29</mdui:IPHint>
-          <mdui:IPHint>147.88.219.224/29</mdui:IPHint>
-          <mdui:IPHint>147.88.0.0/16</mdui:IPHint>
-          <mdui:IPHint>147.88.216.0/26</mdui:IPHint>
-          <mdui:IPHint>147.88.217.0/25</mdui:IPHint>
-          <mdui:DomainHint>hslu.ch</mdui:DomainHint>
-          <mdui:DomainHint>hochschuleluzern.ch</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:47.046681,8.314912</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.013434,8.305034</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.174274,8.512537</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.060845,8.322106</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.048388,8.309762</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.048096,8.314655</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:47.054246,8.295853</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
 FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -91,27 +91,27 @@ dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
 IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
 7uYGZFS62PnJbFAk9NvN1g==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hslu.ch/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hslu.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
 FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -130,31 +130,31 @@ dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
 IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
 7uYGZFS62PnJbFAk9NvN1g==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">hslu.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.hslu.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hslu.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-      <md:SurName>(Hotline)</md:SurName>
-      <md:EmailAddress>mailto:informatikhotline@hslu.ch</md:EmailAddress>
-      <md:TelephoneNumber>+41 41 228 21 21</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-      <md:SurName>(AAI Technician)</md:SurName>
-      <md:EmailAddress>mailto:aai@hslu.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">hslu.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.hslu.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hslu.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
+    <md:SurName>(Hotline)</md:SurName>
+    <md:EmailAddress>mailto:informatikhotline@hslu.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 41 228 21 21</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
+    <md:SurName>(AAI Technician)</md:SurName>
+    <md:EmailAddress>mailto:aai@hslu.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hud.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.hud.ac.uk-shibboleth.xml
index 1ce90d2f..a98ed4eb 100644
--- a/swamid-interfederations-2.0/idp.hud.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.hud.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hud.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hud.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hud.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hud.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hud.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Huddersfield - Athens</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hud.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hud.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hud.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Huddersfield - Athens</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hud.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml
index 3f8896f6..dfefbf0b 100644
--- a/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hughbaird.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-10T11:25:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-10T11:25:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hughbaird.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hughbaird.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIIX17eEDuOAj8wDQYJKoZIhvcNAQEFBQAwOzEbMBkGA1UE
 						CgwSSHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFj
 						LnVrMB4XDTEzMDgwODExMTEwMloXDTIzMDgwODExMTEwMlowOzEbMBkGA1UECgwS
@@ -37,13 +37,13 @@
 						jr+w28z0m4rA2ed7r3vvuceGFkOlSy+zp5DR3Nr6hGMCfDSuxVbJOuNpp/VzYyq/
 						sL1NJoJ0e626msAaAaxLyxiHxQ9bJI/Uu0We2Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIIX17eEDuOAj8wDQYJKoZIhvcNAQEFBQAwOzEbMBkGA1UE
 						CgwSSHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFj
 						LnVrMB4XDTEzMDgwODExMTEwMloXDTIzMDgwODExMTEwMlowOzEbMBkGA1UECgwS
@@ -63,25 +63,25 @@
 						jr+w28z0m4rA2ed7r3vvuceGFkOlSy+zp5DR3Nr6hGMCfDSuxVbJOuNpp/VzYyq/
 						sL1NJoJ0e626msAaAaxLyxiHxQ9bJI/Uu0We2Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hughbaird.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hughbaird.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hugh Baird College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hugh Baird College (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hughbaird.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Billington</md:SurName>
-      <md:EmailAddress>mailto:john.billington@hughbaird.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Billington</md:SurName>
-      <md:EmailAddress>mailto:john.billington@hughbaird.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hughbaird.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hughbaird.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hugh Baird College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hugh Baird College (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hughbaird.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Billington</md:SurName>
+    <md:EmailAddress>mailto:john.billington@hughbaird.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Billington</md:SurName>
+    <md:EmailAddress>mailto:john.billington@hughbaird.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
index 1dd5e4c5..b9c32a74 100644
--- a/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iadt.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-18T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-18T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iadt.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.iadt.ie</mdui:InformationURL>
+        <mdui:Logo height="101" width="151">https://edugate.heanet.ie/rr3/logos/iadt.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.2802499,-6.1539366</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iadt.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.iadt.ie</mdui:InformationURL>
-          <mdui:Logo height="101" width="151">https://edugate.heanet.ie/rr3/logos/iadt.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.2802499,-6.1539366</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVALmq0aeEnY2koINV+tGCDu0kV09pMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5pYWR0LmllMB4XDTA5MDQwODE0NDAyMFoXDTI5
 MDQwODE0NDAyMFowFjEUMBIGA1UEAxMLaWRwLmlhZHQuaWUwggEiMA0GCSqGSIb3
@@ -37,37 +37,37 @@ ApcMs8kQehlArgcwqVTzGqqZ1+FtMfVDyGS5AX/tZHo4frzFJlcqyKYgnrKTueEi
 6IJk9cDYR07yL/pz7pOLDYcKoo1/lNVMA4IXVzCnXOOrE29pL249ewOlHBX3meoy
 Qrq4WvN81X5uUTN6qJPlL6wd+mT+LsrZPH+zyw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iadt.ie/idp/logout.jsp"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iadt.ie/idp/logout.jsp"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iadt.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iadt.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iadt.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iadt.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Arif</md:GivenName>
-      <md:SurName>Syed</md:SurName>
-      <md:EmailAddress>mailto:arif.syed@iadt.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Colm</md:GivenName>
-      <md:SurName>Hennessy</md:SurName>
-      <md:EmailAddress>mailto:colm.hennessy@iadt.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Maurice</md:GivenName>
-      <md:SurName>Coen</md:SurName>
-      <md:EmailAddress>mailto:maurice.coen@iadt.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iadt.ie/idp/logout.jsp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iadt.ie/idp/logout.jsp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iadt.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iadt.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iadt.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iadt.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Arif</md:GivenName>
+    <md:SurName>Syed</md:SurName>
+    <md:EmailAddress>mailto:arif.syed@iadt.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Colm</md:GivenName>
+    <md:SurName>Hennessy</md:SurName>
+    <md:EmailAddress>mailto:colm.hennessy@iadt.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Maurice</md:GivenName>
+    <md:SurName>Coen</md:SurName>
+    <md:EmailAddress>mailto:maurice.coen@iadt.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml
index 3388c86c..04683a66 100644
--- a/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iamtest.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-03T09:53:37Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-03T09:53:37Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUa38GMB38Bw/fc8DRnws12ed2TT8wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLmlhbXRlc3Qub3guYWMudWswHhcNMTMwMzA3MTIx
 						OTU5WhcNMzMwMzA3MTIxOTU5WjAfMR0wGwYDVQQDExRpZHAuaWFtdGVzdC5veC5h
@@ -35,26 +35,26 @@
 						MDhEkM3L6GRkHkQBr16T99CJUDSbIzaYU10ERSEWb1VczZ2/ywvMLar8SszWYmrb
 						+Ii81KZ2VotL9mj7v5li
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iamtest.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iamtest.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUa38GMB38Bw/fc8DRnws12ed2TT8wDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwLmlhbXRlc3Qub3guYWMudWswHhcNMTMwMzA3MTIx
 						OTU5WhcNMzMwMzA3MTIxOTU5WjAfMR0wGwYDVQQDExRpZHAuaWFtdGVzdC5veC5h
@@ -74,25 +74,25 @@
 						MDhEkM3L6GRkHkQBr16T99CJUDSbIzaYU10ERSEWb1VczZ2/ywvMLar8SszWYmrb
 						+Ii81KZ2VotL9mj7v5li
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford - Test IdP for IAMTEST authentication stack</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Systems Development and Support</md:GivenName>
-      <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Development and Support</md:GivenName>
-      <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - Test IdP for IAMTEST authentication stack</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Systems Development and Support</md:GivenName>
+    <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Development and Support</md:GivenName>
+    <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iapg.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iapg.cas.cz-idp-shibboleth.xml
index 0b322d51..07d36720 100644
--- a/swamid-interfederations-2.0/idp.iapg.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iapg.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iapg.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-03-16T14:41:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-03-16T14:41:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iapg.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Animal Physiology and Genetics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav živočišné fyziologie a genetiky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IAPG AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚŽFG AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iapg.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.iapg.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-iapg-44.png</mdui:Logo>
+        <mdui:Logo height="3809" width="3814">https://jiftach.cas.cz/loga/logo-iapg-3809.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iapg.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Animal Physiology and Genetics AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav živočišné fyziologie a genetiky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IAPG AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚŽFG AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.iapg.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.iapg.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-iapg-44.png</mdui:Logo>
-          <mdui:Logo height="3809" width="3814">https://jiftach.cas.cz/loga/logo-iapg-3809.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAP/TTzlnEf+XJJbS0KhgXdAAsN6eMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5pYXBnLmNhcy5jejAeFw0xNDA4MTQwNzA2MzNa
 Fw0zNDA4MTQwNzA2MzNaMBoxGDAWBgNVBAMTD2lkcC5pYXBnLmNhcy5jejCCASIw
@@ -51,29 +51,29 @@ u0mvDseCr7lmhG8b9HlXpS0gazLngMKIdgAOA/M9/Gq27AsBVGHzEr9tyjZXbz2P
 NiC000ydTHDWAJi2h9CwLw6mQx7udVmM9Hg2GZ/dn23cRi2Gm56UduJRjug=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iapg.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iapg.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iapg.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iapg.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iapg.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAP/TTzlnEf+XJJbS0KhgXdAAsN6eMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5pYXBnLmNhcy5jejAeFw0xNDA4MTQwNzA2MzNa
 Fw0zNDA4MTQwNzA2MzNaMBoxGDAWBgNVBAMTD2lkcC5pYXBnLmNhcy5jejCCASIw
@@ -93,26 +93,26 @@ u0mvDseCr7lmhG8b9HlXpS0gazLngMKIdgAOA/M9/Gq27AsBVGHzEr9tyjZXbz2P
 NiC000ydTHDWAJi2h9CwLw6mQx7udVmM9Hg2GZ/dn23cRi2Gm56UduJRjug=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Animal Physiology and Genetics</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav živočišné fyziologie a genetiky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Animal Physiology and Genetics AS CR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav živočišné fyziologie a genetiky AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iapg.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.iapg.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iapg.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Animal Physiology and Genetics</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav živočišné fyziologie a genetiky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Animal Physiology and Genetics AS CR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav živočišné fyziologie a genetiky AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iapg.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.iapg.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml
index bffaf6b6..086e713a 100644
--- a/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ias.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ias.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute for Advanced Study</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ias.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute for Advanced Study</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAJ4Rw7cCRxZXoeImY29/aVrW2esLMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5pYXMuZWR1MB4XDTExMDMyNTE5MTEyNVoXDTMx
 MDMyNTE5MTEyNVowFjEUMBIGA1UEAxMLaWRwLmlhcy5lZHUwggEiMA0GCSqGSIb3
@@ -37,24 +37,24 @@ ahC1lNisUHjdOeugjChmAYKi/RS5PCF8GbEQpG1c4mDwYJFy0YyZkCA81k0y5Ruf
 YyxdIMVGKSdzuKeh2yNoiNTzjqKqQc8d4GiWmVcJLw6kwD4MtniEexvkkRzlYW8q
 SvUIEk0xTVbv2eyIxcQBeXXgXyvtErmlxmp5gw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ias.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ias.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ias.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ias.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ias.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ias.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ias.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ias.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ias.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ias.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ias.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ias.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ias.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ias.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAJ4Rw7cCRxZXoeImY29/aVrW2esLMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5pYXMuZWR1MB4XDTExMDMyNTE5MTEyNVoXDTMx
 MDMyNTE5MTEyNVowFjEUMBIGA1UEAxMLaWRwLmlhcy5lZHUwggEiMA0GCSqGSIb3
@@ -73,26 +73,26 @@ ahC1lNisUHjdOeugjChmAYKi/RS5PCF8GbEQpG1c4mDwYJFy0YyZkCA81k0y5Ruf
 YyxdIMVGKSdzuKeh2yNoiNTzjqKqQc8d4GiWmVcJLw6kwD4MtniEexvkkRzlYW8q
 SvUIEk0xTVbv2eyIxcQBeXXgXyvtErmlxmp5gw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ias.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute for Advanced Study</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Study</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ias.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeffrey Berliner</md:GivenName>
-      <md:EmailAddress>idpadmin@ias.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Federated Authentication Support Team</md:GivenName>
-      <md:EmailAddress>idptech@ias.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Federated Authentication Support</md:GivenName>
-      <md:EmailAddress>idphelp@ias.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ias.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute for Advanced Study</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Study</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ias.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeffrey Berliner</md:GivenName>
+    <md:EmailAddress>idpadmin@ias.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Federated Authentication Support Team</md:GivenName>
+    <md:EmailAddress>idptech@ias.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Federated Authentication Support</md:GivenName>
+    <md:EmailAddress>idphelp@ias.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml b/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml
index 366167f7..e5dc5da1 100644
--- a/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iastate.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iastate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Iowa State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Iowa State University of Science and Technology</mdui:Description>
+        <mdui:Logo height="249" width="564" xml:lang="en">https://shibboleth.iastate.edu/ISU_InCommon_Nameplate.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iastate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Iowa State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Iowa State University of Science and Technology</mdui:Description>
-          <mdui:Logo height="249" width="564" xml:lang="en">https://shibboleth.iastate.edu/ISU_InCommon_Nameplate.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSTCCAjGgAwIBAgIJANtndPl5456+MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFnNoaWJib2xldGguaWFzdGF0ZS5lZHUwHhcNMTMwMTA4MjMwOTU3WhcNMjMw
 MTA2MjMwOTU3WjAhMR8wHQYDVQQDExZzaGliYm9sZXRoLmlhc3RhdGUuZWR1MIIB
@@ -43,31 +43,31 @@ sdhfF/SwKY8OTQ2T5IBB4TX/pc374MeGzyztBkHWI0Wdit4SsqVBk5W/id/Xm6GK
 SjZyukCftG8fPGS9rzYyIHZef/SenG1Jx3H2SK0JfzACakpVnW8rLIz3pOVVn53W
 9X/7A6V/nF9hQCcovLsIvLhCKTmiRoiMQiboEOs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iastate.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.iastate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Iowa State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Iowa State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iastate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Iowa State University Shibboleth Technical Team</md:GivenName>
-      <md:EmailAddress>shibboleth@iastate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Iowa State University Solution Center</md:GivenName>
-      <md:EmailAddress>solution@iastate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Iowa State University InCommon Admins</md:GivenName>
-      <md:EmailAddress>incommon-admins@iastate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iastate.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.iastate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Iowa State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Iowa State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iastate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Iowa State University Shibboleth Technical Team</md:GivenName>
+    <md:EmailAddress>shibboleth@iastate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Iowa State University Solution Center</md:GivenName>
+    <md:EmailAddress>solution@iastate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Iowa State University InCommon Admins</md:GivenName>
+    <md:EmailAddress>incommon-admins@iastate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml
index 93a9867c..f97aa433 100644
--- a/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ibot.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-12-19T14:43:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-12-19T14:43:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibot.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institut of Botany ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Botanický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IBOT AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ibot.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ibot.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="123">https://jiftach.cas.cz/loga/logo-bu-44.png</mdui:Logo>
+        <mdui:Logo height="284" width="796">https://jiftach.cas.cz/loga/logo-bu-284.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibot.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institut of Botany ASCR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Botanický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IBOT AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ibot.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ibot.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="123">https://jiftach.cas.cz/loga/logo-bu-44.png</mdui:Logo>
-          <mdui:Logo height="284" width="796">https://jiftach.cas.cz/loga/logo-bu-284.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAMxsLpF35rXDQbU29hCvQ9ID+RqhMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejAeFw0xNDEyMTUwOTM3MDha
 Fw0zNDEyMTUwOTM3MDhaMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejCCASIw
@@ -51,29 +51,29 @@ ZalqvP5zKZTaT9xbJbh0K+UDgR8nmrd6QTZnFSoylnbX1O+zEyCagZlQQwEDTIVj
 tTzd0Evm3OfMvzbrxeZcRq8rWk2hWbjtw0GbhBkQm41WEgKL+580ax3w65o=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibot.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibot.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibot.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibot.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAMxsLpF35rXDQbU29hCvQ9ID+RqhMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejAeFw0xNDEyMTUwOTM3MDha
 Fw0zNDEyMTUwOTM3MDhaMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejCCASIw
@@ -93,26 +93,26 @@ ZalqvP5zKZTaT9xbJbh0K+UDgR8nmrd6QTZnFSoylnbX1O+zEyCagZlQQwEDTIVj
 tTzd0Evm3OfMvzbrxeZcRq8rWk2hWbjtw0GbhBkQm41WEgKL+580ax3w65o=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institut of Botany ASCR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Botanický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institut of Botany ASCR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Botanický ústav AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ibot.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ibot.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institut of Botany ASCR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Botanický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institut of Botany ASCR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Botanický ústav AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ibot.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ibot.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
index b72e6de3..4f3de643 100644
--- a/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ibp.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-25T15:25:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-25T15:25:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibp.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Biophysics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Biofyzikální ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IBP AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BFÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ibp.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ibp.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="81">https://jiftach.cas.cz/loga/logo-ibp-44.png</mdui:Logo>
+        <mdui:Logo height="65" width="120">https://jiftach.cas.cz/loga/logo-ibp-65.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibp.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Biophysics AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Biofyzikální ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IBP AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BFÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ibp.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ibp.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="81">https://jiftach.cas.cz/loga/logo-ibp-44.png</mdui:Logo>
-          <mdui:Logo height="65" width="120">https://jiftach.cas.cz/loga/logo-ibp-65.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
 DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ u9Mna/iP3SHv09aTqAt9DjGGf+3oQRVkybSpdpdgRbXotUyhoGgCazhsWLCSvZke
 zaDcul2ivMCAW6N+57bhddfKSw9fgoTN5yhdbE17rpMTCk3OMSjfNQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibp.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibp.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibp.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibp.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
 DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ u9Mna/iP3SHv09aTqAt9DjGGf+3oQRVkybSpdpdgRbXotUyhoGgCazhsWLCSvZke
 zaDcul2ivMCAW6N+57bhddfKSw9fgoTN5yhdbE17rpMTCk3OMSjfNQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Biophysics AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Biofyzikální ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Biophysics AS CR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Biofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ibp.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ibp.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Biophysics AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Biofyzikální ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Biophysics AS CR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Biofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ibp.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ibp.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml
index 645c80d4..5745619c 100644
--- a/swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ibt.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ibt.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-03-22T16:52:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-03-22T16:52:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibt.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Biotechnology CAS, v.v.i.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Biotechnologický ústav AV ČR, v.v.i.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IBT AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BTÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ibt.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ibt.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="64">https://jiftach.cas.cz/loga/logo-btu-44.png</mdui:Logo>
+        <mdui:Logo height="366" width="524">https://jiftach.cas.cz/loga/logo-btu-366.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibt.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Biotechnology CAS, v.v.i.</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Biotechnologický ústav AV ČR, v.v.i.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IBT AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BTÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ibt.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ibt.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="64">https://jiftach.cas.cz/loga/logo-btu-44.png</mdui:Logo>
-          <mdui:Logo height="366" width="524">https://jiftach.cas.cz/loga/logo-btu-366.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUMPAWv713tZR1Gu1dYDN+R/Ff2aswDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmlidC5jYXMuY3owHhcNMTYwMzE4MDczMjQ2WhcN
 MzYwMzE4MDczMjQ2WjAZMRcwFQYDVQQDEw5pZHAuaWJ0LmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ a2eDWPSwOGAqw0PDUVJcxcxL0XpG6YEdnbFWwo9g4WbjlGJNRVPtECyIymTIpEia
 Rz/AYiVVKMJBhTjfy5Qt2syX09PrzoS6djp4aeuSoc+NZPnM8v+8
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibt.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibt.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ibt.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibt.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibt.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUMPAWv713tZR1Gu1dYDN+R/Ff2aswDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmlidC5jYXMuY3owHhcNMTYwMzE4MDczMjQ2WhcN
 MzYwMzE4MDczMjQ2WjAZMRcwFQYDVQQDEw5pZHAuaWJ0LmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ a2eDWPSwOGAqw0PDUVJcxcxL0XpG6YEdnbFWwo9g4WbjlGJNRVPtECyIymTIpEia
 Rz/AYiVVKMJBhTjfy5Qt2syX09PrzoS6djp4aeuSoc+NZPnM8v+8
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Biotechnology CAS</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Biotechnologický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Biotechnology CAS, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Biotechnologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ibt.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ibt.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibt.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Biotechnology CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Biotechnologický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Biotechnology CAS, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Biotechnologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ibt.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ibt.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
index 7e9187aa..0c426a89 100644
--- a/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.icpf.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-18T10:21:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-18T10:21:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icpf.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav chemických procesů AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ICPF AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚCHP AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.icpf.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.icpf.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-icpf-44.png</mdui:Logo>
+        <mdui:Logo height="514" width="514">https://jiftach.cas.cz/loga/logo-icpf-514.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icpf.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav chemických procesů AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider ICPF AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚCHP AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.icpf.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.icpf.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-icpf-44.png</mdui:Logo>
-          <mdui:Logo height="514" width="514">https://jiftach.cas.cz/loga/logo-icpf-514.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
 DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
@@ -51,30 +51,30 @@ U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
 TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icpf.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icpf.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
 DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
@@ -94,25 +94,25 @@ U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
 TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.icpf.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.icpf.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml
index fe03e88b..901fdbd0 100644
--- a/swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.identity.uoguelph.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-08-21T16:10:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-08-21T16:10:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoguelph.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:InformationURL xml:lang="en">http://www.uoguelph.ca/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoguelph.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:InformationURL xml:lang="en">http://www.uoguelph.ca/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDyjCCArICCQCluLVINlzKvzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
 Q0ExEDAOBgNVBAgTB09udGFyaW8xDzANBgNVBAcTBkd1ZWxwaDEdMBsGA1UEChMU
 VW5pdmVyc2l0eSBvZiBHdWVscGgxDDAKBgNVBAsTA0NDUzEhMB8GA1UEAxMYaWRw
@@ -36,26 +36,26 @@ DKwJwmEkoo0CP9dlI7f618eVybyTmpybxqQ7ZViFD4udvfCjl0j7LzUfefyyyWnO
 8cyvzuy5JWgN0W3dzew7FVx7KDCitI7MVkB7xgjQhYelVv5GJOVER69yU18Svzxn
 a3M+PZV0yTaCYYLgfmI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.identity.uoguelph.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoguelph.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.identity.uoguelph.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoguelph.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDyjCCArICCQCluLVINlzKvzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
 Q0ExEDAOBgNVBAgTB09udGFyaW8xDzANBgNVBAcTBkd1ZWxwaDEdMBsGA1UEChMU
 VW5pdmVyc2l0eSBvZiBHdWVscGgxDDAKBgNVBAsTA0NDUzEhMB8GA1UEAxMYaWRw
@@ -78,21 +78,21 @@ DKwJwmEkoo0CP9dlI7f618eVybyTmpybxqQ7ZViFD4udvfCjl0j7LzUfefyyyWnO
 8cyvzuy5JWgN0W3dzew7FVx7KDCitI7MVkB7xgjQhYelVv5GJOVER69yU18Svzxn
 a3M+PZV0yTaCYYLgfmI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Guelph</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Guelph</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uoguelph.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Services</md:GivenName>
-      <md:EmailAddress>mailto:ideas@uoguelph.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Guelph</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Guelph</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uoguelph.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Services</md:GivenName>
+    <md:EmailAddress>mailto:ideas@uoguelph.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
index f6785ade..d1240077 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
+        <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
+        <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
-          <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-          <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=idp.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGHGxHEF17jANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=idp.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGHGxHEF17jANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
 MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
@@ -59,28 +59,28 @@ Ql3oyyqhxTnDVK7RpuTbVvq3DQ2OSy2/BX9KZbDRWJHatM0sW9YXYCBmFMh/Hbts
 hTUqA59XpC37wh9EFzxY+3hjzmZshnlYJ9Cvr6JysmMVryieMJ0QibsirMh5WAe4
 wF9hg13FcbfC9M9Vw8yzlIpbNxbbxyj5DlQ6umERQ+wWQcvGmPIK
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=idp.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGHGxHEF17jANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ids-mannheim.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=idp.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGHGxHEF17jANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
 MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
@@ -114,35 +114,35 @@ Ql3oyyqhxTnDVK7RpuTbVvq3DQ2OSy2/BX9KZbDRWJHatM0sW9YXYCBmFMh/Hbts
 hTUqA59XpC37wh9EFzxY+3hjzmZshnlYJ9Cvr6JysmMVryieMJ0QibsirMh5WAe4
 wF9hg13FcbfC9M9Vw8yzlIpbNxbbxyj5DlQ6umERQ+wWQcvGmPIK
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Oliver</md:GivenName>
-      <md:SurName>Schonefeld</md:SurName>
-      <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Andreas</md:GivenName>
-      <md:SurName>Witt</md:SurName>
-      <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>AAI</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:aai@ids-mannheim.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Schonefeld</md:SurName>
+    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Witt</md:SurName>
+    <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
index 7aff1910..3d3efa06 100644
--- a/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifal.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAL - Instituto Federal de Alagoas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAL - Instituto Federal de Alagoas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifal.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifal.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFAL - Instituto Federal de Alagoas</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFAL - Instituto Federal de Alagoas</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifal.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifal.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExLDAqBgNVBAoTI0lGQUwgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNEVEkxKTAnBgkq
 hkiG9w0BCQEWGmFkcmlhbm8uYXJhdWpvQGlmYWwuZWR1LmJyMQ8wDQYDVQQHEwZN
@@ -45,26 +45,26 @@ H1qx/y9tGV+Eb5Jy6jbQLG16B+93zPl1fRf8BgPuLjbsjq+f0xvXUkL+8Gi9TBv3
 Y2F2PrpyMw88ibt/qREHIIa3uIdNu3P0Tq0MvEY51PFkAWXC5J/eocGLZbLUwbVL
 SY7q0H0YJyD8xlGRdz+RsDK4pv1PWQ+9OilkLA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifal.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifal.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifal.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifal.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExLDAqBgNVBAoTI0lGQUwgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNEVEkxKTAnBgkq
@@ -89,24 +89,24 @@ Y2F2PrpyMw88ibt/qREHIIa3uIdNu3P0Tq0MvEY51PFkAWXC5J/eocGLZbLUwbVL
 SY7q0H0YJyD8xlGRdz+RsDK4pv1PWQ+9OilkLA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFAL - Instituto Federal de Alagoas</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Alagoas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifal.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifal.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Adriano da Silva Araujo</md:SurName>
-      <md:EmailAddress>adriano.araujo@ifal.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFAL - Instituto Federal de Alagoas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Alagoas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifal.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifal.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Adriano da Silva Araujo</md:SurName>
+    <md:EmailAddress>adriano.araujo@ifal.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
index fab04cdf..c0b9a7c8 100644
--- a/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifap.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifap.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifap.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifap.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifap.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
 VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDE2MTEyOFoXDTE5MDQwOTE2
 MTEyOFowKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
@@ -39,26 +39,26 @@ GTeDI2aFAmuPNomYl+ijCxk37ur/iQ3ugo0PbvVSZV9hxic8FJbBjGg7ZvyMXwuZ
 HTc3JBOzycaHMO08/JyQND4i4t4OuiY6iemEsTuGgC2aeOZYRJ9qCyjVnFMQE8lV
 arZrEBblthd0n3nlykz5YYjwsNa9rkr6Yo9NDXv3iorY6fD2Rk8z8JB2
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
@@ -84,24 +84,24 @@ BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFAP - Instituto Federal do Amapa</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifap.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifap.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Marco Pantoja</md:SurName>
-      <md:EmailAddress>marco.pantoja@ifap.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFAP - Instituto Federal do Amapa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifap.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifap.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marco Pantoja</md:SurName>
+    <md:EmailAddress>marco.pantoja@ifap.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
index 4bcfe373..15e94c83 100644
--- a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifpb.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifpb.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifpb.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoUJElGUEIgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhw61iYTEMMAoGA1UECxMDRFRJMSwwKgYJ
 KoZIhvcNAQkBFh1hbGV4YW5kcmUuYWxtZWlkYUBpZnBiLmVkdS5icjEVMBMGA1UE
@@ -46,26 +46,26 @@ miCjubGUFtcp0AyIauaCBrDa5yXQC7G4aGsdUmLM9rkVOohfyo6+KXbBXBdH4ohp
 T8Co/9psHWaWH/nbbWkLPelRY7xBqyLbUwdAFj8W6v8BExWLWMJqSZq8A4eD02Ky
 sHw=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoUJElGUEIgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhw61iYTEMMAoGA1UECxMDRFRJMSwwKgYJ
@@ -91,24 +91,24 @@ T8Co/9psHWaWH/nbbWkLPelRY7xBqyLbUwdAFj8W6v8BExWLWMJqSZq8A4eD02Ky
 sHw=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifpb.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alexandre Almeida de Lucena</md:SurName>
-      <md:EmailAddress>alexandre.almeida@ifpb.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifpb.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alexandre Almeida de Lucena</md:SurName>
+    <md:EmailAddress>alexandre.almeida@ifpb.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
index f9c53741..737df1e2 100644
--- a/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifremer.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-09T11:38:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-09T11:38:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifremer.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">French Research Institute for Exploitation of the Sea</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ifremer.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IFREMER</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifremer.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">French Research Institute for Exploitation of the Sea</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ifremer.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IFREMER</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIzCCAgugAwIBAgIUOIqkPXAt3sQ6YTpkVpANOLD+UnwwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIwHhcNMTUwMzI2MTI0NzI2WhcN
 MzUwMzI2MTE0NzI2WjAZMRcwFQYDVQQDEw5pZHAuaWZyZW1lci5mcjCCASIwDQYJ
@@ -36,13 +36,13 @@ uU4gKDT2h2ygqY9keROeWZaAhsCdz5begn6E4ZfVcntHZbYhSKwZ5VwKa87xOzap
 B0qW+1N+EhA//tGc4457hCnKN/YTj2tVgIiH5WDBLZDLjUWhyjX0e7hVg2NvpGPr
 HMX9vyZ286HenUWfR1k+S712csAxIJihzyf/h4hC3Nh48HmYnWe8
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEijCCA3KgAwIBAgIQMyTXXlW9hy8Y6QcUc2/LXzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMDMxMzAwMDAwMFoXDTE1MDMxMzIzNTk1OVowZzELMAkGA1UE
@@ -69,26 +69,26 @@ hZ2ugMoPK71mFFJPxshrqoIztjyQYSkDfiO2T6rj0rjO8LzOiFjXcK7hOIBYvCrg
 zXV+QCUbY/ybM1SrZ1UoRiD3zdYc12j2G+bNJXA/F/PzcGVm5FCodlgwUs9RH6Xn
 epzgatQFKE2hNWcrgIY=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifremer.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifremer.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifremer.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFREMER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFREMER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifremer.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>David Joncourt</md:SurName>
-      <md:EmailAddress>david.joncourt@ifremer.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Patrick Bossard</md:SurName>
-      <md:EmailAddress>Patrick.Bossard@ifremer.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifremer.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifremer.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifremer.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFREMER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFREMER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifremer.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>David Joncourt</md:SurName>
+    <md:EmailAddress>david.joncourt@ifremer.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Patrick Bossard</md:SurName>
+    <md:EmailAddress>Patrick.Bossard@ifremer.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml b/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml
index 43794b87..d95775e8 100644
--- a/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifs.org.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ifs.org.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ifs.org.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute for Fiscal Studies</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifs.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ifs.org.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ifs.org.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute for Fiscal Studies</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifs.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
index 1466c94c..4f23d9d6 100644
--- a/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifsudestemg.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
 dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
 cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
@@ -45,26 +45,26 @@ Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
 0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
 NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifsudestemg.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifsudestemg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
 dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
@@ -89,24 +89,24 @@ Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
 NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifsudestemg.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Elder Marcelino</md:SurName>
-      <md:EmailAddress>elder.marcelino@ifsudestemg.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsudestemg.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Elder Marcelino</md:SurName>
+    <md:EmailAddress>elder.marcelino@ifsudestemg.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
index 2a1c1687..2df00787 100644
--- a/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifto.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFTO - Instituto Federal do Tocantins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFTO - Instituto Federal do Tocantins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifto.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifto.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFTO - Instituto Federal do Tocantins</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFTO - Instituto Federal do Tocantins</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifto.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifto.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xLjAsBgNVBAoTJUlGVE8gLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBUb2NhbnRpbnMxDDAKBgNVBAsTA0dUSTEiMCAG
 CSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEPMA0GA1UEBxMGUGFsbWFz
@@ -45,26 +45,26 @@ p0i71SOGIoP04RQ6StU3DYC+Ug+CuRVrkPGe2nj9/xwfr6yQ57SOAaucmbxC3wLP
 bOyvYzQg+nOb31kvM2UosnGcpLcVHT6Tgupu5je2Hq8oTgOFPLufjqEIp735x/Yh
 6KX9jDqVrd3n8FtVU0WA7kZ5Lz+EnQ==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xLjAsBgNVBAoTJUlGVE8gLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBUb2NhbnRpbnMxDDAKBgNVBAsTA0dUSTEiMCAG
@@ -89,24 +89,24 @@ bOyvYzQg+nOb31kvM2UosnGcpLcVHT6Tgupu5je2Hq8oTgOFPLufjqEIp735x/Yh
 6KX9jDqVrd3n8FtVU0WA7kZ5Lz+EnQ==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFTO - Instituto Federal do Tocantins</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFTO - Instituto Federal do Tocantins</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifto.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Ronaldo</md:SurName>
-      <md:EmailAddress>parente@ifto.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFTO - Instituto Federal do Tocantins</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFTO - Instituto Federal do Tocantins</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifto.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Ronaldo</md:SurName>
+    <md:EmailAddress>parente@ifto.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
index 70cc821c..1de077ab 100644
--- a/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ig.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ig.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-05-05T12:30:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-05-05T12:30:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IG AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GFÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ig.cas.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ig.cas.cz</mdui:InformationURL>
+        <mdui:Logo height="44" width="30">https://jiftach.cas.cz/loga/logo-gfu-44.png</mdui:Logo>
+        <mdui:Logo height="146" width="100">https://jiftach.cas.cz/loga/logo-gfu-146.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IG AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GFÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ig.cas.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ig.cas.cz</mdui:InformationURL>
-          <mdui:Logo height="44" width="30">https://jiftach.cas.cz/loga/logo-gfu-44.png</mdui:Logo>
-          <mdui:Logo height="146" width="100">https://jiftach.cas.cz/loga/logo-gfu-146.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
 NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
@@ -51,29 +51,29 @@ ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
 iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ig.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ig.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ig.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ig.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUW5TBaaB6SfKUuLQgLg+XaF0y3J4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmlnLmNhcy5jejAeFw0xNjA0MDUxMzI0MTlaFw0z
 NjA0MDUxMzI0MTlaMBgxFjAUBgNVBAMTDWlkcC5pZy5jYXMuY3owggEiMA0GCSqG
@@ -93,26 +93,26 @@ ZY9vTx0lCROCttAMuKYs5fcReLwk+/o2IlfIxdxdAVWXDa74bGoWicPV4IvMYax9
 iAMUVpLKlI8Ml/V8Qgk4piCGEo3pgoP8PlIY9phZL+b1IZo=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Geophysics of the CAS</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Geofyzikální ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ig.cas.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ig.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ig.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Geophysics of the CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Geofyzikální ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Geophysics of the CAS, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Geofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ig.cas.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ig.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
index c58d1050..9a7515b6 100644
--- a/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.ihe.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-02-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-02-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">UNESCO-IHE Institute for Water Education</mdui:Description>
+        <mdui:Description xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:Description>
+        <mdui:Logo height="100" width="108">https://static.surfconext.nl/logos/idp/unesco-ihe.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">UNESCO-IHE Institute for Water Education</mdui:Description>
-          <mdui:Description xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:Description>
-          <mdui:Logo height="100" width="108">https://static.surfconext.nl/logos/idp/unesco-ihe.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/67c13bb00741bc9f65da46d70bbad594"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">UNESCO-IHE Institute for Water Education</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">UNESCO-IHE Institute for Water Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">UNESCO-IHE Institute for Water Education</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.unesco-ihe.org/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unesco-ihe.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/67c13bb00741bc9f65da46d70bbad594"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">UNESCO-IHE Institute for Water Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">UNESCO-IHE Institute for Water Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">UNESCO-IHE Institute for Water Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.unesco-ihe.org/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unesco-ihe.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
index 36529461..f6f72a2c 100644
--- a/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.cnr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.cnr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNR Institute of Informatics and Telematics</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CNR Istituto di Informatica e Telematica</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CNR Institute of Informatics and Telematics users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Informatica e Telematica</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://idp.iit.cnr.it/idpservice.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.iit.cnr.it/en</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.cnr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNR Institute of Informatics and Telematics</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">CNR Istituto di Informatica e Telematica</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for CNR Institute of Informatics and Telematics users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Informatica e Telematica</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://idp.iit.cnr.it/idpservice.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.iit.cnr.it/en</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVANNctxDOg6xktyigLZGJNgH/9KDGMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5paXQuY25yLml0MB4XDTA5MDMwMjEwMDQ1OFoX
 DTI5MDMwMjEwMDQ1OFowGTEXMBUGA1UEAxMOaWRwLmlpdC5jbnIuaXQwggEiMA0G
@@ -39,29 +39,29 @@ Oygjy0U5YBCULsebWcg1GT5swQiRYtRuJkFDEnwQ79j91ceADPiQ+DeIdeBeK+Xz
 8eGhNrtn3uOLW2SCx5QBkfE5cBFYMPMSQLM5FaCetuZl6mePHuaj0IkpVQDJpYI6
 RS0HkZxnqxq0gCbYR4dSCVUR/8NFcO/jsQCEZIauvzx9bXt7vpBKSg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.cnr.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iit.cnr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.cnr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.cnr.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iit.cnr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.cnr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVANNctxDOg6xktyigLZGJNgH/9KDGMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5paXQuY25yLml0MB4XDTA5MDMwMjEwMDQ1OFoX
 DTI5MDMwMjEwMDQ1OFowGTEXMBUGA1UEAxMOaWRwLmlpdC5jbnIuaXQwggEiMA0G
@@ -80,23 +80,23 @@ Oygjy0U5YBCULsebWcg1GT5swQiRYtRuJkFDEnwQ79j91ceADPiQ+DeIdeBeK+Xz
 8eGhNrtn3uOLW2SCx5QBkfE5cBFYMPMSQLM5FaCetuZl6mePHuaj0IkpVQDJpYI6
 RS0HkZxnqxq0gCbYR4dSCVUR/8NFcO/jsQCEZIauvzx9bXt7vpBKSg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNR Institute of Informatics and Telematics</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Informatica e Telematica</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.iit.cnr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.iit.cnr.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:iit-idem@iit.cnr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNR Institute of Informatics and Telematics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Informatica e Telematica</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.iit.cnr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.iit.cnr.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:iit-idem@iit.cnr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
index 503c3fa4..1465c255 100644
--- a/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-07-24T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-07-24T14:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for staff and students of IIT - Istituto Italiano di Tecnologia</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per personale e studenti del IIT - Istituto Italiano di Tecnologia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp.iit.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp.iit.it/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp.iit.it/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp.iit.it/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.iit.it/public/logo16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.iit.it/public/logo16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.iit.it/public/logo80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.iit.it/public/logo80.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>iit.it</mdui:DomainHint>
+        <mdui:IPHint>90.147.14.0/24</mdui:IPHint>
+        <mdui:IPHint>90.147.15.0/24</mdui:IPHint>
+        <mdui:IPHint>90.147.38.0/24</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for staff and students of IIT - Istituto Italiano di Tecnologia</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per personale e studenti del IIT - Istituto Italiano di Tecnologia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp.iit.it/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idp.iit.it/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp.iit.it/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp.iit.it/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.iit.it/public/logo16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.iit.it/public/logo16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.iit.it/public/logo80.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp.iit.it/public/logo80.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>iit.it</mdui:DomainHint>
-          <mdui:IPHint>90.147.14.0/24</mdui:IPHint>
-          <mdui:IPHint>90.147.15.0/24</mdui:IPHint>
-          <mdui:IPHint>90.147.38.0/24</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
 MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
@@ -51,29 +51,29 @@ w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
 pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
 roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iit.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iit.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
 MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
@@ -92,24 +92,24 @@ w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
 pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
 roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IIT - Istituto Italiano di Tecnologia</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IIT - Istituto Italiano di Tecnologia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.iit.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.iit.it/en/home.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IIT-Service Desk ICT</md:GivenName>
-      <md:EmailAddress>mailto:ict_servicedesk@iit.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IIT - Istituto Italiano di Tecnologia</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IIT - Istituto Italiano di Tecnologia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.iit.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.iit.it/en/home.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IIT-Service Desk ICT</md:GivenName>
+    <md:EmailAddress>mailto:ict_servicedesk@iit.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml
index e776c948..37e6770e 100644
--- a/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ijs.si/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-10T13:02:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-10T13:02:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijs.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jožef Stefan Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Institut "Jožef Stefan"</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Jožef Stefan Institute</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet za Institut "Jožef Stefan"</mdui:Description>
+        <mdui:Keywords xml:lang="en">jsi ijs institut jozef stefan jožef štefan</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">ijs institut jožef stefan inštitut štefan</mdui:Keywords>
+        <mdui:Logo height="300" width="300">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.ijs.si/ijsw/JSI</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.ijs.si/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijs.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jožef Stefan Institute</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Institut "Jožef Stefan"</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Jožef Stefan Institute</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet za Institut "Jožef Stefan"</mdui:Description>
-          <mdui:Keywords xml:lang="en">jsi ijs institut jozef stefan jožef štefan</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">ijs institut jožef stefan inštitut štefan</mdui:Keywords>
-          <mdui:Logo height="300" width="300">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.ijs.si/ijsw/JSI</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.ijs.si/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgICA7cwDQYJKoZIhvcNAQENBQAwMjELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDESMBAGA1UEAxMJU2lHTkVUIENBMB4XDTE0MTIyNDA5NDIzOVoXDTE1MTIyNDA5NDIzOVowTzELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDEMMAoGA1UEChMDSUpTMQwwCgYDVQQLEwNDTUkxEzARBgNVBAMTCmlkcC5panMuc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVmKfNHpnoMMYrghY4J3HgNgfOYC/jMBQ8A2BN+5Pcv7ZVqi6FJYSVTLK4O0MKiYyKXLhtfNeQYBmaNIrSyvYs8MIPY3z6ZYx0/95lGxzbLn+6d5CKCRHgb/YG5vNl3DulrH72E7L8BpB0hN8wX0aol3O7a7nmlfppqG0ZWBUBNOj3GLE+G95ZXXYMLMWnLpexunyFHRl+YUR1kCCI/5KpcgIwm7Kpih1euvoCHX2ymRhDNvX+paKuGvkkZ1/TgwTmI0PNPYID6ivZPksRhuePxCUiMiGzaK6bQHNFzEL6dY/zj5sjlHh58qUQdOJJz22+CvMmG6+mugFdQzQZBxlAgMBAAGjggITMIICDzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCYGCWCGSAGG+EIBDQQZFhdTZXJ2ZXItQ2xpZW50IG9mIFNpR05FVDAdBgNVHQ4EFgQUG8ciEAHI67SgQpfOh87RhaV2ZzQwWgYDVR0jBFMwUYAUycZzPLenA790qr88vutO7wFl5fGhNqQ0MDIxCzAJBgNVBAYTAlNJMQ8wDQYDVQQKEwZTaUdORVQxEjAQBgNVBAMTCVNpR05FVCBDQYIBADAnBgNVHREEIDAegRBjbWkuYWRtaW5AaWpzLnNpggppZHAuaWpzLnNpMBsGA1UdEgQUMBKBEHNpZ25ldC1jYUBpanMuc2kwGAYDVR0gBBEwDzANBgsrBgEEAfdQAwEBADA+BglghkgBhvhCAQQEMRYvaHR0cDovL3NpZ25ldC1jYS5panMuc2kvcHViL2NybC9zaWduZXQwMmNybC5jcmwwPgYJYIZIAYb4QgEDBDEWL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMA0GCSqGSIb3DQEBDQUAA4IBAQCHeVajfooBA2/jSWyyZP9YHHdJcr3Va95+adILmO0G93bhx2JpqfybFjmN+8YJrcdPg6/Vn1VIhItMdpXwYcnHgqmRxYaSDHqa7AgjFmUTZcqhWQaVY/nqItGwW8AlvGYG36JR9xZNVAPtRyaq5nYWNGHrC3FJf47spgUO5AP6NlXe1QSMixJwCfHPgHwglQ4SvPr/97MNfx90ZyFpKFedpk2laWlYMD8sFxx2e1ZnRagANZNBfH531q4ISISCkLbdNuaV47soRFBXFIT7b2SDMV/pdi9jFcc6BZWPWm913RfG5JU9nHgldPcG93iLAHkPAxNKi/UU9T2s63FusE61</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgICA7cwDQYJKoZIhvcNAQENBQAwMjELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDESMBAGA1UEAxMJU2lHTkVUIENBMB4XDTE0MTIyNDA5NDIzOVoXDTE1MTIyNDA5NDIzOVowTzELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDEMMAoGA1UEChMDSUpTMQwwCgYDVQQLEwNDTUkxEzARBgNVBAMTCmlkcC5panMuc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVmKfNHpnoMMYrghY4J3HgNgfOYC/jMBQ8A2BN+5Pcv7ZVqi6FJYSVTLK4O0MKiYyKXLhtfNeQYBmaNIrSyvYs8MIPY3z6ZYx0/95lGxzbLn+6d5CKCRHgb/YG5vNl3DulrH72E7L8BpB0hN8wX0aol3O7a7nmlfppqG0ZWBUBNOj3GLE+G95ZXXYMLMWnLpexunyFHRl+YUR1kCCI/5KpcgIwm7Kpih1euvoCHX2ymRhDNvX+paKuGvkkZ1/TgwTmI0PNPYID6ivZPksRhuePxCUiMiGzaK6bQHNFzEL6dY/zj5sjlHh58qUQdOJJz22+CvMmG6+mugFdQzQZBxlAgMBAAGjggITMIICDzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCYGCWCGSAGG+EIBDQQZFhdTZXJ2ZXItQ2xpZW50IG9mIFNpR05FVDAdBgNVHQ4EFgQUG8ciEAHI67SgQpfOh87RhaV2ZzQwWgYDVR0jBFMwUYAUycZzPLenA790qr88vutO7wFl5fGhNqQ0MDIxCzAJBgNVBAYTAlNJMQ8wDQYDVQQKEwZTaUdORVQxEjAQBgNVBAMTCVNpR05FVCBDQYIBADAnBgNVHREEIDAegRBjbWkuYWRtaW5AaWpzLnNpggppZHAuaWpzLnNpMBsGA1UdEgQUMBKBEHNpZ25ldC1jYUBpanMuc2kwGAYDVR0gBBEwDzANBgsrBgEEAfdQAwEBADA+BglghkgBhvhCAQQEMRYvaHR0cDovL3NpZ25ldC1jYS5panMuc2kvcHViL2NybC9zaWduZXQwMmNybC5jcmwwPgYJYIZIAYb4QgEDBDEWL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMA0GCSqGSIb3DQEBDQUAA4IBAQCHeVajfooBA2/jSWyyZP9YHHdJcr3Va95+adILmO0G93bhx2JpqfybFjmN+8YJrcdPg6/Vn1VIhItMdpXwYcnHgqmRxYaSDHqa7AgjFmUTZcqhWQaVY/nqItGwW8AlvGYG36JR9xZNVAPtRyaq5nYWNGHrC3FJf47spgUO5AP6NlXe1QSMixJwCfHPgHwglQ4SvPr/97MNfx90ZyFpKFedpk2laWlYMD8sFxx2e1ZnRagANZNBfH531q4ISISCkLbdNuaV47soRFBXFIT7b2SDMV/pdi9jFcc6BZWPWm913RfG5JU9nHgldPcG93iLAHkPAxNKi/UU9T2s63FusE61</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ijs.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ijs.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Inštitut Jožef Stefan (IJS)</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Inštitut Jožef Stefan (IJS)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Inštitut Jožef Stefan (IJS)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Inštitut Jožef Stefan (IJS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ijs.si/ijsw/JSI</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.ijs.si/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jadran</md:GivenName>
-      <md:SurName>Lenarčič</md:SurName>
-      <md:EmailAddress>mailto:jadran.lenarcic@ijs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ijs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Martinec</md:SurName>
-      <md:EmailAddress>mailto:mark.martinec@ijs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Jona Javoršek</md:SurName>
-      <md:EmailAddress>mailto:jona.javorsek@ijs.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Jona Javoršek</md:SurName>
-      <md:EmailAddress>mailto:jona.javorsek@ijs.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgICA7cwDQYJKoZIhvcNAQENBQAwMjELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDESMBAGA1UEAxMJU2lHTkVUIENBMB4XDTE0MTIyNDA5NDIzOVoXDTE1MTIyNDA5NDIzOVowTzELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDEMMAoGA1UEChMDSUpTMQwwCgYDVQQLEwNDTUkxEzARBgNVBAMTCmlkcC5panMuc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVmKfNHpnoMMYrghY4J3HgNgfOYC/jMBQ8A2BN+5Pcv7ZVqi6FJYSVTLK4O0MKiYyKXLhtfNeQYBmaNIrSyvYs8MIPY3z6ZYx0/95lGxzbLn+6d5CKCRHgb/YG5vNl3DulrH72E7L8BpB0hN8wX0aol3O7a7nmlfppqG0ZWBUBNOj3GLE+G95ZXXYMLMWnLpexunyFHRl+YUR1kCCI/5KpcgIwm7Kpih1euvoCHX2ymRhDNvX+paKuGvkkZ1/TgwTmI0PNPYID6ivZPksRhuePxCUiMiGzaK6bQHNFzEL6dY/zj5sjlHh58qUQdOJJz22+CvMmG6+mugFdQzQZBxlAgMBAAGjggITMIICDzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCYGCWCGSAGG+EIBDQQZFhdTZXJ2ZXItQ2xpZW50IG9mIFNpR05FVDAdBgNVHQ4EFgQUG8ciEAHI67SgQpfOh87RhaV2ZzQwWgYDVR0jBFMwUYAUycZzPLenA790qr88vutO7wFl5fGhNqQ0MDIxCzAJBgNVBAYTAlNJMQ8wDQYDVQQKEwZTaUdORVQxEjAQBgNVBAMTCVNpR05FVCBDQYIBADAnBgNVHREEIDAegRBjbWkuYWRtaW5AaWpzLnNpggppZHAuaWpzLnNpMBsGA1UdEgQUMBKBEHNpZ25ldC1jYUBpanMuc2kwGAYDVR0gBBEwDzANBgsrBgEEAfdQAwEBADA+BglghkgBhvhCAQQEMRYvaHR0cDovL3NpZ25ldC1jYS5panMuc2kvcHViL2NybC9zaWduZXQwMmNybC5jcmwwPgYJYIZIAYb4QgEDBDEWL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMA0GCSqGSIb3DQEBDQUAA4IBAQCHeVajfooBA2/jSWyyZP9YHHdJcr3Va95+adILmO0G93bhx2JpqfybFjmN+8YJrcdPg6/Vn1VIhItMdpXwYcnHgqmRxYaSDHqa7AgjFmUTZcqhWQaVY/nqItGwW8AlvGYG36JR9xZNVAPtRyaq5nYWNGHrC3FJf47spgUO5AP6NlXe1QSMixJwCfHPgHwglQ4SvPr/97MNfx90ZyFpKFedpk2laWlYMD8sFxx2e1ZnRagANZNBfH531q4ISISCkLbdNuaV47soRFBXFIT7b2SDMV/pdi9jFcc6BZWPWm913RfG5JU9nHgldPcG93iLAHkPAxNKi/UU9T2s63FusE61</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgICA7cwDQYJKoZIhvcNAQENBQAwMjELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDESMBAGA1UEAxMJU2lHTkVUIENBMB4XDTE0MTIyNDA5NDIzOVoXDTE1MTIyNDA5NDIzOVowTzELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDEMMAoGA1UEChMDSUpTMQwwCgYDVQQLEwNDTUkxEzARBgNVBAMTCmlkcC5panMuc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVmKfNHpnoMMYrghY4J3HgNgfOYC/jMBQ8A2BN+5Pcv7ZVqi6FJYSVTLK4O0MKiYyKXLhtfNeQYBmaNIrSyvYs8MIPY3z6ZYx0/95lGxzbLn+6d5CKCRHgb/YG5vNl3DulrH72E7L8BpB0hN8wX0aol3O7a7nmlfppqG0ZWBUBNOj3GLE+G95ZXXYMLMWnLpexunyFHRl+YUR1kCCI/5KpcgIwm7Kpih1euvoCHX2ymRhDNvX+paKuGvkkZ1/TgwTmI0PNPYID6ivZPksRhuePxCUiMiGzaK6bQHNFzEL6dY/zj5sjlHh58qUQdOJJz22+CvMmG6+mugFdQzQZBxlAgMBAAGjggITMIICDzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCYGCWCGSAGG+EIBDQQZFhdTZXJ2ZXItQ2xpZW50IG9mIFNpR05FVDAdBgNVHQ4EFgQUG8ciEAHI67SgQpfOh87RhaV2ZzQwWgYDVR0jBFMwUYAUycZzPLenA790qr88vutO7wFl5fGhNqQ0MDIxCzAJBgNVBAYTAlNJMQ8wDQYDVQQKEwZTaUdORVQxEjAQBgNVBAMTCVNpR05FVCBDQYIBADAnBgNVHREEIDAegRBjbWkuYWRtaW5AaWpzLnNpggppZHAuaWpzLnNpMBsGA1UdEgQUMBKBEHNpZ25ldC1jYUBpanMuc2kwGAYDVR0gBBEwDzANBgsrBgEEAfdQAwEBADA+BglghkgBhvhCAQQEMRYvaHR0cDovL3NpZ25ldC1jYS5panMuc2kvcHViL2NybC9zaWduZXQwMmNybC5jcmwwPgYJYIZIAYb4QgEDBDEWL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMA0GCSqGSIb3DQEBDQUAA4IBAQCHeVajfooBA2/jSWyyZP9YHHdJcr3Va95+adILmO0G93bhx2JpqfybFjmN+8YJrcdPg6/Vn1VIhItMdpXwYcnHgqmRxYaSDHqa7AgjFmUTZcqhWQaVY/nqItGwW8AlvGYG36JR9xZNVAPtRyaq5nYWNGHrC3FJf47spgUO5AP6NlXe1QSMixJwCfHPgHwglQ4SvPr/97MNfx90ZyFpKFedpk2laWlYMD8sFxx2e1ZnRagANZNBfH531q4ISISCkLbdNuaV47soRFBXFIT7b2SDMV/pdi9jFcc6BZWPWm913RfG5JU9nHgldPcG93iLAHkPAxNKi/UU9T2s63FusE61</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ijs.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ijs.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Inštitut Jožef Stefan (IJS)</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Inštitut Jožef Stefan (IJS)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Inštitut Jožef Stefan (IJS)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Inštitut Jožef Stefan (IJS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ijs.si/ijsw/JSI</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.ijs.si/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jadran</md:GivenName>
+    <md:SurName>Lenarčič</md:SurName>
+    <md:EmailAddress>mailto:jadran.lenarcic@ijs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ijs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Martinec</md:SurName>
+    <md:EmailAddress>mailto:mark.martinec@ijs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Jona Javoršek</md:SurName>
+    <md:EmailAddress>mailto:jona.javorsek@ijs.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Jona Javoršek</md:SurName>
+    <md:EmailAddress>mailto:jona.javorsek@ijs.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
index 79f52892..add8b734 100644
--- a/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ill.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-03T13:42:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-03T13:42:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institut Laue-Langevin</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAACcdkwA1MKsAMSabADk4twApIp0APTy7ADc0swAvKqUALyKXACkgmQA7OrsALyWbADUyrwAxKJ8APz69ADMlmQA7OLcAOTa1ADUtpQAxJJkAKR+VADcwqwA/Pb0AMSypAC0hlwAzKZ8AKR6VADUxrwAxJ58APT29ADc1swArIJUAPTq5ADcyrQA/P78AOzm3ADElmQAxLakAJx6VADUxrQAzJpkAOTm5AC0ilwA9PL0ALyOXAC8lnQA1MrEAMSihAD8+vwA5N7UAMymhADc1tQArIJcAPTu7ADs5uQAxJZsAMS2rAAAAMUAAAASAAAAAAA4AJgAAMWQAAASSgAAAAAAeAJmAAEkAAAA9wAAAHcAANQ3BADHKMYAEvQSAAB3AADmoNgAK2/FAOX7EgB3dwAANIaWAABGUgAA9E0AwHcAAPh+sgBbRv8AFPT/AAB3/wAAAAAAAAAAAAAAAAAAAAAAXAi5AAACjwBQAEoAAAAAAHIIWAAAYPQAbxgSAAAAAABntk4AAMUAAHISAAAAAAAAYQAEAAAAxgBtABIAAAAAACAA2AAAAMUARgASAAAAAABpTvMAAAAZAGwA5QAAAHcAZUMAAAA6AABzXAAAAEQAAPtvKAAzY+QA5XUVAHdtAAAAZf8AAG7/AAB0/wAAc/8AKCAAAORhAAAVbgAAAGQAACggAADkUwAAFWUAAAB0AAAAdAAA4GkAABVuAAAAZwAAAHNqAOBcAAAVQQAAAGQAAABtUAAAaQMAAG4AAABpAAAHc7gAAHRiAAByFAAAYQAAAHRkAMZlIgASdeUAAHJ3AABcAAAATQEAAGUAAABzAAAA/LgAAMRiAAASAQAAAAAAAJUAAAAsAAAA5RQAAHcAAAAALAAAAMMAAAASAAAAAABUAAAAFwAAAOUAAAB3AAAATrjwAABi+gAAFBIAAAAAAP80AgD/1iQA//T3AP93dwBO8/gAABlUAADl9gAAd3cAWAD/APQA/wASAP8AAAD/AAAojQAA5BYAABX0AAAAdwAkACEAxgAeABIA5QAAAHcA2OAAAGDEAABKEhQAAAAAAAQAAADGAAAAEgAAAAAAAACX8LgAUvpiAE0SFAAAAAAAOAIAAMYkAQAS9wAAAHcAAADwHAAAdxgAAPbmAAB3dwCu/wAAxv8AABL/AAAA/wAAsDQEAP/WAAD/9AAAf3cAAGDzAwDGGQAAEuUAAAB3AADzAAAAGQAAAOUAAAB3AAAAANQAAAB3AAAA5AAAAHcAAPMABAAZAAAA5QAAAHcAAAABMAMAAAAAAAAAAAAAdwAANWAEAHHFAABGEgAAAAAAAGAwAgDGxQAAEhIAAAAAAABgAwAAxk0AABIFAAAAAQAAKA8oDygPKA8oDygPKA8oDygoKCgoKCgoKCgoKCgoKCgoDygPKA8oDygPKA8oDygPKCgoKCgoKCgoKCgoKCgoKCw0GhoaJhoAAAAAABQYEyghIiIKBBAiMC42IiIbNAgoMiIiIhcKIjAbCiIiJQAqKBMgIjAeESIiLhAiIhsmHygTASIiNgwiIikMIiIWCRQoJBkgNSkXFiIWFzAiIgcmKA8LAQYGOAMiIjMGIiIQGigPExIwDh0nIiIdDDAiBQ0oKA83GQ0cCxkcHDcNDRwLKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgPJCQTExMTExMTExMTJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ill.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Institut Laue-Langevin staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Institut Laue-Langevin</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel de l' Institut Laue-Langevin</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institut Laue-Langevin</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAACcdkwA1MKsAMSabADk4twApIp0APTy7ADc0swAvKqUALyKXACkgmQA7OrsALyWbADUyrwAxKJ8APz69ADMlmQA7OLcAOTa1ADUtpQAxJJkAKR+VADcwqwA/Pb0AMSypAC0hlwAzKZ8AKR6VADUxrwAxJ58APT29ADc1swArIJUAPTq5ADcyrQA/P78AOzm3ADElmQAxLakAJx6VADUxrQAzJpkAOTm5AC0ilwA9PL0ALyOXAC8lnQA1MrEAMSihAD8+vwA5N7UAMymhADc1tQArIJcAPTu7ADs5uQAxJZsAMS2rAAAAMUAAAASAAAAAAA4AJgAAMWQAAASSgAAAAAAeAJmAAEkAAAA9wAAAHcAANQ3BADHKMYAEvQSAAB3AADmoNgAK2/FAOX7EgB3dwAANIaWAABGUgAA9E0AwHcAAPh+sgBbRv8AFPT/AAB3/wAAAAAAAAAAAAAAAAAAAAAAXAi5AAACjwBQAEoAAAAAAHIIWAAAYPQAbxgSAAAAAABntk4AAMUAAHISAAAAAAAAYQAEAAAAxgBtABIAAAAAACAA2AAAAMUARgASAAAAAABpTvMAAAAZAGwA5QAAAHcAZUMAAAA6AABzXAAAAEQAAPtvKAAzY+QA5XUVAHdtAAAAZf8AAG7/AAB0/wAAc/8AKCAAAORhAAAVbgAAAGQAACggAADkUwAAFWUAAAB0AAAAdAAA4GkAABVuAAAAZwAAAHNqAOBcAAAVQQAAAGQAAABtUAAAaQMAAG4AAABpAAAHc7gAAHRiAAByFAAAYQAAAHRkAMZlIgASdeUAAHJ3AABcAAAATQEAAGUAAABzAAAA/LgAAMRiAAASAQAAAAAAAJUAAAAsAAAA5RQAAHcAAAAALAAAAMMAAAASAAAAAABUAAAAFwAAAOUAAAB3AAAATrjwAABi+gAAFBIAAAAAAP80AgD/1iQA//T3AP93dwBO8/gAABlUAADl9gAAd3cAWAD/APQA/wASAP8AAAD/AAAojQAA5BYAABX0AAAAdwAkACEAxgAeABIA5QAAAHcA2OAAAGDEAABKEhQAAAAAAAQAAADGAAAAEgAAAAAAAACX8LgAUvpiAE0SFAAAAAAAOAIAAMYkAQAS9wAAAHcAAADwHAAAdxgAAPbmAAB3dwCu/wAAxv8AABL/AAAA/wAAsDQEAP/WAAD/9AAAf3cAAGDzAwDGGQAAEuUAAAB3AADzAAAAGQAAAOUAAAB3AAAAANQAAAB3AAAA5AAAAHcAAPMABAAZAAAA5QAAAHcAAAABMAMAAAAAAAAAAAAAdwAANWAEAHHFAABGEgAAAAAAAGAwAgDGxQAAEhIAAAAAAABgAwAAxk0AABIFAAAAAQAAKA8oDygPKA8oDygPKA8oDygoKCgoKCgoKCgoKCgoKCgoDygPKA8oDygPKA8oDygPKCgoKCgoKCgoKCgoKCgoKCw0GhoaJhoAAAAAABQYEyghIiIKBBAiMC42IiIbNAgoMiIiIhcKIjAbCiIiJQAqKBMgIjAeESIiLhAiIhsmHygTASIiNgwiIikMIiIWCRQoJBkgNSkXFiIWFzAiIgcmKA8LAQYGOAMiIjMGIiIQGigPExIwDh0nIiIdDDAiBQ0oKA83GQ0cCxkcHDcNDRwLKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgPJCQTExMTExMTExMTJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ill.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Institut Laue-Langevin staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Institut Laue-Langevin</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel de l' Institut Laue-Langevin</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAPh1tLy+FaH+WftVWsG4GWw7G8FgMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcHNoaWIuaWxsLmZyMB4XDTE2MDEyMDEyMjMyOFoX
 DTM2MDEyMDEyMjMyOFowGTEXMBUGA1UEAwwOaWRwc2hpYi5pbGwuZnIwggEiMA0G
@@ -40,29 +40,29 @@ tjuEqopY4pc6Sp7DQaw4YxFhu+cxfrcRgAeRlyW2i9x0m5ZmKMdvmbJd0q8oScTN
 2FmYHprUiwFwHtlGuM8fKyB3Bv0Ys+F3ux5OfxWNykRV5hFwFtdEr1uiaClt9AHD
 E0ardMDf+phlxOcVQexaMrV2+3E+1Y12S/6z761q8J2WqyTX/KYsEQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ill.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ill.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ill.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ill.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ill.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ill.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institut Laue-Langevin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institut Laue-Langevin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ill.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Fabien Pinet</md:SurName>
-      <md:EmailAddress>pinet@ill.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-François Perrin</md:SurName>
-      <md:EmailAddress>perrin@ill.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ill.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ill.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ill.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ill.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ill.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ill.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institut Laue-Langevin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institut Laue-Langevin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ill.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Fabien Pinet</md:SurName>
+    <md:EmailAddress>pinet@ill.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-François Perrin</md:SurName>
+    <md:EmailAddress>perrin@ill.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
index 340e4b3b..264011a5 100644
--- a/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.img.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-09T12:29:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-09T12:29:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">img.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for IMG ASCR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Poskytovatel identity pro zaměstnance ÚMG AV ČR.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.img.cas.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.img.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="104">https://idp.img.cas.cz/images/img_logo_small.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">img.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for IMG ASCR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Poskytovatel identity pro zaměstnance ÚMG AV ČR.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.img.cas.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.img.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="104">https://idp.img.cas.cz/images/img_logo_small.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
 DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -50,13 +50,13 @@ RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
 N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPH1jffpoY1P09PSPn2C5FEqRR0aMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5pbWcuY2FzLmN6MB4XDTE2MDUwMzA5NDg0MloX
 DTM2MDUwMzA5NDg0MlowGTEXMBUGA1UEAwwOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -75,13 +75,13 @@ tOMzFdtQpHjcvBg4E+boy9D2ouYtEMriUUkXwA8/6xo/tCxZ2yrrRARKJ6k1XuYQ
 OjUAFH7HUxuAasYo2VtlT0zFzN9v7+js0TRzIYFtr96d9O/TxiMbmPymwMMw3lcn
 s3BGFyiU3PuUOF/0edoSgNgbTYAfKlr6zMkfRwawvwug2ZLplWcCJw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAIOCNOvl2AO6vqxEbpoyEwFrR9RfMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5pbWcuY2FzLmN6MB4XDTE2MDUwMzA5NDg0MloX
 DTM2MDUwMzA5NDg0MlowGTEXMBUGA1UEAwwOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -100,13 +100,13 @@ n0YUu/NzcRU+OjQTQmJ5+tVfVPaW2+UColH2n/iyjfLj15FUUK/CxPiBXwlarpVp
 LXu3SILGjAvAWaxNE5BbdkeSGwLjgyBnRO2U9m2T4hBW3AwIWwivK00QsnxRJc8D
 RPOCRujFQFIDaowMdBOOlBmUKqKYAvxj6KaXlX+Bkh4rglUd6DYh0Q==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAO8xd776uz+lDpWqdZ9Gm3yEmHLSMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5pbWcuY2FzLmN6MB4XDTE2MDUwMzA5NDg0MloX
 DTM2MDUwMzA5NDg0MlowGTEXMBUGA1UEAwwOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -125,30 +125,30 @@ E0n6bhk2C8v9z9ptP3VxfDIsbNMitjFJymfJF0LHgblE37ZCsnVLqEubkv3WeL/S
 U0bC68hJxCujEIqHe3k+LPtsmn2hE4CtNUfeOjgDjPinOPnKcwzF9wlLn2TN8GT4
 BTkORnRLbNxaeD5lxF3nKFucq/Hfs2uYBn+TcIhyWUq6nPn6DAZM/g==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.img.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">img.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.img.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">img.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
 DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -168,13 +168,13 @@ RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
 N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPH1jffpoY1P09PSPn2C5FEqRR0aMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5pbWcuY2FzLmN6MB4XDTE2MDUwMzA5NDg0MloX
 DTM2MDUwMzA5NDg0MlowGTEXMBUGA1UEAwwOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -193,13 +193,13 @@ tOMzFdtQpHjcvBg4E+boy9D2ouYtEMriUUkXwA8/6xo/tCxZ2yrrRARKJ6k1XuYQ
 OjUAFH7HUxuAasYo2VtlT0zFzN9v7+js0TRzIYFtr96d9O/TxiMbmPymwMMw3lcn
 s3BGFyiU3PuUOF/0edoSgNgbTYAfKlr6zMkfRwawvwug2ZLplWcCJw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAIOCNOvl2AO6vqxEbpoyEwFrR9RfMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5pbWcuY2FzLmN6MB4XDTE2MDUwMzA5NDg0MloX
 DTM2MDUwMzA5NDg0MlowGTEXMBUGA1UEAwwOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -218,13 +218,13 @@ n0YUu/NzcRU+OjQTQmJ5+tVfVPaW2+UColH2n/iyjfLj15FUUK/CxPiBXwlarpVp
 LXu3SILGjAvAWaxNE5BbdkeSGwLjgyBnRO2U9m2T4hBW3AwIWwivK00QsnxRJc8D
 RPOCRujFQFIDaowMdBOOlBmUKqKYAvxj6KaXlX+Bkh4rglUd6DYh0Q==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAO8xd776uz+lDpWqdZ9Gm3yEmHLSMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5pbWcuY2FzLmN6MB4XDTE2MDUwMzA5NDg0MloX
 DTM2MDUwMzA5NDg0MlowGTEXMBUGA1UEAwwOaWRwLmltZy5jYXMuY3owggEiMA0G
@@ -243,25 +243,25 @@ E0n6bhk2C8v9z9ptP3VxfDIsbNMitjFJymfJF0LHgblE37ZCsnVLqEubkv3WeL/S
 U0bC68hJxCujEIqHe3k+LPtsmn2hE4CtNUfeOjgDjPinOPnKcwzF9wlLn2TN8GT4
 BTkORnRLbNxaeD5lxF3nKFucq/Hfs2uYBn+TcIhyWUq6nPn6DAZM/g==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IMG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.img.cas.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.img.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michal</md:GivenName>
-      <md:SurName>Zacek</md:SurName>
-      <md:EmailAddress>michal.zacek@img.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IMG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.img.cas.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.img.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Zacek</md:SurName>
+    <md:EmailAddress>michal.zacek@img.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
index 0e6d4ddd..474533e1 100644
--- a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
+++ b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inalco.fr/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T14:15:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T14:15:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inalco.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAxElEQVQoz2P8//8/AymAiSTV5GhgkZ78ijQNz778pbGTKix5sEqwMjH8+suw8vr3Bx+hTmBiZAhU42Bpd+DFZdj0c9/e//gH56boc3U48rLgUj35zNeqg5+//ILGkrsSe401jyAHExYNb7//m3PxW+vRL3DVXsrs/S58snzMDAwMWDQce/Kr+sDnv7AEEKTOMcWNX5KHCWcomUuzlZjzsDEzMjAw+KmiqGZgYGD4jw38/vu/8/jn4LXvHnz4gybFOPgSHwDBT2gg9JyRSwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMiswMjowMEOn0x8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDAy+mujAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://inalco.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inalco.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAxElEQVQoz2P8//8/AymAiSTV5GhgkZ78ijQNz778pbGTKix5sEqwMjH8+suw8vr3Bx+hTmBiZAhU42Bpd+DFZdj0c9/e//gH56boc3U48rLgUj35zNeqg5+//ILGkrsSe401jyAHExYNb7//m3PxW+vRL3DVXsrs/S58snzMDAwMWDQce/Kr+sDnv7AEEKTOMcWNX5KHCWcomUuzlZjzsDEzMjAw+KmiqGZgYGD4jw38/vu/8/jn4LXvHnz4gybFOPgSHwDBT2gg9JyRSwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMiswMjowMEOn0x8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDAy+mujAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://inalco.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUXBzPfYV+3ru5apFeK1Xo5W/wdlowDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMB4XDTEwMDkyODE0NTYxOFoX
 DTMwMDkyODE0NTYxOFowGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMIIBIjAN
@@ -37,21 +37,21 @@ cd597hjiVBd85/biLQ3yTBkzJx2UiXm/Wj2qfyHoJDH9UfcLZOorR8R0b1ObSbHY
 e6Kt16MbjbkcX6m9uYJo9HiN5hJ+pP0fV4q8kj2YxAK/av/v0Qp5iXJfBH9QecSK
 BdKgqhQ4XdLkP9D+5i10GGHVDJL3NYCpNbAqNmHeTJGjc+aSG6XpBZPcVw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inalco.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inalco.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inalco.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://inalco.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>ldap-adm@inalco.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inalco.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inalco.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inalco.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://inalco.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ldap-adm@inalco.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml
index adc7e457..21f0b75c 100644
--- a/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.incommonfederation.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommonfederation.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommon.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InCommon Operations</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommonfederation.org</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommon.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">InCommon Operations</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIBADANBgkqhkiG9w0BAQQFADAlMSMwIQYDVQQDExppZHAu
 aW5jb21tb25mZWRlcmF0aW9uLm9yZzAeFw0xMjA4MjcyMDUyMzFaFw0yMjA4MjUy
 MDUyMzFaMCUxIzAhBgNVBAMTGmlkcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMIIB
@@ -40,24 +40,24 @@ IsdNGAFeVZn/1v9+nv34z8rvnfFDvP5kfyL2xXeV0rn9ChD/utvf3C0+6HvT1Zls
 5QOJmNi7uAS1xr5AvbV8eVrOGtqemGVlSxJAtjG7DStzfLGDoMKOR5NkBmUzK+8i
 FZHt70mZqw2O8mIkp6DuO+EJLYkB1/4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.incommonfederation.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.incommonfederation.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.incommonfederation.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.incommonfederation.org/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.incommonfederation.org/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommonfederation.org</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommon.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.incommonfederation.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.incommonfederation.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.incommonfederation.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.incommonfederation.org/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.incommonfederation.org/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommonfederation.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommon.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIBADANBgkqhkiG9w0BAQQFADAlMSMwIQYDVQQDExppZHAu
 aW5jb21tb25mZWRlcmF0aW9uLm9yZzAeFw0xMjA4MjcyMDUyMzFaFw0yMjA4MjUy
 MDUyMzFaMCUxIzAhBgNVBAMTGmlkcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMIIB
@@ -77,18 +77,18 @@ IsdNGAFeVZn/1v9+nv34z8rvnfFDvP5kfyL2xXeV0rn9ChD/utvf3C0+6HvT1Zls
 5QOJmNi7uAS1xr5AvbV8eVrOGtqemGVlSxJAtjG7DStzfLGDoMKOR5NkBmUzK+8i
 FZHt70mZqw2O8mIkp6DuO+EJLYkB1/4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.incommonfederation.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">InCommon LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">InCommon Operations</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.incommon.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.incommonfederation.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InCommon LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InCommon Operations</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.incommon.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
index 8e6cc1c2..7130d1b4 100644
--- a/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.infn.it/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-28T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-28T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">INFN - National Institute for Nuclear Physics</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'INFN</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for INFN users</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://web.infn.it/CCR/index.php/i-progetti/aai/federazione-idem</mdui:InformationURL>
+        <mdui:Logo height="79" width="80" xml:lang="it">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
+        <mdui:Logo height="79" width="80" xml:lang="en">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
+        <mdui:Logo height="15" width="16" xml:lang="it">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
+        <mdui:Logo height="15" width="16" xml:lang="en">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">infn.it</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">INFN - National Institute for Nuclear Physics</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'INFN</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for INFN users</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://web.infn.it/CCR/index.php/i-progetti/aai/federazione-idem</mdui:InformationURL>
-          <mdui:Logo height="79" width="80" xml:lang="it">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
-          <mdui:Logo height="79" width="80" xml:lang="en">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
-          <mdui:Logo height="15" width="16" xml:lang="it">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
-          <mdui:Logo height="15" width="16" xml:lang="en">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">infn.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
 BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
 TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
@@ -45,13 +45,13 @@ dwq2pb++9FiHglwSTl5WV+V4ZuNUMemY8jzhqayOK6UuwdL61UE4dPGKnlCgMaiY
 VST86HkiqFh9oOJ8D6jtlk695pRaz1h3ajxwB9zOa2VAWEsi40P2tZIzY3ek25wT
 M2vuvHO4YsOmkAOxj2Wk/itj5MnK1tT0u840b61Q/j4SJGuKLe4Tzzg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
 BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
 TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
@@ -73,13 +73,13 @@ dwq2pb++9FiHglwSTl5WV+V4ZuNUMemY8jzhqayOK6UuwdL61UE4dPGKnlCgMaiY
 VST86HkiqFh9oOJ8D6jtlk695pRaz1h3ajxwB9zOa2VAWEsi40P2tZIzY3ek25wT
 M2vuvHO4YsOmkAOxj2Wk/itj5MnK1tT0u840b61Q/j4SJGuKLe4Tzzg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEZDCCA0ygAwIBAgIRAJtYpZkrXh+6+4/H9lRGN+gwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzExMDcwMDAwMDBaFw0xNjEyMDMyMzU5NTlaMDkxITAfBgNV
@@ -105,19 +105,19 @@ BQUAA4IBAQBclu01pFdY9/QUnNh89d5BuYj/4Rd9JG8cjTnzjU1+Zb+QHSmUNlk0
 cDhA29FRWYWUwT0z3fA1EDvmYpfP926yoYcrrwguDJzz7BVjMKsHLD/jn8zb3W0v
 jp7JtavGgA6UwGLX5KnnpPeICQozxORx
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.infn.it/saml2/idp/ArtifactResolutionService.php" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.infn.it/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.infn.it/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.infn.it/saml2/idp/ArtifactResolutionService.php" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.infn.it/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.infn.it/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
 BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
 TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
@@ -139,36 +139,36 @@ dwq2pb++9FiHglwSTl5WV+V4ZuNUMemY8jzhqayOK6UuwdL61UE4dPGKnlCgMaiY
 VST86HkiqFh9oOJ8D6jtlk695pRaz1h3ajxwB9zOa2VAWEsi40P2tZIzY3ek25wT
 M2vuvHO4YsOmkAOxj2Wk/itj5MnK1tT0u840b61Q/j4SJGuKLe4Tzzg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.infn.it/shib13/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">INFN - National Institute for Nuclear Physics</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">INFN - National Institute for Nuclear Physics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.infn.it/index.php?lang=it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.infn.it/index.php?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:aai-support@lists.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Enrico Maria Vincenzo</md:GivenName>
-      <md:SurName>Fasanelli</md:SurName>
-      <md:EmailAddress>mailto:Enrico.M.V.Fasanelli@le.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dael</md:GivenName>
-      <md:SurName>Maselli</md:SurName>
-      <md:EmailAddress>mailto:Dael.Maselli@lnf.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Claudio</md:GivenName>
-      <md:SurName>Grandi</md:SurName>
-      <md:EmailAddress>mailto:Claudio.Grandi@bo.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.infn.it/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">INFN - National Institute for Nuclear Physics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">INFN - National Institute for Nuclear Physics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.infn.it/index.php?lang=it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.infn.it/index.php?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:aai-support@lists.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Enrico Maria Vincenzo</md:GivenName>
+    <md:SurName>Fasanelli</md:SurName>
+    <md:EmailAddress>mailto:Enrico.M.V.Fasanelli@le.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dael</md:GivenName>
+    <md:SurName>Maselli</md:SurName>
+    <md:EmailAddress>mailto:Dael.Maselli@lnf.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Claudio</md:GivenName>
+    <md:SurName>Grandi</md:SurName>
+    <md:EmailAddress>mailto:Claudio.Grandi@bo.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
index 6ba1f452..9cf82865 100644
--- a/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inha.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-04T12:21:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-04T12:21:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inha.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA5ElEQVQoz92RwUpCURCG/zlzjmhouBNcC5ELERctgkvgRugJfI/eobeqpdKiwkgI2thCaCeSZXrmnGkheLUucdv2rYZhPv4ZhlQVf8GmZRB5vJXxfZy+QCMAqlS5ceySHhVL6Zju4tfhdbq4vJh1G/N+4kc38f1N9zH7ec7U6oWkB1fgo5ZtndBB+dtKJmPNYonY0mE184YMgQyDiJjzCr/zXwXVzT/zCupXCAGfy3yCSHh60PUqTJ51PvspUBodo4zv/PDKD67xsQBbbrZd59SdnVO5kiUAEAEb0E6seLAF0bbxBWW5bejS9CznAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAw5dDYqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMJSNYBcAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.inha.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inha.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA5ElEQVQoz92RwUpCURCG/zlzjmhouBNcC5ELERctgkvgRugJfI/eobeqpdKiwkgI2thCaCeSZXrmnGkheLUucdv2rYZhPv4ZhlQVf8GmZRB5vJXxfZy+QCMAqlS5ceySHhVL6Zju4tfhdbq4vJh1G/N+4kc38f1N9zH7ec7U6oWkB1fgo5ZtndBB+dtKJmPNYonY0mE184YMgQyDiJjzCr/zXwXVzT/zCupXCAGfy3yCSHh60PUqTJ51PvspUBodo4zv/PDKD67xsQBbbrZd59SdnVO5kiUAEAEb0E6seLAF0bbxBWW5bejS9CznAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAw5dDYqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMJSNYBcAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.inha.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGDCCAgCgAwIBAgIVAO4pV7sAz3uXoZSchrwj2d0PI981MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5pbmhhLmZyMB4XDTEzMDUyNzEzMjk0OVoXDTMz
 MDUyNzEzMjk0OVowFjEUMBIGA1UEAxMLaWRwLmluaGEuZnIwggEiMA0GCSqGSIb3
@@ -37,21 +37,21 @@ md+a7DpGG/GPiczhrHZbrlwfMsbWTvfM6q4NqEHUWohV5TdJz3SVXnF7VWYjkgy2
 dk/zNZ/MGrjW4UnPGRTom36a+nElGRuRkIoyiOGzXuPyYZv6Phauwd3T5TmT1xi2
 BOkRf1b1DqBCezZIc9+vQAydDa2NLP0u415mxA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inha.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inha.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inha.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inha.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin@inha.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inha.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inha.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inha.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inha.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin@inha.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
index bde5eb35..24d0f905 100644
--- a/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inp-toulouse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-27T14:12:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-27T14:12:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inp-toulouse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJ0lEQVQoz5VSS09TYRA9833fvb29jX1YLRFu0YILwcSAqKQrYxdiWKtrY/xRBBBfIYZI2GnciHFFFHCvFE1/gUjbe2/7PcZFSX3snExmMedMMnPm0NLT51PvPtRebDkEBAMYgiUYINY4HZ+vJrUojka6hUK3WOhWzigAUmuHTnuiFk9G3epoJ5/vlkqdSlnnQgDE/FeurK4xs/Z9IvoHAzMAZoBAOAkBQEpZkFL1epSm0hhhLTmn+33nHAAhIIjSNLXWAlBam0bjpqe8fr/farUOv333fV9rvbh45/jncbFYjKKxOE5yuXB7+/1B81AAsMYaY6y1Cwu3L09P93o9AMxsjGF2e3v7yyuP19dfNhq3jDECw+WEaDab9fp8vT6fJMmwzwDAlZHK4B41BIjIGLO0vPro4YNsEOh+H4Cx9sb1azMzVzrtzubmlu97vwcGM0qptSfP7t+7W6mc3dv/rKT8tLu7s/PR8zyllBBCABBSSCmFFEJIAoIg2Nh41Wq1fM8TUvqen8lkfN8fkJWU4uuXA2ZWShlrpJQAsmH29Zu35XK5WCx02u0BlZmJSBHRj6MjrXWQyXS63Xz+VBInJEQYhnEcx3HMzLkwTNI0CII0TQUzR9GYtXZubjbMZq/OzkqlxkbPjVej8fHqRO1CqVSamrokiC5OTjjnaGV1zTknhDDGSCmttVJKZh5qSkTs3BBSgw8AUEoNKxH9qR6kHDjoxEv/Fb8AE5wH89h/eZ0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDDl0NirAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAwlI1gFwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.inp-toulouse.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inp-toulouse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJ0lEQVQoz5VSS09TYRA9833fvb29jX1YLRFu0YILwcSAqKQrYxdiWKtrY/xRBBBfIYZI2GnciHFFFHCvFE1/gUjbe2/7PcZFSX3snExmMedMMnPm0NLT51PvPtRebDkEBAMYgiUYINY4HZ+vJrUojka6hUK3WOhWzigAUmuHTnuiFk9G3epoJ5/vlkqdSlnnQgDE/FeurK4xs/Z9IvoHAzMAZoBAOAkBQEpZkFL1epSm0hhhLTmn+33nHAAhIIjSNLXWAlBam0bjpqe8fr/farUOv333fV9rvbh45/jncbFYjKKxOE5yuXB7+/1B81AAsMYaY6y1Cwu3L09P93o9AMxsjGF2e3v7yyuP19dfNhq3jDECw+WEaDab9fp8vT6fJMmwzwDAlZHK4B41BIjIGLO0vPro4YNsEOh+H4Cx9sb1azMzVzrtzubmlu97vwcGM0qptSfP7t+7W6mc3dv/rKT8tLu7s/PR8zyllBBCABBSSCmFFEJIAoIg2Nh41Wq1fM8TUvqen8lkfN8fkJWU4uuXA2ZWShlrpJQAsmH29Zu35XK5WCx02u0BlZmJSBHRj6MjrXWQyXS63Xz+VBInJEQYhnEcx3HMzLkwTNI0CII0TQUzR9GYtXZubjbMZq/OzkqlxkbPjVej8fHqRO1CqVSamrokiC5OTjjnaGV1zTknhDDGSCmttVJKZh5qSkTs3BBSgw8AUEoNKxH9qR6kHDjoxEv/Fb8AE5wH89h/eZ0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDDl0NirAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAwlI1gFwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.inp-toulouse.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNzCCAh+gAwIBAgIUT/ZV7f3Lusa+9lbOZVbS0YCpfgwwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTaWRwLmlucC10b3Vsb3VzZS5mcjAeFw0xMzA5MjcwOTA1
 MzJaFw0zMzA5MjcwOTA1MzJaMB4xHDAaBgNVBAMTE2lkcC5pbnAtdG91bG91c2Uu
@@ -38,13 +38,13 @@ nJWM2NmnEkHvKTR2q49aCZGjI//t6qrUyOpt03XVabmbBfhYrNbv1ox9cYDWQ6zK
 6ry/CkIwbFwR9jLRuE67WIfLURxILClIr1NlUymiFsuPB4NV90s9HNf1bYPQdJ2C
 lr6eMsR0+Pc7BjU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEczCCA1ugAwIBAgIQUvXDGTom14VWyQKZ9c5IAjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDkyNzAwMDAwMFoXDTE2MDkyNjIzNTk1OVowQTEhMB8GA1UE
@@ -70,22 +70,22 @@ VOMMA2MQMmQm+e+bKYxc4SFtCWqbMgAtwbYayZ5B1Essntx2tiYZqB4V00BvbBR8
 QitJtSVJ5UEYiVLK35rrj7909QURc7UsgZ9iJeueTGvFsYqo+CY6piFLJR7AH4ig
 gx11BVKtBfjtJ60W2R+4M63zQHh+58b7FR3/AYpWkWtFgxac775M
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inp-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inp-toulouse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Vincent CHONG-WING</md:SurName>
-      <md:EmailAddress>vincent.chong-wing@inp-toulouse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inp-toulouse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inp-toulouse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Vincent CHONG-WING</md:SurName>
+    <md:EmailAddress>vincent.chong-wing@inp-toulouse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
index 69cda039..a47454cb 100644
--- a/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inpa.gov.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
 VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
 NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
@@ -39,26 +39,26 @@ Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
 8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
 g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
 VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
@@ -77,24 +77,24 @@ Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
 g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inpa.gov.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Paulo Henrique Cardoso Maia</md:SurName>
-      <md:EmailAddress>paulo.maia@inpa.gov.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inpa.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Paulo Henrique Cardoso Maia</md:SurName>
+    <md:EmailAddress>paulo.maia@inpa.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
index 0efc3289..17ba2576 100644
--- a/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inra.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-17T16:49:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-17T16:49:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inra.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INRA - Institut National de la Recherche Agronomique</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAt0lEQVQ4y2NkIACmbVL+D2Nn+d1lRJdnQuYs2Kf6nljDqAYYYTZ/+/JPAJsz0W01tuE+wMDAwMAnyPJAk/FcIgsDAwMDTDMDAwPD9f9GDsga9m/+iGLj2SNfkeUTMQKFkL/RXchCaUAx4vIjDJgLXXIkGIiUeIHx+n+jBmQBTcZzKHwsgbofbxigA03GcwfQhBhxckgNxCy/u4yMhDQRHajTNin/J8Z2dHXUT0gMDKghj5yUsWVnAJH5WDhNWjRwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAw5dDYqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMJSNYBcAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.jouy.inra.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INRA - Institut National de la Recherche Agronomique</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inra.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INRA - Institut National de la Recherche Agronomique</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAt0lEQVQ4y2NkIACmbVL+D2Nn+d1lRJdnQuYs2Kf6nljDqAYYYTZ/+/JPAJsz0W01tuE+wMDAwMAnyPJAk/FcIgsDAwMDTDMDAwPD9f9GDsga9m/+iGLj2SNfkeUTMQKFkL/RXchCaUAx4vIjDJgLXXIkGIiUeIHx+n+jBmQBTcZzKHwsgbofbxigA03GcwfQhBhxckgNxCy/u4yMhDQRHajTNin/J8Z2dHXUT0gMDKghj5yUsWVnAJH5WDhNWjRwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAw5dDYqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMJSNYBcAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.jouy.inra.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INRA - Institut National de la Recherche Agronomique</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
 BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
 VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
@@ -43,23 +43,23 @@ lJSyrOoagLkgU/k4XV81/NE+fWiQvNQl1GmcvtrN1UZmuza3g/miWRHxf6PgCC/M
 ZbGGM6SI8RhHkV9rmtvlCAbI4nwkIxYP+RX7me4vueKiUCiuod40PJlRQ0D8Wrr7
 UCoh/SWrQNc=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inra.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inra.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inra.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inra.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inra.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inra.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inra.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inra.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
 BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
 VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
@@ -84,19 +84,19 @@ lJSyrOoagLkgU/k4XV81/NE+fWiQvNQl1GmcvtrN1UZmuza3g/miWRHxf6PgCC/M
 ZbGGM6SI8RhHkV9rmtvlCAbI4nwkIxYP+RX7me4vueKiUCiuod40PJlRQ0D8Wrr7
 UCoh/SWrQNc=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inra.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INRA - Institut National de la Recherche Agronomique</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INRA - Institut National de la Recherche Agronomique</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jouy.inra.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>iris@jouy.inra.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inra.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INRA - Institut National de la Recherche Agronomique</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INRA - Institut National de la Recherche Agronomique</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jouy.inra.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>iris@jouy.inra.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
index 93c7c9d0..9397534a 100644
--- a/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.insa-rennes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-09T09:44:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-09T09:44:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">idp v2 INSA Rennes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkIyOEI1MTFDQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkIyOEI1MTFEQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QjI4QjUxMUFBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QjI4QjUxMUJBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5mRQOCAAABCUlEQVR42mL8//8/AymAiYFEQHsNLL9mTv42cyKbieWvM8e50vMhbKAEkAskeRq6mdQ1PkX6AtnTbX00HR1ZkHX/OXsKSP6+ee3/549sju6/z5z4tWUd6xdniKzUq6foToKYysjLB2Lv38lqYsHZ0PH77GlGXn6giMrXTyAnoXhISvbfs8csUjLsxdXfZ00G6vkDsu0TxAjJV09fo9nA7uAKsedzcQaLuiaQDdQPdB6EFPr1Q42PB0UDi7EZiFTXBvr7x6Y1EDuBJHdJDTA8gAy1L58YccX0mzdvzp07z8XFBWSIiIhASDk5WRZc4f3mzdsNGzcBVdy4cVNDQx1CarxRZxwGaQkgwACB/3sY4hVazQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-rennes.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">idp v2 INSA de Rennes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">idp v2 INSA Rennes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkIyOEI1MTFDQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkIyOEI1MTFEQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QjI4QjUxMUFBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QjI4QjUxMUJBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5mRQOCAAABCUlEQVR42mL8//8/AymAiYFEQHsNLL9mTv42cyKbieWvM8e50vMhbKAEkAskeRq6mdQ1PkX6AtnTbX00HR1ZkHX/OXsKSP6+ee3/549sju6/z5z4tWUd6xdniKzUq6foToKYysjLB2Lv38lqYsHZ0PH77GlGXn6giMrXTyAnoXhISvbfs8csUjLsxdXfZ00G6vkDsu0TxAjJV09fo9nA7uAKsedzcQaLuiaQDdQPdB6EFPr1Q42PB0UDi7EZiFTXBvr7x6Y1EDuBJHdJDTA8gAy1L58YccX0mzdvzp07z8XFBWSIiIhASDk5WRZc4f3mzdsNGzcBVdy4cVNDQx1CarxRZxwGaQkgwACB/3sY4hVazQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-rennes.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">idp v2 INSA de Rennes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVAJHTEvJ6v+nlYzV+wkUtFZ6HzcHCMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5mcjAeFw0xMTExMTgwOTU4
 MzZaFw0zMTExMTgwOTU4MzZaMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5m
@@ -38,21 +38,21 @@ DS0IzKCW7Qw9cBjhyIPJP1AsVe0qAPzz/+cFYeAhn1IDhFVmDLrWuFMtFEhytPPx
 83jRvkMRYTkV2AdH1UqS1c46r/56fa6YwAGxq90K4mMN1hbdkatVdfF/WUbmW9fU
 R/EORI5dwv0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">idp v2 INSA de Rennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">idp v2 INSA de Rennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-rennes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri-systeme@insa-rennes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">idp v2 INSA de Rennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">idp v2 INSA de Rennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-rennes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri-systeme@insa-rennes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
index 9dac1cb7..808907ac 100644
--- a/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inserm-transfert.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-26T17:34:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-26T17:34:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSERM-Transfert</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">INSERM-Transfert</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnel</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSERM-Transfert</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">INSERM-Transfert</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnel</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAJ0+TvIeavAjFYxpT+7F0r61FktEMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MTEw
 NTExMTYzM1oXDTM1MTEwNTExMTYzM1owIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
@@ -39,13 +39,13 @@ PtOxxP015w7/b9XDcshiRp7Xq/SExT4u5lweQiuYCtQG50GglyTnAiusgudwOJe2
 x3BVTdBOVbAslCRJv87S1z+DTBWmau+d8f5UDihF4YOpGRfIdo6wMf5JFn9BvZ7X
 JEYjjQM1FVU+uKub1f4DfSjgrc4HvczfZY1hnw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAIJyc+Gfzp0eVbXdBuMNzE3AyFxwMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MDkx
 NzE0MDQ1NloXDTM1MDkxNzE0MDQ1NlowIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
@@ -65,26 +65,26 @@ CJX0zPBriZsEKtzvHyKP/J8fI2Xn5uyvK8Z2WI1JyGr9r69EHXtN1ERk/jkdM+vf
 IDXLNZxDZcZALVhexi2xQG6uuu4dr/CnjWMJjDPN9nvx4WBsmPl1K7Tx0GRmF7gJ
 xIMPqERTBQpVvk4wmDf5mFKRvz1TjqYd32QhVA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm-transfert.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm-transfert.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAJ0+TvIeavAjFYxpT+7F0r61FktEMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MTEw
 NTExMTYzM1oXDTM1MTEwNTExMTYzM1owIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
@@ -104,13 +104,13 @@ PtOxxP015w7/b9XDcshiRp7Xq/SExT4u5lweQiuYCtQG50GglyTnAiusgudwOJe2
 x3BVTdBOVbAslCRJv87S1z+DTBWmau+d8f5UDihF4YOpGRfIdo6wMf5JFn9BvZ7X
 JEYjjQM1FVU+uKub1f4DfSjgrc4HvczfZY1hnw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAIJyc+Gfzp0eVbXdBuMNzE3AyFxwMA0GCSqGSIb3DQEB
 CwUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MDkx
 NzE0MDQ1NloXDTM1MDkxNzE0MDQ1NlowIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
@@ -130,19 +130,19 @@ CJX0zPBriZsEKtzvHyKP/J8fI2Xn5uyvK8Z2WI1JyGr9r69EHXtN1ERk/jkdM+vf
 IDXLNZxDZcZALVhexi2xQG6uuu4dr/CnjWMJjDPN9nvx4WBsmPl1K7Tx0GRmF7gJ
 xIMPqERTBQpVvk4wmDf5mFKRvz1TjqYd32QhVA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm-transfert.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSERM-Transfert</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSERM-Transfert</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm-transfert.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSERM-Transfert</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSERM-Transfert</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
index f42e5ae7..a0dea41d 100644
--- a/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inserm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-29T14:53:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-29T14:53:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSERM</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAANElEQVQ4y2NkwA7+o/EZcahjYGKgEIwaMGoAVQygHfjPwPD/P2aewACMuDSjKaJdZqLYCwC8YAsRZ1lnqQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMCB35iUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDBRKl6ZAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INSERM</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSERM</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAANElEQVQ4y2NkwA7+o/EZcahjYGKgEIwaMGoAVQygHfjPwPD/P2aewACMuDSjKaJdZqLYCwC8YAsRZ1lnqQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMCB35iUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDBRKl6ZAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INSERM</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
 MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
@@ -37,23 +37,23 @@ lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
 f6ou5oRTltOZOUJfXI1XMhAUNnU7zQvrFeoGrRzGv3zq8AieXbRyWhXY1Eo1mPpS
 4gA/AqUGz/DMMnCEWuy1Dmq9rAOVcoAxntyKDo0ntUiBrUg=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
 MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
@@ -72,19 +72,19 @@ lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
 f6ou5oRTltOZOUJfXI1XMhAUNnU7zQvrFeoGrRzGv3zq8AieXbRyWhXY1Eo1mPpS
 4gA/AqUGz/DMMnCEWuy1Dmq9rAOVcoAxntyKDo0ntUiBrUg=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm.fr/idp/AA"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSERM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSERM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm.fr/idp/AA"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSERM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSERM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml
index 8b7878fa..9099506f 100644
--- a/swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inshea.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-22T17:43:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-22T17:43:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inshea.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</mdui:DisplayName>
+        <mdui:Logo height="11" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAACwD18GZZAAACHUlEQVQoz41RTUiTcRx+/h/v5qYrRZEEda1w9mGHNazEg0ERFEJE59ahGnmM8hLIMMjo1qEOkdcEDRUkIoKMJJAI6UOSEeU28KPplm2++3j3vv//r8sOHQp84Dk9H/z4PQDA/ssJEgAQmMl14z0deoT7px42PegHgBhiHACTAAj/AhEHYwrT1Jgw6N6Zj6klL8x42l//FBlgGMP6bzsDYhzVVsSIAwAmyON5nn05+OTz1ouzQzNvL14PAcDjcNSoXgl5uC26n2ttKZl0DOURFo9qMTfkDQLb05s/es61bNT0LEx9qtPLi2NdtauYHGgby9l0MHBFMBsGCwejTWWbAqTJx5jOErEWbjpJ1VxXKrc0Hjv5885X8zfUs7qbDN/yrd0B5EwtHElWjrNdvxgAdLVfu6ShTxATq8InKj6nHBc9oeVcci2y+Kb4BUZFdDY7HR6XcllazAlCr2Z4vZQanZXVB6xDyg/SLNgilanMo34TIfdGqzS+H+9la3y14La0m8q2aBCCuxyohMHhAADr9F/ey7jL5S7mKzLdLlZu72k/7U2WQuN5e94kezJRyob3NYhiUTEh2G4lSbggt2zlSMG15jXKY8cD/kI0PZ5ZGB3sOBLuHzm/7Z0NBytXeSSwAniVv1brgiMqUql1t6VXFFclCMfk2m1VJycGAMiQb+rW2Kt3kRupxEjfAQAgVLWdgIDWXB8G1u5eOLrTzB8gJ/AD0J/JFwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMOXQ2KsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDCUjWAXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.inshea.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">staff and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel et étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inshea.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</mdui:DisplayName>
-          <mdui:Logo height="11" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAACwD18GZZAAACHUlEQVQoz41RTUiTcRx+/h/v5qYrRZEEda1w9mGHNazEg0ERFEJE59ahGnmM8hLIMMjo1qEOkdcEDRUkIoKMJJAI6UOSEeU28KPplm2++3j3vv//r8sOHQp84Dk9H/z4PQDA/ssJEgAQmMl14z0deoT7px42PegHgBhiHACTAAj/AhEHYwrT1Jgw6N6Zj6klL8x42l//FBlgGMP6bzsDYhzVVsSIAwAmyON5nn05+OTz1ouzQzNvL14PAcDjcNSoXgl5uC26n2ttKZl0DOURFo9qMTfkDQLb05s/es61bNT0LEx9qtPLi2NdtauYHGgby9l0MHBFMBsGCwejTWWbAqTJx5jOErEWbjpJ1VxXKrc0Hjv5885X8zfUs7qbDN/yrd0B5EwtHElWjrNdvxgAdLVfu6ShTxATq8InKj6nHBc9oeVcci2y+Kb4BUZFdDY7HR6XcllazAlCr2Z4vZQanZXVB6xDyg/SLNgilanMo34TIfdGqzS+H+9la3y14La0m8q2aBCCuxyohMHhAADr9F/ey7jL5S7mKzLdLlZu72k/7U2WQuN5e94kezJRyob3NYhiUTEh2G4lSbggt2zlSMG15jXKY8cD/kI0PZ5ZGB3sOBLuHzm/7Z0NBytXeSSwAniVv1brgiMqUql1t6VXFFclCMfk2m1VJycGAMiQb+rW2Kt3kRupxEjfAQAgVLWdgIDWXB8G1u5eOLrTzB8gJ/AD0J/JFwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMOXQ2KsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDCUjWAXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.inshea.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">staff and students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel et étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUJbK6nstF0pm/+lEcGZ5dEj8AFb4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAwwNaWRwLmluc2hlYS5mcjAeFw0xNTA1MjAwODUxMzhaFw0z
 NTA1MjAwODUxMzhaMBgxFjAUBgNVBAMMDWlkcC5pbnNoZWEuZnIwggEiMA0GCSqG
@@ -39,26 +39,26 @@ Bf9T9mnR+nYvfPnk5/hox3490z7h9wOddP/I+BT55OOCecjZZxc7BhcqCVMHVYop
 7giVJzQjJAvZh/gTvvZE3LFD83JAwjLBovLc8ZPb7xPNy7fk+9eH1hOkEeOs9kcZ
 549vcVK5oOJCGuRuLlb0XayJKoOPX9vZ+DEGQdVAZaRbVuI=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inshea.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inshea.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inshea.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inshea.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>SOCCALINGAM</md:SurName>
-      <md:EmailAddress>Sejiane.Soccalingam@inshea.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>HAFFNER</md:SurName>
-      <md:EmailAddress>Didier.Haffner@inshea.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inshea.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inshea.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inshea.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inshea.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>SOCCALINGAM</md:SurName>
+    <md:EmailAddress>Sejiane.Soccalingam@inshea.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>HAFFNER</md:SurName>
+    <md:EmailAddress>Didier.Haffner@inshea.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ionio.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ionio.gr-idp-shibboleth.xml
index ab0836c5..eca97cb5 100644
--- a/swamid-interfederations-2.0/idp.ionio.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ionio.gr-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ionio.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ionio.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="el">Ιόνιο Πανεπιστήμιο</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ionian University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ionio.gr/central/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.ionio.gr/central/</mdui:InformationURL>
+        <mdui:Logo height="200" width="200">https://www.ionio.gr/ionio_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ionio.gr</mdui:DomainHint>
+        <mdui:IPHint>195.130.124.0/22</mdui:IPHint>
+        <mdui:IPHint>195.251.110.0/23</mdui:IPHint>
+        <mdui:GeolocationHint>geo:39.620953,19.923851</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ionio.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="el">Ιόνιο Πανεπιστήμιο</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Ionian University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ionio.gr/central/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.ionio.gr/central/</mdui:InformationURL>
-          <mdui:Logo height="200" width="200">https://www.ionio.gr/ionio_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>ionio.gr</mdui:DomainHint>
-          <mdui:IPHint>195.130.124.0/22</mdui:IPHint>
-          <mdui:IPHint>195.251.110.0/23</mdui:IPHint>
-          <mdui:GeolocationHint>geo:39.620953,19.923851</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZjCCA06gAwIBAgIRAPWTRagWnzvVLSSd1G9MdmAwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTgwMDAwMDBaFw0xNjA2MTcyMzU5NTlaMDoxITAfBgNV
@@ -52,26 +52,26 @@
                             Ztz8OjKAppGeu5GdHsLnN+O1YA7BoTPqGwrhnZoeSGpBX9jpjrT72uUVucjoIBfq
                             1IqBpxI/cQ/QLqM9wmVE2rnIaaxvNaplij8=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ionio.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ionio.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ionio.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ionio.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ionio.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ionio.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ionio.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ionio.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ionio.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ionio.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ionio.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ionio.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ionio.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ionio.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZjCCA06gAwIBAgIRAPWTRagWnzvVLSSd1G9MdmAwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTgwMDAwMDBaFw0xNjA2MTcyMzU5NTlaMDoxITAfBgNV
@@ -97,26 +97,26 @@
                             Ztz8OjKAppGeu5GdHsLnN+O1YA7BoTPqGwrhnZoeSGpBX9jpjrT72uUVucjoIBfq
                             1IqBpxI/cQ/QLqM9wmVE2rnIaaxvNaplij8=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ionio.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ionio.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ionian University</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Ιόνιο Πανεπιστήμιο</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ionian University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Ιόνιο Πανεπιστήμιο</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ionio.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.ionio.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Greek Research and Technology Network</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-      <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ionio.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ionio.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ionian University</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Ιόνιο Πανεπιστήμιο</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ionian University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ιόνιο Πανεπιστήμιο</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ionio.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.ionio.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
index b8887205..964069b6 100644
--- a/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipa.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">An Foras Riarachaín</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
+        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipa.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">An Foras Riarachaín</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
-          <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAI3sMWxFvjpe4FwTUUSZvm2vGfvVMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5pcGEuaWUwHhcNMTExMTI1MTczNTQxWhcNMzEx
 MTI1MTczNTQxWjAVMRMwEQYDVQQDEwppZHAuaXBhLmllMIIBIjANBgkqhkiG9w0B
@@ -38,28 +38,28 @@ A2dPT+rM2JRZ/li0YmTLUcvE0IP1q7VuihtEXBKbndKPe4sEIy4LVfpPDs2oYjg6
 0VDwE1ENoiu+3TYEkP/ZZpu2Z68FG7Ygpedl96CjXFm5qufuU8UUpz7SRMf2gEv/
 NkaVXN/aXmq6gSQ+gfVeKU+eqHo2TR51
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipa.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipa.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipa.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Public Administration</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Public Administration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ipa.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Sisk</md:SurName>
-      <md:EmailAddress>mailto:psisk@ipa.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Sisk</md:SurName>
-      <md:EmailAddress>mailto:psisk@ipa.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipa.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipa.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipa.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Public Administration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Public Administration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipa.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Sisk</md:SurName>
+    <md:EmailAddress>mailto:psisk@ipa.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Sisk</md:SurName>
+    <md:EmailAddress>mailto:psisk@ipa.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
index aa17e367..c03c48ea 100644
--- a/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipb.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-29T14:12:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-29T14:12:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipb.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IPB - Bordeaux INP</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAChElEQVQoz22SS0hUARSG//vwqndGx2uW0cjYS5OKIFFRV0WamzaWi9zUwlzkqrCgEoSgVtFCWkhuKnATWJGUaZoaiabRjIlp83J8VI7jdZxmnDuPO/eeFhOi4b85cOD7OYf/B22R6uwhoojNE/7kUqfaaSexAADofg8ACCbN+YYVjRQNQI8DWLt7Lfz8IraIBQA1otrfBZ/e4i2Vnq8veD5CspszF4e6uzhxRKxt/x8Y7hZDkW8ZBYZwR7127Iavr4U2lNjcb9X2xFDdwAgShb3qbNc/QJdnTpUOyAeLJ5RnKUa7eeSqXlInVpdFxybST8a53BORV1WxiccI/tGVIABm2Lm6KMspkRDHhmcTr1srmiHmJc0S1kcJx2f2SAMrmbnd+xhDBgCGiBBcQXA9trwU4KTc4pLNc2OqPrHkPZQayuFjgsBAkGDI427XngbLMXssvKXIKHHgDQCTBHjE+M4LnkBw2s+NLcQ4kyXXJDJEBICi6+rXtoQcpLRSw9laMGm6StYvdcacqkKXQIle7vglHKgBI7AgLdrbFH1bl3L0/EaPN61AUO39gdYHU+6ZktJOsb+pf++439Ko+jZADACQniBNJaKVK+eINN07Hhlolq/fi2jawq8V7cdL7UPLeF/5WmgxmTSSY73jTnzOTkRKd72u/JRvthGR1TZJRPH3TRTwbFaDT/6X1XgfgO6bIn4Xk24mY54cDOTnWwaHPoqZl8tN+8NhZdnrlaQsdlvs2YVizUMA3Jmi4cGhbElyu11Go3F0dMwzP2/KzLTaJrcB4NPACgDSyw5DIwAOp3PV56usrNB1XVGUVEHAjh1WEwmX201EDoczuVnz+6e/z7jdc38B6uOQFkjKTvMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDUrMDI6MDCGAO2RAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAw911VLQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">https://www.bordeaux-inp.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IPB - Bordeaux INP</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipb.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IPB - Bordeaux INP</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAChElEQVQoz22SS0hUARSG//vwqndGx2uW0cjYS5OKIFFRV0WamzaWi9zUwlzkqrCgEoSgVtFCWkhuKnATWJGUaZoaiabRjIlp83J8VI7jdZxmnDuPO/eeFhOi4b85cOD7OYf/B22R6uwhoojNE/7kUqfaaSexAADofg8ACCbN+YYVjRQNQI8DWLt7Lfz8IraIBQA1otrfBZ/e4i2Vnq8veD5CspszF4e6uzhxRKxt/x8Y7hZDkW8ZBYZwR7127Iavr4U2lNjcb9X2xFDdwAgShb3qbNc/QJdnTpUOyAeLJ5RnKUa7eeSqXlInVpdFxybST8a53BORV1WxiccI/tGVIABm2Lm6KMspkRDHhmcTr1srmiHmJc0S1kcJx2f2SAMrmbnd+xhDBgCGiBBcQXA9trwU4KTc4pLNc2OqPrHkPZQayuFjgsBAkGDI427XngbLMXssvKXIKHHgDQCTBHjE+M4LnkBw2s+NLcQ4kyXXJDJEBICi6+rXtoQcpLRSw9laMGm6StYvdcacqkKXQIle7vglHKgBI7AgLdrbFH1bl3L0/EaPN61AUO39gdYHU+6ZktJOsb+pf++439Ko+jZADACQniBNJaKVK+eINN07Hhlolq/fi2jawq8V7cdL7UPLeF/5WmgxmTSSY73jTnzOTkRKd72u/JRvthGR1TZJRPH3TRTwbFaDT/6X1XgfgO6bIn4Xk24mY54cDOTnWwaHPoqZl8tN+8NhZdnrlaQsdlvs2YVizUMA3Jmi4cGhbElyu11Go3F0dMwzP2/KzLTaJrcB4NPACgDSyw5DIwAOp3PV56usrNB1XVGUVEHAjh1WEwmX201EDoczuVnz+6e/z7jdc38B6uOQFkjKTvMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDUrMDI6MDCGAO2RAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAw911VLQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">https://www.bordeaux-inp.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IPB - Bordeaux INP</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEYjCCA0qgAwIBAgIRALgbEIwRuh3U84klcQg/9UAwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MjgwMDAwMDBaFw0xNzA1MjcyMzU5NTlaMDgxITAfBgNV
@@ -44,22 +44,22 @@ wORHtv4Q51ZnfSkDLOjKG98VQKN2RTtPvrnj4TnIvp8KSFbfH7ETyJq8l5nA2lHs
 ZKgUrRmjDmCf5UuCYHwMtOgFzULqTmmHdveUn/tYTyooHhj9tGz0NOXuzji6RUPt
 6XlibuDkkJwzRII2QYI3FB+8/h7Vqg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipb.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipb.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipb.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IPB - Bordeaux INP</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IPB - Bordeaux INP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.bordeaux-inp.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Moniez</md:SurName>
-      <md:EmailAddress>philippe.moniez@ipb.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipb.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipb.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipb.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IPB - Bordeaux INP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IPB - Bordeaux INP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.bordeaux-inp.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Moniez</md:SurName>
+    <md:EmailAddress>philippe.moniez@ipb.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
index 2cf4e6ad..d07aa14f 100644
--- a/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipm.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-02T15:43:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-02T15:43:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipm.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Physics of Materials of the AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav fyziky materiálů AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IPM AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFM AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ipm.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ipm.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ipm-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ipm-129.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipm.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Physics of Materials of the AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav fyziky materiálů AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IPM AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFM AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ipm.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ipm.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ipm-44.png</mdui:Logo>
-          <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ipm-129.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
 MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ U3lLI0Wpl9gNT3J89dwcansCYLHrppaXrp9ppEwnQe+gECcTLsGgytjJxS9vq5Qo
 HWJ2rutN+DemwFxa01O3ukfKoIRYNyWNajx2Ey8kS2kfoycp9Jgx
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipm.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipm.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipm.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipm.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
 MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ U3lLI0Wpl9gNT3J89dwcansCYLHrppaXrp9ppEwnQe+gECcTLsGgytjJxS9vq5Qo
 HWJ2rutN+DemwFxa01O3ukfKoIRYNyWNajx2Ey8kS2kfoycp9Jgx
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Physics of Materials</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Physics of Materials of the Academy of Sciences of the Czech Republic, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ipm.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ipm.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Physics of Materials</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Physics of Materials of the Academy of Sciences of the Czech Republic, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipm.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ipm.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
index 838c3c6d..ad712716 100644
--- a/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipp.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-24T14:52:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-24T14:52:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipp.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Plasma Physics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav fyziky plazmatu AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IPP AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFP AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ipp.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ipp.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="91">https://jiftach.cas.cz/loga/logo-ipp-44.png</mdui:Logo>
+        <mdui:Logo height="136" width="282">https://jiftach.cas.cz/loga/logo-ipp-136.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipp.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Plasma Physics AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav fyziky plazmatu AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IPP AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFP AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ipp.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ipp.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="91">https://jiftach.cas.cz/loga/logo-ipp-44.png</mdui:Logo>
-          <mdui:Logo height="136" width="282">https://jiftach.cas.cz/loga/logo-ipp-136.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVANNKPXr0zaDp+SLe9bDmbfYURJlsMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pcHAuY2FzLmN6MB4XDTE0MTEyNDA4MDkyOFoX
 DTM0MTEyNDA4MDkyOFowGTEXMBUGA1UEAxMOaWRwLmlwcC5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ NyztXViyX7Ty8PAIGXwq42+/+f+m8Jj/9DwOIBJk706VSEWLxKY54POG4QjWoCmm
 Gm9fZgC9QDcKNl55dlv4/lBPY8ZKvOck3iwTgsoxU+kwPZQp32pULA==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipp.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipp.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipp.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipp.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVANNKPXr0zaDp+SLe9bDmbfYURJlsMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pcHAuY2FzLmN6MB4XDTE0MTEyNDA4MDkyOFoX
 DTM0MTEyNDA4MDkyOFowGTEXMBUGA1UEAxMOaWRwLmlwcC5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ NyztXViyX7Ty8PAIGXwq42+/+f+m8Jj/9DwOIBJk706VSEWLxKY54POG4QjWoCmm
 Gm9fZgC9QDcKNl55dlv4/lBPY8ZKvOck3iwTgsoxU+kwPZQp32pULA==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Plasma Physics</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav fyziky plazmatu AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Plasma Physics AS CR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav fyziky plazmatu AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ipp.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ipp.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Plasma Physics</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav fyziky plazmatu AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Plasma Physics AS CR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav fyziky plazmatu AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipp.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ipp.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
index 2c2305fd..5efb65f8 100644
--- a/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.irstea.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-17T15:52:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-17T15:52:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irstea.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQozzXSv06TYRgF8HOe96UttIgFWygINIiRIIbFP6OJxgtQZxdHL0EXR2/ATRPvwMSIgxegxkENOhgVI2rAlGolYi3t9z7H4dPlOcOTM50fpQQY4AAAAyCAAgARdIgCCSUyAKAkCGB+HDJBpPKyIxkIJ4yCExbzAADgw7d77V9PhX1DABDBjMm9pGAL45emqucBRMAggE6g1Vnb/PHAopiZ038PTjGghNdgqISpyeoFApFwmAlIA/vamf+8d227t9jqzm0NDn0aHFgebl9pnlMqdbNvBOCKkN15uH537fnG+1b77MWJw+PInAxlyuXb/bFs0GT8AkQBNEUgvd9qP3uzheT1OBgzT2ZkJoVItrLir3TkYNg0JsAFMyCcWZ5qVEeg5DCiINIJwBNtN/V/9k8EEABkFAz0lWZ9cf6QQfswKSX5XrIBmeQlhJ1e04Mo5K3o4FxjYnVhcjnpkVKZrIRw+XDpTaf/sct1/9NNi0FIdAqgRxNLEaeO1tdbuzdXxouztTJtOGbjxaFr05WNne5spVEr3+r6FxGEmQhJK8dmauXyTo+v2r3KaNjsqR8KoYDawUoYHonFBXGPSsp3EK3ZqD5++W7/7aYVS99HR153uvWh8HJ0aKPTWywXb1w/vTpzEgz0FHMZ1Urhxb7/3G4B9mpkeGF6dGJ2cnVp+uqxxtL8ZL1aAAIAWKBLEEjcvv/kx252cmn6+Fxtpj4WYi5GMlIQ/5Gju5MEHDIIyTzAcpG5X8n+/53AX9H3FvIIb+2KAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.irstea.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irstea.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQozzXSv06TYRgF8HOe96UttIgFWygINIiRIIbFP6OJxgtQZxdHL0EXR2/ATRPvwMSIgxegxkENOhgVI2rAlGolYi3t9z7H4dPlOcOTM50fpQQY4AAAAyCAAgARdIgCCSUyAKAkCGB+HDJBpPKyIxkIJ4yCExbzAADgw7d77V9PhX1DABDBjMm9pGAL45emqucBRMAggE6g1Vnb/PHAopiZ038PTjGghNdgqISpyeoFApFwmAlIA/vamf+8d227t9jqzm0NDn0aHFgebl9pnlMqdbNvBOCKkN15uH537fnG+1b77MWJw+PInAxlyuXb/bFs0GT8AkQBNEUgvd9qP3uzheT1OBgzT2ZkJoVItrLir3TkYNg0JsAFMyCcWZ5qVEeg5DCiINIJwBNtN/V/9k8EEABkFAz0lWZ9cf6QQfswKSX5XrIBmeQlhJ1e04Mo5K3o4FxjYnVhcjnpkVKZrIRw+XDpTaf/sct1/9NNi0FIdAqgRxNLEaeO1tdbuzdXxouztTJtOGbjxaFr05WNne5spVEr3+r6FxGEmQhJK8dmauXyTo+v2r3KaNjsqR8KoYDawUoYHonFBXGPSsp3EK3ZqD5++W7/7aYVS99HR153uvWh8HJ0aKPTWywXb1w/vTpzEgz0FHMZ1Urhxb7/3G4B9mpkeGF6dGJ2cnVp+uqxxtL8ZL1aAAIAWKBLEEjcvv/kx252cmn6+Fxtpj4WYi5GMlIQ/5Gju5MEHDIIyTzAcpG5X8n+/53AX9H3FvIIb+2KAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.irstea.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIVAINKG8UKonnXc9QRha4KV5urgO0WMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5pcnN0ZWEuZnIwHhcNMTMwNDExMDkxMDE3WhcN
 MzMwNDExMDkxMDE3WjAYMRYwFAYDVQQDEw1pZHAuaXJzdGVhLmZyMIIBIjANBgkq
@@ -37,21 +37,21 @@ zs1YMK99JgGR3A7GKIoZGi5pOgWL10ugmSPEYG7wQZwcX+S9px4BGzxJ1sgMqxyU
 ekqCqNunsUWxdTSksZHzVPhHOoRpnOvy2B8CI6XDJo7D7iHhGki66kUsGuHMd/1I
 7CnuMGR/VZ7zf1lkTbIVv4J+xugV9IYQOb/hnoai7lHX658a
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.irstea.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irstea.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irstea.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.irstea.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>federation.contact@lists.irstea.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.irstea.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irstea.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irstea.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.irstea.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation.contact@lists.irstea.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
index e315880a..b13b5c91 100644
--- a/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.isibrno.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-03T16:09:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-03T16:09:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isibrno.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ISI ASCR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚPT AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.isibrno.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.isibrno.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="54">https://jiftach.cas.cz/loga/logo-upt-44.png</mdui:Logo>
+        <mdui:Logo height="90" width="110">https://jiftach.cas.cz/loga/logo-upt-90.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isibrno.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider ISI ASCR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚPT AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.isibrno.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.isibrno.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="54">https://jiftach.cas.cz/loga/logo-upt-44.png</mdui:Logo>
-          <mdui:Logo height="90" width="110">https://jiftach.cas.cz/loga/logo-upt-90.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
 MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
@@ -52,29 +52,29 @@ XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
 AsEuKAX9NA8=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.isibrno.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isibrno.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.isibrno.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isibrno.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
 MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
@@ -95,26 +95,26 @@ XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
 AsEuKAX9NA8=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Scientific Instruments of the ASCR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav přístrojové techniky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.isibrno.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.isibrno.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Scientific Instruments of the ASCR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav přístrojové techniky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.isibrno.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.isibrno.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
index ca6ac110..8c4cd9ba 100644
--- a/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ist.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-07-09T08:48:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-07-09T08:48:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ist.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">IST Austria</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IST Austria</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SSO at the Institute of Science and Technology Austria</mdui:Description>
+        <mdui:Logo height="101" width="220">https://idp.ist.ac.at/images/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://ist.ac.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ist.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">IST Austria</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">IST Austria</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SSO at the Institute of Science and Technology Austria</mdui:Description>
-          <mdui:Logo height="101" width="220">https://idp.ist.ac.at/images/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://ist.ac.at/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKNzZl6QxKuXj/y1k1CBCEO3WHNBMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQ0WhcN
 MzUwNjMwMTAzNTQ0WjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
@@ -43,13 +43,13 @@ cYLtEfhCb2dvtj3qwlHz6AeIjBRtuKlptX4Bexg9uA0QYSz+xPXiu43O3qqns/Nb
 LI5BtXvOmtCt9MxwZ6lwywPSsTeBNKsFuS0Dp4lUBRoSgWu90CiKHkoGLUOUPrlN
 J1TxfFmf6lEHmb7zvSgo8Uchp/uYF7AZ7n8h8Sc+BIXaMAsLlUeFsYJLu18y90Xl
 ojDt/GTfp8exfqbFUriqj6Xhf5eu9fSY/jsodmVaOw2GoZmN</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAJUtQynzhfho/ZFcuyGKElEn3i4KMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQzWhcN
 MzUwNjMwMTAzNTQzWjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
@@ -67,13 +67,13 @@ ihXXSPFWjL0Gd68pKk3wXJJnIavwB/Evi80hVxL4dDBT498ZiwTE2vTRF1FHlj3O
 b8x/yObUbZVe9wHEr1SxOtMTOSJIb1ns0Br6H+Wji/o6LjSavZYAnxydgnhxcixn
 p9lET5YFTpHa31MRrKpb4XM+sYfrQ0khIhMyLm6BzIkuFaNpxpm/x+bOQEJwoeIW
 dulXVfj+LyVXzjp8pM9wRPfaAFbzZzCLj174b6/CfHWXl7IP</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUeq9cJechTNP7ey2ymp1zDhsMOiswDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNaWRwLmlzdC5hYy5hdDAeFw0xNTA2MzAxMDM1NDRaFw0z
 NTA2MzAxMDM1NDRaMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwggEiMA0GCSqG
@@ -91,30 +91,30 @@ ssFbT6K7YzQRrBmzVeSbDqth85hjibxiPnqivbTK9YBfpX4Q8dd/MxfU9vxHvJoB
 FQxWpNRAFgItkxMbnPgFcx+zZXjQJVkBtvjEgOa1g/f+Sn0kQGLW0C/dsSZoz5+o
 Knqc5fFVPJWH382R74QJwi7AIy5spcEg5tK1P1rin7g2PYqZyT5RBzmCPbpTsYm2
 ivyYh1imiU7hjVtiJXZPSaWkJr13eoANuG5xURLnr4p6xWU=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ist.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ist.ac.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ist.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ist.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKNzZl6QxKuXj/y1k1CBCEO3WHNBMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQ0WhcN
 MzUwNjMwMTAzNTQ0WjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
@@ -132,13 +132,13 @@ cYLtEfhCb2dvtj3qwlHz6AeIjBRtuKlptX4Bexg9uA0QYSz+xPXiu43O3qqns/Nb
 LI5BtXvOmtCt9MxwZ6lwywPSsTeBNKsFuS0Dp4lUBRoSgWu90CiKHkoGLUOUPrlN
 J1TxfFmf6lEHmb7zvSgo8Uchp/uYF7AZ7n8h8Sc+BIXaMAsLlUeFsYJLu18y90Xl
 ojDt/GTfp8exfqbFUriqj6Xhf5eu9fSY/jsodmVaOw2GoZmN</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAJUtQynzhfho/ZFcuyGKElEn3i4KMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQzWhcN
 MzUwNjMwMTAzNTQzWjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
@@ -156,13 +156,13 @@ ihXXSPFWjL0Gd68pKk3wXJJnIavwB/Evi80hVxL4dDBT498ZiwTE2vTRF1FHlj3O
 b8x/yObUbZVe9wHEr1SxOtMTOSJIb1ns0Br6H+Wji/o6LjSavZYAnxydgnhxcixn
 p9lET5YFTpHa31MRrKpb4XM+sYfrQ0khIhMyLm6BzIkuFaNpxpm/x+bOQEJwoeIW
 dulXVfj+LyVXzjp8pM9wRPfaAFbzZzCLj174b6/CfHWXl7IP</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUeq9cJechTNP7ey2ymp1zDhsMOiswDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNaWRwLmlzdC5hYy5hdDAeFw0xNTA2MzAxMDM1NDRaFw0z
 NTA2MzAxMDM1NDRaMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwggEiMA0GCSqG
@@ -180,27 +180,27 @@ ssFbT6K7YzQRrBmzVeSbDqth85hjibxiPnqivbTK9YBfpX4Q8dd/MxfU9vxHvJoB
 FQxWpNRAFgItkxMbnPgFcx+zZXjQJVkBtvjEgOa1g/f+Sn0kQGLW0C/dsSZoz5+o
 Knqc5fFVPJWH382R74QJwi7AIy5spcEg5tK1P1rin7g2PYqZyT5RBzmCPbpTsYm2
 ivyYh1imiU7hjVtiJXZPSaWkJr13eoANuG5xURLnr4p6xWU=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ist.ac.at/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ist.ac.at/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.istructe.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.istructe.org-idp-shibboleth.xml
index e9c3064f..e8746e05 100644
--- a/swamid-interfederations-2.0/idp.istructe.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.istructe.org-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.istructe.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-14T14:23:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-14T14:23:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istructe.org</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istructe.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUI8V/OTsGBfuY+YJQ6gZ1YyQctn0wDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAwwQaWRwLmlzdHJ1Y3RlLm9yZzAeFw0xNTA0MDIwOTM0MDla
 						Fw0zNTA0MDIwOTM0MDlaMBsxGTAXBgNVBAMMEGlkcC5pc3RydWN0ZS5vcmcwggEi
@@ -31,29 +31,29 @@
 						ZJT1SQ3WFFL98LSeg3nrdo12C5I7fhskFBsIQsbjxKoftyHHf7NFEgtcEihP21/x
 						+mn3EVKlLdMxUcghPyFm46KgIBvDcpOqo/k1ZqJ92DT6mIi5EGed8yeRbgGluPo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.istructe.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.istructe.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.istructe.org/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.istructe.org/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.istructe.org:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.istructe.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.istructe.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.istructe.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.istructe.org/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istructe.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.istructe.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.istructe.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.istructe.org/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.istructe.org/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.istructe.org:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.istructe.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.istructe.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.istructe.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.istructe.org/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istructe.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUI8V/OTsGBfuY+YJQ6gZ1YyQctn0wDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAwwQaWRwLmlzdHJ1Y3RlLm9yZzAeFw0xNTA0MDIwOTM0MDla
 						Fw0zNTA0MDIwOTM0MDlaMBsxGTAXBgNVBAMMEGlkcC5pc3RydWN0ZS5vcmcwggEi
@@ -72,27 +72,27 @@
 						ZJT1SQ3WFFL98LSeg3nrdo12C5I7fhskFBsIQsbjxKoftyHHf7NFEgtcEihP21/x
 						+mn3EVKlLdMxUcghPyFm46KgIBvDcpOqo/k1ZqJ92DT6mIi5EGed8yeRbgGluPo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.istructe.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.istructe.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Institution of Structural Engineers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Institution of Structural Engineers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.istructe.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:ahirst@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:ahirst@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.istructe.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.istructe.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Institution of Structural Engineers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Institution of Structural Engineers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.istructe.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:ahirst@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:ahirst@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
index e996ae81..cee6bf6c 100644
--- a/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it-tallaght.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-tallaght.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Technology Tallaght</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.it-tallaght.ie/contactus</mdui:InformationURL>
+        <mdui:Logo height="100" width="152">https://edugate.heanet.ie/rr3/logos/itta.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.2903000,-6.3631789</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-tallaght.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Technology Tallaght</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.it-tallaght.ie/contactus</mdui:InformationURL>
-          <mdui:Logo height="100" width="152">https://edugate.heanet.ie/rr3/logos/itta.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.2903000,-6.3631789</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUYPVjSYp7op9s7Ie2DtEL+5ZzoCIwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0LmllMB4XDTExMDcyODEyMTQz
 OVoXDTMxMDcyODEyMTQzOVowHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0Lmll
@@ -38,30 +38,30 @@ fvQkMgjKXKvMuOcowJFd2qlyR5s9mkU/vlsuG/8X03M/XC7fQ9g/Z5AZiBmT5UR7
 Tz1+RVaB+0GP8hZXw6p8CGDihXoX8rV0N4aSrnG/7oJOBsdL+liIEINf0MKqSHGH
 Bf7NsJw2jQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it-tallaght.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Technology Tallaght</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tallaght</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.it-tallaght.ie/contactus</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>McCarrick</md:SurName>
-      <md:EmailAddress>mailto:Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>McCarrick</md:SurName>
-      <md:EmailAddress>mailto:Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it-tallaght.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Tallaght</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tallaght</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it-tallaght.ie/contactus</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>McCarrick</md:SurName>
+    <md:EmailAddress>mailto:Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>McCarrick</md:SurName>
+    <md:EmailAddress>mailto:Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
index bb942ce2..36435ba1 100644
--- a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.gu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>gu.se</mdui:DomainHint>
+        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-          <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>gu.se</mdui:DomainHint>
-          <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
 MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
@@ -51,26 +51,26 @@ CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
 MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
 MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
@@ -90,35 +90,35 @@ CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
 MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gu.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>University of Gothenburg</md:Company>
-      <md:SurName>Lena Ström</md:SurName>
-      <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Gothenburg</md:Company>
-      <md:SurName>Pablo Millet</md:SurName>
-      <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46707104070</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Gothenburg</md:Company>
-      <md:SurName>GU-Support</md:SurName>
-      <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Gothenburg</md:Company>
+    <md:SurName>Lena Ström</md:SurName>
+    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Gothenburg</md:Company>
+    <md:SurName>Pablo Millet</md:SurName>
+    <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46707104070</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Gothenburg</md:Company>
+    <md:SurName>GU-Support</md:SurName>
+    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
index 0ae518f2..514216cb 100644
--- a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.su.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.su.se/regelboken/bok-3/teknik</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.su.se/rules/book-3/3-3-technics</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>su.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
-          <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="110" width="127">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://www.su.se/regelboken/bok-3/teknik</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.su.se/rules/book-3/3-3-technics</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>su.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
 MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
@@ -44,26 +44,26 @@ kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
 zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
 nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
 VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.su.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.su.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.su.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.su.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
 MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
@@ -79,36 +79,36 @@ kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
 zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
 nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
 VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.su.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Stockholm University</md:Company>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Stockholm University</md:Company>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Stockholm University</md:Company>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.su.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Stockholm University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Stockholm University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Stockholm University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
index e529270e..483ba6fd 100644
--- a/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itam.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-24T16:47:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-24T16:47:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itam.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ITAM AS CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTAM AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.itam.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.itam.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="42">https://jiftach.cas.cz/loga/logo-itam-44.png</mdui:Logo>
+        <mdui:Logo height="1095" width="1044">https://jiftach.cas.cz/loga/logo-itam-1095.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itam.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider ITAM AS CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTAM AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.itam.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.itam.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="42">https://jiftach.cas.cz/loga/logo-itam-44.png</mdui:Logo>
-          <mdui:Logo height="1095" width="1044">https://jiftach.cas.cz/loga/logo-itam-1095.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
 DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
@@ -51,29 +51,29 @@ ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
 G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itam.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itam.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itam.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itam.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
 DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
@@ -93,26 +93,26 @@ ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
 G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.itam.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.itam.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itam.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.itam.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
index 016eb6ae..f01c7fc0 100644
--- a/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itcarlow.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itcarlow.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Technology Carlow</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.itcarlow.ie</mdui:InformationURL>
+        <mdui:Logo height="89" width="171">https://edugate.heanet.ie/rr3/logos/it-carlow.png</mdui:Logo>
+        <mdui:Logo height="89" width="171" xml:lang="en">data:image/png;base64,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AHAch5tuusk2Gi1x++232/POO08ccshmHnlkJ3fccYednJzkhBNOEEKW3PWrX5Emib3oGReJE44/njRJuOaaa2yWpjz88EPMzMygpCQKQm6+5WZ75ulnCIvlF7+4wZ5x+lliw4YNYmRdrrvuOlsUBevWrWNyclKMGllKydq1azn00EPFjh077CmnnCJarRYA3/ve96wQgmc84xliYWGBY489VuR57SvfeNMNdu/evaxfv56zzjxL7Nm7h127dtnHHnuMqakpzjrzPOH7Pvfeey+33367PfXUU8VombLW8oMf/MBqrXn6058u8jwfT5qJiQm+//3v2yzLePKTnyw2bNjAYYcdJrZu3UoYhtx9993s2LHDttttzj//fJEkCXNzc3z1q1+1GzZsYPv27WJ2dhZrLXfeeae96667uOiii8Ts7CwLCwv86Ec/si984QvF1NQU3/3ud61Siu3bt4tt27YRx/F46f7Qhz5kX/va14o1a9Zw5JFHirm5OUYDXQjBD3/4QxtFESeffLJIkoSqqrjllltst9vlFa94hVBKcf/993P33XfbiYkJTjnlFLFv3z56vR7XXnutffrTny6stfz85z+3vV6PJz3pSWLjxo0IIbjyyitts9nkuOOOE61Wi4WFBYqiYM+ePXbr1q2i1WoRhiH33Xcft956q123bh0nnXSSmJiYYM+ePVx11VV206ZNnHzyycIYw+TkJN/5znes4zhcdNFF4okxhBTiYMQ1mvWtVms4w2/BcRxe/OIXi+9+97tWa8tNN95in/ucS8QJx58kfvTDH9s0ydm0cQsnHH+S6PdjHnpwB74Xcti27WKiM8Xc7FqUdHls526rteXmm24FJL2VATf+4makdLj66p9aKR1+85vf2iCIeP7zXyDuvfd+qspYY8BxPKwVY3ckz0u0tlgreOc7/9E+85nPFkcffYz4whe+ZGdm5vjud//HOo7DLbfcYnsrA15w6YvE3r17GcQD7rzzTru4uMhznvMcsbi4yPz8PL1ej9tuu83+/u//vrj55pvtgw8+yNLSEp/73OfsM5/5TDE1NcVVV11lwzCkLEuazSaf/OQn7Yknniie/exni//8z/+0YRhy//3326WlJX71q19xzTXX2Oc+97nC8zyuueYaG4Yh73znO+3ZZ58t1qxZI66//no78tMOOeQQ8YIXvEB8+9vftiM/7/jjjxetVosvfOEL9rTTThNPfepTxbXXXmtXL/utVgshBGvXrh37oscdd9w4WNuxYwcnnXSS8H2fHTt2MDMzw7e//W37nOc8R5xxxhniiiuusAA//elP7Qte8AIRBAE33XSTbTabKKU47bTTxCh4O+qoo8RFF10kvvnNb1qlFF//+tftRRddJC666CLxla98xU5MTHDdddfZX/3qV/bYY48VvV5vvNRfe+219mUve5mIoojHHnsMgM985jP2la98pdi4caO46qqr7OTkJPfddx9Pe9rTxNatW8WnPvUp+0Tf3Rn5ZaujzZEPW5YlGzZsIAg8JiYmADjiiCPEe97zz3bTpk285CUvEZ4vMQbm5uoGW15eodcb0OlMUhQVzWabbrdLq9URWls2bz6EoqgIggjfD4fuhU+a5tx77/1ceumlAuC0084Qy8vLtqoMnucAEmsFxliCIEJKh15vQJ6XfPGLX7bNZpP5+QMArFu3gbLU3HDDjbzhDW8QeV7ywhf8nuj3+6yZW8f09LTASjas34Tv+9x8883WdV0++clP2iiK2Ldvny3LUrzqVa8S3W6XM888U7z3ve+1F198McYYkiThda97nfjGN75h9+3bN/bZer0eQRCwa9cu+8IXvlD0ej1OP/108YEPfMCeeuqpbN++nfXr11OWJVu3bhUj1GRmZgZjDMvLyxRFwZYtW8bB1ite8QrxH//xHzaKInbs2PE4P3kUUI6ClBHkJIRgamqKQw89lJmZGbTW4r777rMHDhwQcRxzxRVX2DAMx27GOeecI6688kr76KOPcuyxxzI3N4cQgjAMcRyHxcVF5ubmxr42wMUXXyxuuOEG2+12cV2XJEno9Xq89KUvFaOgc82aNWitecYzniE+//nP25WVFc455xx27drFi170IpHnORs3buSII44QRVEwMTFBGIZs3rx5HGCvHrAS5DjqAwiCgOXlZQCs1YRhiLV1Rygl6A9W7F/99V+Iy1/5UvGud/+jraNVAwiMgThOmZqaQimXqakZsqyg3Z4gSTKUclleXsFxPAaDhChqoitQ0iUMfDrtSdqtJlgY9BPrOj6e66ArwEqMBiUF/V5MVRpazRZR2OT3XnSZuOS5zxcve+krRFXC7l17CYKANWvWsbLSJwxDbr75l7bbHbCwsITnBQihKIoKz/PYtm2bOO+888RrX/ta8cxn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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.827382668158585,-6.935741901397705</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itcarlow.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Technology Carlow</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.itcarlow.ie</mdui:InformationURL>
-          <mdui:Logo height="89" width="171">https://edugate.heanet.ie/rr3/logos/it-carlow.png</mdui:Logo>
-          <mdui:Logo height="89" width="171" xml:lang="en">data:image/png;base64,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AHAch5tuusk2Gi1x++232/POO08ccshmHnlkJ3fccYednJzkhBNOEEKW3PWrX5Emib3oGReJE44/njRJuOaaa2yWpjz88EPMzMygpCQKQm6+5WZ75ulnCIvlF7+4wZ5x+lliw4YNYmRdrrvuOlsUBevWrWNyclKMGllKydq1azn00EPFjh077CmnnCJarRYA3/ve96wQgmc84xliYWGBY489VuR57SvfeNMNdu/evaxfv56zzjxL7Nm7h127dtnHHnuMqakpzjrzPOH7Pvfeey+33367PfXUU8VombLW8oMf/MBqrXn6058u8jwfT5qJiQm+//3v2yzLePKTnyw2bNjAYYcdJrZu3UoYhtx9993s2LHDttttzj//fJEkCXNzc3z1q1+1GzZsYPv27WJ2dhZrLXfeeae96667uOiii8Ts7CwLCwv86Ec/si984QvF1NQU3/3ud61Siu3bt4tt27YRx/F46f7Qhz5kX/va14o1a9Zw5JFHirm5OUYDXQjBD3/4QxtFESeffLJIkoSqqrjllltst9vlFa94hVBKcf/993P33XfbiYkJTjnlFLFv3z56vR7XXnutffrTny6stfz85z+3vV6PJz3pSWLjxo0IIbjyyitts9nkuOOOE61Wi4WFBYqiYM+ePXbr1q2i1WoRhiH33Xcft956q123bh0nnXSSmJiYYM+ePVx11VV206ZNnHzyycIYw+TkJN/5znes4zhcdNFF4okxhBTiYMQ1mvWtVms4w2/BcRxe/OIXi+9+97tWa8tNN95in/ucS8QJx58kfvTDH9s0ydm0cQsnHH+S6PdjHnpwB74Xcti27WKiM8Xc7FqUdHls526rteXmm24FJL2VATf+4makdLj66p9aKR1+85vf2iCIeP7zXyDuvfd+qspYY8BxPKwVY3ckz0u0tlgreOc7/9E+85nPFkcffYz4whe+ZGdm5vjud//HOo7DLbfcYnsrA15w6YvE3r17GcQD7rzzTru4uMhznvMcsbi4yPz8PL1ej9tuu83+/u//vrj55pvtgw8+yNLSEp/73OfsM5/5TDE1NcVVV11lwzCkLEuazSaf/OQn7Yknniie/exni//8z/+0YRhy//3326WlJX71q19xzTXX2Oc+97nC8zyuueYaG4Yh73znO+3ZZ58t1qxZI66//no78tMOOeQQ8YIXvEB8+9vftiM/7/jjjxetVosvfOEL9rTTThNPfepTxbXXXmtXL/utVgshBGvXrh37oscdd9w4WNuxYwcnnXSS8H2fHTt2MDMzw7e//W37nOc8R5xxxhniiiuusAA//elP7Qte8AIRBAE33XSTbTabKKU47bTTxCh4O+qoo8RFF10kvvnNb1qlFF//+tftRRddJC666CLxla98xU5MTHDdddfZX/3qV/bYY48VvV5vvNRfe+219mUve5mIoojHHnsMgM985jP2la98pdi4caO46qqr7OTkJPfddx9Pe9rTxNatW8WnPvUp+0Tf3Rn5ZaujzZEPW5YlGzZsIAg8JiYmADjiiCPEe97zz3bTpk285CUvEZ4vMQbm5uoGW15eodcb0OlMUhQVzWabbrdLq9URWls2bz6EoqgIggjfD4fuhU+a5tx77/1ceumlAuC0084Qy8vLtqoMnucAEmsFxliCIEJKh15vQJ6XfPGLX7bNZpP5+QMArFu3gbLU3HDDjbzhDW8QeV7ywhf8nuj3+6yZW8f09LTASjas34Tv+9x8883WdV0++clP2iiK2Ldvny3LUrzqVa8S3W6XM888U7z3ve+1F198McYYkiThda97nfjGN75h9+3bN/bZer0eQRCwa9cu+8IXvlD0ej1OP/108YEPfMCeeuqpbN++nfXr11OWJVu3bhUj1GRmZgZjDMvLyxRFwZYtW8bB1ite8QrxH//xHzaKInbs2PE4P3kUUI6ClBHkJIRgamqKQw89lJmZGbTW4r777rMHDhwQcRxzxRVX2DAMx27GOeecI6688kr76KOPcuyxxzI3N4cQgjAMcRyHxcVF5ubmxr42wMUXXyxuuOEG2+12cV2XJEno9Xq89KUvFaOgc82aNWitecYzniE+//nP25WVFc455xx27drFi170IpHnORs3buSII44QRVEwMTFBGIZs3rx5HGCvHrAS5DjqAwiCgOXlZQCs1YRhiLV1Rygl6A9W7F/99V+Iy1/5UvGud/+jraNVAwiMgThOmZqaQimXqakZsqyg3Z4gSTKUclleXsFxPAaDhChqoitQ0iUMfDrtSdqtJlgY9BPrOj6e66ArwEqMBiUF/V5MVRpazRZR2OT3XnSZuOS5zxcve+krRFXC7l17CYKANWvWsbLSJwxDbr75l7bbHbCwsITnBQihKIoKz/PYtm2bOO+888RrX/ta8cxn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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.827382668158585,-6.935741901397705</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAJQ2ewGshpdWhwNWnDcU0/wS++8XMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5pdGNhcmxvdy5pZTAeFw0xMTA3MDExMDEwMjla
 Fw0zMTA3MDExMDEwMjlaMBoxGDAWBgNVBAMTD2lkcC5pdGNhcmxvdy5pZTCCASIw
@@ -38,35 +38,35 @@ OOCmXDZHfSy1rEg+uS+zEmqwG1mcimp85irrJM8iMGUSbaftJoGjRkNNodOIQQNj
 Hh0m2mAznihkKOHbcM/aKEJFVp3VXIzWHQ3CkjL52JU69HLL/UkSvcmhXOnXzu/w
 Nqk1qHwvphmVTTjuGU3G/X+SBodR/C+F+ahxA0QkHcvBcEoxg20feB3MMgo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itcarlow.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itcarlow.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itcarlow.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Technology Carlow</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Technology Carlow</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.itcarlow.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Dermody</md:SurName>
-      <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Dermody</md:SurName>
-      <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Dermody</md:SurName>
-      <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itcarlow.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itcarlow.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itcarlow.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Carlow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Carlow</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itcarlow.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Dermody</md:SurName>
+    <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Dermody</md:SurName>
+    <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Dermody</md:SurName>
+    <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
index 04a221b9..76961ff0 100644
--- a/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itep.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itep.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.itep.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.itep.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itep.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</mdui:Description>
-          <mdui:Description xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.itep.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.itep.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLjAsBgNVBAoTJUluc3RpdHV0
 byBkZSBUZWNub2xvZ2lhIGRlIFBlcm5hbWJ1Y28xDTALBgNVBAsTBFVUSUMxIzAh
 BgkqhkiG9w0BCQEWFHBsYW50YW8tdXRpY0BpdGVwLmJyMQ8wDQYDVQQHEwZSZWNp
@@ -45,26 +45,26 @@ g15xNx4qO4znwZXq6b/YtHgXSPXH0YXDbDL1V6hzH02OhwnVQvTuqs1U/isTt7un
 ialGuHDf5vCXiTpYL0bb2cI6+5lxtDWkinby7/DJ3w2lExZI1YDmEtOzS+zPpVUu
 Dw6i1eVLb8QLB2R+pfcTZ4PrmFo=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itep.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itep.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itep.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itep.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itep.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itep.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itep.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itep.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itep.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itep.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itep.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itep.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itep.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itep.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLjAsBgNVBAoTJUluc3RpdHV0
 byBkZSBUZWNub2xvZ2lhIGRlIFBlcm5hbWJ1Y28xDTALBgNVBAsTBFVUSUMxIzAh
@@ -89,24 +89,24 @@ ialGuHDf5vCXiTpYL0bb2cI6+5lxtDWkinby7/DJ3w2lExZI1YDmEtOzS+zPpVUu
 Dw6i1eVLb8QLB2R+pfcTZ4PrmFo=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itep.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itep.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.itep.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.itep.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Erick Marllon</md:SurName>
-      <md:EmailAddress>erick@itep.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itep.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itep.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itep.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.itep.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Erick Marllon</md:SurName>
+    <md:EmailAddress>erick@itep.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
index 5d7d56ff..647d8b02 100644
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+        <mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+        <mdui:Logo height="16" width="16">https://apps.fz-juelich.de/logos/Juelich-J-16x16.png</mdui:Logo>
+        <mdui:Logo height="114" width="350">https://apps.fz-juelich.de/logos/Logo_FZ_Juelich_350x114.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
-          <mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
-          <mdui:Logo height="16" width="16">https://apps.fz-juelich.de/logos/Juelich-J-16x16.png</mdui:Logo>
-          <mdui:Logo height="114" width="350">https://apps.fz-juelich.de/logos/Logo_FZ_Juelich_350x114.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
 BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
 MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
 KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
@@ -58,28 +58,28 @@ ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
 L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
 WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fz-juelich.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
 BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
 MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
 KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
@@ -112,35 +112,35 @@ ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
 L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
 WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e234</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e234</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fz-juelich.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fz-juelich.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jens</md:GivenName>
-      <md:SurName>Heidbüchel</md:SurName>
-      <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jens</md:GivenName>
-      <md:SurName>Heidbüchel</md:SurName>
-      <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS Service Desk</md:GivenName>
-      <md:SurName>Forschungszentrum Jülich GmbH</md:SurName>
-      <md:EmailAddress>mailto:it-services@fz-juelich.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e234</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e234</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fz-juelich.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fz-juelich.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jens</md:GivenName>
+    <md:SurName>Heidbüchel</md:SurName>
+    <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jens</md:GivenName>
+    <md:SurName>Heidbüchel</md:SurName>
+    <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Service Desk</md:GivenName>
+    <md:SurName>Forschungszentrum Jülich GmbH</md:SurName>
+    <md:EmailAddress>mailto:it-services@fz-juelich.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml
index 3f2faed6..e650acb5 100644
--- a/swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.utexas.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.utexas.edu/its/helpdesk/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utexas.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas at Austin</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Logon service for The University of Texas at Austin</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utexas.edu/its/help/shibboleth</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.utexas.edu/cio/policies/web-privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="344" xml:lang="en">https://www.utexas.edu/includes/core/images/wordmark-stacked-2012.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.utexas.edu/its/helpdesk/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utexas.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas at Austin</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Logon service for The University of Texas at Austin</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.utexas.edu/its/help/shibboleth</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.utexas.edu/cio/policies/web-privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="344" xml:lang="en">https://www.utexas.edu/includes/core/images/wordmark-stacked-2012.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAKPStYoZAbTw2rzx/dJ9wcFl/s2ZMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVkdTAeFw0xNDA0MTYxMjA1
 MThaFw0zNDA0MTYxMjA1MThaMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVk
@@ -42,24 +42,24 @@ cINu0ZcgPH9q4l8yWDrzRECYbhqEUJdhiOaTlPDMh6/lK/QIttKxhqH+Nx0z3N6F
 VZWH/+OpywKUCeg5c5S6/oGEzmcGSJHH27DJdGPoLefO8/gscFtanxC3aOp6O1Zl
 wy0ZZr9AXLI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.utexas.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.utexas.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.utexas.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.utexas.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utexas.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.utexas.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.utexas.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.utexas.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.utexas.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utexas.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAKPStYoZAbTw2rzx/dJ9wcFl/s2ZMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVkdTAeFw0xNDA0MTYxMjA1
 MThaFw0zNDA0MTYxMjA1MThaMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVk
@@ -79,27 +79,27 @@ cINu0ZcgPH9q4l8yWDrzRECYbhqEUJdhiOaTlPDMh6/lK/QIttKxhqH+Nx0z3N6F
 VZWH/+OpywKUCeg5c5S6/oGEzmcGSJHH27DJdGPoLefO8/gscFtanxC3aOp6O1Zl
 wy0ZZr9AXLI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas at Austin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas at Austin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utexas.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
-      <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
-      <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
-      <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas at Austin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas at Austin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utexas.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
+    <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
+    <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
+    <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
index 1709fd1e..47821306 100644
--- a/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itsligo.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsligo.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">An Institiúid Teicneolaíochta, Sligeach</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
+        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:54.2769291,-8.4651857</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsligo.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">An Institiúid Teicneolaíochta, Sligeach</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
-          <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:54.2769291,-8.4651857</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAM0cwxuTuo+doAYLQTZ+F9Kh2xiQMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pdHNsaWdvLmllMB4XDTExMDcyNjA3NTc0NVoX
 DTMxMDcyNjA3NTc0NVowGTEXMBUGA1UEAxMOaWRwLml0c2xpZ28uaWUwggEiMA0G
@@ -38,25 +38,25 @@ QIetzxpSXXz3n8tdU8r0wql2IbivjLdPKS0QOD+RAnTzVVBbKR0lXGBsVfR5oI2Z
 k3pnLaUJBrOCfFJMyrbTiKAOM4VDp8biKKxnYH0hs+hnDDOmKhRH1aqC9JuQ96xk
 AzsGEoivSwmcdqqwrTDW9ILcLk9Z7EsHRPKz1erD1ItJqsdN5EHsFA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itsligo.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itsligo.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itsligo.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Technology Sligo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Technology Sligo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.itsligo.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kieran</md:GivenName>
-      <md:SurName>Kennedy</md:SurName>
-      <md:EmailAddress>mailto:kennedy.kieran@itsligo.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itsligo.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itsligo.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itsligo.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Sligo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Sligo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itsligo.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kieran</md:GivenName>
+    <md:SurName>Kennedy</md:SurName>
+    <md:EmailAddress>mailto:kennedy.kieran@itsligo.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml b/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
index b2a85c7b..004a8518 100644
--- a/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
+++ b/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ittralee.ie/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ittralee.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta, Trá Lí</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
+        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.28620934512703,-9.67296838760376</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ittralee.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta, Trá Lí</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
-          <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.28620934512703,-9.67296838760376</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQCvcZzmkJJefjANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
 SUUxEDAOBgNVBAgTB011bnN0ZXIxDzANBgNVBAcTBlRyYWxlZTEnMCUGA1UEChMe
 SW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kgVHJhbGVlMRQwEgYDVQQLEwtJVCBTZXJ2
@@ -41,35 +41,35 @@ r+1A8dYo/Q4pe4HchkK+bp8Uxg8D6Qkp/zWlWfUGJqU7SbhOE/tp1SW1GYDjkRKw
 bgyUlPiEHeB/o2fUwUV3PxrUpgt5sohBPH/x5ZG620GYODoZqdPVZ7NDZp0+UIcE
 6AWAe75jwYVCSeU3
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ittralee.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ittralee.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ittralee.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Technology Tralee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tralee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ittralee.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Quirke</md:SurName>
-      <md:EmailAddress>mailto:andrew.quirke@staff.ittralee.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Bradshaw</md:SurName>
-      <md:EmailAddress>mailto:chris.bradshaw@staff.ittralee.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Padraig</md:GivenName>
-      <md:SurName>Dineen</md:SurName>
-      <md:EmailAddress>mailto:padraig.dineen@staff.ittralee.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ittralee.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ittralee.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ittralee.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Tralee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tralee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ittralee.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Quirke</md:SurName>
+    <md:EmailAddress>mailto:andrew.quirke@staff.ittralee.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Bradshaw</md:SurName>
+    <md:EmailAddress>mailto:chris.bradshaw@staff.ittralee.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Padraig</md:GivenName>
+    <md:SurName>Dineen</md:SurName>
+    <md:EmailAddress>mailto:padraig.dineen@staff.ittralee.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
index af8fcb37..b6a742e4 100644
--- a/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iuav.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-01T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-01T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuav.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University IUAV Venezia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università IUAV di Venezia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University IUAV Venezia users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università IUAV di Venezia</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.iuav.it/idem.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.iuav.it/English-Ve/About-Iuav/Iuav-profi/index.htm</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuav.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University IUAV Venezia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università IUAV di Venezia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University IUAV Venezia users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università IUAV di Venezia</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.iuav.it/idem.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.iuav.it/English-Ve/About-Iuav/Iuav-profi/index.htm</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOjXzyapswcd6xsf69yjpd4te2HWMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5pdWF2Lml0MB4XDTA5MTEzMDAwMTg0OVoXDTI5
 MTEzMDAwMTg0OVowFjEUMBIGA1UEAxMLaWRwLml1YXYuaXQwggEiMA0GCSqGSIb3
@@ -39,28 +39,28 @@ UfwqWE4i9xF85M+YZJxfoWHGh+C3L2nuTKuZkZHSVKqpTdoYN47ciumatANtH+H0
 uqj/sHDHt3o0KgBhWw4+MJFAelDhald9bb9/V2E3vZDuV8RSVn1kDIzStdarkhtW
 dgmwVYFjA3Uc77ULxhwfAy4wsbDrXopR4Hxfsg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iuav.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iuav.it/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://idp.iuav.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iuav.it/idp/profile/SAML2/POST/SLO" ResponseLocation="https://idp.iuav.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it/idp/profile:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iuav.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iuav.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iuav.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuav.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iuav.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iuav.it/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://idp.iuav.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iuav.it/idp/profile/SAML2/POST/SLO" ResponseLocation="https://idp.iuav.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it/idp/profile:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iuav.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iuav.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iuav.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuav.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOjXzyapswcd6xsf69yjpd4te2HWMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5pdWF2Lml0MB4XDTA5MTEzMDAwMTg0OVoXDTI5
 MTEzMDAwMTg0OVowFjEUMBIGA1UEAxMLaWRwLml1YXYuaXQwggEiMA0GCSqGSIb3
@@ -79,28 +79,28 @@ UfwqWE4i9xF85M+YZJxfoWHGh+C3L2nuTKuZkZHSVKqpTdoYN47ciumatANtH+H0
 uqj/sHDHt3o0KgBhWw4+MJFAelDhald9bb9/V2E3vZDuV8RSVn1kDIzStdarkhtW
 dgmwVYFjA3Uc77ULxhwfAy4wsbDrXopR4Hxfsg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iuav.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università IUAV di Venezia</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University IUAV Venezia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università IUAV di Venezia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University IUAV Venezia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.iuav.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.iuav.it/English-Ve/About-Iuav/Iuav-profi/index.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Piergiorgio</md:GivenName>
-      <md:SurName>Ghezzo</md:SurName>
-      <md:EmailAddress>mailto:pier@iuav.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@iuav.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iuav.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università IUAV di Venezia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University IUAV Venezia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università IUAV di Venezia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University IUAV Venezia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.iuav.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.iuav.it/English-Ve/About-Iuav/Iuav-profi/index.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Piergiorgio</md:GivenName>
+    <md:SurName>Ghezzo</md:SurName>
+    <md:EmailAddress>mailto:pier@iuav.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@iuav.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
index 96029534..37a14302 100644
--- a/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ivb.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-02-03T16:51:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-02-03T16:51:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivb.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Vertebrate Biology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav biologie obratlovců AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IVB AS CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚBO AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ivb.cz/index_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ivb.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="40">https://jiftach.cas.cz/loga/logo-ivb-44.png</mdui:Logo>
+        <mdui:Logo height="733" width="674">https://jiftach.cas.cz/loga/logo-ivb-733.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivb.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Vertebrate Biology AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav biologie obratlovců AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IVB AS CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚBO AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ivb.cz/index_en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ivb.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="40">https://jiftach.cas.cz/loga/logo-ivb-44.png</mdui:Logo>
-          <mdui:Logo height="733" width="674">https://jiftach.cas.cz/loga/logo-ivb-733.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKTPOMQGB+LGGdHAwNPUS60Nl+MzMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pdmIuY2FzLmN6MB4XDTE1MDEyMzA5NTYwM1oX
 DTM1MDEyMzA5NTYwM1owGTEXMBUGA1UEAxMOaWRwLml2Yi5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ eODBz7FUUN5ygnnjLQZYgQ+FPmfz0MnjmcwcIU6oPpaZWFXSwHxLPMCVoM3hGHZM
 m5Bo9+8u/vl5bAhC25NeEfUoI8Q0RVBptV0oQOH5jblwfXBZFXKa+Q==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ivb.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivb.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ivb.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivb.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKTPOMQGB+LGGdHAwNPUS60Nl+MzMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5pdmIuY2FzLmN6MB4XDTE1MDEyMzA5NTYwM1oX
 DTM1MDEyMzA5NTYwM1owGTEXMBUGA1UEAxMOaWRwLml2Yi5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ eODBz7FUUN5ygnnjLQZYgQ+FPmfz0MnjmcwcIU6oPpaZWFXSwHxLPMCVoM3hGHZM
 m5Bo9+8u/vl5bAhC25NeEfUoI8Q0RVBptV0oQOH5jblwfXBZFXKa+Q==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Vertebrate Biology AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav biologie obratlovců AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Vertebrate Biology AS CR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav biologie obratlovců AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ivb.cz/index_en.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ivb.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Vertebrate Biology AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav biologie obratlovců AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Vertebrate Biology AS CR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav biologie obratlovců AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ivb.cz/index_en.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ivb.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
index 7c667a90..a6b29bf7 100644
--- a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.izs.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-27T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-27T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izs.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell' Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the user of Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/0</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/1</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/0</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/1</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izs.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell' Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the user of Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/0</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/1</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/0</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/1</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
 MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
@@ -41,29 +41,29 @@ wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
 F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
 z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.izs.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.izs.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izs.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.izs.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.izs.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izs.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
 MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
@@ -82,30 +82,30 @@ wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
 F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
 z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.izs.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.izs.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fabrizio</md:GivenName>
-      <md:SurName>Quaranta</md:SurName>
-      <md:EmailAddress>mailto:idem@izs.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniele</md:GivenName>
-      <md:SurName>Zippo</md:SurName>
-      <md:EmailAddress>mailto:idem@izs.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.izs.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.izs.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fabrizio</md:GivenName>
+    <md:SurName>Quaranta</md:SurName>
+    <md:EmailAddress>mailto:idem@izs.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniele</md:GivenName>
+    <md:SurName>Zippo</md:SurName>
+    <md:EmailAddress>mailto:idem@izs.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml
index 9529693a..9822c6e0 100644
--- a/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.jisc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-28T13:43:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-28T13:43:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jisc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">corp.jisc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jisc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">corp.jisc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLjCCAhYCCQCv1Jl+hrmSWjANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChME
 						SklTQzEXMBUGA1UEAxMOaWRwLmppc2MuYWMudWswHhcNMTQwMzEzMTAzMzE0WhcN
@@ -33,30 +33,30 @@
 						8H2um6dpNv1oaivSr1PS79zX6aO4G0jFH9MHotmgICOJx6V2ROMnu1ZdXx2yxRUP
 						dnA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.jisc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jisc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">corp.jisc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.jisc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jisc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">corp.jisc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLjCCAhYCCQCv1Jl+hrmSWjANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChME
 						SklTQzEXMBUGA1UEAxMOaWRwLmppc2MuYWMudWswHhcNMTQwMzEzMTAzMzE0WhcN
@@ -76,27 +76,27 @@
 						8H2um6dpNv1oaivSr1PS79zX6aO4G0jFH9MHotmgICOJx6V2ROMnu1ZdXx2yxRUP
 						dnA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Grigg</md:SurName>
-      <md:EmailAddress>mailto:m.grigg@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Grigg</md:SurName>
-      <md:EmailAddress>mailto:m.grigg@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Grigg</md:SurName>
+    <md:EmailAddress>mailto:m.grigg@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Grigg</md:SurName>
+    <md:EmailAddress>mailto:m.grigg@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml
index 1f884af4..94c598dc 100644
--- a/swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.johnruskin.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">johnruskin.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">johnruskin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/johnruskin.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/johnruskin.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">John Ruskin College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.johnruskin.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/johnruskin.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/johnruskin.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">John Ruskin College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.johnruskin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml
index bbcc6e88..f2d6d319 100644
--- a/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.juilliard.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.juilliard.edu/juilliards-incommon-federated-id-system" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">juilliard.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Juilliard School</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The identity provider for InCommon operations.</mdui:Description>
+        <mdui:Logo height="109" width="300" xml:lang="en">https://idp.juilliard.edu/idp/images/jlogo2011.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.juilliard.edu/juilliards-incommon-federated-id-system" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">juilliard.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Juilliard School</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The identity provider for InCommon operations.</mdui:Description>
-          <mdui:Logo height="109" width="300" xml:lang="en">https://idp.juilliard.edu/idp/images/jlogo2011.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUd4dtEwhlfYyB4HH7Ogd0EyU2elIwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLmp1aWxsaWFyZC5lZHUwHhcNMTIwMzAxMjAxNDA5
 WhcNMzIwMzAxMjAxNDA5WjAcMRowGAYDVQQDExFpZHAuanVpbGxpYXJkLmVkdTCC
@@ -40,23 +40,23 @@ CRioWvGAmCweetpmDjHwuoo9N93KfJOq9MmnjIfQax/AqdraW8crsKkTJnjD9TnD
 wbbE50o+AHJCe0UX6qPQgV/B79j6Z0uAL93NiL+v7e2tJYZj1ePR7gzqBX1YK5zs
 NIEi
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.juilliard.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.juilliard.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.juilliard.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.juilliard.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.juilliard.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">juilliard.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.juilliard.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.juilliard.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.juilliard.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.juilliard.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.juilliard.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">juilliard.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUd4dtEwhlfYyB4HH7Ogd0EyU2elIwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLmp1aWxsaWFyZC5lZHUwHhcNMTIwMzAxMjAxNDA5
 WhcNMzIwMzAxMjAxNDA5WjAcMRowGAYDVQQDExFpZHAuanVpbGxpYXJkLmVkdTCC
@@ -76,26 +76,26 @@ CRioWvGAmCweetpmDjHwuoo9N93KfJOq9MmnjIfQax/AqdraW8crsKkTJnjD9TnD
 wbbE50o+AHJCe0UX6qPQgV/B79j6Z0uAL93NiL+v7e2tJYZj1ePR7gzqBX1YK5zs
 NIEi
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.juilliard.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Juilliard School</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Juilliard School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.juilliard.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy Pinquist</md:GivenName>
-      <md:EmailAddress>jpinquist@juilliard.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex Milyavskiy</md:GivenName>
-      <md:EmailAddress>amilyavskiy@juilliard.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tunde Giwa</md:GivenName>
-      <md:EmailAddress>tgiwa@juilliard.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.juilliard.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Juilliard School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Juilliard School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.juilliard.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy Pinquist</md:GivenName>
+    <md:EmailAddress>jpinquist@juilliard.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Milyavskiy</md:GivenName>
+    <md:EmailAddress>amilyavskiy@juilliard.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tunde Giwa</md:GivenName>
+    <md:EmailAddress>tgiwa@juilliard.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
index 64a650d6..1c3fea89 100644
--- a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kb.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the National Library of Sweden.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
+        <mdui:Logo height="488" width="516">https://idp.kb.se/idp/images/logga_FB.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kb.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the National Library of Sweden.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
-          <mdui:Logo height="488" width="516">https://idp.kb.se/idp/images/logga_FB.gif</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kb.se</mdui:DomainHint>
-          <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDzCCAfegAwIBAgIUVlpEkwM6W7NogVNrIcnSovJJzLowDQYJKoZIhvcNAQEL
 BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczOVoXDTM1MDgx
 MDEyNTczOVowFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
@@ -47,13 +47,13 @@ IEE+xgp+RP9KZExoKSW1kFj73DtXdGIH3JR9kqnuoXB0SfodVn/VDwycz1Z/O0yN
 4A8qH0ICOY7dpFmIlqG3zQt22utADnEPw//MMGt+jPcOmt2oc93fANBuL4Wu3lxM
 6plirV23s6E7Nr/N8VPwy4+Miw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDzCCAfegAwIBAgIUPRTxiWnkKuI40epCA9OdEIV5odIwDQYJKoZIhvcNAQEL
 BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczN1oXDTM1MDgx
 MDEyNTczN1owFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
@@ -72,13 +72,13 @@ sQv7s+f3pqBFVrJBw40PngEUQe42R3mbBCqYwUu7g6zdcI3usNX/xS10wLh14uiB
 ID7dVun5XzLL4GkdMk4gz2V0fMGCYFGYdkEO3cuzzzJmrlcb7LLZz/AxG0MH0MsR
 wo6wrN/1o5l0p8UXK9qqgh5+Bw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEDCCAfigAwIBAgIVAI0FNsztKW2wPAG/Bo8IvsP2dpNeMA0GCSqGSIb3DQEB
 CwUAMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTAeFw0xNTA4MTAxMjU3MzhaFw0zNTA4
 MTAxMjU3MzhaMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -97,31 +97,31 @@ o5Zg08dqglDKEaVM5kaAFrGmDl58sfMfuB+F/C+1U89MeiFSqa6+dXci8swOmOhd
 1YITw59DTTD5FxnbnScRfjOE3tU7Iet2KI85BLnkTxbycEH+6dbmXQJrho5tSfS8
 hJ2GrICmdWsVIb88lmoEw8Hn/ew=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDzCCAfegAwIBAgIUVlpEkwM6W7NogVNrIcnSovJJzLowDQYJKoZIhvcNAQEL
 BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczOVoXDTM1MDgx
 MDEyNTczOVowFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
@@ -140,13 +140,13 @@ IEE+xgp+RP9KZExoKSW1kFj73DtXdGIH3JR9kqnuoXB0SfodVn/VDwycz1Z/O0yN
 4A8qH0ICOY7dpFmIlqG3zQt22utADnEPw//MMGt+jPcOmt2oc93fANBuL4Wu3lxM
 6plirV23s6E7Nr/N8VPwy4+Miw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDzCCAfegAwIBAgIUPRTxiWnkKuI40epCA9OdEIV5odIwDQYJKoZIhvcNAQEL
 BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczN1oXDTM1MDgx
 MDEyNTczN1owFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
@@ -165,13 +165,13 @@ sQv7s+f3pqBFVrJBw40PngEUQe42R3mbBCqYwUu7g6zdcI3usNX/xS10wLh14uiB
 ID7dVun5XzLL4GkdMk4gz2V0fMGCYFGYdkEO3cuzzzJmrlcb7LLZz/AxG0MH0MsR
 wo6wrN/1o5l0p8UXK9qqgh5+Bw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEDCCAfigAwIBAgIVAI0FNsztKW2wPAG/Bo8IvsP2dpNeMA0GCSqGSIb3DQEB
 CwUAMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTAeFw0xNTA4MTAxMjU3MzhaFw0zNTA4
 MTAxMjU3MzhaMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -190,33 +190,33 @@ o5Zg08dqglDKEaVM5kaAFrGmDl58sfMfuB+F/C+1U89MeiFSqa6+dXci8swOmOhd
 1YITw59DTTD5FxnbnScRfjOE3tU7Iet2KI85BLnkTxbycEH+6dbmXQJrho5tSfS8
 hJ2GrICmdWsVIb88lmoEw8Hn/ew=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KB</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">National Library of Sweden</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>National Library of Sweden</md:Company>
-      <md:SurName>Mattias Olsson</md:SurName>
-      <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
-      <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>National Library of Sweden</md:Company>
-      <md:SurName>Mattias Olsson</md:SurName>
-      <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
-      <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>National Library of Sweden</md:Company>
-      <md:SurName>swamid@kb.se</md:SurName>
-      <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
-      <md:TelephoneNumber>+46700073555</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Library of Sweden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>National Library of Sweden</md:Company>
+    <md:SurName>Mattias Olsson</md:SurName>
+    <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>National Library of Sweden</md:Company>
+    <md:SurName>Mattias Olsson</md:SurName>
+    <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>National Library of Sweden</md:Company>
+    <md:SurName>swamid@kb.se</md:SurName>
+    <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46700073555</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml
index 95e12349..b4bccaf5 100644
--- a/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kdg.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kdg.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Karel de Grote-Hogeschool</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Karel de Grote-Hogeschool, Katholieke Hogeschool Antwerpen</mdui:Description>
-          <mdui:Logo height="64" width="250">data:image/png;base64,
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kdg.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Karel de Grote-Hogeschool</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Karel de Grote-Hogeschool, Katholieke Hogeschool Antwerpen</mdui:Description>
+        <mdui:Logo height="64" width="250">data:image/png;base64,
 iVBORw0KGgoAAAANSUhEUgAAAPoAAABACAYAAAAzvWouAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAQABJREFUeAHtvQeAVsX1/332ebbTli4gvQgoCqKAoghir7F3sHfFbjR2Y42JPUosaLBDBFRUpKlUpXeV3qXX7e39fM88d3fBEpNgfvm/MrDPvXfuzJkzZ06bes12h90U2E2B/99TIKmkpKTUjP+WxD9d/Le84qUlVkJcEkn0ptR/SsmhOEVylxQvT/9/dCdUVI9SbmKxmF182Tu2eOkmokoto1K6fTz44l2C2QN/HG6jx8y30pIYoEvsixFXe7leOmUlJcV2STllQKiXqB0aRw+hfZJ2bqeyDKqyE4MY0UNNSlv9TPoKWf/t21Ci8NNdkuOcZKJFiT8Ll11Om38b299exuSRoxZYbkFhaAza6MTj2uxIBRgrBpNMn7nKlq3cRNPRiPBaaXGJHXVEG0tPiycaNTDgjpn/e0/i48DUQdDWb8i1Veu2g23MKucU7TJENm/Js5Vrc2DaUisuEhObFUOLWCz+6wiTyOoEL3FBWb92m02cssxGjlpoS5dttJWrtjgOGWlpVq9uprXbt4F1PbiJ7dN2D6teI8Okd9BH5PVkv9qPDIFEXD8qM5iNUitBISYliU6hXX41BHYD/lkKJD/8+EhbAfPEYkmWHI/9QNDFY3PnfG8nn/W6pWemoqDVnCXWtUtzO+mEtjxiQWnW/+sQrJgsVzkmQfhhsl3IY6o9Ii1OtqJEveNxlF1pMX9i6goIlKPy79+5hSyxdetz7eFHRth7H821qpkpeFmykCoreFZbcgpszabtNnXuGuv39lQ75fg29vjDJyDkKAja9lcPwich5Zs3Ztvk6d9bp471rWq19IQC/tUx2F3Az1AgWXwki602KnUhDqmdv4jMyyuysy94w9IrpViM98WxEmvbtLa9+uJpVlpE44qJpM5DMydYn8cQxUUMAAvwLCvo1kl8t+NtWT5PJxSEUshU/s6jE4AFInErcCGAH9bVBY8CVJ2ghMpTRCl3vlaAyquQvhz3SKiUS10ZLDiWSsoxhGC54nHVszxtlF9pyuNVkkJ53vJ7kSXQK9AnwFq0cKMdefKrlp4St6pVULaY6BhKhW6Xt1lpgv6ir7otyRSx3z4NKEMESFjTBC29aEeBnwpKKbymdDR7gh3A0BNGGAV4Ed68khFIFO1gx49ZanfcO9SWrN7mBmDy6D5WpWqClgKl9GUIcOcwEvX1skKJShNKjtJ7pt0//wEFkr1RI+ZMULekGFsFw6hPdcRxfa1AZC+GsWLFVr9GZRv8j4ucyWLJoUmCfih2heGM4g3lrchdEqKhxhTDxcN9gunk0ZWY8kXxwIuJ1WnoYpzuhOAk0AIGAsVvxIBeOi9VfhL55KZHwhdLMGxIE0EA8E8Eh61kCe6Vuys5joSotLjYkrDcgltaigUX8sUBbokED2/IFSUEVbcGORQ2pC0WctAyCSVUaiQjm7pDogev5OdWCEm8KzF1pfAbACLX/LjT+1lKajKUAgcJOMVWz0q3ow9pbMcd1y7ApfYzZi6zj3Hpl63cYhlVQrokcJXrLL9LeIpGTr/Q8JTjFOIqIQcXJBf9QR4KcdygK+0VaipEI89F9Cat6qaXgPnrS+Ns9aZcS89ItZycPOKKBDXQUW3Ofw0JuXEQTC/OoTgdUNPACpySVEI7uxFRmbvDf0qB5B8DUJqUTOOU2uHHv2QbttAfFdMh5GlYlM8ZfJJ1kkAFK0VrwcxJWI6SEgblaHBZmpJEvzUWh7mc2eIwJEwCo6mL4GOApI3xzhlLEgBcMWJRUbFbhDjCKyUgCyYF4vzET5E4PSFcceWDkcVsJHFGEQ760+WXB8EvoqZywyW44FtYYkUIZzJGNE4f3IPgJlFf8BQ+CjGYvcQVAeQkUsyvuhSVwOhCishkXsWoj0QN/UX9pLA8OfAEJQTBTMJbAA3el9hxp71ODDiJSEIB2jx4+5F21rn7O51VnlCTkHbu2tguv+pQ4AXIguUKyekv2lJHxzOkF9FK8qEtCKWoTRKKRLmjdpCHlJyMggN3ISBBVC2EtPrfkWKlRngSYYAyoUpIR4kSaNKKV5TH+QZIoo+cjWKuLvwoBacjhUu5xncLuai0y4ILulx39bUjjhONL2PUes3KzRDd7ZIVwPCjhl5BweqZBmHQVRpeKebN22SPPPaZTZqxEsYhGniyPimxFDvrd3vbHXce7lYvWIfQ4L0ueNPyioqshEGtq684zA7t1sj69BlioycvhLHjNmbYlVarZujjFReW2g03vm/DJy5T6eJEZ7qDOjS0F1883ZJTxHiworhUxYdLYLDE/T+7yLpKFc2esdouvm6QZWcXUkawzod03NNe7ns29Ajlyn2XPCs4E0vxIYQxhKLfS+Pt+X5TLDc/30kqXGrQV334zmPssMNbCAB5RANZ2gTCDknVkqWTYBfZ+/+YYzlF2ZZammJFlFWQV2xvvXSOdenS0OuntEle4eBNxOKUBA0kWEpAMfzEbdqMFfboYyNQqkTEkq1//3OtYHuRHXbc3yw7P9uyMjJswpjryCPPw2z+gnV2BbRevWp7qK9UAO1x+hF72f0PH+OCL3TlRa3GTb/+hkE8ldoSBmvjIgoFa3Dw2uv+QTcKxQ3vXHnJQdbzmFbKRcoSy95ebGf06m/LVmxIKIwg3Kcf19buvf9YgfcQjMmONIre7b7+cgq4oCt5RVK+/MIE+2LyiiDkMPR2Bno+fOtCq8uoboLT/QpLco3bM38ebc++PRmGRNjglDiCWwLjS3kUlBTY39+faQMYRJo+8XpylLP2zO/WwMjFVlRQbFu2ZNvRJ/zNVqzPRtPDDDJTQgrme/PNKfbAX0a6xsemyJgr2uKUN276cmvf+Qm7/cYe1uuCjkCXPVFw7MhTsWb+4kd/JBNSWBdd+paNn7ISJiYfDCuLEytNtrHQo3XHJ6xdy9qhj26QrgS33IMsV5IVUdaBBz1l2/IKeYvwAcKVAGk2bs6za28dbE0aVLYPPrjChSRQwqUxAUdYJzBHQO97fLTFS5KtEFKoruee3N4OOrixK4mS0qBw3Up73wW6JEDRZE47CXwJOGbnFNr0b9YixHgqeGs5W4usS89ngnKniyZ1o0CPDS/ueVvNjEWSvDPRWppDlCHvgFHf2Pud5trlF3axm/p087oV0dYzvl0bLHUAQx78Ijy52Qs2OGRZ7PXrsp1Gosmdtw+194fNA2Yow/CQiumqiZpvfTDH3v14rn3yzoXWqGmN0A7E7w7/GQXka3lDi0mkoWfP+t7+9LcxNK2amd5iYbH1e/4Ma79//WDwYZ7QD4fFuBcryNWSZyd+y87DiqHFS9Hiefkwo6QSLyCnKNcO6vEc6QU5BFlQCbXgfPLJN7Z8PaP/YiysFHbAy58+dZXd/8QonnEfSVeA61lYWGhpgMgrLkToS+nRxuyBx0fZqtVbvVxBl+ApRILmDz/4kduoSP+xTz79zsZNlpCHhOonFjLgmIuiK/Juh9ms79aBF/i5pQ+crV8phoO7P205eQVeHzofWK18y2KmIkfTe6BTBJEWrthqd93/MXUhEzhSpR8EFV+MpyPX38tCWHMLiqzXhSgyFcZPRA8pU+EbXGuKAWAJ5QQlwsCkvAPyCI5JOXHpduxfoQ9dJtKq3fwVly7dn7K1G+hbE1eKt1FEuXkorVwGZF14HVDMXnx1oj38+OegT34ASFEX8OdjAA5TAPBApPALi6yAP3lK6ve/8MIYGzR8PvirliWWTxrxSD75i6E1D3h4pXbSea87TV3RqFzSqku4O/x7FEgW6cQcspAYVzuz1xsJ/5eGgdEf+P1RdkTPljCLi7RLs1u7qDzyFvGuYe10e/bpM6xho+pWpZLE0Gw7jH7pVQNsBtNzasSNm/JtG3GVK6eGMml8CaL6gKOnLPHGz8hMts57N7DtCEw8nmw33v2hpcKcYhTBGDHoMmvarIbD14KYHrifqamwDUPN55z7ln0xWgtYFNQbFnMHlveoCj8SBZcAMVHCZb325kGWkiaPQCqu1Fo0yrJ+r5yLGxpDiWy34zUoBq6IIMJEHejDK0gBPfXkF7Z5G5ac+xII+Yebe9h557RnEA1Bzy2ym24fYiMnLARy3N79x2y79YbullUtDRQ0WFYBMVKIJugVD2JxSXJedo7t1aqOW2gpSLXZwIEz7Z1BMwItPWHIo2GLHJTTSy+caXVrVfLIOJZb/W0JrIQyD/Pddb+Gloki2rhxuz2CoszB8vvgGjikM9A6aOClVpv8Gm8ZNuI7+/39n3hbaVCyX/+v7MzftbXGzWrauJGB5jfdOsSm0Nbqh2dT/ifvXGy1ameI0lY1K8O2bs23J54fZxmpTA/KS6EOX3x6JZ5iFcfxMxTApX0GWiXaMy+vxO6/95PgxuNNqBWpgtNGdd8d/jUKJGvQzVsC5pKGLnbrjF0lurio0E49eW/XpCKurKSsfpkJUFk8nnPG/nbLrT28ETzKfesky6yUan959EQsSF/66pIntD8avGKQULmiofx9W9eyAW9fyOvQkNsQHFlpzQDI/XvwjiOscZMsd/FieAxNG2fZuy+fY72veQullGKL1m6x71dttT3qVwWE3MIQhPHOQeWKeVQfjfbOnrnW8XOjIZqAwkdDLqPc4CK3aJVmzz1+kl156yCEAEbVAKSUBEFexSvvTIERsTo879+mgV3Yu5PTUOnSYdw/M6fd/uCnUUi4zzyPG7/Cjj++lTBwGOU/KhtlAUwfN9F7olollJtoIfLKDV+7bpvNnLfGbaOUgwuAUCLL9twCK8ajgjC0C22peNpA4xsFAHjjhbOsa9emZcU22/sRFGYaWYstGS/gqy+ut7Q00Sh0hc44vZ2tXLHJnuv3FQN3yUZvxv745y/stRfPsD0QVFnrOMrWxwHwBETC2nUqWZ096O5RqmRz1OcLLTWN8QYQ0szE2OHXWPXaKDvSqy2OOrKlnfe79jbk0zk8l9rAT+bZPfce4x6jMPEKlGG8++ZfoQDz6JDQGTYMreXmM7qeHscywU0w5LkXvWWDB1zkjOeWXPSm0coC9/UbBY0sRvt89AJbs2a7bd2+XZJt2zSgRbwaTkHuXXkgM//F0BqQe6NfLwZ9YBbBx5sY9N50Z2q5h3n5BbZP63q2ZBHLWiVOwpt0NWtlck2hjCIEMNlWrN7sgq5yVKZA6e8HwescxTKNtWazpcLAYkh1RQ7avyEvfYxcqHgX4+hjWlu9x6owE5Hr7F/oiJKM9zLuPrfN4/EntbZFCzbC7ODgAKkTZlYDdRHuQwZPsxOO3+tHLVT5dFbAXJQrYDDSA5V25Uyh3P2gbj4dSNKgq5Rf6UNWtYOELB08DjqoIbSmfrTziGELuKICNJtA3jatayOQogP48iz3WeS6AS/khde/5qkQ0Y3ZN3NWlxFX9dSMhSim/yR3OmoMR/nlhbz1xtdESnXQ3YJgmzbn2ratea6E4sSjAq1zp/o28OPZ7hn57Apw1E2BLYAb4ITa7P79VyiAXiaEtoEZk2zAq+fZuYy40z4QOGZzWKzx4IPD7O67j4bYaF6EVw0lugepKLXlS7fYXQ8Oty8mLGDqLGhvn1cWYJhJcOV+OpMT55ZH+cU9HkqtdvVMVzBBOEmPcE+Ytgj3nXvyVE5PtxPOeQ1m8BYnRhZMmJRYRnoKOgXlxH0OikpB8qWcHspuoghdFVlePt1Ir7OmtjT3ffRhrbgKCJbKywlpO+yzp40ct8C7EhIKBV1KASAc5PTf+9goFNcI8gdF43UCofR0yA39NOW1dPlWz7mzRdezpvfk1kpAw9RTsS2hbw9o8BEFeAFunQ5oaDekdHVlyBsb8sFsRr63BCF3wVGsFKJykBnSSCGe0KMN3odwkQeSDC4b3AFyipCsa0eUHIN2FAW6CD8tHpGq0R5VbTmKXKhszslXAY6LFIZPGTrJVAdAiDBSHt72ZouXbXGaaPYwJS3Zep70kmqiqoQfMsjtT2PNgHArZe2GEgh/1UBdpDL+IMvu8MspEASd9M6zUPyAzg3t7FPa2TsfziJWGj5mr7w93fbZu76dcmo7J7QYUY2nEd0t9Lu6n4xrjjXNROC0GESDZdWqplqtGlWYiy62ZWtgUjE9eSSAFd1M5wV+qpPWA/c+qEODl9DQjheN7C4lbp8vGwEnMUAkJPICVAPZirF4FN0OburvFCsein79NvrRiwA8vBd+cG8RP8lwYu26lcFVDKs/4R4gubAqB3GaWQgBQLyXMCkmWejhDTn8CkoCcuEdiGWNUXCsIXc/YFxJh/JrQFMplB8/uUqlmE2Zscw60K/2xSy869CxnnXYv0FQpDxPm7LcliTWvkt4hLLjLUAeoedkO/SwtkTQuvKeUKhSPkJKdZUacd1KG7um0aCd19+zUFaw8nrKTyjVINHAUHCkQ9m+AIfKqL4evG6UKWUKnVNTgZXAU8XJY9Q1tCeg6DaJWqK1oId2SJSTALn78ssogKBDSDG0C0vI9MD9x9jEr5fasu/ZFEKDpGXE7YY7P7RW9KHbtKnnjaOU0vSnnfE6Lq/6rCXMiZfY+afuaw9WmAfdgnvWodszlspiG43Eu1lR6yp/opHFHMlat5mIE2Ta1qpkyu2jFGBrdPZq+r3JcKEWdrg0hCyeL6HzreMBjRLPgk8BABKD/HiAq6iD8iqFLAedAAaKWDPw+XzreRR9aEdV+ARhX70aq8Q/X9yRGG+QiJNbmLobeuJRLaxh3RrOzOFdeem+gAVhy2N2QsHBl7+mHGL4rzGNVDRGPi4uDrfFiXju+fHW7+WzoXUiH0pAA1S/KACzlCm5UsYyCuW+QEVfbER5aRI4gJYyAKe5+NkL1qPE8cQcuOrtYubFrPye+gtp2qRalTDoqscQKtDZG1eGQsgGJEUzGQ69KqKPfvVFncFJ76AvfCYelBJTOnlqnpV1mUlJqdyrrcpLShS4+/ILKRAseqAoxHR2RyDNPvvkCmt30F+sME8WpdgyGJ0976J3bPKY653pRPQiprdWsoHBG4cCux3Y0IVcll6+oOZeNZimEV8B1Q6v7SyUqFE9YFfOFohDgmMDDlI+Zkf23NuGjFzolkWjxZ0PbGAHH9LcLVho8vKG17LdmAaJEkAFx4XzZwkhvGBurFptlvYWwnzuHlL4iDEL7Y8JYA5HCBEmTl+GYKS6YqvIdykossICmBSQldMr2Y03H+ar5VTn8nSwr8qDmX3QD5oUe8+2HEkV4zRA6G69oqs9/MwXGFwxfpKN+WqpvfzKRLv0ki4uiMgC3Q1VWMJTTotyaBXuSObbiSk7eARqVwmPWUe8ggLqrp4FBdn0Wat8xkOKwfvu0AFRtFkzVtk2pgozMkTnJKteNcPzu5pM0N0jvMIMcTK4EY1RCL+O7Rva0mFzgKly4tTjYJ+BkdJxxa3CpUXAUTSQoikVDMH+Z/ULBe/+/QkKSJ0mQsQoXOmXibjvv94L+UQre8Mxb81c7pEn0q9SUrRviUapxASaK+F2z3pZAZY0t9/F7KqrB8LYCSYjdvyXixPleRYvR4zizO1vPDF3SXb0cXuxDRbuA5eUlFK796FRboWET3Cpy0DZJqbuxnyxuJwfKtbsJ5lEZUlakqxVi5pWhCtaDHPp32amAVcsp79LXmXX9cEHPkbJMRKAgDh44j1wrVo50w2XXN9+70y2ObNWBzeXd6Fuzq2WvS3fHnl4lCsEKS+J8I6BZ+gXQwlccHEnq1wlCFMS9JZVf+zpL+3W2z7yOXrtNZAgRkIeobMDPAfPG38pyoVUat8SrKlw25utrY33qMYbeQ8x28RgY/9+k4CLQKO0A/mS7JY/DGU8RHHAQFMd0rWJ51eeQKcAWw2WAp0WL9QinUA74XT9DV1FDPiBeqOgHrj3U73kT4rEE1L1AGPeN+ts3pz18KK6ieJHpRCf7FC73Q+/kAK0EEwLEdVVi0JgHrMWLWvYdVceTJtCYLlVNMIKBmIuv2Kgz7XLimmgSmMmJbjl734wy55/bqxth5lnzlxtnbs9a9+zVl5iL6UgAdHcOGPUXpSEwhldbptLjpCgOWXu+NOa924HNQp9SYRi9bqt1nK/x+3N/tOZj89FuHPs3bemWKdDnrLOPV+w2fPWkj9URD0BlSuLoqmcHwuBCSmYm5rMFx/BdJMrJRi+JFZk3U/sa7ff/qENfn+unXzqK9b//dm8F0NSiv4ioNwMerO3L/RgCMsyK6fYief+3a67jmWkeDRbt6CExiyx83q9Ze3B9cU3JpFT9WRGQsAqBFdgCBeTXJCgxMaMutqnu9RAShvDnf9gxDe2X9dn7KBuz9vtt33I1OYHdhyrCr+kuwXUBDQRVB6EFBn/JSH8+XShBtooVvPtbjWJv/OW7t6GEJ7INHvo6c/t+JP/Zu8NmGkvPD/R9jrwcfr/m/21fqpWTbcHmfryoCqAc3dN1+EFlLAqTjMY19z2gb3Wb7I999wYu+++YVa/bjWrypSrVvWVMBj40ecL7FAWUY0bs8w2bc22tWuy7Y8PjbC99vszC2b62/drmVqlFd07VHVkQHYkVyh/9+8/pQDqGQFE0AJBA5OIKcQfEuxrrz7EZrEI4vPxS2gg9qwDcvRXi+25pz63667tbn+840i744/DPH8stdSeeXWCPcfKKa3NjiNg1atm2trNOcy9klFKgUbGPjti0QYHlQ1vKAH/cRdx68TUcbT+80+dZsec+IotXbHRp7m00uuPTw63+//ymXIlcEdhAFJ9eYfBr8TCR6zFJ84dqttPc4nq/PgjJ1mnns/SN04GMttykYQhn821IcO/cSHR5o9kKSwxnXonEgr+5AJrvviis/azfgNZwEJcBjCGj59vw05YKIMFPLo6FK9ZiSI/6EPoCNBOQShShhs23qdyM3VsH+t0+DOWmyvvivJIozGPTdn5Nnj4PDIg3j6CpjteqkDqo+k+yYmCSKA6SonHEoo2vAkvjz22rV21YK31fXWqvy+l3AWM9N/zyGjkDAVNm2hXg9x+KeIPB14CP0hRS11TOzyhiy87yJ7qO97yUfriqXz0+WPPfiEdYOefvq/0jY0dca3t1+1pS2HAtoS23MBg7iXXD8RgQBfgOfrwinokcRTS7rBrKICdkNaHUcRgZQF2oaEj+ej7/OlW21dxsSYMNyrGvPWzr09kxdsqO+W0ve36SzpbIQ0rh1aDL1r+EGMVW7WqaTbq0yusMJdGRUWorz9t6oryUpB5l2/nS7GBxJN0/AMUj9rwUmyffniJnXd6e19qqcy+dNNZTN6IYpLZ8FFqnZkxiIKiJeDwZCLsUMEosuyqtJqTnzz6OmgBBtomiwC7m4nAUB3rtPcedsftPQLS0Mf1iuoMw0oAf3/nkfYGG1/E+s60dGkcP+CVyMUGGY1fnOabO1Q0lZRQVgjC0uvPVXDUxU9m4crUMX3ssbuOCCPiEdHkaVFADO9DilJdDikdbYetTV0qZ6H9JOxK50qFe9F1p+Blkr/P1d2s/wunSdYIiC/4SpDl4qvIUvYtNG1Y1aZNuNFq1eH0Gkc9wNeqO42Rv/Pq+T52I73uLj45i8GxyImFpacrNhvF1b51XWhBDcFNCls+jHeaxIsUpkHXfffdQ4jsDruAAklbt+a6pyzmErNLOOU+qqE9SNoR0Fy2MxbSh5U4u8VxBuOYJi13helzthXYEpakzmSnVCHCfurJ7Ritxyqi6bdvyw2wsFQpMG0m+5XFJVu2FgBL7Iz2ZhFHFXfrACchUmuDRwl9NG1llSXRdI7WXg8ZPNsZhkTWrFkd26t1TQZ10rws4a16qEx57KDuvF6tWoZbyWDVAisHpBK/IIE48hPEbAvu9meffcs0cKnVoP/a+cD6lJHB8tEi1r6znt+tZRJLO9MBIIYNikXkkqBt25ZH92WNrVyp+XIYHAt8+BHNGXNIhS5SiKqT8gWlGuFC8V5XRMMRl7cTmiPUS1Y0G1pr/fmIYawZZ9eeKxOw7w58DRSm0yRp6XKRXfR9hHt7NqPXKgR6ZLAE2ae2okK5Bi+OMqC9PCEtX/5k6LeBZtC+U+fGVpvlrJUrs5sQnNXlIzX/1Hpqr/L656HY1XVbsGgDKjjJaterzEKYRqwj0MImeY+oAWDmsJhqHRtoxo75jm6E8C229h0aWMM9syyTEX38NWCjSAJwrvxX0Qm8y9syvAjrBaK3iUS/4BJqoISJO4HjSW3pIVG+y4gjENKVl59I9z98YfEWtdipQmUVFuIRkXXLP98sovQJYihv1NhKruCiArOIUvqn/zsGZU4AKaOmg0wkBUKiReEHz6++pRZ5SAFE0z3+ih8pHwmEQPmgja4hW1mxeta8rAaYXDCB44tGdkgREK1Q5fK3AqD6e5KQTjGa6tMiGykXp49ff6TKyg0Mp5UDCXUM8ASpPDickLLst/ztP78rx78CHZWN8gOfCpHyOnh5eud01JQmD/wFNIOi8dSKrniTeA4XfhNtFuGvIstCWd6yGOihMsrxKH/DnSpBYWEOnzRiBOALR6jtGJbllX5OMEqYUfgJmDsUUP4gT1PTfAEVcJJylUb0a+CZAFH0VD65RVGFfqYOSvo/EvC0A+q7Eh8nnPptDjpBiJ9q0F9csNzeiD/V8GpduaqKi4T/pxtY1QxpSU+ZrhoiLfKLcdgxoVdPkCr0tX+WeXfM/j/zVC6YEfMG1FQ/KVH5BU7Znybvr1KXQF/hRNAF10WelHteYOT+hFwpYce7MGYgT0kZfmkQXyiDCiixjeze+3QoW2jpOtRvkMXiomYOT0plyPuzfLOQuh+nnbEfhoM88JDyywv9Xw67frSD1tEaaU3L+SqqwCK7gAbSuIlGVaO4Bqapnb7qEf58UENVZABNX/kg0s9n+9m3sh7btxfaiae9CqyYNWDk/s03z//ZPP+LL11gsGDzv91gva98l5OEUq0yc+UfDbnE98GLoSG3C9Z/F38ZCcpOWFBZWrHTrOlrbfGidS5c6XQPO3RoVDZm8INNV/8UYTFQxFcxplQ32p2PfMZBJnE7kunDbj0QdIdRak8wo7RqwxaryZoSCbqMjZR8mWfxT8v6v0uw6wVdAqVBHEaX72ON/Kv9J7MjzttH4pkgWiBdWbUlt/62LGaHm3z6xSMHXWL7daiP1kZ5Jyxot8Ofs8WcgqOlsrO+7mM1aoQtmTtkTjxoa2bTfR6GOeL0bwtt8YzbrUq1oCAiKywLUlEZhOdyrIWjhKIs8ErTV6uYFtKgWGLgO/G6PF9Z+p+5+QHsCmn9nbvFIZVckx2ZKypLV4VEN6IiruFF2e+OdSYfkiwareKAiMzUXNvKWfgKbuxkSUXzqBjF/wAHT80PZZPu51zo8rwVAO4EU28UwhiG2QcfzbI335lpE6cudwH3/RMk0pJiNs5bnTqVmSI8zE4+AQGsGAIyFWKiMqOrMAZn8ShRMlJJrFeIM40pGiu7Kq76x9kvncIqUG3TDSG6KkUF3nA4elb46baIUCujh/Iph2f0O4cQ/ZSliyK4lsdVTB/uI/hKvssF3QtmAE4hjX3HGZlsfUzwiCqt0TGNsgoVUVZHQBUzsi5Ku15FkkXIMPcdSKWBrHCyK06ka3iHZJWAnZmZTj6gVZRQwd4p6LXSSwGJSXzTjbeiMFEXQI0pwikjzSaQuqoLwm/Q+SQIKAXo3Ks7UVjAllBeFGo+SbkDEOA5MGIqZgJb6hrQFSOpDMomzplN+b20QEMhogEypfEECUw0YKYQSC04UReClMrDPw1uqSBnYMVw41YRGIGJeXbU9EOpDCJqhiSnmOnFuJbLirLUjFkWhUmTl9hHHM4xn8Usb715nsdV/NFaCS8DSxeWtnrxnmRHmqhuomiijgkggf4Bf72ScG1k5aXWH3y3bBOLcGK+MchH+MFVWl9HaaUywLmZabq4juLZKTiVIvde76iq6qWyyurOjdOIOHUMmFhyydAajLCRRvQhn9pVCUNGLtx7u+lKAsGmLG9HtSsDrt7FjOoZwDgs/QiMDzqrVMFOAAnlJB6VkBAUe2hnLyhE6w25QvmC5XsXInheXih0lwv6jpZG2KjCKgxkIEwKtdNkm5pZc6Vn9ppgHww4hEMJRF2IrFFfZ1QeA47chBAeaZTEc0Sc6DlK93PX8lNKApNHQhdgJRgQ6xYESO49w23gj1H7AT6Kqsoo9Ighl6uWHCIJOb3BAgahwbAMOyAUnqQgArMDFrq4MJNX8qt7wfFReSyMcBbTe4MKGmmEn+AH2gqWmEB5RB/G7Mnja9lVjuArib8RnWFAMaQYkDz+R5rWbWrZ5x9fGZYse58zYdVIKajX3/KhbWTEvzkHcuwcQtnCU7BFR0oDpsoM9wE/VwbAU9kV33siCY3Koq7a4rtsOQeLnNDXVyOmsgpQivSA/RvZ8exb33/fPf28g5WcUzd+8nIbMnQusyM/5dEJD+EDDZ3uoYyAM+h6meV8JZQr8nGoQYhTHpKXB3+pDGoL0SlqJ65E+7yH8jg9y7M5HKdNoIOSAMQTqOzwHJommoWKcAqzHmQImkJFh6xkj/jBhV5tkQi7XNAjwOXXQATVUwsn8qCSbKQLPBgW5WsFGLPnvNf5bFof7eO+zrDlUH7yTpXciYg/mZYXTiwnakgVCKrWp2E0Hwcs9fOcIXHzRTApJG268GmhisBpSQljkxa1SBcESIpBVHeCw++B5aNMoUXUPvrzBT1cvexEy/qgDvfBYCs3sw00WICrlMAmT0iuzIIZGJcbx1dl+ymqSqSCyKN6S7SV2cnlAMScvKUYMY+2jrZkKXA5PSW4KkyQWaSjzS88MOP5g+DJEPBgofQ6lPuDhOQPI9xaOFXOiEoXVI/ELuy/735MX6YJ2YJMG2gat//bF/pe+bDaD/jg3axpTTuke3O7/ZbDyZUQNq+zICoIfxImBFEWVguJNO4QPCVG1X/MsU3UOcAIv0E4A8iK8U5EpYewTk/uA7V5do9Is0VqI9EEdPReaFEvKXHfD+Fvwo/4QtPSQcELZoQMUF3pJ54dEHQTPI9Se1UoS3GhyB+rYYUSd8mt6261gVfuMPY6a053EwcOLGUnlDAUUXQclc4KO7h9fdvAjrcFy1huyRvH/2fwEEFkd/+lkKi86KRTYXJyWB+ghgeXSom+6ebN2/zoo+28y2R9dz1OUcmoJMFXOlVHwiPLmWT5HJukkJpGXeka5HIkU1gByNoA5oOFnRfJjS/GQVD0rDUBtJvD9HR6z58sTwFHaX2/ZhvrF1gMizquxOR4fQ6WLGYqLw7OwTUW5Bin1eYDJ4nNJpy6yxrzHOb5V3EAh5RmNdYX1KuvLcCUiC5axQk8OuZJzFGZ9Qw1+GxTJe1CQwBUeDb1VVL1UTPYaquTcJUxnZMoHDd+JOc61kv4KwgL1UfKrhIeToiJYnlMpND5gzpwQgyekaFuVMinFApSQPqmnRTPrSztTeEAFJ02l8606sTR13iXS7DITrupBbhXf5kIHaIhuDqWrGJQW33PMuRscM0v0NkFyawFSGFBUbQtOiBRURCVv1y4KkID34Sw7hQLQsKHHZyMc3wPX+fl4r2yXCSddQ316lUp6yoqv/OPtDUhLAnnSzzrcllXks1aEfFg3KpXy7RqWRyqAr1zsjGPEEW4+7Hj8F2w3M6Flkd7rl2/3bLpduko9UwGKPfck1OWKoT/ikUXsvCc2siuvPxQq1+vknU75kVnStUX/YqQF9mLj/7OGreoYbfeMcQJ49pLra/1tMr8E+Gfq4OQUWSBQv7nbOiNFrdTz+pn3yxcbzWrZ9iUcX04enqgfTpuoVvFOK6Gzm/bjvA8zuEbF/Q60EFE9icfgWzb6Qkgx+yemw63iy/tZCec/ndbtHw9jV1gsyfc4iPCKlacLDLoR0XrvLu13+dYVvVUX22mOqr/+PCjX9jf+k/EwqbScGh9LJAYuSrfuXvvzV7WsmUtgEgwk1iYk217d2ZJKbAfvPM4a9Yiy86/+E2Wq7NYiVR7oqBGci7b3Lkr+azWGxg3FIVkA3zUJ9eJtcPf62377renH03V9sC/+IKmngdxvPUr57M2/+lwzj5pdfKQ6jl/2Xprvu+joSLENKqfyTr4bS4Ej/7hOM7uY+rJ/1GOmxuvut13zwh788PpFJxk30ztA+NKwQAmEYSThHz9+i0cJ/UtXwcCV07BHf5hb19QJfoog7wed/uhS3D/NYYjIFhBr5gGg1lNOG2FXXzlQNoOq50SLLn2uuuvQ/Oa1pdVjDp3oBAFIQ9TfOqio8Zx3kggVvGi+ggNgoRN5TkPE//XZ8fbY33HMTYlj4pqUk+9TwWXd1/rzXfxOPOPssQFoouMlL6EdNkV73HK8DLkgfEjipbyz6ObctWFne3aaw6xdrSvOrtffXG1n/GQIiIh7IL9+mtf2d0Pj6YbAw1Uf/0jf0Fhvn084FLbe+96pNO42H8haNRdhzmIQNmcA5ebm+8DdTppVBtqdIBDJU6Qad+pgT3x5JdgJMuplWFURoQlY4K2P8DWCU26CvzygzQVI0TcndNqP7YOlJCF69r9GRv19RKsc9wqM42SmqI172ZZWL0H//KlvfDiWGcIIRTxQwar0ARD2lTh+COb+Hr5Kmz86PvqOG9cJS5lK62YSflythXB0NkW50i1S3sfhNBhlRCmjl2ftP6DJoNL3DIYqExhQFNnzokRs0lzxEkv27hxS72cEo0agZxwT+Vvw4bNdtFV71lMeENTDXRqbf2SJevthLPf9ikjWcIUzrxLUx4sjuDWY9dhtKpMp/XIcsgzEJ0yGHdI99WM0AEG09oIWZUMrIa2q+ojm8cfthdej/BNsYeeHOG4uUpT21Ee/535XvvHJGDHrRqf90qTh7BTQ4guos/S5dssBSFnEyX4lVjtPdjbj4Aog/hA6fj1/4kfL1M/EhQNtN50ywd25kXvWi5772VZU6mz2jRVA3r0xWYxuNflqBc5d2GFl0Gxzm/Oa9yHMsrA+s0PrDk86icBgdrBhz1lz7420Q8S1XhCMvwceEKnCSSxyalfWGno3QjhCN8jkZ3ZwzCJbcFqZzkjaketnhR9//7ONLvpRs4opEslpZiCW67z/KLv7p3X613709Pj+OwVOzNw+1LY6JhGu+lsh4y0TPvd+W/YaM5VUFflv2DRNYCJVWQ9tr7kMWvmcvvbK0vs9OP3trc+nAkSEnYYnzPhnnt6jHXef097b8g0GlYVUn9SPbd/Lshqp18Son7PD9ICYBUfKYyDY52ale3LEVf6+mwRaRTW5YrbBzEoxGmvbNq46spDnOGQ4ASY6Boeb7yhpz31t4mM8qfb2ImaDtJXahAQdnS51YCrHnp0OPDiuF2FPrgk5rzh5iHQQXWNW8tmWfb+gN7UX8wdtw+GzLab72GbKAxw3S3v29QJNzmu7o9TPLxmf319kntOhzJQ9eqrfGyCOMnEmWe/bvC44/DWK2dbx46NeIEUoYGHDJ7jVi1gXv6rTS1aQz/lqxtpPymnJOvW86/2/aZsa9Wwus+xK7XK0N+7Q2dZNvvx5SKvZYdjHb4BEAa/1LFKtgV8FCITd13W5qarurpEBrEVlBBkAdHDNogdc+KJIhTLRZykKwF3yx3JdpThR69J1vfF8ZxjMN9P+tGU4Rt/PYudfk0gEpYNYXn0kVHW71027yQX27mXvGWjP7rUGjeuBg1dPQEVjnPJ37GAKE5WU0GKSgrh1t9/ZFs4Z0HEboSH8OlHl1GPIFojPvvGLrt5MN/NS2aD0Gd27PF7kVFWN2aH9HzeLbe+G9C6UQ0b9H5vHzfQGMiEr5fZBVe8Y2OmLac06O9akQLAS8ZKn++eOmc5RcasZZO69tE/eruFF92mz/zezr/0Hepbar0uf8/mz7ztv2HR6ceKp4o52YTKPd1von09Z529DeNqG1gRglRQJL8rmcP759lDz46xhctyIARVIJ9oKiYTM+0cov7OzvE/96w88gIUooaL0ouZqvERQwm5gj7CAGn5/txeHE/VzBm3kC7G0A/nOsHdfPB+ZzjS1od2aqrq2bcL1/jZ8DL2KtW/KQYOOndOQty6cU1rghu5aNF6+2DoHLcQNdhANOgfl8DsGoQjIwx6El+7uZbNQzrUZjP95vfemep6RkdsRYpQ10MYlXYhpzCNXCtoVFpWID2Dwx84Z86DXoHnSae0Ee/8IDjFOY1Gg6SCq0BT+SGZ2pnmz2RUGUTbnx4+iXc6oDNuU33jUhg7kWDJ0/w76ylkjeT19LqsM3SNsHZQ/hOmhsxW098MLV5sZ599AHSijhGSP4JrOYRwpwMs9TGRfKY9dUrwwd2a+BCEBjW1KUsDdxdLgZSk4dXE7GZmE6iZt3Wiqs5z4pUfC1JgCoK3gr0Mg4bO9laQAH760RUe7wnAVacU3X3TYbwvtg3svxiIgvGykOZ1bOeWtkgGp8H/6OVThSpS5/IfdFBj/yqPV1toSNBV98RYyt/fmwq+Mb5klOFCLvqoBlIK7ferZ3fSjZRSTa+SbJ+gbH51i65+TI+jN3GKyWp5mY6sNqo4vhBsj/obrWmTKSgDvUzUJXGFYtbvmb1szUYYKjSDp3HOFEVk7am8tJhrhPCWX5iIuJ0bSqvhJL4eSBC9d9jAKylMspsvP5jsYkLBVho8C2Cd0LOFfTlhCW5rsi1aymGK3thesIMTrIgZpUhO45jsr2euoM7J9jynxNxw42GkozvCcyEnumrAUXjfcFM34ul/TVnFZ6lReqB42w3EUahDB652x+mzRtfiSTzx17F0KdLYe77MzjizA3lFNzUxLiIt+9ADHI+sFoZ2PoMBmarThSh0xi+xd/jqzTnnHQBsmJU4rWkotxiAEu18sIeRExAU60SzDb6kWZaemCgoheh1eI8WuIwpfJkHHB4baccc2zpYIZkncvx9wFR39RvVqQ5q1IyynV5qxygQJ3Ab/EMelALchg1laRUoiWcIH6X+0evIEfP5iEYeJSZb9y5NrFOXxqqRKxtlT9bcNtupb//9EdZ/8EzWQJTYpNkrbQ3HptWpW8nr7qUJRWXYOag9gOcBYzRz7moGDVFm4H7ndd1pb808iCqhTNHv7DM6+IGh2rT1xqBZdvpZ7fn02GDaWHUptdf4doCvIhVYaCMKq+hOnTkPkMVg2t+vHYC+nZzy+/efJOgM+BZzdFt7N1wqL3jA6qebncs4yaNPjeYItlJ7f/CsiOsd7V/lR67Y58Oqc1B/dRiHL63ACMWMDqbybS6NeJ9z4Tb74P39vc8qBAJ7Q0xoIIIpf2RByhBMNHZgFOUJQcSJ8kVatywPN75UhwS+saUiv5BRsHSaypnndUwAg9wqHIKK6m05/VUHXSbRF/dyPVU5kEhpeDR4nMa22tvu+5i+F243GvWGm7qjl8hLQ151zbswe8xHxw85qClZYvbV+EXUIwWxK7avJ62g77iE9MIVMcQqastuckqaj2pLTlawItDn21EIvjQYeAWMvterX03okj4sTBI+N/bpbk88NcoF/94/jbJX351uD9za0w46tKnkzZWKFIPXVRk8iKETcboQXJmJ2oKfeA53IlGpNW9SlUHNLbaE8+a1a68+g3T6ZtssFJ7WGBTDtLfferjjJxydvBEArgKrompmVYZZNzmtxo5ZYl0PbUw87UMdVXdPxOXHwgAUihRTMXS7uJfOpAt4K63zhkqRJABo31Z1bYr3j+O2EI9Kgq62UEhU2e8r/og/JYgeuIwdvcjTqv7zFnxvd9451J/hcioU+EenI6nvLK9qI4elqIzhYxdjNNgRWpBke/IdAq+WF8qPrkKcm57dmtjwcZQha+PKMYmjvla7Z6Tp6Kkoqbs5+UcDjH7mP+VGqljTxGpDKbGEeXO0f70fTURjGdFTNuCVs2zW1FU2dtJSG8eJKIpXhdXoqlpY3iqh4x7XUoRlwHSnoJToSvqYcus05aSjgTVgI/oEAQ1pKmb0DwDiXgZrXfEN0CCuBuNCgEBEhCkMuY3RApqQbsec4Ul9/ygIlsJxR+xtw7+cbyv4WKHXjnh1DybxEUcx2iGdm/hJLUq7go8jSPuXYhEG4goGKypriuYmbZyGlMb2kVXotXFj2PpLDlKE02jatOLgToL2vIsGqqeY4+LeHW0ZW4hff2+Kn32/jLLOZ9CuCQtfXu97JlMxDMZ5zl/6k6hgheTC84mHfmdHn/GqVWFAYNbsVdagfmvaliPJBs1hMIyBMCxfjx4tHC9f4QhuEa0cFPVU2Jcz7MbzTT3V7N2BU63rIU0cP38dfjzdj/3ki+GhUmFRAV+pYaTzBwHcxVwU3In97lMQGoGUN+TIuKv5g0xlEap5RVqtYsGOR0Dv9z6cAwzBkUIKvCu6iCnjKHw1Rz5f7VEooD+bTB5ZZW39dSSUtizoHm/40GYI+mJkR7RCGoClgz1EN3HrlxOXYNET3CLEpFt0FW0pUlD0ZaH/iqD7t8phPvDjgMHVuOtVrBnM9eVXy6gfkVgT15Rgr6sIE9Q9FULIijl1ZscQCNK6VW2OkuZ7bTwmoUycudWIBIGoyETFdG4FHe3BIp0i5rchbhRULq/0XW8F3QsP0cyp5ZE8JdLpcefgDeqRrkbcLT/nzHY2dORcd+f+8sRoRoIPZ2Q8l7lWzT/H7MbrNKgnxmS+GytWWrLO3bBnnziJmYlwzJQ8AAomFb80nrhFSzMraXRNOIKWFmWov69ZZ4+D0ZRe98orHr7vniPtpBNa26OPfm6T5q6gb5rsX0I95LgXbPSQK61J08SJnZ7vn/0E6BVTqR4t9qptVZmd0KedXuaUoWOObu1J3h00zdtz31aaFlRAeTGDEBRyiPFfwEpxHX1kC3v+5Qm8T7JPR8+n2wKjUlF1ieQa/1wQjWRNxXN5+qpGggZleYChZbNq4xxO7NFV7eryzb1Wsv1U2MFrSyTSaLdAqNWfeOgEjA58pnaSUFI8oFVdEqidmT1hfYIMkibDHJ4OV3FrnUjHRSG0ODccnaQaiXtdeAVLgkSJOhm5D5/JbtiQNQFEhWKVTvkEQWUKlkzBrx0oFL6jj0GRIHbBBQfaNdcPspMZ4HqdY5d8Wse1MIhxDcIqTIPAetO7C1QRUb1PssN77GWfclqrXBTNYd51T0+PV01VwVB7v7GtLN3Uialq2PZt6obIxK8ThAwRD0WN7+TWgwNT/76ccDsA0IPSeLrIcWLxDwN4qXK7qft7fE1Wgn733R87I+QW5Fs7zsoHpOdr2rKmTZiyzJm6ZcOa1rRVzcAIAuocQzpvSa665V6oKbuSBOaS8OuB/zCaMHHwcLFmMdprRuO9C2zypOV2zc3v8624fI68SrfHnxxlLzx7uqCG/GW/3FQM3qckwrk3vAgrAt3eOJqdOTji83F4a1NWsOUz277jK64Mxvsg/70cO6YilF3Lc53OFeA7WCKbN6nt88uZfIcvjiD1e/kru/xKRurhCbWVo6l8ngE+cf6QKMT4Wm2WjZu6zA/6WEr3Zr/96odyRA9o5p6askLTzycs0w3rBEotiwNEQMsFVXC9HJXxo0F0Uii1/Ts3si+nLsGjTLK9m9exZnsxFcg/jX2UQRHgKAu3wqEKg2TZLBzTAh8dUlJZi5Y8py5KLPHEA35/Co9SPpE8lFpTvm+oWRy18B7VU+x3zGC5F0FdFHyPA3l86SxppOl/Wn15lv/8R+g42tLgzO+17fAEQpdtDzwxkufArKpCRW0Z0BV19Ccm2ik4k5fY4T2b49JK05u98f40K/LPFmlBREgvTem3EPYWPnKI78uUVJL1ZtGLUz4U5Pj5T+JZBJKFVMHCS/9cW4VcZb+hlPJfT8ejZ9UP4SI+5awabGUloFb+fTZhqY9VnHJkW1basVmERtAiis6sCMzHcmmw72Y+LBlcb5WLggEfZ2YUGhH8caVRJWRqQF+UQlQC/VA+8bpRnCsF7mS1lGp/BH78qOuBxHvgT1dXIhGiOkSwonhdXSlLYBJ1C2MVmhkQc8nTKGH0/WSOzS7mtKB0GzN+MV/vWepz8vVrVbaWe3F8FOn8Y49ewE6l0DYaXNSHLh+9W0qb97Tho8+OtS8+R6GrtsrigkBlVB89i8FhbMG+9bYeklanwXNsK3V6KT2w5RE4nhzKKdZfyboDdYXUdWzHSbhSIyJ1gM/1xwKgEvIELL6gi6BrL4SWHN/0BxZ6YdX0T2gFzucql0ooUBf30MDjxMNbUx4bcljn8MifPneayuukCl5Poayv8E5kqkzQNIYosqstj+zZigUxOrUoyV4bSDcPbwd1xTvqRxk6vUh4qL6qDgD0/9cPqrQLDvOFHDBq05he28LCGSeHCKMEO4XARFHkTgm8wuargapUoVIIu5jv9/cOwyLKMpOAZwmLyh2AEpg0baUTUEdWH3d8aycoNNtlIWL+igDVWKcyLSZXnTa0u+4aigslAS21Ozj/zetIQ6sRjjyqtXcptG5gzvwNNpzR48B0tDDp5Z6L0dXY48Yu83r5PDWV8EG5BFyVr9QqW/AFYzvTcUFx6Q3p8WzkDuLBQiemaFgR+EuClIBO0/mWveBR0ImuATbvQK4KX+jZk66ZZlgGD5ljH32iadRS69KZLcZieILaRWl3ppkLgSswY0ahI6v6skjMyjK6Gb2ufs+eRnD1KWoxtmZDQJ0r9/xbz0j9WgadMhjZbtJIew/MFnO45Yt9xyboQ1rK1l8Md/jU016xknxNARbZPTfjaUAZCagHEu2MW3gR/Ub8WMLKsz34qq6OWCu1+Ys2+jFnXjeeKYk/4EIMtdHEiUu9DAn8vcyOqHE0oPYxp/p+hMen49RkZIRkASvmjuLjpFos5V+41RgULwR7X7yUpntWAzYrDOevtSf42KWmMfWsf4GOAh+zAQN0WOl/ZcGMitFcr7Y6cm6ZEEaDSjOpkTasrYQQRIQjCeHniRzS6DfO9snRn1xr+x/yJJUx+3DYXBv00XQ75dh2MFsNDoXIto+GfWsbOf9NNJdFuwf3WdNTsipyrnZV2FExBagSypYt67JKiRFnyh7w6TwXLm2eqVGdqRwaWe6kPDONqr78zJl2JS51jIGbq/iE86EHNLYbruvK56oqsQY931fE/YXPDjdgMcrwT64MloUy3KKL4VUgwQ2c7sXt1LH3he9Y02bV7eILO1kVBn62bcuxcy99FxZHK/L/1FP283wVfwKkijF8TLNBVb6frr33Sdar91t8rONoX4s/kVHh3nx1RdqzmMqccEQb69v/axs3aZkPcWiN+918fru8WybUqHsC36gUMakYX4pfS39HfHI5U7Mv2grWjmeyWuxZThh+7OkvWCtQ3w49tJV/cCOfZcbDR85jWe5W6/vkqXYs68o/eK+XHdD9Of/y5eMoh1mz19r10DGTFYwbGMS8qs8A27iV9WpUslGD6ixrPsC9APGlsyLlO00TiEW4Sk0qeH+Zq/BMos/d9/nT7JI+tBse6i33DbW3Gfm/87Yjabd0lGwex1mv5JvyY5iGS7UJrNmnqbxtTjhyL3j2O2Zmkq3PHUPtVb5U2717K1u/cau9/vYMX/dQvVJl25DLkenQxXHCKy2OFdp9d/W0S67RQpy4vfT6Vzbqi+/sT3y5uBpjT9pLMmX6Knv0iRGsScixMzgk41fpo0eEEVHEdb4v13Weppck+HC9GJx3Iz5r7ZUIaYn2f2JP0aIiMwQihzjeQ62S0nymm5Lt0/cvsZPPeY2pCpY7st5xKMczB/unsiUArgtZJLGfXXgRjQoojIJfd5T1BHuLqBGnh2IdvfATXpAkIKlIolyThgRlv0ojZvrjXUfbnfezEk40YBXQJWcckBiUUf00SClXqxSr3tJuYq78uZcm+JjGePqaYy9cGtwxAOlkVBUb+mxiONmjoDCFg2ij4L9+r7sk1rBvtnmL1sJU0AVOVr83zqq3GOvIK7HB46ILtX4/5HUACRhRXBjtNfs9awFOPf9NnzL8atZK68FyXA2W9ujS0DXql0sAAB4USURBVC7kYxNq5zj1uPWWHvbia1+jsIQvi4KaVfMNGoIt4Q5tWH4Vxk4r0qpZXCmzwEpfbR097Eq7ke+ufzb6W0tmz0NVFjTNmL/RZnyHW65hZSUHZkZmio0fu9COZewnhYHKLz6+3HrysRENfI0k/tMxi1Gm8B1ZVIZc3KYMCH/24eVBMWowl7oIlntIoZkdVy9EP2UkCjfiXw0mH969pT1w8+H28JNfUIMSPmW9zk7r/QbeZfgEdRIKIIZyr87+AwVteEriMMw/I5i5uQNs5BdLtbzC5tBGc5dwrDlp01kC3YaxpIvOOoBp2o+gW0KRo4x8jUC3Vvb8n06ku/CRu/UL+Ljmqee+wWwD7QqfaGGSugFU1Mt0uvrdLvpxEriUsBKLb6fV4lNHNWtm8pfBfabV5lojq5LvmqrB7pxa7NKpgetYo3q61WQnVbimWw3S6fhlaUXd++BNAunAkzQMFl3MpRHjmV/dZFecfaDv1tKZXukwWTrrhzNZM92J/u/McTfarbf3DI1FAzlzJVquejV2cYFjdT/RlTdiRs1hUw9uUSgQDqaqg2XVSiStRXZATkmOiSa+WharrFjwUjEor6z3AfTjqlVLsRq1MqxOtWp2/Y0HOWN7PWAu2sUFQHmvuaarzZx8gx3FxxAyWeiSSR0qs3S0EktfK+GWdm5X31576SzwwxSLKcnj9INO1aFhCIp1DP167VXdsOSpvn9bH1CohDtYKSPDzjpxb5vM0cuyFBrNkMX1tqKdskjv5IHB/Jt50ED92A/f7s3OL63jBi/W1FdG0VbGijD84Eyu8WGFA9rv6XDVJz4GBSbhjqY/y4WdIjzeq8KP2kV1AoZo4iJZan/mu/RzJt9ml5zdgeXJVdgXofZlf4Gm7LBoVRDy5iysOe2M9u61iS7VqcO08TdYn0ux5Ax0VWaRTAb8KM+gLu9ewXsaPvRyx1XFqL1FBQlIFnxYk6/7Vq4SBDMAZeGReFXv4FsP8IRzEj/nX7C/zZt2C94M6/4Ze8lE2VSFPpkIbGXabr996tkbL54FLwW+1dJv0fy5J0+xiZ9fYycd2ZKuSg0+DZZmJ2PpR31wpQ1+qxddFaw55cgnVoNI4EUbPR5zdBubM+lmO7xzM6dBKs1fhd2KldLSvW0O7rinTRx1XUAVQgvCLg0+CCAmBLKIFzHkf1KI0JRlKWJmSjvKKqLt1h2+l1UMSj4wesXyQi1JJAuP6+nPoKZFDNLiJWhfnWzjLlKCkMLbKSqBV01EKZdlniUcZe+pIi/l0nqUt0QoXd+Ew4b6uIEGTFQ+JSJUTKu4BdlROYR6Uq7gSdkEowUwcJdPAIOUlSGZkv+otIKpW/VPyCTMPa1w5sEZhNuKQYzmhy16FlhJ6xFARxiFrhViKwEAvvqOKldKL0ECB8UrUcZpiE7zNtCL62/6wIZ9/h3zxoW2ZN6djo+jAr2lr92jIjbUV+XpbfC+pD/Fz0JcljeGFxTKhRjkBwv+ygjDE0JDlGrtVlYYURH1nEEbqMoneCGoKH0+OvKMVK8iVkXGGSwOOIgW5CGh3HneEK9aCh40UjyxTieBBMcggIykgIhvJVV8Inh55FW3Js4Aqj5c4QiTVv13nXmv5cEKgQ5CV0iyXPiCN2wic/0qf+LIa6w6Bkl1jbxUeXWaPAs84RAcN89PW4WPV5aNPijBrgtOUyeGU9SF4D+DrgYAaRAPZ3mF52hQR7CTEJzgYlJ6Ys5etFKfzzeycFVjiIFEeBFOTCOx8/9ochdewUrERfUQvMhSqVGV3QWKWAel39BODkvQPeillIfeUZZ3YZBGNYruxWhRw4YMKlvvBF92TUqCkpGgQs2dqoGJQeT8n7MeCsqZk181upSKAAguNSKDGlsCI8YO8VplJ5QlLuE33IlzYwi2aiU8FCtcg5IAD40oqk7+F+ruOEpy+S+BpDDS80HICYs8YbeDWjgM1UPto6D3Cpo1CDgpTu9Cyb7SzzEQzEA3CasPMhHvdBS3858HGJ9v5W2bxpdrZgTcgK8pV3lKgcbAJZ3Pwigb+ErJhnoFnLTTLxJ8xE+AKVx0UONJmPRP8NR+uhdeoR5SxlLirliAK0MX1UtejBANG3ZIJT4jpTNiYgBNC7mCt0M+UisIl40bc2zcrDWkBQP4Thua5MmFAbvAyK7EKCKUF8riQf+dXmQjvT6fsquDYyoCqNCEVCUa9t8tKhBURAgaVTUXSJ9KENGdSVgd5g1CBTEXdLnUFN7YKtetL4wVJJI33lgoB2YCaIawEwyC8KIMrhOMKK01948NugxRnqhH+WWNTvlhaA8B8sbzErknrSguq+iwxUBBEPVOq/o0eiw8wzw4r4kvYWtlTCOw6riRPRyyENLJWhMFPhIcwdOfx3idguJCqMHD4YKnbwUWNxKC26xmh5bUVTm9LrryAH9RP+KpU7gqjxid/BqtF91LtZgH+NATLCmASP5rF49QuuCitxmkYz0WE+hXXXyQICdw9VuHkZO/DuW1kfskPmjJRg/y5xWwjqBkA/DzbWsei2wIpQzg8j1n6qsn1UttJLpp4I72I4Xao4Q2l3fWreVEpII5caXjbRxhJZPfqwxvKVXCo1V7UUzPpJfXoihXdrSl3iov6UVLpXVYnki3xDk+qre8QZJAJn+tbNDY4QNbi3RUhtPL4RTZFXyAtBObkC7T/gpSl/ET+QpYg38U39NLAaigHN+jhX/RGCCJdEJTPIA1h7f8SzzOu5SIwnWlBT6y5Q6XH6G3iwMgnUABbFSB/6QQZ1onBiSBZhWD18AJq9gdy/b28fSqpm4iSEpb8Snk81QJ+OUpQ16VE1mlcK/GEbHVFBKsUILj4OWogChWFiQ8CoZH81qZYC/IJThKiyD7Sz0rPcxFEGPLEkmbByshwQ0Y+iYRL13pA4yQN6FIiCMXahDFBzzne4dZBkFF/GwoKNzKsk0+YonQbc6dDLw4z5tYnbUUmOwIu6uu95sXLyhkPTfLc8G9Tdtcu/OBYcz5SiEgOClFYVumhEFyJEtGQnljVaoU2MLvWnCa62oXWNdhIOrKqDTFijmsMhlr5haR+jAo78GFTTQSs7MxqmvrcbjB5UtfRQ6nt8pxGunXS1XlA5uGRAGeaOXt7z+hkPCGX8Wp7YDlr0XrkC4CsTOvR89epstEKFR4dzr0OV9fkZqeZFnVKjEuksGy4UpM022yNeu3Wgk7nLTFV97JbPri0tWRQYhKLodfhkkF/Bxx/9n1Ft3BUvlQ//AUqFJe6r9xp2ZS+DFQO8btWHY5HhFCEaSARPlTyBel8rLKMkexiUZCx5aXKUHUn97BfQnLqThnLDGzM4/cN/U3JciCl2Aobl2AAahBMWlnEU/WOrh7cjsDjOAa67NGEnKFCHvBCzhGeBUVF7AEFLeP+K25mktliq9oCzvnlrOkOGbbCqcBB+Fn0KO4NI/3bBku3uZgismrIzylGoqKs0kXLIRwkovKcRj+Tn0SF0Tez55+IcKcB2ynhNXOitn1dw62/DxGnhHwZ544w5YtybDHnn8djyWD+e58jk/KYtR/s82dvr89fPcB1uuKGXwqeyVeWPAWRDdMMnRgN5pvCOLRBRylRznCRiIrE+p9aveaRJfyEOhRkU6qYqCVZ1XSiGh+m3hXDiJxF8WrbaKXZTdlcVLIFUP07GX6K9pZV6pWj/7292u30L6ptq4g29ZrJeHCdfCAeIFjqVCQR7HW/ZmnTvYMPiqQAB+VUg4/KrUiflGczNDu8IspIKKKtaKWClqcZwVpeV0USXDrrKTqTrhg0kzBOCeYImoqGFauL2lzC9ajJzjeKYevt4qNsZS5RQucybMLvkW9aAAvx4VPQAoK+X44wqc+d1EJ33gDh4JibaGVchAOvBNoXGqdfT9k4CGcPxa3Xhd/DniGrhCQMAos5SMUJMRiCWrpnoqYRn8c2S2Y/EsqZcWTdzlIh9ABmp9ku+KmL2zxd63wruPWoctca96aLbp6BUSGI7DWNWyvvTZidWO2aGEje/KhrnbXQx/xHbi41dtzqd12z0Zr3nIrigI1kszuRkbJNWCpwdf8PL73BqTtW2vZ5o3VrUrWBvtyVFtr334lB3MupO4ahlN3QgqQivyPh6jlPxh8ia1fm22Ll2ywhUyrLVywEcyTrDInxhzQoaE1aZJlDZjnD4aCmnmb/nuVowuZ4Mx/L///47nEFBJefv8NKuYVskKMzDn0LeWLatdYfuEyhIIDIrmWlOYSx6GEhQgfbJ9XFJaaqqjCojXEsVIwfbFt21iVY4ByvUFlmTQPKrwC08K8pNfAY1AwUiguciEFwBx/Urtlo5xQI48IcSiA7Vsq2TUXn2oHHrzdruWEGmS8jHFkFaP+ZCgTmK5AhAPjBbiOGtDR4SGeSUqIf+lprLhLRpQZ+sjJ56OIGowjyCLNmrI3Ahq3Vvss56MHeXwFphlZ8zk4s4pNHNPUpk+vzPbTJZz8ssa+mV3b5s6qZ/c8OpADDivZS3/pYTNm1GRqKdlatMi1ux4ZzM63bXbfLafxhZZqeCAINoOTGg7pc9s0O6DTTMdXSvXgll9SXlVhkahfGXUct/+ZH5S4e3au/aUOozYPGHrP3Ltt4I+n5yf+oAT/3SD1/RsNEA8BKCrZziqpMZZfuhbLx2mbWMfcglXQJG45RVgliKxBn4LCFfAOn2cuWoltYU8xjSAXUwOAOgpIrqSWZvrosD+oURBOJEprqVNTi1EIqUFEaDu9zcgosIvPvJ4v2PK5n7+9ZAX5CBJZJKre9BJGJdSfu/Xg7ANFitNLwad8LKoOiSDGozVNJDe/SJYcCyvLnZPN3DPxe7fbQD62OKYW2qYNDWzTukxrvNdS+oNSD+p6kIe7JD7mPnEcp88Ad/G39Wzb1krWbr+ldthR01x5fTO7jb356oEcEZVKv7rEjj95th1+7FRbtXRPu/+2o20bp6Dq+/Znnp9u7TqssUfu6mSnnLOSr6zWs1WLKYY6ZW+rbnXrTbW3X2tv69ZUskpVt9ud15/Hrrq4nX3BHKuUlW+vPtvB7rr1DI7weplDHjN9gPLZvoNZPVbZ7r+9m82ZVcv270SFpG104V8wXdRBdHPi6fq/FEBU3oezB+0mpUoIlltIS/XqpW6pjydVvVQnr5SS/0vhtyvokiDc0ZR4ZZu98nLcxRoQTg0gousaFEE02JOWWmJrVtey6rU4mTUp1Ynu77yzKKEnD8KoEfwwEspoEw2Tl5th7791MAceZtkd97zvkJMQOM0Ly+Xsctg3nE2+HXecQ/1S8QpwbSWonK7GSSk6YlmNLiZGCdBvy8WNXbOyFgt8cm3+fLaW4mLve8BKfAP61QjlikV72GcfdURwqliT5qvtxDOmsNBmq23aVIPDdPmG/MEazU6y+249z2ZMq+xWsRq7HB97ZrBVq6k98bAYHkkeXz156bn9vQ7NW+XZ6lVpNuHL9lZnz63uWj9w+yHWqEm2XX3TXPtgYFsb0H8f637UDHvmLwfgA+Tb868Os/oN17DcNtPmzazDN95L+aTWajur92d28akX+Ek6N7AJJBn3fOvWdE6vzbU501vb0mXJfDp5vR1x/CT3IPo918HWrUT14E3k0u3Yv+Nmq1Zrra1fk+UDi5kZ0Jt6QS5Xitn5y6xa5j5ON2K8rvz8jwXxXpBjaaNIdMuFOIoBbU8Xnsvf/+vVCarkX8/3/34OaOe7ilQTrbDzf1oJFe4SzYC1VN86ZheecpmNGdWcbYUMUiF8qaw3TsNtTU8To5EL66qBtPz8arRNkq1euYd9v6quzZvdxIZ92sCaNt1mixbsgR4BfgFp4cFVK+pzZnkVa9R0s61bvYc9ckcve/W5U+2Cky633x17lY0d1SFMD+I5hCkUswXzGttdN/W0PleeYC8/39me//PBdm1vVsqhDObPaWr3sMZ63twsS6+83kYNb2SP3Xe8pWbk24xJ7JajS1C16mYs7rm4wOn2/Guf2MtvfMgGilIbNbIpqGkaTWsPWJbLCDZLAKxF23y79/H37Oo+rNNH2a1bVWoD+x/MKsBiu+Oh0bjfU+2qG8a75Z81vb0de8IqeDdut15zgk3/qq2lZWYzCNfQuyPtDpxq+XgWGk9rt08h02tQCtpu2ZhiDRqtQTnxDXtq0rwVio/lrlJsWj4QZ+loCV5Lbk7MWrVZjn6OM3DF4iGStKRfL9rTClzjnBO3hqvaNIxTqK12h9/4YJzmPhXUpwt9ogJGpTP5yEEmLi9uOIKclVXExpkDscD5TBvVtCFvH22H9pyM5TqOk3IqsVurxC66fJ517THBVi5pbTdd1832abfN5szWBxc4EGkjxwtz2ujo4XUZSKpsV7Yc5F6blsLMmNzchg6pb/t2WoRVS7V581Js1coMO6f3Ahv0VmN7/aW21qXbTEatmUtG82tQf+36VJRLsXU5dK31+cNgu6fPhbZwIctVwffpxw7GI2Db41PvWGbl7fbE/WdzimtVNtUYLnOW9JnlIzCrV2iJKCPhj/SkK4IiSy6yjavrcGXWmjl87f7btjWDIktY2jmJLgVHCaeyMQiBirGwJI++d2VOXapTZyX98FT7dnZzBK2UA0VWW4dOK61Bw6327J/3swfvPtj6D1xuc2Y04ht5LCehGnmF0oqctFufKbjCFJs1tx3WusiaNl9ldetnQ+e4zZyeZd2OyLLB7/ZwT+niK+bSp2+HsJdao2ar3XKvWlZTDhTHY0/hiC8dqawVaVITGvxUq9K2Uua7BV3E+O2OustuR05TSqwuhyeuwjWsalf0PpNjmgtYnIBVK0qGcdfYV2NrY5FiuKCVrP4xy7HMWRy4uMUuu2aFjfykAWvPm1vnrpNhxgZWtRJfWFmpke1VdugRk+2TwQfasKH1bMDQF237Nqa4CtWfZ3aUfv38b1kjTiPUb7DFJo6tw10JrvA8a7n3DDZonGPLl2o0XH1sKSS2MsQKbM3yqri9cbv4qrGcs5fBHu/tPqLNRz4Z4ON4pM45DOzliN0RStSJPAjul36XzvnofGRBPQqgZdUotH323eRjB0rRpescrDjdBsy4ugrTvmYfPQL5/brajGwvsSH/aIwSKQVXNhJl5tnW7FT3WLTC7M3XGhBXSn97lY0f0dXadpxstWrtY5s3IXzooJWrU1nrn+tKBufE6//lZ1k2aXxvO/5339CF4QCFuvnWuMkKO+7EVTZyZF274bITaYNSO7DTZjuw+2Qb/E431qwXgXcBAs1JuJuqcfDjFroZeAYItf5pBdvW3DlWN+tI7iXkftn9AwV+s310CXmYQgqDT3L/ZE1TUvKs++Fb7ZyLtGNIIlDKANNxPir80lsf8pRPviSrXdts+LD9bY96xbZ5AwIM8y1ZkomFLLG7H/+c7Y8c4Mdg27fzarIYooiBpwwUB2WK7TDNsWQUwvIavhNM00vLF3dmG2MK/e2vsJJptmR+Ku9ooGR9bolcCHtKSjEudwMkJcaGiy2sPjMb/wUnmuB5hMU0xbZgPqYW13bzpto25evq1rAxn+tZXZMz5AutYVNO2VE/g7+VK9PtulsnWM72ajb0H4dY3TM+w+2lQIQ5xmGGU76u43V65Zm2zIHvw3bIIs6Dz7FmLZfauRfHbO5NPewm3HONNVStWmxPvTiYgb097fV+TSz571h4BjBv+D3eALtdMqFDh45rmD9nEwr1vvmOWTbskyZ2zIlLGGtYZ/vuu9b2bLqUxTdxO+vCT+28y1E4DCYWM7WmLoSs8qnnjLDTz0FJQooivIJeVw1D9XEgZgEzF/yLuk9uxmlbKU2FsHrQb3/TP79ZQZddiwYwM1Ia2Hb6dg2wVqksOx3xWQ0Y/XxONnmL02oLbNv2LKvToBhLuZ2+dH277tKTsNy51vEgFn2sl8XV3G+RLaffW1KYbo0afw9zYjoxPQu+zeRMLyypdnyIIUkr5kuOFzOVlGqNGrFYhedFC6tbjaoF9E3j7D3nqxwIb5OW2CqtENGofimWjM08a9ek89UOhOW6cznFxWzrllJrsy+LWnBbm7fMsXnfJLPL6yKsMXlp3RtuHQeOme7Wtm2zlXT5dscDX9N378SW2FOwg0m23/54AHgOIB3GEKDNd3PSLK1KoV138yzGGepZhwMW4GnM5YumKbZHg1XWd8DffX4/iXqoS6Gfmul51vfNN13MJKCakhPMR595EwWjksJIfJt9p4PzNMqOWSF4JzMmoP66LHUJSqqI5Z98RYytneSg26OZhpg8Id6HFYQ8azBV3gooo5qAzYAldNyePz8h0LwgPlLmicjf7OU3LOjS+vpLXGCc9Mwt9tc3+tvbL53E0UVVbcrETtb18C99tLdRE60e43jdSXVZf1xotz/4Nd+QW4GrfzYMihDGCzj6ByFohIBh/fLz+VQSG0kKcjlcY1OqvfTCqXbRNYNY2wIUBpni6WzE2JJi7Q/83vu3ixelWdu2DCxRShHCpKUrjRtnO3Il7m8jCAj/pvXJdtiRKzmLbU/7dnGJnXDKGjv5PE7WQdBuvnuQLfqurX09tiVTWsutzX6siMMr0V/ft/u70tBHIZo0n2PPv/6dj2THklh1pi4+/Vy56toDkJdTycuqt2ehtes4xfbhBGx5McXFJKTuOv+P7rvMJTBEQKxuQqgEw2ce5ElLGL1GSKgsLM9aBebnxYOvBv2Ssfjaoy+LLCFXb5sfugmiQAlbag9BESC08RpWNbUZ9Sy2ahn7gTMHLZZmsR2zGbCjTpjKUS7S42IlSUkCU/B+6+E3K+jiHWdCmDU1Xg0Xudj+eOc51v6ADbZgIft/sSI162yG+eATLMd389LsyvMvs1v+MJp3MXvk7i6s4oJJsdQNmuJiw09yz5s2wtWWceFdAcJz452T7Jln9qe/zXFNCTcUv53FM4V2Qe+l1qHzNMveUtmee+0tTkCB+XFFK1fJtr/2ew9vIiyqAEUXwG9naV67mBHqTXb51SP9YH8tHCnG8mm/vIbyW7T8ltNY57kVdAZ34cKSMnXn4uDA6NECx4f+9SzLKevo0huzrdu1jp0DI5qHj0wUADuOh5LEenO3oPJOSKulqYGKsqyyqoXsw9Z5fBqAbEDXo557IjUqdUH0CpilqMX++kbkVQqUBlfUF38aRCNOGscDMarPPwnKAwjKljLTXQhgQ5tJqQCbeoVU0dvf5vW3vTIOqyJTMm/lfbZm08d2721n2fIVybjwxXbGOZOtfefZWLm4bdrMHPKYLpwTvtEO6DbF1qyqxfw4p51U1WAXmy2YtspkAKyAPm6KvtqJdRfjK+gMOC10006jYk0ZUV7gScb5WVAi91SWTopB+8fFub5iiqu4Xwyrf1oOO/LjLvbqC23t1rumoSBmEccIOUIioyqL6JtdUELqCjDRR9m8c8lESIWD4HvQVdNPpVY5bV/SpaMoqjGa31CdYrolHVBm+uRvGnEtfNNKjJkJoaSh++h8snhSBjCoI32EHQRzJ9lSGs9Ldp/dUI2gRxhoFNDd4demwG9a0KP+2zcr77G12wbjrmpqBiZEcvIQQLmh3g+kFfzASRhW87re9YRRtYQVEfSIQoaTU3TIhEuxRFOuqcaCE6wtQeZeg2Ha7aXBNZWj72x5wD13QZV1c5dA/ctc8MHpQlI0uJXLSHdpXherUTeH0XJOL4k1omzWRqe14VqEZ1IL4dRR1jrIQOe0yzLq2CjOjCcuJYaw0idWnz+uYfqdA8Lt+omrC6YrD1lrFBKVdqvt9VOchDUAkBISnoGewMAbCoonUTeSKa0rMDCJ7ita4Z1R2f28aynwm3XdIzLKymXIkm3D+mkZKAKJrLkVFiP696ywcsgkQiPBkRTIYuo5jIgncU4XD1hB3FlxMakFVw5pamoL9npp6SuDW2lNSVbMwpVmFMAUW1JV3PUGCICEtA4CIGvMCrl4WPGmONcGls7gXOTWAl7ykxCycO/YEClhQgElcChFoL0zTXqPkxuvRO49IHB+r0yKkyQKjrwHLtTHg1+kdCJPRGVIyD0TSQQHIfeZAeWAeALleCif6KXnUEQ4Q4A0oVBl2B3+CxT4zQq69+PEgS68MKr+YbUqpbSEKdk/HcvAKrIsliTpjMqLseWqpqXVgalZEZdcj3epvKaPn8I9jO7WlHSxpEyElVUqvyAEcVHpgPMfCvRAXJmwECGrTlm+9xycy/qlJA9HUpULl4RIQh62l6qvK8AqQwIaLLPDkeAD1/UCVz8KS2m8vy58NEbA5FUk1EoDJE9POocLDCEeKRLFhfflwiwa6X/wDMJ0mZRaWR2AtDv8uhT4/wC1JMLrDIdYugAAAABJRU5ErkJggg==
 				</mdui:Logo>
-          <mdui:Logo height="75" width="75">data:image/png;base64,
+        <mdui:Logo height="75" width="75">data:image/png;base64,
 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
 </mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.154.64/26</mdui:IPHint>
-          <mdui:IPHint>193.190.71.0/26</mdui:IPHint>
-          <mdui:IPHint>193.191.182.128/25</mdui:IPHint>
-          <mdui:IPHint>2001:06a8:0540::/48</mdui:IPHint>
-          <mdui:DomainHint>kdg.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.2198900,4.4034600</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.154.64/26</mdui:IPHint>
+        <mdui:IPHint>193.190.71.0/26</mdui:IPHint>
+        <mdui:IPHint>193.191.182.128/25</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:0540::/48</mdui:IPHint>
+        <mdui:DomainHint>kdg.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.2198900,4.4034600</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAPGgGOPxkWRQN27VjuZmpvCjmnizMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC5rZGcuYmUwHhcNMTQwODI1MDkwMzMxWhcNMzQw
@@ -51,29 +51,29 @@ Dip0z/sGPBLF+QVmQdY1y0uMawVy9FJp/OzRAQ97PGZrRx9BnuVgQP5qjtLZV+Sg
 WwKI1yjSjIyoht8aBaNNdlNtFLfcf2q3
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kdg.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kdg.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kdg.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kdg.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kdg.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kdg.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kdg.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kdg.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kdg.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kdg.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kdg.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kdg.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kdg.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kdg.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kdg.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kdg.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAPGgGOPxkWRQN27VjuZmpvCjmnizMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC5rZGcuYmUwHhcNMTQwODI1MDkwMzMxWhcNMzQw
@@ -94,28 +94,28 @@ Dip0z/sGPBLF+QVmQdY1y0uMawVy9FJp/OzRAQ97PGZrRx9BnuVgQP5qjtLZV+Sg
 WwKI1yjSjIyoht8aBaNNdlNtFLfcf2q3
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kdg.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kdg.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
 KdG
 </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
 Karel de Grote-Hogeschool
 </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
 http://www.kdg.be
 </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dienst ICT</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>helpdesk-ict@kdg.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dienst ICT</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk-ict@kdg.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml
index 2cc4e943..f535f97c 100644
--- a/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kidderminster.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-07T10:38:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-07T10:38:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidderminster.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidderminster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfjCCAmYCCQC1lEqsdKl1pjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
 						dGVyMR4wHAYDVQQKDBVLaWRkZXJtaW5zdGVyIENvbGxlZ2UxIDAeBgNVBAMMF2lk
@@ -33,26 +33,26 @@
 						iI7pdvffghmNIpB/5M6m3Pt0ZPCWOTUbAlBt34zSVFfrDIHBHru0D9/ZBjY74j54
 						Tr/tGMotauH4aEa18dgsPJ3fiAlCAOcfTKDJKfzyX7FkIw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kidderminster.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidderminster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kidderminster.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidderminster.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfjCCAmYCCQC1lEqsdKl1pjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
 						dGVyMR4wHAYDVQQKDBVLaWRkZXJtaW5zdGVyIENvbGxlZ2UxIDAeBgNVBAMMF2lk
@@ -73,27 +73,27 @@
 						iI7pdvffghmNIpB/5M6m3Pt0ZPCWOTUbAlBt34zSVFfrDIHBHru0D9/ZBjY74j54
 						Tr/tGMotauH4aEa18dgsPJ3fiAlCAOcfTKDJKfzyX7FkIw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NCG Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kidderminster College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kidderminster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Dalton</md:SurName>
-      <md:EmailAddress>mailto:jdalton@kidderminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Mason</md:SurName>
-      <md:EmailAddress>mailto:gmason@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NCG Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kidderminster College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kidderminster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Dalton</md:SurName>
+    <md:EmailAddress>mailto:jdalton@kidderminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Mason</md:SurName>
+    <md:EmailAddress>mailto:gmason@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml
index e0c46782..6a61eb73 100644
--- a/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kingston-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIVAMdUWtt4ktwl67ApElUJmzacgr80MA0GCSqGSIb3DQEB
 						BQUAMCUxIzAhBgNVBAMTGmlkcC5raW5nc3Rvbi1jb2xsZWdlLmFjLnVrMB4XDTEz
 						MDQxNzE1MDg0NFoXDTMzMDQxNzE1MDg0NFowJTEjMCEGA1UEAxMaaWRwLmtpbmdz
@@ -30,26 +30,26 @@
 						g22QCNGnQBNm+23uTa1K4sR+WSZ2SOwwzIdgfATd5XdnnY28BMKy4uNME+XJklhY
 						4O5uQkWDV+eFTekWMLQ1esZs27Pvp0NECx1IgTb2IjoXF8X16uNqDA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kingston-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kingston-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIVAMdUWtt4ktwl67ApElUJmzacgr80MA0GCSqGSIb3DQEB
 						BQUAMCUxIzAhBgNVBAMTGmlkcC5raW5nc3Rvbi1jb2xsZWdlLmFjLnVrMB4XDTEz
 						MDQxNzE1MDg0NFoXDTMzMDQxNzE1MDg0NFowJTEjMCEGA1UEAxMaaWRwLmtpbmdz
@@ -69,25 +69,25 @@
 						g22QCNGnQBNm+23uTa1K4sR+WSZ2SOwwzIdgfATd5XdnnY28BMKy4uNME+XJklhY
 						4O5uQkWDV+eFTekWMLQ1esZs27Pvp0NECx1IgTb2IjoXF8X16uNqDA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kingston College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kingston College (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kingston-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@kingston-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@kingston-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kingston College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kingston College (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kingston-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@kingston-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@kingston-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml
index 10111bfb..1c627a81 100644
--- a/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kingston.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-04T10:12:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-04T10:12:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kingston University London</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University based in Kingston upon Thames, Greater London</mdui:Description>
+        <mdui:Logo height="60" width="80">https://staffnet.kingston.ac.uk/includes/img/static/kulogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kingston University London</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University based in Kingston upon Thames, Greater London</mdui:Description>
-          <mdui:Logo height="60" width="80">https://staffnet.kingston.ac.uk/includes/img/static/kulogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUQjxnHZMeQMvjHxSoR20dG8MKz1AwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVrMB4XDTEzMDcwMTA5MDkx
 						MloXDTMzMDcwMTA5MDkxMlowHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVr
@@ -37,26 +37,26 @@
 						4js256ukDUd7eAlrqPbT4TWLEGqdDG2RKB7LdiS9ooSyzX1KLYe2b7CBgZR0zpdh
 						FxWK7Ksb9Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.kingston.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.kingston.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUQjxnHZMeQMvjHxSoR20dG8MKz1AwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVrMB4XDTEzMDcwMTA5MDkx
 						MloXDTMzMDcwMTA5MDkxMlowHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVr
@@ -76,27 +76,27 @@
 						4js256ukDUd7eAlrqPbT4TWLEGqdDG2RKB7LdiS9ooSyzX1KLYe2b7CBgZR0zpdh
 						FxWK7Ksb9Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kingston University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kingston University London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kingston.ac.uk/icts/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Grove</md:SurName>
-      <md:EmailAddress>mailto:m.grove@kingston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Murray</md:SurName>
-      <md:EmailAddress>mailto:k.murray@kingston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kingston University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kingston University London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kingston.ac.uk/icts/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Grove</md:SurName>
+    <md:EmailAddress>mailto:m.grove@kingston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Murray</md:SurName>
+    <md:EmailAddress>mailto:k.murray@kingston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
index 1fc4e340..b4b1f5a1 100644
--- a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kirkleescollege.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-19T15:38:46.844016Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-19T15:38:46.844016Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kirklees College</mdui:DisplayName>
+        <mdui:Logo height="67" width="137">https://www.kirkleescollege.ac.uk/wp-content/uploads/2015/06/kcLogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kirklees College</mdui:DisplayName>
-          <mdui:Logo height="67" width="137">https://www.kirkleescollege.ac.uk/wp-content/uploads/2015/06/kcLogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
 						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
 						MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
@@ -36,13 +36,13 @@
 						JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
 						dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
 						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
 						MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
@@ -62,13 +62,13 @@
 						uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
 						uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
 						CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
 						MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
@@ -88,26 +88,26 @@
 						f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
 						hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.kirkleescollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kirkleescollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUPzSZlLFegyJ/xf53eryEDjcKM9EwDQYJKoZIhvcNAQEL
 						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
 						MzAzMTAxODQ3WhcNMzYwMzAzMTAxODQ3WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
@@ -127,13 +127,13 @@
 						JBwwLSL7JuEb/lyeuxXMQ0Uadl2f68HdgycsUKbGCRdskzL49x1MNcyqrT9e+FFM
 						dgIVva94fIIj02YnTFHvjX1CIoHAh/0Tg/xMHLUeJyrCLp9i8iJG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUd97fOFDggCwIB+n7K8vwH2yP6mUwDQYJKoZIhvcNAQEL
 						BQAwJTEjMCEGA1UEAwwaaWRwMy5raXJrbGVlc2NvbGxlZ2UuYWMudWswHhcNMTYw
 						MzAzMTAxODQ2WhcNMzYwMzAzMTAxODQ2WjAlMSMwIQYDVQQDDBppZHAzLmtpcmts
@@ -153,13 +153,13 @@
 						uLubDQXxFYEriQdqBU7xzKtZO8Uvh4bHSgbh2PlsHwNrn3Pz1j7HJUUinQjx11F1
 						uXzeRs4SkLVanB/ZfQiRhdtDaRsNRrXMBWDLn/zeJiTcyusUtHtf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIVAKB3QrzbWC6UDhYtgWKIpucJuo+aMA0GCSqGSIb3DQEB
 						CwUAMCUxIzAhBgNVBAMMGmlkcDMua2lya2xlZXNjb2xsZWdlLmFjLnVrMB4XDTE2
 						MDMwMzEwMTg0N1oXDTM2MDMwMzEwMTg0N1owJTEjMCEGA1UEAwwaaWRwMy5raXJr
@@ -179,24 +179,24 @@
 						f/H76DoF7VcK7V5hujvHlb0P51EAA15gDfywo8GT3S8M5OrSYmFoL8p0/NrQ16lB
 						hRIYrS+7nU8Dmaso2COWvd0q91Gb0tAQx+Qamj5LcT+mdcQ636jf0g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kirklees College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kirklees College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kirkleescollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Lim</md:SurName>
-      <md:EmailAddress>mailto:slim@kirkleescollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Lim</md:SurName>
-      <md:EmailAddress>mailto:slim@kirkleescollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kirklees College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kirklees College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kirkleescollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Lim</md:SurName>
+    <md:EmailAddress>mailto:slim@kirkleescollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Lim</md:SurName>
+    <md:EmailAddress>mailto:slim@kirkleescollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
index ca18062c..e691b417 100644
--- a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kkh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kkh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
+        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
+        <mdui:InformationURL xml:lang="sv">http://kkh.se/index.php/sv/om-kkh</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://kkh.se/index.php/en/about-kkh</mdui:InformationURL>
+        <mdui:Logo height="110" width="404">https://idp.kkh.se/idp/images/kkh.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://kkh.se/images/stories/helens/Personuppgifter_KKH_infotext.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kkh.se</mdui:DomainHint>
+        <mdui:IPHint>130.242.7.0/24</mdui:IPHint>
+        <mdui:IPHint>130.242.8.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.324458,18.082998</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kkh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
-          <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art</mdui:Keywords>
-          <mdui:InformationURL xml:lang="sv">http://kkh.se/index.php/sv/om-kkh</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://kkh.se/index.php/en/about-kkh</mdui:InformationURL>
-          <mdui:Logo height="110" width="404">https://idp.kkh.se/idp/images/kkh.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://kkh.se/images/stories/helens/Personuppgifter_KKH_infotext.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kkh.se</mdui:DomainHint>
-          <mdui:IPHint>130.242.7.0/24</mdui:IPHint>
-          <mdui:IPHint>130.242.8.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.324458,18.082998</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTQxMjEyMDcxOTI1WhcNMzQx
 MjEyMDcxOTI1WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAm8Np4yJz6CjpvlsIS3p9E7tYXhC+mcxCVMBlSq+1
@@ -52,29 +52,29 @@ ip2x2eHt6JoiHx7OabzAOL4oDo/akaqopY0tcmhjrRRw1tuuOxSZiejIh2DXmkn8
 rkzEd5A2/OKLgeYgcrLEpShVXxIs2PxwOj3zgNJblb8dT00sajTf9usa9WZk6R9q
 qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
 /u55VifGWHpaCkgtHFGyHuq6l7I7vZ1A</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kkh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kkh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kkh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kkh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTQxMjEyMDcxOTI1WhcNMzQx
 MjEyMDcxOTI1WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAm8Np4yJz6CjpvlsIS3p9E7tYXhC+mcxCVMBlSq+1
@@ -91,37 +91,37 @@ ip2x2eHt6JoiHx7OabzAOL4oDo/akaqopY0tcmhjrRRw1tuuOxSZiejIh2DXmkn8
 rkzEd5A2/OKLgeYgcrLEpShVXxIs2PxwOj3zgNJblb8dT00sajTf9usa9WZk6R9q
 qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
 /u55VifGWHpaCkgtHFGyHuq6l7I7vZ1A</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KKH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Institute of Art</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kkh.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Kungl. Konsthögskolan</md:Company>
-      <md:SurName>Fredrik Reuterswärd</md:SurName>
-      <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
-      <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Kungl. Konsthögskolan</md:Company>
-      <md:SurName>Fredrik Reuterswärd</md:SurName>
-      <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
-      <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Kungl. Konsthögskolan</md:Company>
-      <md:SurName>Fredrik Reuterswärd</md:SurName>
-      <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
-      <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KKH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Institute of Art</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kkh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Kungl. Konsthögskolan</md:Company>
+    <md:SurName>Fredrik Reuterswärd</md:SurName>
+    <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
+    <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Kungl. Konsthögskolan</md:Company>
+    <md:SurName>Fredrik Reuterswärd</md:SurName>
+    <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
+    <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Kungl. Konsthögskolan</md:Company>
+    <md:SurName>Fredrik Reuterswärd</md:SurName>
+    <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
+    <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml
index 20339457..105ff327 100644
--- a/swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kmc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/kmc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/kmc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kingston Maurward College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kmc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/kmc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/kmc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kingston Maurward College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kmc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
index 055e1ce0..5f7b7491 100644
--- a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kmh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Royal College of Music</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Musikhögskolan</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Royal College of Music</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kmh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kmh.se/english</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kmh.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Royal College of Music</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Kungliga Musikhögskolan</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Royal College of Music</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.kmh.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.kmh.se/english</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kmh.se</mdui:DomainHint>
-          <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
 MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
@@ -46,30 +46,30 @@ BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
 D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
 cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
 SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
 MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
@@ -86,35 +86,35 @@ BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
 D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
 cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
 SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KMH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Music</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kmh.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Royal College of Music</md:Company>
-      <md:SurName>KMH IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Royal College of Music</md:Company>
-      <md:SurName>KMH IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Royal College of Music</md:Company>
-      <md:SurName>KMH IT HelpDesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@kmh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 161939</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KMH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Music</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kmh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Royal College of Music</md:Company>
+    <md:SurName>KMH IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Royal College of Music</md:Company>
+    <md:SurName>KMH IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Royal College of Music</md:Company>
+    <md:SurName>KMH IT HelpDesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@kmh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 161939</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml
index 96c3dcca..038aa656 100644
--- a/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.knowsleycollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-01T17:22:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-01T17:22:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knowsleycollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knowsleycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEgDCCA2igAwIBAgIRAJp6NZY3oZd2UzczIfqpV5UwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
@@ -39,26 +39,26 @@
 						PvraWXaWABehzvK7oqqu/SZiVYri54k4w8UA8CL16ME3tL6UGql/05Sl0Q6aQZmT
 						8HV+cQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.knowsleycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knowsleycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.knowsleycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knowsleycollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEgDCCA2igAwIBAgIRAJp6NZY3oZd2UzczIfqpV5UwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
@@ -85,27 +85,27 @@
 						PvraWXaWABehzvK7oqqu/SZiVYri54k4w8UA8CL16ME3tL6UGql/05Sl0Q6aQZmT
 						8HV+cQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Knowsley Community College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Knowsley College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.knowsleycollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>McDonald</md:SurName>
-      <md:EmailAddress>mailto:amcdonald@knowsleycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>McDonald</md:SurName>
-      <md:EmailAddress>mailto:amcdonald@knowsleycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Knowsley Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Knowsley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.knowsleycollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McDonald</md:SurName>
+    <md:EmailAddress>mailto:amcdonald@knowsleycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McDonald</md:SurName>
+    <md:EmailAddress>mailto:amcdonald@knowsleycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
index b4030ae4..8bbc9fef 100644
--- a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kpi.ua/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:00:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:00:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NTUU KPI IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ru">НТУУ КПИ IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="uk">НТУУ КПІ IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for NTUU "KPI"</mdui:Description>
+        <mdui:Description xml:lang="ru">Identity Provider для НТУУ "КПИ"</mdui:Description>
+        <mdui:Description xml:lang="uk">Identity Provider для НТУУ "КПІ"</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp.kpi.ua</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="ru">https://idp.kpi.ua</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="uk">https://idp.kpi.ua</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="uk">http://peano.uran.ua/~ukr/policy.htm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="219" width="181">https://idp.kpi.ua/kpi-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:50.450233,30.461022</mdui:GeolocationHint>
+        <mdui:IPHint>77.47.128.0/17</mdui:IPHint>
+        <mdui:IPHint>2a02:db0::/32</mdui:IPHint>
+        <mdui:DomainHint>kpi.ua</mdui:DomainHint>
+        <mdui:DomainHint>ntu-kpi.kiev.ua</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NTUU KPI IdP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ru">НТУУ КПИ IdP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="uk">НТУУ КПІ IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for NTUU "KPI"</mdui:Description>
-          <mdui:Description xml:lang="ru">Identity Provider для НТУУ "КПИ"</mdui:Description>
-          <mdui:Description xml:lang="uk">Identity Provider для НТУУ "КПІ"</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp.kpi.ua</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="ru">https://idp.kpi.ua</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="uk">https://idp.kpi.ua</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="uk">http://peano.uran.ua/~ukr/policy.htm</mdui:PrivacyStatementURL>
-          <mdui:Logo height="219" width="181">https://idp.kpi.ua/kpi-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:50.450233,30.461022</mdui:GeolocationHint>
-          <mdui:IPHint>77.47.128.0/17</mdui:IPHint>
-          <mdui:IPHint>2a02:db0::/32</mdui:IPHint>
-          <mdui:DomainHint>kpi.ua</mdui:DomainHint>
-          <mdui:DomainHint>ntu-kpi.kiev.ua</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkDCCBHigAwIBAgIRAPRpb7ML9+xEG/ROUJsB3TYwDQYJKoZIhvcNAQELBQAw
 gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
@@ -65,26 +65,26 @@ fQW4RquXlpR/6PoDPP6Cf13Rwp7uUf8ztARG7ayFJezjBMfMN5hejC4tPwWG6UJY
 v5XnzHrd9qUFqh0E1Q5gpnAHvQRcpeZ2kvajhOn2pNc+iVdNuWHt04X6NvCHY5dz
 SG0FZDkYw5/MQEKbISmfTiDg+gCz4ZW+BnZRjt/x319pMgsv
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kpi.ua/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kpi.ua/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
-      <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>TechSupport</md:SurName>
-      <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kpi.ua/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kpi.ua/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
+    <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>TechSupport</md:SurName>
+    <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml
index d892b9cb..c65b3c9c 100644
--- a/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kutztown.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.kutztown.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kutztown.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kutztown University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.kutztown.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kutztown.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kutztown University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAJ3D3gijWRLD8z8jAWuBcPQG+wpvMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC5rdXR6dG93bi5lZHUwHhcNMTMwMjAxMjA1NTA2
 WhcNMzMwMjAxMjA1NTA2WjAbMRkwFwYDVQQDExBpZHAua3V0enRvd24uZWR1MIIB
@@ -37,23 +37,23 @@ WhWvEZ0AYyzo3Fgk+iCst/tMb++3yebMxjhY2hDvQmHAHtMAS2NWrg5QuAcWKNUo
 reL8ewKmZ+HT8AB0pP0jS3Cln94bvncHDNtY/PxTYNFIvLmclhT0+wN/VlCUYzF4
 HKssl2bp1LTZPwNXt8hUArVYIypb1ChoiffijKBeaBT8NSHXKQkH6Kcs6hBiHq3v
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kutztown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kutztown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kutztown.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kutztown.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kutztown.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kutztown.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kutztown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kutztown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kutztown.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kutztown.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kutztown.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kutztown.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAJ3D3gijWRLD8z8jAWuBcPQG+wpvMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC5rdXR6dG93bi5lZHUwHhcNMTMwMjAxMjA1NTA2
 WhcNMzMwMjAxMjA1NTA2WjAbMRkwFwYDVQQDExBpZHAua3V0enRvd24uZWR1MIIB
@@ -72,23 +72,23 @@ WhWvEZ0AYyzo3Fgk+iCst/tMb++3yebMxjhY2hDvQmHAHtMAS2NWrg5QuAcWKNUo
 reL8ewKmZ+HT8AB0pP0jS3Cln94bvncHDNtY/PxTYNFIvLmclhT0+wN/VlCUYzF4
 HKssl2bp1LTZPwNXt8hUArVYIypb1ChoiffijKBeaBT8NSHXKQkH6Kcs6hBiHq3v
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kutztown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kutztown.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kutztown University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kutztown University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kutztown.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard Miller</md:GivenName>
-      <md:EmailAddress>idpadmin@kutztown.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mitch Freed</md:GivenName>
-      <md:EmailAddress>idpadmin@kutztown.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kutztown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kutztown.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kutztown University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kutztown University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kutztown.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard Miller</md:GivenName>
+    <md:EmailAddress>idpadmin@kutztown.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mitch Freed</md:GivenName>
+    <md:EmailAddress>idpadmin@kutztown.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
index 120854df..64a7cfea 100644
--- a/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kva.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kva.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademien</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Royal Swedish Academy of Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Vetenskapsakademien</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
+        <mdui:Logo height="78" width="179">https://idp.kva.se/idp/images/headerLogo.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kva.se</mdui:DomainHint>
+        <mdui:IPHint>130.242.20.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.36542,18.05204</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kva.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademien</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">The Royal Swedish Academy of Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Kungliga Vetenskapsakademien</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
-          <mdui:Logo height="78" width="179">https://idp.kva.se/idp/images/headerLogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kva.se</mdui:DomainHint>
-          <mdui:IPHint>130.242.20.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.36542,18.05204</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
@@ -45,27 +45,27 @@ bS0T9qUjP0Djkv1HcffkxHJd9mbHMv4MiQjScE4Gwy4+6PPOO5a/3Q7JoGSbdVfm
 y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kva.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kva.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kva.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kva.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
@@ -86,34 +86,34 @@ bS0T9qUjP0Djkv1HcffkxHJd9mbHMv4MiQjScE4Gwy4+6PPOO5a/3Q7JoGSbdVfm
 y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KVA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kva.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-      <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-      <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-      <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KVA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kva.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
+    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
+    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
+    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml
index 5f66d504..4278fc38 100644
--- a/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lambeth.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-26T11:10:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-26T11:10:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lambeth.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lambeth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAOew5SzBfog/X45WRCY3nAQXwA63MA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC5sYW1iZXRoLmFjLnVrMB4XDTE0MDIxOTA4MTI1
 						NloXDTM0MDIxOTA4MTI1NlowHDEaMBgGA1UEAxMRaWRwLmxhbWJldGguYWMudWsw
@@ -32,26 +32,26 @@
 						Dq+Aacae6PXVL70A1dyUC7H5LTpcTdGejtDI+9wSwE3IL7sBh6/OprCp54UeU0Qa
 						ONYm4A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lambeth.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lambeth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lambeth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lambeth.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAOew5SzBfog/X45WRCY3nAQXwA63MA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC5sYW1iZXRoLmFjLnVrMB4XDTE0MDIxOTA4MTI1
 						NloXDTM0MDIxOTA4MTI1NlowHDEaMBgGA1UEAxMRaWRwLmxhbWJldGguYWMudWsw
@@ -71,31 +71,31 @@
 						Dq+Aacae6PXVL70A1dyUC7H5LTpcTdGejtDI+9wSwE3IL7sBh6/OprCp54UeU0Qa
 						ONYm4A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lambeth College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lambeth College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lambethcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Network Support</md:GivenName>
-      <md:EmailAddress>mailto:networksupport@lambeth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Preston</md:SurName>
-      <md:EmailAddress>mailto:TPreston@lambethcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eric</md:GivenName>
-      <md:SurName>Zhuang</md:SurName>
-      <md:EmailAddress>mailto:ezhuang@lambeth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lambeth College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lambeth College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lambethcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Network Support</md:GivenName>
+    <md:EmailAddress>mailto:networksupport@lambeth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Preston</md:SurName>
+    <md:EmailAddress>mailto:TPreston@lambethcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Zhuang</md:SurName>
+    <md:EmailAddress>mailto:ezhuang@lambeth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml
index 4236293d..94e81991 100644
--- a/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lancs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-16T16:54:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-16T16:54:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lancaster University</mdui:DisplayName>
+        <mdui:Logo height="54" width="157">https://idp.lancs.ac.uk/logo-small.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lancaster University</mdui:DisplayName>
-          <mdui:Logo height="54" width="157">https://idp.lancs.ac.uk/logo-small.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJjCCAg6gAwIBAgITE/T96ytOqT8HI/CQq7WILI+KmjANBgkqhkiG9w0BAQUF
 						ADAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswHhcNMTMwMjE4MTUwNzQyWhcN
 						MzMwMjE4MTUwNzQyWjAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswggEiMA0G
@@ -35,26 +35,26 @@
 						6VanTXJSl+jZvaa69WfW+/vlKHnCPEGEuBZFw3b7BJA6wnYuH25Fzrg7zf23nLsB
 						74wrr0WZQi7ryvmVcpxoclU/i5jee6m0IHMOtadvVoA625KVX/JBH4Kf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJjCCAg6gAwIBAgITE/T96ytOqT8HI/CQq7WILI+KmjANBgkqhkiG9w0BAQUF
 						ADAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswHhcNMTMwMjE4MTUwNzQyWhcN
 						MzMwMjE4MTUwNzQyWjAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswggEiMA0G
@@ -73,26 +73,26 @@
 						6VanTXJSl+jZvaa69WfW+/vlKHnCPEGEuBZFw3b7BJA6wnYuH25Fzrg7zf23nLsB
 						74wrr0WZQi7ryvmVcpxoclU/i5jee6m0IHMOtadvVoA625KVX/JBH4Kf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Lancaster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lancaster University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ISS Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:iss-service-desk@lancaster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:S.Bennett@lancaster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Lancaster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lancaster University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ISS Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:iss-service-desk@lancaster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:S.Bennett@lancaster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lancs.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lancs.ac.uk-shibboleth.xml
index ae444909..d17538ad 100644
--- a/swamid-interfederations-2.0/idp.lancs.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lancs.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lancs.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lancaster.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lancaster.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lancaster University (Old)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lancaster.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lancaster.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lancaster University (Old)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml
index f8eac700..bed2f34d 100644
--- a/swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lboro.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lboro.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lboro.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lboro.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lboro.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Loughborough University (ATHENS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lboro.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lboro.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lboro.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Loughborough University (ATHENS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lboro.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml
index 6467378d..14550bfb 100644
--- a/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lboro.ac.uk/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-10T17:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-10T17:31:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lboro.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lboro.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8zCCAtugAwIBAgIJAJC1ySyy8NnHMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxFTATBgNVBAcMDExvdWdo
 						Ym9yb3VnaDEgMB4GA1UECgwXTG91Z2hib3JvdWdoIFVuaXZlcnNpdHkxFDASBgNV
@@ -36,24 +36,24 @@
 						tDPQasPZEABCL4E0cEK4YHwrffT/nd3I0KQ2wS/C17z3798QYPQJ9f6KHty2X5mf
 						PmG2OinSJg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lboro.ac.uk/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lboro.ac.uk/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Loughborough University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lboro.ac.uk/it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Loughborough University IT Services</md:GivenName>
-      <md:EmailAddress>mailto:it.services@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Loughborough University IT Services</md:GivenName>
-      <md:EmailAddress>mailto:it.services@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lboro.ac.uk/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lboro.ac.uk/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Loughborough University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lboro.ac.uk/it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Loughborough University IT Services</md:GivenName>
+    <md:EmailAddress>mailto:it.services@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Loughborough University IT Services</md:GivenName>
+    <md:EmailAddress>mailto:it.services@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml
index a2510342..1cae76a5 100644
--- a/swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lcwc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcwc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcwc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lcwc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lcwc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lakes College West Cumbria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lcwc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lcwc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lcwc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lakes College West Cumbria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lcwc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml
index 6c65061a..3ddcca03 100644
--- a/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.le.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">le.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">le.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEEjCCAvqgAwIBAgIJAKikJalhNqxJMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECBMOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcTCUxlaWNl
 						c3RlcjEgMB4GA1UEChMXVW5pdmVyc2l0eSBvZiBMZWljZXN0ZXIxFDASBgNVBAsT
@@ -39,26 +39,26 @@
 						Odbs8W//GG1PFnFYJUcWsQX9tKPPWOortXmq6hdMpCRacUBnLKkEbVPXAhwc3OCK
 						9oOJu420TumzHCrOZ9nlTK+VFxzPCRiIZ5q/gbltmuFXP5G0pVE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.le.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.le.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.le.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.le.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.le.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.le.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">le.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.le.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.le.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.le.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.le.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.le.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.le.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">le.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEEjCCAvqgAwIBAgIJAKikJalhNqxJMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECBMOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcTCUxlaWNl
 						c3RlcjEgMB4GA1UEChMXVW5pdmVyc2l0eSBvZiBMZWljZXN0ZXIxFDASBgNVBAsT
@@ -82,27 +82,27 @@
 						Odbs8W//GG1PFnFYJUcWsQX9tKPPWOortXmq6hdMpCRacUBnLKkEbVPXAhwc3OCK
 						9oOJu420TumzHCrOZ9nlTK+VFxzPCRiIZ5q/gbltmuFXP5G0pVE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.le.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.le.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Leicester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Leicester (Shibboleth Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www2.le.ac.uk/offices/itservices/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Newton</md:SurName>
-      <md:EmailAddress>mailto:mcn4@leicester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Newton</md:SurName>
-      <md:EmailAddress>mailto:mcn4@leicester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.le.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.le.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Leicester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Leicester (Shibboleth Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www2.le.ac.uk/offices/itservices/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Newton</md:SurName>
+    <md:EmailAddress>mailto:mcn4@leicester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Newton</md:SurName>
+    <md:EmailAddress>mailto:mcn4@leicester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.le.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.le.ac.uk-shibboleth.xml
index ff9e00bf..d065f677 100644
--- a/swamid-interfederations-2.0/idp.le.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.le.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.le.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">le.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">le.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/le.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/le.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Leicester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.le.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/le.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/le.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Leicester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.le.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml
index 3f014bae..439c1517 100644
--- a/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lec.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T09:21:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T09:21:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lec.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lec.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAOhCOyKOXTcMdnvggD4B9+FnzBWtMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5sZWMuYWMudWswHhcNMTQwNjE5MTUyODQxWhcN
 						MzQwNjE5MTUyODQxWjAYMRYwFAYDVQQDEw1pZHAubGVjLmFjLnVrMIIBIjANBgkq
@@ -31,29 +31,29 @@
 						4c/B50roEAWi6UjG1BoWsAHpAU6vNpAwX5rpPF2jfW3diOaSlOeId7C679ccWmQJ
 						Gp39POQVUg52O0GAfPJgGgmUrlThA5+DQ5KdGTlmOsObK3LV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lec.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lec.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lec.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lec.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lec.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lec.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lec.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lec.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAOhCOyKOXTcMdnvggD4B9+FnzBWtMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5sZWMuYWMudWswHhcNMTQwNjE5MTUyODQxWhcN
 						MzQwNjE5MTUyODQxWjAYMRYwFAYDVQQDEw1pZHAubGVjLmFjLnVrMIIBIjANBgkq
@@ -72,27 +72,27 @@
 						4c/B50roEAWi6UjG1BoWsAHpAU6vNpAwX5rpPF2jfW3diOaSlOeId7C679ccWmQJ
 						Gp39POQVUg52O0GAfPJgGgmUrlThA5+DQ5KdGTlmOsObK3LV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Leicester College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leicester College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lec.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lisa</md:GivenName>
-      <md:SurName>McDonald</md:SurName>
-      <md:EmailAddress>mailto:lmcdonald@lec.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sherwin</md:GivenName>
-      <md:SurName>D'Souza</md:SurName>
-      <md:EmailAddress>mailto:sdsouza@lec.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leicester College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leicester College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lec.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lisa</md:GivenName>
+    <md:SurName>McDonald</md:SurName>
+    <md:EmailAddress>mailto:lmcdonald@lec.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sherwin</md:GivenName>
+    <md:SurName>D'Souza</md:SurName>
+    <md:EmailAddress>mailto:sdsouza@lec.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml
index a608a57d..f5ce1d1e 100644
--- a/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.leeds-art.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds-art.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds-art.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leeds-art.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leeds-art.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds College of Art</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leeds-art.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leeds-art.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leeds-art.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds College of Art</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leeds-art.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml
index 047a2940..cb852c17 100644
--- a/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.leedscitycollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedscitycollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedscitycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUASZ17mZyc2P8yvTqlRkJ7HlBmGIwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAwwaaWRwLmxlZWRzY2l0eWNvbGxlZ2UuYWMudWswHhcNMTYw
 						MjE2MTAzODEzWhcNMzYwMjE2MTAzODEzWjAlMSMwIQYDVQQDDBppZHAubGVlZHNj
@@ -30,26 +30,26 @@
 						OkHv4EZCNk+1JfIVGNA5w5t8ANJUJb/U2/ISd9eNZH4hqtwRK8LeLreWiOFMcWkK
 						w/ZQfnfhrlXcEQ82N8Y7Rq24DoADTToXlxQ8BgqRAcmWayFKNn+2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.leedscitycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedscitycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.leedscitycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedscitycollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUASZ17mZyc2P8yvTqlRkJ7HlBmGIwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAwwaaWRwLmxlZWRzY2l0eWNvbGxlZ2UuYWMudWswHhcNMTYw
 						MjE2MTAzODEzWhcNMzYwMjE2MTAzODEzWjAlMSMwIQYDVQQDDBppZHAubGVlZHNj
@@ -69,27 +69,27 @@
 						OkHv4EZCNk+1JfIVGNA5w5t8ANJUJb/U2/ISd9eNZH4hqtwRK8LeLreWiOFMcWkK
 						w/ZQfnfhrlXcEQ82N8Y7Rq24DoADTToXlxQ8BgqRAcmWayFKNn+2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Leeds City College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds City College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leedscitycollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Elliott</md:SurName>
-      <md:EmailAddress>mailto:robert.elliott@leedscitycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Elliott</md:SurName>
-      <md:EmailAddress>mailto:robert.elliott@leedscitycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leeds City College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds City College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedscitycollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Elliott</md:SurName>
+    <md:EmailAddress>mailto:robert.elliott@leedscitycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Elliott</md:SurName>
+    <md:EmailAddress>mailto:robert.elliott@leedscitycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml
index b7c539a2..8430da60 100644
--- a/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.leedstrinity.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedstrinity.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedstrinity.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leedstrinity.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leedstrinity.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds Trinity University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leedstrinity.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leedstrinity.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds Trinity University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml
index 4ba22c9b..944308a1 100644
--- a/swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.leyton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leyton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leyton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leyton.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leyton.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leyton Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leyton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leyton.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leyton.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leyton Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leyton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml
index 85e4366f..8a74a705 100644
--- a/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lhup.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.lhup.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lhup.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lock Haven University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.lhup.edu/computing_and_tech</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lhup.edu/computing_and_tech/aup.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="42" width="447" xml:lang="en">https://www.lhup.edu/images/web-logo-head-11.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.lhup.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lhup.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lock Haven University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.lhup.edu/computing_and_tech</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lhup.edu/computing_and_tech/aup.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="42" width="447" xml:lang="en">https://www.lhup.edu/images/web-logo-head-11.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEuTCCA6GgAwIBAgIQZcvMkgZaqKLekHBsU354XjANBgkqhkiG9w0BAQUFADA8
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 aGF3dGUgU1NMIENBMB4XDTEyMDcyNDAwMDAwMFoXDTE1MDcyNDIzNTk1OVowgY0x
@@ -49,23 +49,23 @@ blFlMDAkDVVUynA6Lp+wyrf/C2+2N0jg8EVGl8PuOnBeL860Lg9j+zEwJZiQrllW
 TKvZOVB6ym5AhHfgCOR4ZcQYIh+TVAYjxgtVqTADfuOZ6WiO5D2Hilad+xW3UQyx
 L6VIWeNvK0QGSePPsg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhup.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lhup.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lhup.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lhup.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lhup.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lhup.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhup.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lhup.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lhup.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lhup.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lhup.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lhup.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEuTCCA6GgAwIBAgIQZcvMkgZaqKLekHBsU354XjANBgkqhkiG9w0BAQUFADA8
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 aGF3dGUgU1NMIENBMB4XDTEyMDcyNDAwMDAwMFoXDTE1MDcyNDIzNTk1OVowgY0x
@@ -93,26 +93,26 @@ blFlMDAkDVVUynA6Lp+wyrf/C2+2N0jg8EVGl8PuOnBeL860Lg9j+zEwJZiQrllW
 TKvZOVB6ym5AhHfgCOR4ZcQYIh+TVAYjxgtVqTADfuOZ6WiO5D2Hilad+xW3UQyx
 L6VIWeNvK0QGSePPsg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhup.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lock Haven University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lock Haven University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lhup.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lock Haven University IT Department</md:GivenName>
-      <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Lock Haven University IT Department</md:GivenName>
-      <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lock Haven University IT Department</md:GivenName>
-      <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhup.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lock Haven University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lock Haven University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lhup.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lock Haven University IT Department</md:GivenName>
+    <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Lock Haven University IT Department</md:GivenName>
+    <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lock Haven University IT Department</md:GivenName>
+    <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
index 28d71e3c..6d57ae0a 100644
--- a/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lib.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T13:21:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T13:21:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Academy of Sciences Library</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Knihovna AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for registered readers the Academy of Sciences Library</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro registrované čtenáře Knihovny AV ČR, v. v. i.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.lib.cas.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.lib.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="160" width="160">https://www2.eduid.cz/idp-loga/kav.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Academy of Sciences Library</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Knihovna AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for registered readers the Academy of Sciences Library</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro registrované čtenáře Knihovny AV ČR, v. v. i.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.lib.cas.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.lib.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="160" width="160">https://www2.eduid.cz/idp-loga/kav.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
@@ -56,28 +56,28 @@ CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
 QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
 MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
 		    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lib.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lib.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lib.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lib.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
@@ -103,27 +103,27 @@ CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
 QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
 MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
 		    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Academy of Sciences Library</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Knihovna AV ČR, v. v. i.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Academy of Sciences Library</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Knihovna AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lib.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.lib.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Duda</md:SurName>
-      <md:EmailAddress>duda@lib.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Academy of Sciences Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Knihovna AV ČR, v. v. i.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Academy of Sciences Library</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Knihovna AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lib.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.lib.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Duda</md:SurName>
+    <md:EmailAddress>duda@lib.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml
index 5c63ef01..b7bdbc2c 100644
--- a/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lincoln.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T09:14:03Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T09:14:03Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincoln.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincoln.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSjCCAjKgAwIBAgIIc6UBcBsQyJgwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
 						CgwVVW5pdmVyc2l0eSBvZiBMaW5jb2xuMRowGAYDVQQDDBFpZHAubGluY29sbi5h
 						Yy51azAeFw0xMzAxMjkxMDQ5MTFaFw0yMzAxMjkxMDQ5MTFaMDwxHjAcBgNVBAoM
@@ -30,13 +30,13 @@
 						hi/GatyZw+G/0dmCdpKTeUIm1XLmcBya6DJmLvT9hgKjhS/YBfS8pzXYSHSccmmx
 						lhH0f8puYVYzEpQri0i10R25xmhRpI1gEieJUqNQ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSjCCAjKgAwIBAgIIc6UBcBsQyJgwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
 						CgwVVW5pdmVyc2l0eSBvZiBMaW5jb2xuMRowGAYDVQQDDBFpZHAubGluY29sbi5h
 						Yy51azAeFw0xMzAxMjkxMDQ5MTFaFw0yMzAxMjkxMDQ5MTFaMDwxHjAcBgNVBAoM
@@ -56,25 +56,25 @@
 						hi/GatyZw+G/0dmCdpKTeUIm1XLmcBya6DJmLvT9hgKjhS/YBfS8pzXYSHSccmmx
 						lhH0f8puYVYzEpQri0i10R25xmhRpI1gEieJUqNQ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lincoln.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lincoln.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Lincoln</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Lincoln</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://lincoln.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Elif</md:GivenName>
-      <md:SurName>Varol</md:SurName>
-      <md:EmailAddress>mailto:athens@lincoln.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Tompkins</md:SurName>
-      <md:EmailAddress>mailto:stompkins@lincoln.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lincoln.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lincoln.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Lincoln</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Lincoln</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://lincoln.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elif</md:GivenName>
+    <md:SurName>Varol</md:SurName>
+    <md:EmailAddress>mailto:athens@lincoln.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Tompkins</md:SurName>
+    <md:EmailAddress>mailto:stompkins@lincoln.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lincoln.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lincoln.ac.uk-shibboleth.xml
index 3e9f63b6..3c9982ca 100644
--- a/swamid-interfederations-2.0/idp.lincoln.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lincoln.ac.uk-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lincoln.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-23T09:45:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-23T09:45:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Lincoln - TEST DO NOT USE</mdui:DisplayName>
+        <mdui:Logo height="58" width="299">https://www.lincoln.ac.uk/home/media/universityoflincoln/styleassets/images/logo-dark.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincoln.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Lincoln - TEST DO NOT USE</mdui:DisplayName>
-          <mdui:Logo height="58" width="299">https://www.lincoln.ac.uk/home/media/universityoflincoln/styleassets/images/logo-dark.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincoln.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -44,13 +44,13 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -73,24 +73,24 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lincoln.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lincoln.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Lincoln</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Lincoln - TEST DO NOT USE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://lincoln.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Elif</md:GivenName>
-      <md:SurName>Varol</md:SurName>
-      <md:EmailAddress>mailto:library@lincoln.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Eduserv OpenAthens</md:SurName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lincoln.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lincoln.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Lincoln</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Lincoln - TEST DO NOT USE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://lincoln.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elif</md:GivenName>
+    <md:SurName>Varol</md:SurName>
+    <md:EmailAddress>mailto:library@lincoln.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Eduserv OpenAthens</md:SurName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lipa.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lipa.ac.uk-shibboleth.xml
index f1acd439..79e48f4e 100644
--- a/swamid-interfederations-2.0/idp.lipa.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lipa.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lipa.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lipa.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lipa.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lipa.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lipa.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LIPA Learning Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lipa.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lipa.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lipa.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LIPA Learning Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lipa.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lit.ie-saml2.xml b/swamid-interfederations-2.0/idp.lit.ie-saml2.xml
index 522e0450..dc00f09f 100644
--- a/swamid-interfederations-2.0/idp.lit.ie-saml2.xml
+++ b/swamid-interfederations-2.0/idp.lit.ie-saml2.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lit.ie/saml2">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-05T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-05T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Limerick Institute of Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://lit.ie</mdui:InformationURL>
+        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/lit.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.67518513199228,-8.64822506904602</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Limerick Institute of Technology</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://lit.ie</mdui:InformationURL>
-          <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/lit.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.67518513199228,-8.64822506904602</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAK59k/q1uMH3/ug2R0Sas9bw35KeMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC5saXQuaWUwHhcNMTAwMjA0MTEyOTQxWhcNMzAw
 MjA0MTEyOTQxWjAVMRMwEQYDVQQDEwppZHAubGl0LmllMIIBIjANBgkqhkiG9w0B
@@ -39,35 +39,35 @@ zJ1pOvbz5lQUhwFoXj6hK+Mbf2eMkRPBB2GWyHa+SQ7Od9OiGOXO3yq458Z56Epu
 4bU1gxeWc19hELfEjHGb2GcLShYI6WQMUbW8VYxJHHEko1zuS/Ubblk0L6r7pX01
 JoJbFT2leW55hVI25oEHL5f7LtG353O6
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Limerick Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Limerick Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://lit.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joe</md:GivenName>
-      <md:SurName>O'Gorman</md:SurName>
-      <md:EmailAddress>mailto:joe.ogorman@lit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Tuohy</md:SurName>
-      <md:EmailAddress>mailto:mickt@lit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Niall</md:GivenName>
-      <md:SurName>Corcoran</md:SurName>
-      <md:EmailAddress>mailto:Niall.Corcoran@lit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Limerick Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Limerick Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://lit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>O'Gorman</md:SurName>
+    <md:EmailAddress>mailto:joe.ogorman@lit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Tuohy</md:SurName>
+    <md:EmailAddress>mailto:mickt@lit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Niall</md:GivenName>
+    <md:SurName>Corcoran</md:SurName>
+    <md:EmailAddress>mailto:Niall.Corcoran@lit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml
index 3cf52c79..3eb4e142 100644
--- a/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ljmu.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-05T17:05:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-05T17:05:00Z">
-		</mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ljmu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ljmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -34,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ljmu.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ljmu.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Liverpool John Moores University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ljmu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ljmu.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ljmu.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Liverpool John Moores University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ljmu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml
index 0e0d5529..04190d9f 100644
--- a/swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.llandrillo.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llandrillo.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llandrillo.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/llandrillo.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/llandrillo.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Grwp Llandrillo Menai</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.llandrillo.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/llandrillo.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/llandrillo.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Grwp Llandrillo Menai</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.llandrillo.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
index ac231143..03b49b23 100644
--- a/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.llgc.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-16T17:10:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-16T17:10:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
 						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
@@ -31,26 +31,26 @@
 						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
 						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.llgc.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.llgc.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">llgc.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
 						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
@@ -69,28 +69,28 @@
 						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
 						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Library of Wales</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Library of Wales</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cy">Llyfrgell Genedlaethol Cymru</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.llgc.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Illtud</md:GivenName>
-      <md:SurName>Daniel</md:SurName>
-      <md:EmailAddress>mailto:ild@llgc.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Illtud</md:GivenName>
-      <md:SurName>Daniel</md:SurName>
-      <md:EmailAddress>mailto:ild@llgc.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Library of Wales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Library of Wales</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cy">Llyfrgell Genedlaethol Cymru</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.llgc.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Illtud</md:GivenName>
+    <md:SurName>Daniel</md:SurName>
+    <md:EmailAddress>mailto:ild@llgc.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Illtud</md:GivenName>
+    <md:SurName>Daniel</md:SurName>
+    <md:EmailAddress>mailto:ild@llgc.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml
index 3fb065f6..176656c1 100644
--- a/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lmc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpTCCA42gAwIBAgIRANrEQ8SK6/aNfqeZLMcYlvIwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzAxMjkwMDAwMDBaFw0xNjAxMjkyMzU5NTlaMHgxCzAJBgNV
@@ -37,13 +37,13 @@
 						EFiUYc67MpmwjkobQXpBBHhdZDq85pddff4kqd/rgjNbAWaBMZ3Db22msPvZkEcw
 						YplNVj4iVlAZp/HFmJURCXZDpHI10D7HTYsUQxZq3Ow+kCXXn2MCu9g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAPgRF90SkOfrpvO6fGRYgI1fbQGVMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMMDWlkcC5sbWMuYWMudWswHhcNMTYwMTI3MTY1MzI1WhcN
 						MzYwMTI3MTY1MzI1WjAYMRYwFAYDVQQDDA1pZHAubG1jLmFjLnVrMIIBIjANBgkq
@@ -62,26 +62,26 @@
 						Nkdxh/uOkDan5WM/AE5Fe2CouZrHItuY8riu+fWjyGiznIfBoHDTiprbE7NDgd6g
 						nqCb0LLQ84AQKuxaMFLRtqgD4cK5zggpl8SLoPw/IdTulbB8
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lmc.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lmc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lmc.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lmc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpTCCA42gAwIBAgIRANrEQ8SK6/aNfqeZLMcYlvIwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzAxMjkwMDAwMDBaFw0xNjAxMjkyMzU5NTlaMHgxCzAJBgNV
@@ -108,13 +108,13 @@
 						EFiUYc67MpmwjkobQXpBBHhdZDq85pddff4kqd/rgjNbAWaBMZ3Db22msPvZkEcw
 						YplNVj4iVlAZp/HFmJURCXZDpHI10D7HTYsUQxZq3Ow+kCXXn2MCu9g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAPgRF90SkOfrpvO6fGRYgI1fbQGVMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMMDWlkcC5sbWMuYWMudWswHhcNMTYwMTI3MTY1MzI1WhcN
 						MzYwMTI3MTY1MzI1WjAYMRYwFAYDVQQDDA1pZHAubG1jLmFjLnVrMIIBIjANBgkq
@@ -133,26 +133,26 @@
 						Nkdxh/uOkDan5WM/AE5Fe2CouZrHItuY8riu+fWjyGiznIfBoHDTiprbE7NDgd6g
 						nqCb0LLQ84AQKuxaMFLRtqgD4cK5zggpl8SLoPw/IdTulbB8
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lmc.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lancaster and Morecambe College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lancaster and Morecambe College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lmc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computer Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:computerhelpdesk@lmc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>McCaig</md:SurName>
-      <md:EmailAddress>mailto:i.mccaig@lmc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lmc.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lancaster and Morecambe College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lancaster and Morecambe College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lmc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computer Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:computerhelpdesk@lmc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>McCaig</md:SurName>
+    <md:EmailAddress>mailto:i.mccaig@lmc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
index fab2f59e..dc534533 100644
--- a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lnu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lnu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Linnéuniversitetet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linnaeus University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Linnéuniversitetet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Linnaeus University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://lnu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://lnu.se/?l=en</mdui:InformationURL>
+        <mdui:Logo height="55" width="361">https://idp.qa.lnu.se/logo_swamid.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="55" width="361">https://idp.qa.lnu.se/logo_swamid.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="55" width="361">https://idp.qa.lnu.se/logo_swamid.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>lnu.se</mdui:DomainHint>
+        <mdui:IPHint>194.47.64.0/18</mdui:IPHint>
+        <mdui:IPHint>194.47.160.0/19</mdui:IPHint>
+        <mdui:IPHint>194.47.192.0/20</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.6661,16.3484</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:56.8546,14.8304</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lnu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Linnéuniversitetet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Linnaeus University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Linnéuniversitetet.</mdui:Description>
-          <mdui:Description xml:lang="en">The Linnaeus University Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://lnu.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://lnu.se/?l=en</mdui:InformationURL>
-          <mdui:Logo height="55" width="361">https://idp.qa.lnu.se/logo_swamid.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="55" width="361">https://idp.qa.lnu.se/logo_swamid.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="55" width="361">https://idp.qa.lnu.se/logo_swamid.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>lnu.se</mdui:DomainHint>
-          <mdui:IPHint>194.47.64.0/18</mdui:IPHint>
-          <mdui:IPHint>194.47.160.0/19</mdui:IPHint>
-          <mdui:IPHint>194.47.192.0/20</mdui:IPHint>
-          <mdui:GeolocationHint>geo:56.6661,16.3484</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:56.8546,14.8304</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
 A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
 bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
@@ -61,26 +61,26 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
 1qXbJLIBEw2yRiL7ayAgirIbuJUR/7+zQVxYX9NyJw==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lnu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lnu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lnu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lnu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lnu.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lnu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lnu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lnu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lnu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lnu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
 A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
 bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
@@ -108,22 +108,22 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
 1qXbJLIBEw2yRiL7ayAgirIbuJUR/7+zQVxYX9NyJw==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Linnaeus University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lnu.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Linnæus University</md:Company>
-      <md:EmailAddress>mailto:it.idp@lnu.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Linnaeus University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lnu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Linnæus University</md:Company>
+    <md:EmailAddress>mailto:it.idp@lnu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml
index 5388090b..fab4032a 100644
--- a/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.london.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">london.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of London</mdui:DisplayName>
+        <mdui:Logo height="75" width="239">https://idp.london.ac.uk/images/uol-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">london.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of London</mdui:DisplayName>
-          <mdui:Logo height="75" width="239">https://idp.london.ac.uk/images/uol-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAJCgNzs/ToqPMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlkcC5sb25kb24uYWMudWswHhcNMTIwNjIxMTMyODU4WhcNMjIwNjE5MTMy
 						ODU4WjAbMRkwFwYDVQQDExBpZHAubG9uZG9uLmFjLnVrMIIBIjANBgkqhkiG9w0B
@@ -32,26 +32,26 @@
 						ni0aehQMWN4NdxrC/1Q36n95Krbq7dzTNFrpf1nL/egN6rmgCGzyT/GxPfbi/Nvf
 						1aev0Vum2CXcvkJbLl0J2H59qh/IBKgxDIIUItznpVWoi5HDxGWmCNMnUQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.london.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.london.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.london.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.london.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.london.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.london.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">london.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.london.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.london.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.london.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.london.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.london.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.london.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">london.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAJCgNzs/ToqPMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlkcC5sb25kb24uYWMudWswHhcNMTIwNjIxMTMyODU4WhcNMjIwNjE5MTMy
 						ODU4WjAbMRkwFwYDVQQDExBpZHAubG9uZG9uLmFjLnVrMIIBIjANBgkqhkiG9w0B
@@ -69,27 +69,27 @@
 						ni0aehQMWN4NdxrC/1Q36n95Krbq7dzTNFrpf1nL/egN6rmgCGzyT/GxPfbi/Nvf
 						1aev0Vum2CXcvkJbLl0J2H59qh/IBKgxDIIUItznpVWoi5HDxGWmCNMnUQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.london.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.london.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.london.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hans</md:GivenName>
-      <md:SurName>Litteck</md:SurName>
-      <md:EmailAddress>mailto:h.litteck@ulcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hans</md:GivenName>
-      <md:SurName>Litteck</md:SurName>
-      <md:EmailAddress>mailto:h.litteck@ulcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.london.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.london.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.london.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hans</md:GivenName>
+    <md:SurName>Litteck</md:SurName>
+    <md:EmailAddress>mailto:h.litteck@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hans</md:GivenName>
+    <md:SurName>Litteck</md:SurName>
+    <md:EmailAddress>mailto:h.litteck@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml
index fd3c4a44..7250e131 100644
--- a/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.londonmet.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUDHdfCxkdKbK8wHhVtq9PRTUWSm0wDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAxMTaWRwLmxvbmRvbm1ldC5hYy51azAeFw0xMDA4MjYxNTA3
 						NDZaFw0zMDA4MjYxNTA3NDZaMB4xHDAaBgNVBAMTE2lkcC5sb25kb25tZXQuYWMu
@@ -30,26 +30,26 @@
 						dl+2HVg3VDLg4o4BRGZnC5Ip8nX8UyDgdiyzeBtFk5pXSXmyDl4ck421skd7CKOW
 						O+pzHAT8SmUOATI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.londonmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.londonmet.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonmet.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUDHdfCxkdKbK8wHhVtq9PRTUWSm0wDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAxMTaWRwLmxvbmRvbm1ldC5hYy51azAeFw0xMDA4MjYxNTA3
 						NDZaFw0zMDA4MjYxNTA3NDZaMB4xHDAaBgNVBAMTE2lkcC5sb25kb25tZXQuYWMu
@@ -69,27 +69,27 @@
 						dl+2HVg3VDLg4o4BRGZnC5Ip8nX8UyDgdiyzeBtFk5pXSXmyDl4ck421skd7CKOW
 						O+pzHAT8SmUOATI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London Metropolitan University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Metropolitan University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.londonmet.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rui</md:GivenName>
-      <md:SurName>Zong</md:SurName>
-      <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rui</md:GivenName>
-      <md:SurName>Zong</md:SurName>
-      <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London Metropolitan University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Metropolitan University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.londonmet.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rui</md:GivenName>
+    <md:SurName>Zong</md:SurName>
+    <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rui</md:GivenName>
+    <md:SurName>Zong</md:SurName>
+    <md:EmailAddress>mailto:r.zong@londonmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml
index 98dac589..c4f0f103 100644
--- a/swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.longleypark.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longleypark.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longleypark.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/longleypark.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/longleypark.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Longley Park Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.longleypark.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/longleypark.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/longleypark.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Longley Park Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.longleypark.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml
index ae19a94e..49ad4e1f 100644
--- a/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.longroad.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longroad.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Long Road Sixth Form College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://idp.longroad.ac.uk/idp/images/idp-logo-80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.longroad.ac.uk/idp/images/idp-icon-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longroad.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Long Road Sixth Form College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://idp.longroad.ac.uk/idp/images/idp-logo-80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.longroad.ac.uk/idp/images/idp-icon-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUCy8kggY2RBllD2ewV21UpOU1mlkwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVrMB4XDTExMDUxMzA4MTI0
 						M1oXDTMxMDUxMzA4MTI0M1owHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVr
@@ -35,26 +35,26 @@
 						X/xSXhUkBYgRzeNd4EaiR4zZLepncxkcIZF+To/nrXNoghw9aQny7LYKL9dOeOIT
 						gyi6viaAxA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.longroad.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longroad.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.longroad.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longroad.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUCy8kggY2RBllD2ewV21UpOU1mlkwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVrMB4XDTExMDUxMzA4MTI0
 						M1oXDTMxMDUxMzA4MTI0M1owHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVr
@@ -74,25 +74,25 @@
 						X/xSXhUkBYgRzeNd4EaiR4zZLepncxkcIZF+To/nrXNoghw9aQny7LYKL9dOeOIT
 						gyi6viaAxA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Long Road Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Long Road Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.longroad.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CSD Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@longroad.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>CSD Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@longroad.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Long Road Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Long Road Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.longroad.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CSD Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@longroad.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CSD Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@longroad.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml
index f9df549c..02c731d2 100644
--- a/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.longsight.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.longsight.com/contact" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longsight.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Longsight</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Longsight IDP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.longsight.com/incommon/pop.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.longsight.com/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="50" width="252" xml:lang="en">https://idp.longsight.com/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.longsight.com/contact" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longsight.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Longsight</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Longsight IDP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.longsight.com/incommon/pop.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.longsight.com/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="50" width="252" xml:lang="en">https://idp.longsight.com/idp/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUGFtcG0YkyyHEvkX3w9yCDcJ2iT4wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLmxvbmdzaWdodC5jb20wHhcNMTEwOTIyMTc0MTQy
 WhcNMzEwOTIyMTc0MTQyWjAcMRowGAYDVQQDExFpZHAubG9uZ3NpZ2h0LmNvbTCC
@@ -42,23 +42,23 @@ IM9eGjNvKq3WBxpa9x9tEO8wVAphoJ8UG9xKZbqdU2OlNAc3Crn4t5PrcDIcCBtJ
 PM93Xs8kLba8ndrnn7sfuMPPPQmjAYnX1TAQ/w2EIWaM5N0n3zvRRRdrKrenC09T
 wtpJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longsight.com/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longsight.com/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.longsight.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.longsight.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.longsight.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longsight.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longsight.com/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longsight.com/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.longsight.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.longsight.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.longsight.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longsight.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUGFtcG0YkyyHEvkX3w9yCDcJ2iT4wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLmxvbmdzaWdodC5jb20wHhcNMTEwOTIyMTc0MTQy
 WhcNMzEwOTIyMTc0MTQyWjAcMRowGAYDVQQDExFpZHAubG9uZ3NpZ2h0LmNvbTCC
@@ -78,26 +78,26 @@ IM9eGjNvKq3WBxpa9x9tEO8wVAphoJ8UG9xKZbqdU2OlNAc3Crn4t5PrcDIcCBtJ
 PM93Xs8kLba8ndrnn7sfuMPPPQmjAYnX1TAQ/w2EIWaM5N0n3zvRRRdrKrenC09T
 wtpJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longsight.com/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Longsight Group LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Longsight</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.longsight.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam Ottenhoff</md:GivenName>
-      <md:EmailAddress>sam@longsight.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Longsight Support</md:GivenName>
-      <md:EmailAddress>support@longsight.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Longsight Operations</md:GivenName>
-      <md:EmailAddress>operations@longsight.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longsight.com/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Longsight Group LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Longsight</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.longsight.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam Ottenhoff</md:GivenName>
+    <md:EmailAddress>sam@longsight.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Longsight Support</md:GivenName>
+    <md:EmailAddress>support@longsight.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Longsight Operations</md:GivenName>
+    <md:EmailAddress>operations@longsight.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
index 1dfc4f3f..4d7145c7 100644
--- a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
+        <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
+        <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
-          <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
-          <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -65,15 +65,15 @@ rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
 BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
 RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -108,29 +108,29 @@ rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
 BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
 RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -165,15 +165,15 @@ rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
 BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
 RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -208,36 +208,36 @@ rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
 BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
 RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e38</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e38</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.lrz.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.lrz.de/english/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ralf</md:GivenName>
-      <md:SurName>Ebner</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ralf</md:GivenName>
-      <md:SurName>Ebner</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ralf</md:GivenName>
-      <md:SurName>Ebner</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e38</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e38</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.lrz.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lrz.de/english/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Ebner</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Ebner</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Ebner</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml
index a972ecb9..9eb67567 100644
--- a/swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lse.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-06T16:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-06T16:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAMcU7xA7jz0MTrgM81ujFT/gZtT/MA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5sc2UuYWMudWswHhcNMTEwMTI3MTAyMjI5WhcN
 						MzEwMTI3MTAyMjI5WjAYMRYwFAYDVQQDEw1pZHAubHNlLmFjLnVrMIIBIjANBgkq
@@ -36,26 +36,26 @@
 						7fu3YOJMs6pwf9/WCqmBlmaX2HWJrkD5UMduUQq6Yg2MFwjr8UkZ5tNC2XYgDCjC
 						zUEMsrJaVSqkypBftCFqjUaPV5uzH1W7rWzwCZGvC2kWJ90c
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lse.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lse.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lse.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lse.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lse.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lse.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lse.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lse.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAMcU7xA7jz0MTrgM81ujFT/gZtT/MA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5sc2UuYWMudWswHhcNMTEwMTI3MTAyMjI5WhcN
 						MzEwMTI3MTAyMjI5WjAYMRYwFAYDVQQDEw1pZHAubHNlLmFjLnVrMIIBIjANBgkq
@@ -74,27 +74,27 @@
 						7fu3YOJMs6pwf9/WCqmBlmaX2HWJrkD5UMduUQq6Yg2MFwjr8UkZ5tNC2XYgDCjC
 						zUEMsrJaVSqkypBftCFqjUaPV5uzH1W7rWzwCZGvC2kWJ90c
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London School of Economics and Political Science</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Economics: Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lse.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Prockter</md:SurName>
-      <md:EmailAddress>mailto:n.prockter@lse.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Prockter</md:SurName>
-      <md:EmailAddress>mailto:n.prockter@lse.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London School of Economics and Political Science</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Economics: Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lse.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Prockter</md:SurName>
+    <md:EmailAddress>mailto:n.prockter@lse.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Prockter</md:SurName>
+    <md:EmailAddress>mailto:n.prockter@lse.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml
index 73cd7893..12eee269 100644
--- a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml
+++ b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lshtm.ac.uk/shibboleth-xfr">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGMjCCBBqgAwIBAgIJAMDPoGjJOgX6MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
 						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
@@ -51,26 +51,26 @@
 						C+Ar+eubE63of1BjM7tWtOldASsG/Kwoq5dNqCWjqmoL3EbLr1hx65qAaRR0XbtB
 						rDHM7cXn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGMjCCBBqgAwIBAgIJAMDPoGjJOgX6MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
 						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
@@ -106,27 +106,27 @@
 						C+Ar+eubE63of1BjM7tWtOldASsG/Kwoq5dNqCWjqmoL3EbLr1hx65qAaRR0XbtB
 						rDHM7cXn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London School of Hygiene and Tropical Medicine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Hygiene and Tropical Medicine (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lshtm.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christopher</md:GivenName>
-      <md:SurName>Manning</md:SurName>
-      <md:EmailAddress>mailto:christopher.manning@lshtm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Whitbread</md:SurName>
-      <md:EmailAddress>mailto:steven.whitbread@lshtm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London School of Hygiene and Tropical Medicine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Hygiene and Tropical Medicine (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lshtm.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christopher</md:GivenName>
+    <md:SurName>Manning</md:SurName>
+    <md:EmailAddress>mailto:christopher.manning@lshtm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Whitbread</md:SurName>
+    <md:EmailAddress>mailto:steven.whitbread@lshtm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml
index bc8af518..cefe0786 100644
--- a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lshtm.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGMDCCBBigAwIBAgIJAIUFHfw4Gj9WMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
 						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
@@ -46,26 +46,26 @@
 						ztKtqBRmGFEv+NdL7FW65bo+35Gp/Ajdh/bD+t3RPXBZwqNg4snlXRXRcfk2MKis
 						clTSFw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lshtm.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGMDCCBBigAwIBAgIJAIUFHfw4Gj9WMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
 						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
@@ -101,27 +101,27 @@
 						ztKtqBRmGFEv+NdL7FW65bo+35Gp/Ajdh/bD+t3RPXBZwqNg4snlXRXRcfk2MKis
 						clTSFw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London School of Hygiene and Tropical Medicine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Hygiene &amp; Tropical Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lshtm.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christopher</md:GivenName>
-      <md:SurName>Manning</md:SurName>
-      <md:EmailAddress>mailto:christopher.manning@lshtm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Whitbread</md:SurName>
-      <md:EmailAddress>mailto:steven.whitbread@lshtm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London School of Hygiene and Tropical Medicine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Hygiene &amp; Tropical Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lshtm.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christopher</md:GivenName>
+    <md:SurName>Manning</md:SurName>
+    <md:EmailAddress>mailto:christopher.manning@lshtm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Whitbread</md:SurName>
+    <md:EmailAddress>mailto:steven.whitbread@lshtm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml
index 2c9ad2e2..77cec596 100644
--- a/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lstonline.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-13T09:04:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-13T09:04:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAMFlYrF0zZoa942kcmsKFS6POLrtMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMME2lkcC5sc3RvbmxpbmUuYWMudWswHhcNMTQwODE4MDk1
 						NjM3WhcNMzQwODE4MDk1NjM3WjAeMRwwGgYDVQQDDBNpZHAubHN0b25saW5lLmFj
@@ -37,29 +37,29 @@
 						zdHPlAIvSZc7mqH+NprXPLi39BJh6/LVNq/KxBLPh+dXvxOTekhJ/ihW1JGnvBaO
 						J8P9Rw7ynUh4F0pC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lstonline.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lstonline.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAMFlYrF0zZoa942kcmsKFS6POLrtMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMME2lkcC5sc3RvbmxpbmUuYWMudWswHhcNMTQwODE4MDk1
 						NjM3WhcNMzQwODE4MDk1NjM3WjAeMRwwGgYDVQQDDBNpZHAubHN0b25saW5lLmFj
@@ -79,27 +79,27 @@
 						zdHPlAIvSZc7mqH+NprXPLi39BJh6/LVNq/KxBLPh+dXvxOTekhJ/ihW1JGnvBaO
 						J8P9Rw7ynUh4F0pC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London School of Theology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Theology (OLD)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lst.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London School of Theology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Theology (OLD)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lst.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ltcc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ltcc.edu-idp-shibboleth.xml
index 295bce01..3903a307 100644
--- a/swamid-interfederations-2.0/idp.ltcc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ltcc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ltcc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ltcc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lake Tahoe Community College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ltcc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lake Tahoe Community College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIw5vv7kNNzUAGMBYYmz7GBzIvGfMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDGlkcC5sdGNjLmVkdTAeFw0xNjAyMDUyMjE3MjlaFw0z
 NjAyMDUyMjE3MjlaMBcxFTATBgNVBAMMDGlkcC5sdGNjLmVkdTCCASIwDQYJKoZI
@@ -37,20 +37,20 @@ DrTigu41S6+Dmyhk+E+NRkaTkub3xPQWGYdsw0/mLyxjSanD3xc0Cjs6kWjtc2ZN
 +eVZmbDE3zJB3uXLMSOsJePF4ETTk6zJzuubY128PKXUEzEr6znPIrBK3pOgaaNS
 n7xTN3O1UJMh8orWZerjJMZllHbVuSkTpkMebBf19ZY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ltcc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ltcc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ltcc.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lake Tahoe Community College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lake Tahoe Community College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ltcc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bill Abiko</md:GivenName>
-      <md:EmailAddress>abiko@ltcc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ltcc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ltcc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ltcc.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lake Tahoe Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lake Tahoe Community College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ltcc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bill Abiko</md:GivenName>
+    <md:EmailAddress>abiko@ltcc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lut.fi.xml b/swamid-interfederations-2.0/idp.lut.fi.xml
index c6f28784..92081adf 100644
--- a/swamid-interfederations-2.0/idp.lut.fi.xml
+++ b/swamid-interfederations-2.0/idp.lut.fi.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lut.fi">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lut.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lappeenranta University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</mdui:DisplayName>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>157.24.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>lut.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:61.06490,28.09240</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lut.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lappeenranta University of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</mdui:DisplayName>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>157.24.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>lut.fi</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:61.06490,28.09240</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQXxAGKmjmI6A8/AokeEg6njANBgkqhkiG9w0BAQsFADBk
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQXxAGKmjmI6A8/AokeEg6njANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMjAeFw0xNTAxMTYwMDAwMDBaFw0xODAyMjUyMzU5NTlaMDgxITAfBgNVBAsT
@@ -52,31 +52,31 @@ btWNk3dgXXrCRH3u33X+HeBykZdYI03sFNnmT85QcYmrpYrGOujMGS9Wu5o0PYHV
 HXu+H5jgwuJsS8jvJTWo9E//iEx2M7YddnG3DKaxU4WhZ01Zy+lM0n7TIZOVC8pk
 UisE3gOCfuK9kEQKiQbQN/UBIx9xnY50fpTfplouzcoMzBd9LxU9k5Ir1X0rQ5g6
 CqEjXNP5Vdullr/akxI3IB8X</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lut.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Lappeenranta University of Technology</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Lappeenranta University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.lut.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.lut.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.lut.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Pekka</md:GivenName>
-      <md:SurName>Kuronen</md:SurName>
-      <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Antti</md:GivenName>
-      <md:SurName>Sirvio</md:SurName>
-      <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lut.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Lappeenranta University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lappeenranta University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.lut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.lut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Pekka</md:GivenName>
+    <md:SurName>Kuronen</md:SurName>
+    <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Antti</md:GivenName>
+    <md:SurName>Sirvio</md:SurName>
+    <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml
index 8c1a7cf7..b246ce49 100644
--- a/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lutonsfc.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lutonsfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lutonsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lutonsfc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lutonsfc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Luton Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lutonsfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lutonsfc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lutonsfc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Luton Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lutonsfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml
index 171727c2..93c9bfc6 100644
--- a/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lyit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Letterkenny Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Leitir Ceanainn</mdui:DisplayName>
+        <mdui:Logo height="96" width="159">https://edugate.heanet.ie/rr3/logos/lyit.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:54.95229943501583,-7.720813751220703</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.95186314818439,-7.721607685089111</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Letterkenny Institute of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Leitir Ceanainn</mdui:DisplayName>
-          <mdui:Logo height="96" width="159">https://edugate.heanet.ie/rr3/logos/lyit.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:54.95229943501583,-7.720813751220703</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:54.95186314818439,-7.721607685089111</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAIygXE7mgeFS1ogZQvsHmJd9TtAHMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5seWl0LmllMB4XDTExMDYzMDE0MTg1N1oXDTMx
 MDYzMDE0MTg1N1owFjEUMBIGA1UEAxMLaWRwLmx5aXQuaWUwggEiMA0GCSqGSIb3
@@ -38,25 +38,25 @@ KuOUA77foIOtvbHY0cYNBcVj9gbQl0+OP78ZlBwvqGnnW1rlLPbtmVCZxz8PeJ2w
 rArDeKt+kQanlUaaYnFd6NVkmDcZH7KtD+/PxbAGs1WS24APYAzSEyc271mWoLBM
 egBqflp2dlNsm6/6kKlbVEgTaD/+ZGSPjqLpgA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lyit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lyit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lyit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Letterkenny Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Letterkenny Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://lyit.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Seamus</md:GivenName>
-      <md:SurName>Byron</md:SurName>
-      <md:EmailAddress>mailto:seamus.byron@lyit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lyit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lyit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lyit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Letterkenny Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Letterkenny Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://lyit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Seamus</md:GivenName>
+    <md:SurName>Byron</md:SurName>
+    <md:EmailAddress>mailto:seamus.byron@lyit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml
index 5121354b..6fdf49b0 100644
--- a/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.macclesfield.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">macclesfield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">macclesfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQD/7vODco0h7zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIQ2hlc2hpcmUxFTATBgNVBAcTDE1hY2NsZXNmaWVsZDEdMBsG
 						A1UEChMUTWFjY2xlc2ZpZWxkIENvbGxlZ2UxIDAeBgNVBAMTF2lkcDIubWFjY2xl
@@ -31,26 +31,26 @@
 						9/dIxdTe1CnRSzW8XzAbJPUdaYjy5ORlYKJ28OqKs/11N2llbaTuAwZqm3Ps9bKL
 						URTAw0QV//xFG86AyPeEYg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.macclesfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">macclesfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.macclesfield.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">macclesfield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQD/7vODco0h7zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIQ2hlc2hpcmUxFTATBgNVBAcTDE1hY2NsZXNmaWVsZDEdMBsG
 						A1UEChMUTWFjY2xlc2ZpZWxkIENvbGxlZ2UxIDAeBgNVBAMTF2lkcDIubWFjY2xl
@@ -71,27 +71,27 @@
 						9/dIxdTe1CnRSzW8XzAbJPUdaYjy5ORlYKJ28OqKs/11N2llbaTuAwZqm3Ps9bKL
 						URTAw0QV//xFG86AyPeEYg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macclesfield College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Macclesfield College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.macclesfield.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>White</md:SurName>
-      <md:EmailAddress>mailto:scott.white@macclesfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>White</md:SurName>
-      <md:EmailAddress>mailto:scott.white@macclesfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macclesfield College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Macclesfield College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.macclesfield.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>White</md:SurName>
+    <md:EmailAddress>mailto:scott.white@macclesfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>White</md:SurName>
+    <md:EmailAddress>mailto:scott.white@macclesfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
index dc1c397f..23ec3a61 100644
--- a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mah.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mah.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Malmö högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Malmö University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Malmö högskola</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Malmö University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.mah.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mah.se/english</mdui:InformationURL>
+        <mdui:Logo height="195" width="132">https://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="195" width="132">https://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="195" width="132">https://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">mah malmo+hogskola malmo+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">mah malmo+hogskola malmo+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>mah.se</mdui:DomainHint>
+        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:55.608982,12.992469</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mah.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Malmö högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Malmö University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Malmö högskola</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Malmö University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.mah.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.mah.se/english</mdui:InformationURL>
-          <mdui:Logo height="195" width="132">https://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="195" width="132">https://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="195" width="132">https://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">mah malmo+hogskola malmo+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">mah malmo+hogskola malmo+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>mah.se</mdui:DomainHint>
-          <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-          <mdui:GeolocationHint>geo:55.608982,12.992469</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
 MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
@@ -49,13 +49,13 @@ JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
 LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
 jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
 MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
@@ -74,13 +74,13 @@ UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
 t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
 2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
 MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
@@ -99,25 +99,25 @@ eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
 Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
 7UutZmHR05RiErkouLWVildFWPkfDUIO
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mah.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mah.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mah.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mah.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUPrvA/P0+Dsrc50jusZnN26yth0cwDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTJaFw0zNjAz
 MjIwODExNTJaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
@@ -136,13 +136,13 @@ JW+eSiJqXLxZ66LtzYpR006NkwmvGIiNklUXpSohW8Qli6fdQsN1jelLSg22kjKe
 LFzVBYxtNETAVdxLSeIJ8saBNAcs+PrZ/tDjWYwefkJGiOR/Sy1BmbR7H8itKAti
 jJU2WIS+eETI7AoMBvxYUdOwhHO9Uyc=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUZqSagQMfxaTdLMgiEq1DliWEF6swDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLm1haC5zZTAeFw0xNjAzMjIwODExNTBaFw0zNjAz
 MjIwODExNTBaMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwggEiMA0GCSqGSIb3DQEB
@@ -161,13 +161,13 @@ UE3r/3QIhBMi1ydR5a93F6bL8kQHm110COBSxA/y9n5rel6ybwhgQUGPWlfpV1CL
 t27XR73hJaFRoXZHtdbTkG386Q4u/nrLj5WSydSVRDkWUt0Cib52ft10Kz6bQtxg
 2l1TKCgfNmMiI8LLDq42FYLivsEaFAs=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAM5xFJJcWySFKJeIz/WavrXmbuhNMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC5tYWguc2UwHhcNMTYwMzIyMDgxMTUwWhcNMzYw
 MzIyMDgxMTUwWjAVMRMwEQYDVQQDDAppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
@@ -186,33 +186,33 @@ eMaU8y4Mq8Swi7X4ErzBD+DKFQe0q5aCaXIiwD+H4XJzOYkUxZSpAPW62lOgJAku
 Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
 7UutZmHR05RiErkouLWVildFWPkfDUIO
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MAH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Malmö högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mah.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Malmö University</md:Company>
-      <md:SurName>IT Drift</md:SurName>
-      <md:EmailAddress>mailto:drift@mah.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Malmö University</md:Company>
-      <md:SurName>Robert Faling</md:SurName>
-      <md:EmailAddress>mailto:robert.faling@mah.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 768 428753</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Malmö University</md:Company>
-      <md:SurName>Servicedesk Malmö högskola</md:SurName>
-      <md:EmailAddress>mailto:support@mah.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MAH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Malmö högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mah.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Malmö University</md:Company>
+    <md:SurName>IT Drift</md:SurName>
+    <md:EmailAddress>mailto:drift@mah.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Malmö University</md:Company>
+    <md:SurName>Robert Faling</md:SurName>
+    <md:EmailAddress>mailto:robert.faling@mah.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 768 428753</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Malmö University</md:Company>
+    <md:SurName>Servicedesk Malmö högskola</md:SurName>
+    <md:EmailAddress>mailto:support@mah.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml
index e6567e37..2802f082 100644
--- a/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.maine.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umf.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umfk.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umm.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umpi.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usm.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ums.maine.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Maine System</mdui:DisplayName>
+        <mdui:Logo height="180" width="250" xml:lang="en">https://identity.maine.edu/cas/images/ums-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umf.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umfk.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umm.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umpi.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usm.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ums.maine.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Maine System</mdui:DisplayName>
-          <mdui:Logo height="180" width="250" xml:lang="en">https://identity.maine.edu/cas/images/ums-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQCFxyTiaTwczjANBgkqhkiG9w0BAQUFADBrMRYwFAYDVQQDDA1p
 ZHAubWFpbmUuZWR1MSMwIQYDVQQKDBpVbml2ZXJzaXR5IG9mIE1haW5lIFN5c3Rl
 bTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBU1haW5lMQ8wDQYDVQQHDAZCYW5nb3Iw
@@ -47,13 +47,13 @@ CX4AhoApL6teiUhjOeyBqRtMLvFrODbyfWOw92v/SBo+IBuskFWczRFfYmpEgcls
 7XUZ1jj9jADb5vUFXttyD6DvlorsrDpym8UUa8xckbEORr039A2inJ1+JCHvF3Lp
 e2iwjc4lUcFC9ro7nesIcjc38rz36026jl8cvuGzfL83/NhL9zY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQDqg7foDxXSlDANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJV
 UzEOMAwGA1UECAwFTWFpbmUxDzANBgNVBAcMBkJhbmdvcjEjMCEGA1UECgwaVW5p
 dmVyc2l0eSBvZiBNYWluZSBTeXN0ZW0xFjAUBgNVBAMMDWlkcC5tYWluZS5lZHUw
@@ -73,31 +73,31 @@ A4CX3y33HFyk/3PXxSxnpaWsuXozahayLy+mjL3INcpCOI4hD3mjhap8HZpz6s53
 xxXxaapewT8D9qN7AOzL5K1HB2z2JgTuG6Ucxwz+DmD+fpTSKZfFka7Aa0xOgk4l
 aPxZ1d6VzB7zlPxt3EBPg+v65IxSNM8rHmxa3Zc2nc6u7dd1uSs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.maine.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.maine.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.maine.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.maine.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.maine.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umf.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umfk.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umm.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umpi.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usm.maine.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ums.maine.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.maine.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.maine.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.maine.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.maine.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.maine.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umf.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umfk.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umm.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umpi.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usm.maine.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ums.maine.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQCFxyTiaTwczjANBgkqhkiG9w0BAQUFADBrMRYwFAYDVQQDDA1p
 ZHAubWFpbmUuZWR1MSMwIQYDVQQKDBpVbml2ZXJzaXR5IG9mIE1haW5lIFN5c3Rl
 bTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBU1haW5lMQ8wDQYDVQQHDAZCYW5nb3Iw
@@ -117,13 +117,13 @@ CX4AhoApL6teiUhjOeyBqRtMLvFrODbyfWOw92v/SBo+IBuskFWczRFfYmpEgcls
 7XUZ1jj9jADb5vUFXttyD6DvlorsrDpym8UUa8xckbEORr039A2inJ1+JCHvF3Lp
 e2iwjc4lUcFC9ro7nesIcjc38rz36026jl8cvuGzfL83/NhL9zY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQDqg7foDxXSlDANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJV
 UzEOMAwGA1UECAwFTWFpbmUxDzANBgNVBAcMBkJhbmdvcjEjMCEGA1UECgwaVW5p
 dmVyc2l0eSBvZiBNYWluZSBTeXN0ZW0xFjAUBgNVBAMMDWlkcC5tYWluZS5lZHUw
@@ -143,27 +143,27 @@ A4CX3y33HFyk/3PXxSxnpaWsuXozahayLy+mjL3INcpCOI4hD3mjhap8HZpz6s53
 xxXxaapewT8D9qN7AOzL5K1HB2z2JgTuG6Ucxwz+DmD+fpTSKZfFka7Aa0xOgk4l
 aPxZ1d6VzB7zlPxt3EBPg+v65IxSNM8rHmxa3Zc2nc6u7dd1uSs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.maine.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.maine.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Maine System</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Maine System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.maine.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Grover</md:GivenName>
-      <md:EmailAddress>jgrover@maine.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Drew Northup</md:GivenName>
-      <md:EmailAddress>drew.northup@maine.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Drew Northup</md:GivenName>
-      <md:EmailAddress>drew.northup@maine.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.maine.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.maine.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Maine System</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Maine System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.maine.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Grover</md:GivenName>
+    <md:EmailAddress>jgrover@maine.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Drew Northup</md:GivenName>
+    <md:EmailAddress>drew.northup@maine.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Drew Northup</md:GivenName>
+    <md:EmailAddress>drew.northup@maine.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.marine.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.marine.ie-idp-shibboleth.xml
index 840cc1e3..a4319a31 100644
--- a/swamid-interfederations-2.0/idp.marine.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.marine.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.marine.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-02-22T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-02-22T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marine.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Marine Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Marine Institute is the national agency responsible for Marine Research, Technology Development and Innovation (RTDI). We seek to assess and realise the economic potential of Ireland's 220 million acre marine resource; promote the sustainable development of marine industry  through strategic funding programmes and essential scientific services; and safeguard our marine environment through research and environmental monitoring. The Institute was set up under the 1991 Marine Institute Act</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.marine.ie</mdui:InformationURL>
+        <mdui:Logo height="60" width="221">https://edugate.heanet.ie/rr3/logos/minst.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.25056556375224,-8.967840021068696</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marine.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Marine Institute</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Marine Institute is the national agency responsible for Marine Research, Technology Development and Innovation (RTDI). We seek to assess and realise the economic potential of Ireland's 220 million acre marine resource; promote the sustainable development of marine industry  through strategic funding programmes and essential scientific services; and safeguard our marine environment through research and environmental monitoring. The Institute was set up under the 1991 Marine Institute Act</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.marine.ie</mdui:InformationURL>
-          <mdui:Logo height="60" width="221">https://edugate.heanet.ie/rr3/logos/minst.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.25056556375224,-8.967840021068696</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAJ8phchulw4ssW/ZBKYd9IxD3Js7MA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5tYXJpbmUuaWUwHhcNMTMwMjIyMTU0NjU4WhcN
 MzMwMjIyMTU0NjU4WjAYMRYwFAYDVQQDEw1pZHAubWFyaW5lLmllMIIBIjANBgkq
@@ -38,29 +38,29 @@ s0/JvOSY6uR33prbr4qTgVRSTagS6iuEiNlucxyFc95Gco2Rc1FPoHTxeR4/KAv+
 FFx10hRPFOYTMLf1GklpNkc/+B5VBLRwipPBhr7ADrW1KGHEJyQPfD/LysTbiOZH
 ETIww+xk+Xw+Gf39lvXw1zsoosgfStOG4yIVyaaIb63FOhda
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marine.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marine.ie/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Marine Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Marine Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.marine.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Keith Manson</md:SurName>
-      <md:EmailAddress>mailto:keith.manson@marine.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Keith Manson</md:SurName>
-      <md:EmailAddress>mailto:keith.manson@marine.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Keith Manson</md:SurName>
-      <md:EmailAddress>mailto:keith.manson@marine.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marine.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marine.ie/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Marine Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Marine Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.marine.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Keith Manson</md:SurName>
+    <md:EmailAddress>mailto:keith.manson@marine.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Keith Manson</md:SurName>
+    <md:EmailAddress>mailto:keith.manson@marine.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Keith Manson</md:SurName>
+    <md:EmailAddress>mailto:keith.manson@marine.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
index 9b476ab8..bb394cd7 100644
--- a/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.marjon.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marjon.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marjon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
 						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						oF1hWv0YvVydDCsa/nN8L3stVEAIvSGzsBS5vkbUXmRE3NuUCcJwkOUzwAzDWdM6
 						DR76/+4E+wc36deoLR3NAIWq4IX54pvX1UqIRIkpekdtAG2vLW3rl3e1IbC1j++6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.marjon.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marjon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.marjon.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marjon.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
 						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
@@ -67,27 +67,27 @@
 						oF1hWv0YvVydDCsa/nN8L3stVEAIvSGzsBS5vkbUXmRE3NuUCcJwkOUzwAzDWdM6
 						DR76/+4E+wc36deoLR3NAIWq4IX54pvX1UqIRIkpekdtAG2vLW3rl3e1IbC1j++6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of St Mark &amp; St John</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of St Mark &amp; St John</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.marjon.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Moore</md:SurName>
-      <md:EmailAddress>mailto:cmoore@marjon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>St John</md:SurName>
-      <md:EmailAddress>mailto:istjohn@marjon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of St Mark &amp; St John</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of St Mark &amp; St John</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.marjon.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Moore</md:SurName>
+    <md:EmailAddress>mailto:cmoore@marjon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>St John</md:SurName>
+    <md:EmailAddress>mailto:istjohn@marjon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml
index 61214e0c..bed2bc86 100644
--- a/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.marshall.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.marshall.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marshall.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Marshall University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://idp.marshall.edu/idpinfo.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp.marshall.edu/idp_privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="200" width="800" xml:lang="en">https://idp.marshall.edu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.marshall.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marshall.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Marshall University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://idp.marshall.edu/idpinfo.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp.marshall.edu/idp_privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="200" width="800" xml:lang="en">https://idp.marshall.edu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANGAwu+l/UWmtqeKbBJJeQMw2rmCMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMMEGlkcC5tYXJzaGFsbC5lZHUwHhcNMTUwMTI2MTg1MjIy
 WhcNMzUwMTI2MTg1MjIyWjAbMRkwFwYDVQQDDBBpZHAubWFyc2hhbGwuZWR1MIIB
@@ -40,23 +40,23 @@ KTCjPZPIfa7HqJo093cyBY96qCYkYXXJfYGsb/AisqHXyzQQHbIQsW8dLC+ouTEa
 R21kn0ymq/VE5kJml2rLvTB8Msh76fdsxVz1IHvXexZCiuGIYHbVfJEzOlukooug
 t17n6E3j/nC8A5MtLGLUCIpW+p7tJdEF7fRdBxvs2ZyC8NaXfkSJX/ELF5P3km3d
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marshall.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marshall.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.marshall.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marshall.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marshall.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marshall.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marshall.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marshall.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.marshall.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marshall.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marshall.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marshall.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANGAwu+l/UWmtqeKbBJJeQMw2rmCMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMMEGlkcC5tYXJzaGFsbC5lZHUwHhcNMTUwMTI2MTg1MjIy
 WhcNMzUwMTI2MTg1MjIyWjAbMRkwFwYDVQQDDBBpZHAubWFyc2hhbGwuZWR1MIIB
@@ -75,22 +75,22 @@ KTCjPZPIfa7HqJo093cyBY96qCYkYXXJfYGsb/AisqHXyzQQHbIQsW8dLC+ouTEa
 R21kn0ymq/VE5kJml2rLvTB8Msh76fdsxVz1IHvXexZCiuGIYHbVfJEzOlukooug
 t17n6E3j/nC8A5MtLGLUCIpW+p7tJdEF7fRdBxvs2ZyC8NaXfkSJX/ELF5P3km3d
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marshall.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Marshall University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Marshall University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.marshall.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Edward Aractingi</md:GivenName>
-      <md:EmailAddress>aractingi1@marshall.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Team</md:GivenName>
-      <md:EmailAddress>systems@marshall.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marshall.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Marshall University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Marshall University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.marshall.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Edward Aractingi</md:GivenName>
+    <md:EmailAddress>aractingi1@marshall.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Team</md:GivenName>
+    <md:EmailAddress>systems@marshall.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
index 54fcbca0..32b2742d 100644
--- a/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mast.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mast.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mast.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.mast.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mast.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
-          <mdui:Description xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
-          <mdui:Description xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mast.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.mast.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
 VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
 MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
@@ -39,26 +39,26 @@ qKtjaM50D240z40M9X+0p8U6Tpfx55DXntfVKPbhDu5AbrewaViSNq4PNdTno1tD
 eDx/vYT88tTDClBXMGL9de+zKpodeKd6NmQcGkqNz0Y62cg3uAcp5J8Dt9skdSmj
 08dyKGEknfITw3O8/pJo0cxq2CY0bYSlltquU3oEaaQcFM/Wjifp7mSd
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mast.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mast.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mast.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mast.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mast.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mast.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mast.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mast.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mast.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mast.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
 VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
@@ -77,24 +77,24 @@ eDx/vYT88tTDClBXMGL9de+zKpodeKd6NmQcGkqNz0Y62cg3uAcp5J8Dt9skdSmj
 08dyKGEknfITw3O8/pJo0cxq2CY0bYSlltquU3oEaaQcFM/Wjifp7mSd
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mast.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.mast.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Leonardo Cardozo</md:SurName>
-      <md:EmailAddress>leonardo@mast.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mast.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.mast.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Leonardo Cardozo</md:SurName>
+    <md:EmailAddress>leonardo@mast.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
index 8827c15a..bc11a0a6 100644
--- a/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.math.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-10T13:39:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-11-10T13:39:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Mathematics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Matematický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider MU AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.math.cas.cz/index.php?lang=1</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.math.cas.cz/index.php?lang=0</mdui:InformationURL>
+        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-math-44.png</mdui:Logo>
+        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-math-100.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Mathematics AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Matematický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider MU AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.math.cas.cz/index.php?lang=1</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.math.cas.cz/index.php?lang=0</mdui:InformationURL>
-          <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-math-44.png</mdui:Logo>
-          <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-math-100.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAMI6h1I2Ucbuc9TH2mQ3pJfm1qhGMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejAeFw0xNDExMDcwOTE0MzRa
 Fw0zNDExMDcwOTE0MzRaMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejCCASIw
@@ -51,29 +51,29 @@ SoTahRu2eTDuvcQSrsIy13GhlWj9D5fTUjeIx9y83wFfR5c1G2u9jWYyjHCP3BPV
 9BY8Bxf+cas1FfM8Ajg8fddlhBG/1/KJwXbjUWw9MNE3hdZQZ0WQ37yhIJs=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.math.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.math.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.math.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.math.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.math.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.math.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.math.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.math.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAMI6h1I2Ucbuc9TH2mQ3pJfm1qhGMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejAeFw0xNDExMDcwOTE0MzRa
 Fw0zNDExMDcwOTE0MzRaMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejCCASIw
@@ -93,26 +93,26 @@ SoTahRu2eTDuvcQSrsIy13GhlWj9D5fTUjeIx9y83wFfR5c1G2u9jWYyjHCP3BPV
 9BY8Bxf+cas1FfM8Ajg8fddlhBG/1/KJwXbjUWw9MNE3hdZQZ0WQ37yhIJs=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.math.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Mathematics</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Matematický ústav</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics AS CR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Matematický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.math.cas.cz/index.php?lang=0</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.math.cas.cz/index.php?lang=1</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.math.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Mathematics</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Matematický ústav</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics AS CR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Matematický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.math.cas.cz/index.php?lang=0</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.math.cas.cz/index.php?lang=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
index d6ea6b75..16e61d9d 100644
--- a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mba.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-16T15:47:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-16T15:47:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Marine Biological Association of the UK</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://idp.mba.ac.uk/idp/images/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.mba.ac.uk/idp/images/logo-icon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Marine Biological Association of the UK</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://idp.mba.ac.uk/idp/images/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.mba.ac.uk/idp/images/logo-icon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDeDCCAmACCQC//ypb/YRuTTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBseW1vdXRoMTQwMgYDVQQKDCtU
 						aGUgTWFyaW5lIEJpb2xvZ2ljYWwgQXNzb2NpYXRpb24gb2YgdGhlIFVLMRYwFAYD
@@ -37,29 +37,29 @@
 						UBYyypbXGq9dHlR/Hln5yEchjXlQe62dG/19UdqC5nC60eFtnSgmMWiLnJO3DjwD
 						cnhP7ImWStAG8MeUbq7PpoEfB29LFlAyelI4VkG6ms51DGE3ApJ5M1My6aAkhKXi
 						+x2qLGn4QG1NifGc7iGgas5AQdopZwumKy8d6A== </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mba.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mba.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mba.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mba.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mba.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mba.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDeDCCAmACCQC//ypb/YRuTTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBseW1vdXRoMTQwMgYDVQQKDCtU
 						aGUgTWFyaW5lIEJpb2xvZ2ljYWwgQXNzb2NpYXRpb24gb2YgdGhlIFVLMRYwFAYD
@@ -80,27 +80,27 @@
 						cnhP7ImWStAG8MeUbq7PpoEfB29LFlAyelI4VkG6ms51DGE3ApJ5M1My6aAkhKXi
 						+x2qLGn4QG1NifGc7iGgas5AQdopZwumKy8d6A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Marine Biological Association of the United Kingdom</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Marine Biological Association of the UK</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mba.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Lear</md:SurName>
-      <md:EmailAddress>mailto:dble@mba.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Lear</md:SurName>
-      <md:EmailAddress>mailto:dble@mba.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Marine Biological Association of the United Kingdom</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Marine Biological Association of the UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mba.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Lear</md:SurName>
+    <md:EmailAddress>mailto:dble@mba.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Lear</md:SurName>
+    <md:EmailAddress>mailto:dble@mba.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml
index dead8851..dbe5993a 100644
--- a/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mbl.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbl.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Marine Biological Laboratory</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Marine Biological Laboratory Federated Single Sign-On Service</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mbl.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mbl.edu/it/files/2013/05/incommon_privacy_statement.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbl.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Marine Biological Laboratory</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Marine Biological Laboratory Federated Single Sign-On Service</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mbl.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.mbl.edu/it/files/2013/05/incommon_privacy_statement.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDeDCCAuGgAwIBAgIJAJXRYjhSMB8sMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
 VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czElMCMGA1UEChMcTWFyaW5l
 IEJpb2xvZ2ljYWwgTGFib3JhdG9yeTEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVj
@@ -42,24 +42,24 @@ GDAWgBReurFgimXLG1EYKa8q4rJPb+X7tzANBgkqhkiG9w0BAQUFAAOBgQBWsE6q
 LfjdzGmLyOc+oHKS1CuQPe7hZS3IzC8U1fuyY/KIfqjba2zCk4ZyRFCP0vRlzxGc
 D9aaA2f9N+a9QmB0Bnwu75zgxjIrbQmLdJJp+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mbl.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbl.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbl.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbl.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mbl.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbl.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbl.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbl.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDeDCCAuGgAwIBAgIJAJXRYjhSMB8sMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
 VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czElMCMGA1UEChMcTWFyaW5l
 IEJpb2xvZ2ljYWwgTGFib3JhdG9yeTEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVj
@@ -80,26 +80,26 @@ GDAWgBReurFgimXLG1EYKa8q4rJPb+X7tzANBgkqhkiG9w0BAQUFAAOBgQBWsE6q
 LfjdzGmLyOc+oHKS1CuQPe7hZS3IzC8U1fuyY/KIfqjba2zCk4ZyRFCP0vRlzxGc
 D9aaA2f9N+a9QmB0Bnwu75zgxjIrbQmLdJJp+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Marine Biological Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Marine Biological Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mbl.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kent Nasveschuk</md:GivenName>
-      <md:EmailAddress>knasveschuk@mbl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christopher Dematos</md:GivenName>
-      <md:EmailAddress>cdematos@mbl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Christopher Dematos</md:GivenName>
-      <md:EmailAddress>cdematos@mbl.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Marine Biological Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Marine Biological Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mbl.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kent Nasveschuk</md:GivenName>
+    <md:EmailAddress>knasveschuk@mbl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher Dematos</md:GivenName>
+    <md:EmailAddress>cdematos@mbl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Christopher Dematos</md:GivenName>
+    <md:EmailAddress>cdematos@mbl.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml b/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml
index 1fa3b67b..2fa11350 100644
--- a/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml
+++ b/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mbro.ac.uk/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbro.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbro.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mbro.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mbro.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Middlesbrough College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mbro.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mbro.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mbro.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Middlesbrough College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mbro.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
index fc0cbdf0..187ef96a 100644
--- a/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mbu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-08T13:24:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-08T13:24:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Microbiology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Mikrobiologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IMIC AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MBŮ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mbu.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mbu.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="60">https://jiftach.cas.cz/loga/logo-mbu-44.png</mdui:Logo>
+        <mdui:Logo height="100" width="137">https://jiftach.cas.cz/loga/logo-mbu-100.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Microbiology AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Mikrobiologický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IMIC AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MBŮ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mbu.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.mbu.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="60">https://jiftach.cas.cz/loga/logo-mbu-44.png</mdui:Logo>
-          <mdui:Logo height="100" width="137">https://jiftach.cas.cz/loga/logo-mbu-100.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
 MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
 eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mbu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mbu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
 MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
 eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Microbiology  AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Mikrobiologický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Microbiology  AS CR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Mikrobiologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mbu.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.mbu.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Microbiology  AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Mikrobiologický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Microbiology  AS CR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Mikrobiologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mbu.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mbu.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
index 35c3e209..af7a4f7d 100644
--- a/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mci4me.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-08-26T15:09:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-08-26T15:09:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mci4me.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Management Center Innsbruck</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Management Center Innsbruck</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mci4me.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Management Center Innsbruck</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Management Center Innsbruck</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
 OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
@@ -35,26 +35,26 @@ llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
 JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
 FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mci4me.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mci4me.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mci4me.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mci4me.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mci4me.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mci4me.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mci4me.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mci4me.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mci4me.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mci4me.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
 OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
@@ -73,26 +73,26 @@ llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
 JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
 FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Management Center Innsbruck</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Management Center Innsbruck</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Management Center Innsbruck</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Management Center Innsbruck</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.mci4me.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.mci4me.at/index.php?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Florian</md:GivenName>
-      <md:SurName>Lechner</md:SurName>
-      <md:EmailAddress>mailto:florian.lechner@mci.edu</md:EmailAddress>
-      <md:TelephoneNumber>+43 512 2070 1407</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Management Center Innsbruck</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Management Center Innsbruck</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Management Center Innsbruck</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Management Center Innsbruck</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.mci4me.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.mci4me.at/index.php?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Florian</md:GivenName>
+    <md:SurName>Lechner</md:SurName>
+    <md:EmailAddress>mailto:florian.lechner@mci.edu</md:EmailAddress>
+    <md:TelephoneNumber>+43 512 2070 1407</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
index a62abcb6..47ecea14 100644
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.meduniwien.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-03T14:46:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-03T14:46:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meduniwien.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Medizinische Universität Wien</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Medical University of Vienna</mdui:DisplayName>
+        <mdui:Logo width="172" height="82">https://idp.meduniwien.ac.at/idp/images/meduni_logo.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://idp.meduniwien.ac.at/idp/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meduniwien.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Medizinische Universität Wien</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Medical University of Vienna</mdui:DisplayName>
-          <mdui:Logo width="172" height="82">https://idp.meduniwien.ac.at/idp/images/meduni_logo.gif</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://idp.meduniwien.ac.at/idp/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
 MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
@@ -38,26 +38,26 @@ NSMYR5rudqBBzTUAo5qe/9UX3Hp9//vK9rkPHSMpFUd/9dfp59VOtimG95Onr9K7
 jatEfpnMS4nv+9dyJBBzqAjL/AxoqapRDix1pFU6DnnI6NjEK0ycSBdl0GbUWX/+
 OKQ7j1Bqsv6B43xMHff+
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.meduniwien.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meduniwien.ac.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.meduniwien.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meduniwien.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
 MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
@@ -77,30 +77,30 @@ NSMYR5rudqBBzTUAo5qe/9UX3Hp9//vK9rkPHSMpFUd/9dfp59VOtimG95Onr9K7
 jatEfpnMS4nv+9dyJBBzqAjL/AxoqapRDix1pFU6DnnI6NjEK0ycSBdl0GbUWX/+
 OKQ7j1Bqsv6B43xMHff+
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Medizinische Universität Wien</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Medical University of Vienna</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Medizinische Universität Wien</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Medical University of Vienna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.meduniwien.ac.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.meduniwien.ac.at/homepage/1/homepage/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Herbert</md:GivenName>
-      <md:SurName>Jacubetz</md:SurName>
-      <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Amsuess</md:SurName>
-      <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Medizinische Universität Wien</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Medical University of Vienna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Medizinische Universität Wien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Medical University of Vienna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.meduniwien.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.meduniwien.ac.at/homepage/1/homepage/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Herbert</md:GivenName>
+    <md:SurName>Jacubetz</md:SurName>
+    <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Amsuess</md:SurName>
+    <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
index d032b8b3..39cd1a8e 100644
--- a/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mendelu.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mendelu.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:19:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:19:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mendelu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mendel Univerzity in Brno </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Mendelova univerzita v Brně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Mendel Univerzity in Brno</mdui:Description>
+        <mdui:Description xml:lang="cs">Poskytovatel identity Mendelovy univerzity v Brně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mendelu.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mendelu.cz/</mdui:InformationURL>
+        <mdui:Logo height="100" width="150">https://idp.mendelu.cz/mendelu-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mendelu.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mendel Univerzity in Brno </mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Mendelova univerzita v Brně</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Mendel Univerzity in Brno</mdui:Description>
-          <mdui:Description xml:lang="cs">Poskytovatel identity Mendelovy univerzity v Brně</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mendelu.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.mendelu.cz/</mdui:InformationURL>
-          <mdui:Logo height="100" width="150">https://idp.mendelu.cz/mendelu-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
 MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
@@ -52,26 +52,26 @@ ly0Ky8TPxWhwkcZo83muhNJk5LuZG8VblckmvsGR27bt9wty60PqE1Wb4zlguTzY
 eBFJcQNHXyofYwsQlK2LyCnlOlpQUtbXe5/BcXKA9pp+RnjZAB9dVpY/KJ6hy6BQ
 /9z9n5iDjFjm8dk=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mendelu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mendelu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mendelu.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mendelu.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mendelu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mendelu.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mendelu.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mendelu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mendelu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mendelu.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mendelu.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mendelu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mendelu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mendelu.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDlzCCAn+gAwIBAgIJAJDI3wy+XpHDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDmlkcC5tZW5kZWx1LmN6MB4XDTE2MDMyOTEwNDE0MFoXDTM2MDMyNDEwNDE0
 MFowGTEXMBUGA1UEAxMOaWRwLm1lbmRlbHUuY3owggEiMA0GCSqGSIb3DQEBAQUA
@@ -93,25 +93,25 @@ ly0Ky8TPxWhwkcZo83muhNJk5LuZG8VblckmvsGR27bt9wty60PqE1Wb4zlguTzY
 eBFJcQNHXyofYwsQlK2LyCnlOlpQUtbXe5/BcXKA9pp+RnjZAB9dVpY/KJ6hy6BQ
 /9z9n5iDjFjm8dk=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mendelu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mendelu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mendel Univerzity in Brno</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Mendelova univerzita v Brně</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mendel Univerzity in Brno</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Mendelova univerzita v Brně</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mendelu.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.mendelu.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Banzet</md:SurName>
-      <md:EmailAddress>michael.banzet@mendelu.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mendelu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mendelu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mendel Univerzity in Brno</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Mendelova univerzita v Brně</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mendel Univerzity in Brno</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Mendelova univerzita v Brně</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mendelu.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mendelu.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Banzet</md:SurName>
+    <md:EmailAddress>michael.banzet@mendelu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.merit.edu.xml b/swamid-interfederations-2.0/idp.merit.edu.xml
index 71d7b12f..f1215bcc 100644
--- a/swamid-interfederations-2.0/idp.merit.edu.xml
+++ b/swamid-interfederations-2.0/idp.merit.edu.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.merit.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merit.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Merit Network, Inc.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Merit SSP IDP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merit.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Merit Network, Inc.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Merit SSP IDP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEEzCCAvugAwIBAgIJAJPTkMqcbv2AMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCTUkxEjAQBgNVBAcMCUFubiBBcmJvcjEWMBQGA1UE
 CgwNTWVyaXQgTmV0d29yazEWMBQGA1UECwwNSVQgT3BlcmF0aW9uczEeMBwGA1UE
@@ -43,19 +43,19 @@ oG0SFXgE1Zbvnu56JcWrUKdDrSs0QIxjqTxHiq/jRhztxiExjCI9DFPc8ig/rbzk
 UX42ZnYC7Be3Kknd87onuaSSWLyMQFGqoz0FiBdnH7r0V1s4NDuDawHHk4sMDZBl
 yW53IkO/bdDl7whtv2akTp37DPTKkdCRD0jz51PoJTqf0NaLo6qh
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://merit-idp01.merit.edu/ssp/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://merit-idp01.merit.edu/ssp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Merit Network, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Merit Network, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.merit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Operations</md:GivenName>
-      <md:EmailAddress>it-ops@merit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://merit-idp01.merit.edu/ssp/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://merit-idp01.merit.edu/ssp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Merit Network, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Merit Network, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.merit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Operations</md:GivenName>
+    <md:EmailAddress>it-ops@merit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml
index 2a80983c..ba3728d6 100644
--- a/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.merthyr.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIURCB/tUHtc3A/ovYJbLippy5MADIwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRaWRwLm1lcnRoeXIuYWMudWswHhcNMTEwNzA1MTExMjMx
 						WhcNMzEwNzA1MTExMjMxWjAcMRowGAYDVQQDExFpZHAubWVydGh5ci5hYy51azCC
@@ -30,26 +30,26 @@
 						0eUpscAC9+6x+Q53jgbzcKJ0011YisfPRo5mS0bMw1eMC849PJeX2p8MZeGgXuf8
 						wQ0d
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merthyr.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIURCB/tUHtc3A/ovYJbLippy5MADIwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRaWRwLm1lcnRoeXIuYWMudWswHhcNMTEwNzA1MTExMjMx
 						WhcNMzEwNzA1MTExMjMxWjAcMRowGAYDVQQDExFpZHAubWVydGh5ci5hYy51azCC
@@ -69,27 +69,27 @@
 						0eUpscAC9+6x+Q53jgbzcKJ0011YisfPRo5mS0bMw1eMC849PJeX2p8MZeGgXuf8
 						wQ0d
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of South Wales</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Merthyr Tydfil College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Watkins</md:SurName>
-      <md:EmailAddress>mailto:a.watkins@merthyr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Watkins</md:SurName>
-      <md:EmailAddress>mailto:a.watkins@merthyr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of South Wales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Merthyr Tydfil College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Watkins</md:SurName>
+    <md:EmailAddress>mailto:a.watkins@merthyr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Watkins</md:SurName>
+    <md:EmailAddress>mailto:a.watkins@merthyr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml b/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
index df683410..250a125e 100644
--- a/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
+++ b/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mf.uni-lj.si/idp/20111101">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T10:01:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T10:01:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.uni-lj.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Ljubljana, Faculty of Medicine</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani, Medicinska fakulteta</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization University of Ljubljana, Faculty of Medicine</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani, Medicinska fakulteta</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization University of Ljubljana, Faculty of Medicine</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani, Medicinska fakulteta</mdui:Keywords>
+        <mdui:Logo height="287" width="189">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKgAAADICAIAAADz3T25AAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAABCZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyI+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjU8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjE2ODwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+MjAwPC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAgICAg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xMaNG2kF5YYNGxhobEZdXR1q98orr4ArA0ctZLBllLETr7/++ieffPLRRx99+OGH0KNV4FdbW0s3uJAM1miSA55ahhiCZ599FibI03PPPYdxlthLSpB+4IEHvvGNb0AMDVWIEX341re+hUBzm8gE5RDTfOnSpR9//DHX5RRWF154IZIEc7oEH66LkT/hhBMYE/B7/vnnb7zxxkGDBnEjmA268dprr0H85JNPSsnGZsg7pS03iKWEmxTxt95669Zbb0WSuFB+EoaxWymeNTJZI8uULZnF94pZEYGnnk3HUpz6Rgx55q2FojaaEdWZ7I8fv2d1sPaWX90yeczo3//81vt/fdu3r//a5CkTwxF/NqPf/uOfTBl6RDYaufcv9yoDPPcveZbC7Tu2nHbpea++/9avfnrzI/fdF0uE31i26LhTTvAHW2685poZU6fcevevtIElby1e+NUrL39x2RtPvPL0jPPmnHrBGU2Rlp/94qd3/u6OeCx04QXn/u1Pf8waKRjqsTB/ZLLp5NL3lt/0f384ZuwEPZ0NJ/Qp006sqWuI6Rm6HEikuJ1kJjtg6PCHHvs73eeP9Nhjj5133nnf//73kcLbb7+dKH316tUoJVVHH3002KPfYD98+HCE4Nprr33zzTcR/XXr1mEeaEhzKP/2t79NmjQJ90Eekf3BD36A70AB/ud//gd7QHMEF2OOYJG/6667Xn31VbzP2rVrkZI///nPo0aNevDBB2FI87yknmp8++xEUVSXRgDG9AsVUbCODlsoECaYi7cEhpcM/O43v/3J5i1zr77qhu9/784//N4fDb+7cnk6k77syrkNzU2KXf3W166fMH5irFHETZrDcfKMmQ11u7EN06dPX79uXcDvb25qem/p0smTJ6NG3/7GN/27W4+fNu2Bh+fPOv7EsqLi5rr6u++8KxIM7d6567JLL2X4xowZAx7+1lYYOtxutE84cDN015OpK664QlUVQoOzzzqLyzkdtrSe8bm0lhb/W28uIsC75OKLGZpoOA4eU6dOxTFNmzaNSOWMM87AEYwfPx7vgEfnZukhSCxevBjr9cILLwDwlClTTjzxxPfff58LYsPmzJlDBENzpIEYCOnB6xPN4Afx4kuWLAF4bmrZsmVnnXXWf/zHf/zhD38g7sEwIEk4QbDHh2IDOOZH100u3QbeptDELqAVvs9MMp/N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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.uni-lj.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Ljubljana, Faculty of Medicine</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani, Medicinska fakulteta</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization University of Ljubljana, Faculty of Medicine</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani, Medicinska fakulteta</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization University of Ljubljana, Faculty of Medicine</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani, Medicinska fakulteta</mdui:Keywords>
-          <mdui:Logo height="287" width="189">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKgAAADICAIAAADz3T25AAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAABCZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyI+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjU8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjE2ODwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+MjAwPC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAgICAg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xMaNG2kF5YYNGxhobEZdXR1q98orr4ArA0ctZLBllLETr7/++ieffPLRRx99+OGH0KNV4FdbW0s3uJAM1miSA55ahhiCZ599FibI03PPPYdxlthLSpB+4IEHvvGNb0AMDVWIEX341re+hUBzm8gE5RDTfOnSpR9//DHX5RRWF154IZIEc7oEH66LkT/hhBMYE/B7/vnnb7zxxkGDBnEjmA268dprr0H85JNPSsnGZsg7pS03iKWEmxTxt95669Zbb0WSuFB+EoaxWymeNTJZI8uULZnF94pZEYGnnk3HUpz6Rgx55q2FojaaEdWZ7I8fv2d1sPaWX90yeczo3//81vt/fdu3r//a5CkTwxF/NqPf/uOfTBl6RDYaufcv9yoDPPcveZbC7Tu2nHbpea++/9avfnrzI/fdF0uE31i26LhTTvAHW2685poZU6fcevevtIElby1e+NUrL39x2RtPvPL0jPPmnHrBGU2Rlp/94qd3/u6OeCx04QXn/u1Pf8waKRjqsTB/ZLLp5NL3lt/0f384ZuwEPZ0NJ/Qp006sqWuI6Rm6HEikuJ1kJjtg6PCHHvs73eeP9Nhjj5133nnf//73kcLbb7+dKH316tUoJVVHH3002KPfYD98+HCE4Nprr33zzTcR/XXr1mEeaEhzKP/2t79NmjQJ90Eekf3BD36A70AB/ud//gd7QHMEF2OOYJG/6667Xn31VbzP2rVrkZI///nPo0aNevDBB2FI87yknmp8++xEUVSXRgDG9AsVUbCODlsoECaYi7cEhpcM/O43v/3J5i1zr77qhu9/784//N4fDb+7cnk6k77syrkNzU2KXf3W166fMH5irFHETZrDcfKMmQ11u7EN06dPX79uXcDvb25qem/p0smTJ6NG3/7GN/27W4+fNu2Bh+fPOv7EsqLi5rr6u++8KxIM7d6567JLL2X4xowZAx7+1lYYOtxutE84cDN015OpK664QlUVQoOzzzqLyzkdtrSe8bm0lhb/W28uIsC75OKLGZpoOA4eU6dOxTFNmzaNSOWMM87AEYwfPx7vgEfnZukhSCxevBjr9cILLwDwlClTTjzxxPfff58LYsPmzJlDBENzpIEYCOnB6xPN4Afx4kuWLAF4bmrZsmVnnXXWf/zHf/zhD38g7sEwIEk4QbDHh2IDOOZH100u3QbeptDELqAVvs9MMp/N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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mf.uni-lj.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mf.uni-lj.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.mf.uni-lj.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Dušan</md:GivenName>
-      <md:SurName>Šuput</md:SurName>
-      <md:EmailAddress>mailto:dusan.suput@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Emil</md:GivenName>
-      <md:SurName>Hudomalj</md:SurName>
-      <md:EmailAddress>mailto:emil.hudomalj@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Damijan</md:GivenName>
-      <md:SurName>Senčar</md:SurName>
-      <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jure</md:GivenName>
-      <md:SurName>Pesko</md:SurName>
-      <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Branimir</md:GivenName>
-      <md:SurName>Leskošek</md:SurName>
-      <md:EmailAddress>mailto:brane.leskosek@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Damijan</md:GivenName>
-      <md:SurName>Senčar</md:SurName>
-      <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mf.uni-lj.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mf.uni-lj.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.mf.uni-lj.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dušan</md:GivenName>
+    <md:SurName>Šuput</md:SurName>
+    <md:EmailAddress>mailto:dusan.suput@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Emil</md:GivenName>
+    <md:SurName>Hudomalj</md:SurName>
+    <md:EmailAddress>mailto:emil.hudomalj@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Damijan</md:GivenName>
+    <md:SurName>Senčar</md:SurName>
+    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jure</md:GivenName>
+    <md:SurName>Pesko</md:SurName>
+    <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Branimir</md:GivenName>
+    <md:SurName>Leskošek</md:SurName>
+    <md:EmailAddress>mailto:brane.leskosek@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Damijan</md:GivenName>
+    <md:SurName>Senčar</md:SurName>
+    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml
index 872af31f..6ce9e8fb 100644
--- a/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mic.ul.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2012-05-03T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2012-05-03T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mic.ul.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mary Immaculate College</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Coláiste Mhuire gan Smál</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.mic.ul.ie/</mdui:InformationURL>
+        <mdui:Logo height="130" width="111">https://edugate.heanet.ie/rr3/logos/mic.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.6505454,-8.6402852</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mic.ul.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mary Immaculate College</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Coláiste Mhuire gan Smál</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.mic.ul.ie/</mdui:InformationURL>
-          <mdui:Logo height="130" width="111">https://edugate.heanet.ie/rr3/logos/mic.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.6505454,-8.6402852</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAIm8XfsrXL+n3FjD8+FCAsrpZwqYMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5taWMudWwuaWUwHhcNMTIwNjI1MTM0OTMxWhcN
 MzIwNjI1MTM0OTMxWjAYMRYwFAYDVQQDEw1pZHAubWljLnVsLmllMIIBIjANBgkq
@@ -38,33 +38,33 @@ MXhwW3z4Tu/7hjJuQ6dJBN1vGSGS0KhkNmu+Z4uYVzd99Oz0coLrv50tpvpwm0SB
 2QoN+ZsgJIiaLp/+TGaKd9mNRkmbsw/WCW4u4h6gD9hsuXndRdIz+fR9MKmUbx6s
 otIlv/GxlW1INiKMfyASC5mCnkwuLrWXW+8oAgXfPTrtPVu1
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mic.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mic.ul.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mic.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mary Immaculate College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mary Immaculate College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mic.ul.ie/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Glenn</md:GivenName>
-      <md:SurName>Wearen</md:SurName>
-      <md:EmailAddress>mailto:gwearen@heanet.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Spencer</md:SurName>
-      <md:EmailAddress>mailto:john.spencer@mic.ul.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kieran</md:GivenName>
-      <md:SurName>Pearse</md:SurName>
-      <md:EmailAddress>mailto:kieran.pearse@mic.ul.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mic.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mic.ul.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mic.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mary Immaculate College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mary Immaculate College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mic.ul.ie/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Wearen</md:SurName>
+    <md:EmailAddress>mailto:gwearen@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Spencer</md:SurName>
+    <md:EmailAddress>mailto:john.spencer@mic.ul.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kieran</md:GivenName>
+    <md:SurName>Pearse</md:SurName>
+    <md:EmailAddress>mailto:kieran.pearse@mic.ul.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml
index ac40f8c4..27c64ee6 100644
--- a/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.midchesh.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T16:28:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T16:28:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midchesh.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midchesh.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQCXDevqC5AIhDANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCU5vcnRod2ljaDEdMBsGA1UE
 						ChMUTWlkIENoZXNoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC5taWRjaGVzaC5h
@@ -32,26 +32,26 @@
 						HLD4x1Fd+jxUSLr+LVnXDBiGYnzJvghKLS67rv40kH2ozEqUVVZ5WgKfNQeDQ/L8
 						41sdGgX3jERpyhfgZbJH7UihB+MQ+vsRb/BkjH1T0iSvtJE45npvq1FBrYw4soJO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.midchesh.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midchesh.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.midchesh.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midchesh.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQCXDevqC5AIhDANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCU5vcnRod2ljaDEdMBsGA1UE
 						ChMUTWlkIENoZXNoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC5taWRjaGVzaC5h
@@ -71,27 +71,27 @@
 						HLD4x1Fd+jxUSLr+LVnXDBiGYnzJvghKLS67rv40kH2ozEqUVVZ5WgKfNQeDQ/L8
 						41sdGgX3jERpyhfgZbJH7UihB+MQ+vsRb/BkjH1T0iSvtJE45npvq1FBrYw4soJO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mid-Cheshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mid Cheshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.midchesh.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Thomas</md:SurName>
-      <md:EmailAddress>mailto:sthomas@midchesh.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Thomas</md:SurName>
-      <md:EmailAddress>mailto:sthomas@midchesh.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mid-Cheshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mid Cheshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.midchesh.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Thomas</md:SurName>
+    <md:EmailAddress>mailto:sthomas@midchesh.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Thomas</md:SurName>
+    <md:EmailAddress>mailto:sthomas@midchesh.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml
index fd376f69..b7537ef0 100644
--- a/swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.millersville.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">millersville.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Millersville University of Pennsylvania</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Millersville University Shibboleth Identity Provider</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.millersville.edu/registrar/faculty/ferpa.php</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">millersville.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Millersville University of Pennsylvania</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Millersville University Shibboleth Identity Provider</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.millersville.edu/registrar/faculty/ferpa.php</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDvjCCAqYCCQCad9weHImjfTANBgkqhkiG9w0BAQUFADCBoDELMAkGA1UEBhMC
 VVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMTWlsbGVyc3ZpbGxl
 MQswCQYDVQQKDAJNVTELMAkGA1UECwwCSVQxHTAbBgNVBAMMFGlkcC5taWxsZXJz
@@ -43,13 +43,13 @@ W9f49ZEtPeCsIRlBj5+g8bp0Kp/01+ZBsUH3sz4Il7xdKP5SDmSliwsdtFdtGtG3
 B1Hr85xtqTtI/mbxmfcdcmmfrY5MeMsi3FWn25+n9vouDArR9CPBswnaC7QQv8Q5
 XaY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQDPokmAeSlZezANBgkqhkiG9w0BAQUFADCBjTEdMBsGA1UEAwwU
 aWRwLm1pbGxlcnN2aWxsZS5lZHUxMTAvBgNVBAoMKE1pbGxlcnN2aWxsZSBVbml2
 ZXJzaXR5IG9mIFBlbm5zeWx2YW5pYSAxCzAJBgNVBAYTAlVTMRUwEwYDVQQIDAxQ
@@ -71,24 +71,24 @@ zMjjr6ZldRn41oqKMVdr6Wsv7FXecCOwbFPzItMINzDJ5GAP8Fm2H02JBkai8jX8
 WAWsqXPCafwwasFkMDtUQbBIB70JqFTLFdb8xbP6ESn8cBr2nbB8qcvWPM8MBvX5
 rkHfGo7YiJzuzWRw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.millersville.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.millersville.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.millersville.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.millersville.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.millersville.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.millersville.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">millersville.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.millersville.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.millersville.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.millersville.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.millersville.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.millersville.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.millersville.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">millersville.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDvjCCAqYCCQCad9weHImjfTANBgkqhkiG9w0BAQUFADCBoDELMAkGA1UEBhMC
 VVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMTWlsbGVyc3ZpbGxl
 MQswCQYDVQQKDAJNVTELMAkGA1UECwwCSVQxHTAbBgNVBAMMFGlkcC5taWxsZXJz
@@ -111,13 +111,13 @@ W9f49ZEtPeCsIRlBj5+g8bp0Kp/01+ZBsUH3sz4Il7xdKP5SDmSliwsdtFdtGtG3
 B1Hr85xtqTtI/mbxmfcdcmmfrY5MeMsi3FWn25+n9vouDArR9CPBswnaC7QQv8Q5
 XaY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQDPokmAeSlZezANBgkqhkiG9w0BAQUFADCBjTEdMBsGA1UEAwwU
 aWRwLm1pbGxlcnN2aWxsZS5lZHUxMTAvBgNVBAoMKE1pbGxlcnN2aWxsZSBVbml2
 ZXJzaXR5IG9mIFBlbm5zeWx2YW5pYSAxCzAJBgNVBAYTAlVTMRUwEwYDVQQIDAxQ
@@ -139,27 +139,27 @@ zMjjr6ZldRn41oqKMVdr6Wsv7FXecCOwbFPzItMINzDJ5GAP8Fm2H02JBkai8jX8
 WAWsqXPCafwwasFkMDtUQbBIB70JqFTLFdb8xbP6ESn8cBr2nbB8qcvWPM8MBvX5
 rkHfGo7YiJzuzWRw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.millersville.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.millersville.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Millersville University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Millersville University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.millersville.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Keith Wenz</md:GivenName>
-      <md:EmailAddress>Keith.Wenz@millersville.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christopher Medalis</md:GivenName>
-      <md:EmailAddress>Christopher.Medalis@millersville.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Veronica Longenecker</md:GivenName>
-      <md:EmailAddress>Veronica.Longenecker@millersville.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.millersville.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.millersville.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Millersville University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Millersville University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.millersville.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Keith Wenz</md:GivenName>
+    <md:EmailAddress>Keith.Wenz@millersville.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher Medalis</md:GivenName>
+    <md:EmailAddress>Christopher.Medalis@millersville.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Veronica Longenecker</md:GivenName>
+    <md:EmailAddress>Veronica.Longenecker@millersville.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml
index 46c53a63..4ccb4e0b 100644
--- a/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mimas.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUExVE+BsgxiwDLoOHU9bL+UpPdVEwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMB4XDTEwMTAwNDE3MDczOFoX
 						DTMwMTAwNDE3MDczOFowGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMIIBIjAN
@@ -29,26 +29,26 @@
 						fvrpFwCGZkEH+4xIDCEGFTxBWBy7Ex/MJ7ltPBeOwej+omCGkJxJcAbzaBsM+5AM
 						fRhXAFKoBmWmKAGSKfZDAIj7HXfN/kBwjy0PyOt8kPDXrvqGmveft0zUvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mimas.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mimas.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUExVE+BsgxiwDLoOHU9bL+UpPdVEwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMB4XDTEwMTAwNDE3MDczOFoX
 						DTMwMTAwNDE3MDczOFowGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMIIBIjAN
@@ -67,26 +67,26 @@
 						fvrpFwCGZkEH+4xIDCEGFTxBWBy7Ex/MJ7ltPBeOwej+omCGkJxJcAbzaBsM+5AM
 						fRhXAFKoBmWmKAGSKfZDAIj7HXfN/kBwjy0PyOt8kPDXrvqGmveft0zUvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Manchester: Mimas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mimas helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:info@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicholas</md:GivenName>
-      <md:SurName>Syrotiuk</md:SurName>
-      <md:EmailAddress>mailto:syrotiuk@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Manchester: Mimas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mimas helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:info@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicholas</md:GivenName>
+    <md:SurName>Syrotiuk</md:SurName>
+    <md:EmailAddress>mailto:syrotiuk@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mines-paristech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mines-paristech.fr-idp-shibboleth.xml
index c26602ad..2b1b3d48 100644
--- a/swamid-interfederations-2.0/idp.mines-paristech.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mines-paristech.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mines-paristech.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-19T15:46:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-19T15:46:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-paristech.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MINES ParisTech</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMxmAAW/gAAI////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////ALhwAGG4cAAKt3EAarlwAHu0aQARuHAAHbhwAF24cAB8uHAAkbhwAHm4cAAx////AP///wD///8A////AP///wC4cAAhuHAAu7hwAHS5cQCPuHAA8rlwAHa4cACyuHAAv7hwABi4cAAduHAAjbhwAI24cAAK////AP///wD///8AuHAAsLhwADS4cACsuHAA5bdwAGq4cADQt3AAi7ZwAEC4cACvuHAAP////wC4cABSuHAApP///wD///8A////ALhwADu4cADhuHAAsrhwAM64cADZtnAAQ7lxAF+4cQCav3AAELhwAFC4cABTuHAAAbhwAJ24cABX////AP///wD///8AuHAAF7hwAN24cABeuHAADLhwAHu4cABLv4AACLdxAFG4cAAZuHAABLhwAB64cAA4uHAArP///wD///8A////AP///wC4cADTuHAAIP///wD///8AuHAAGLhwABH///8Av4AABP///wD///8AuHAACLhwAN7///8A////AP///wD///8AuHAAvbhwACn///8A////ALNmAAr///8AuHAAD7hwAC////8A////ALhwABm4cADk////AP///wD///8A////ALhwAIa4cABfuHAAG7hwABq/gAAIt28AVbZtACq4cAAvuHAAmbhwADC4cABauHAA9LhwAEn///8A////AP///wC4cAAjuHAAyrhwAAi4cAA4uHAAdLhwABS3bwBut3AAmbZxADO4cADOuHAA5rhwAJm4cADcuHAAf////wD///8A////ALhwAF24cACguHAACLhwABW4cACquHAAgLhwAE65cADkt28AjblwAKq4cADmuHAAPbhwAHb///8A////AP///wD///8AuHAAQbhwALO4cABjuHAAL7hwAJO4cADruXAAbbhvAL64cADGum8AObhwAKa4cABU////AP///wD///8A////AP///wC4cAAGuHAANLhwAGS4cABjuHAAJP///wD///8AuW4AM7dvAGfMZgAFuHAAMP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAA==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.mines-paristech.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students and employees in MINES ParisTech</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">MINES ParisTech</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Étudiants et personnels MINES ParisTech</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-paristech.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MINES ParisTech</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMxmAAW/gAAI////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////ALhwAGG4cAAKt3EAarlwAHu0aQARuHAAHbhwAF24cAB8uHAAkbhwAHm4cAAx////AP///wD///8A////AP///wC4cAAhuHAAu7hwAHS5cQCPuHAA8rlwAHa4cACyuHAAv7hwABi4cAAduHAAjbhwAI24cAAK////AP///wD///8AuHAAsLhwADS4cACsuHAA5bdwAGq4cADQt3AAi7ZwAEC4cACvuHAAP////wC4cABSuHAApP///wD///8A////ALhwADu4cADhuHAAsrhwAM64cADZtnAAQ7lxAF+4cQCav3AAELhwAFC4cABTuHAAAbhwAJ24cABX////AP///wD///8AuHAAF7hwAN24cABeuHAADLhwAHu4cABLv4AACLdxAFG4cAAZuHAABLhwAB64cAA4uHAArP///wD///8A////AP///wC4cADTuHAAIP///wD///8AuHAAGLhwABH///8Av4AABP///wD///8AuHAACLhwAN7///8A////AP///wD///8AuHAAvbhwACn///8A////ALNmAAr///8AuHAAD7hwAC////8A////ALhwABm4cADk////AP///wD///8A////ALhwAIa4cABfuHAAG7hwABq/gAAIt28AVbZtACq4cAAvuHAAmbhwADC4cABauHAA9LhwAEn///8A////AP///wC4cAAjuHAAyrhwAAi4cAA4uHAAdLhwABS3bwBut3AAmbZxADO4cADOuHAA5rhwAJm4cADcuHAAf////wD///8A////ALhwAF24cACguHAACLhwABW4cACquHAAgLhwAE65cADkt28AjblwAKq4cADmuHAAPbhwAHb///8A////AP///wD///8AuHAAQbhwALO4cABjuHAAL7hwAJO4cADruXAAbbhvAL64cADGum8AObhwAKa4cABU////AP///wD///8A////AP///wC4cAAGuHAANLhwAGS4cABjuHAAJP///wD///8AuW4AM7dvAGfMZgAFuHAAMP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAA==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.mines-paristech.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students and employees in MINES ParisTech</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">MINES ParisTech</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Étudiants et personnels MINES ParisTech</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUKdAY17zuMXudJDIY39h9OoUPvykwDQYJKoZIhvcNAQEL
 BQAwITEfMB0GA1UEAwwWaWRwLm1pbmVzLXBhcmlzdGVjaC5mcjAeFw0xNjA0MTkw
 OTExNDRaFw0zNjA0MTkwOTExNDRaMCExHzAdBgNVBAMMFmlkcC5taW5lcy1wYXJp
@@ -40,25 +40,25 @@ T/INlmCX3BSX60eghRNpETRWclB+RDSUeVezz6nzdLyIbAiJNn8rvHyQcF1T+n5z
 a7YwDEFqdkEs62OngI1LAUc2xFsAc7w2+uJtkU7Vk+7y/UnCY2xYh8iFYZqa535+
 QRVZMntYrGJNmrKeAcYsW548YxI4eGI=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mines-paristech.fr:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mines-paristech.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MINES ParisTech</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MINES ParisTech</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mines-paristech.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>VEILLAS Aurélien</md:SurName>
-      <md:EmailAddress>aurelien.veillas@mines-paristech.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mines-paristech.fr:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mines-paristech.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MINES ParisTech</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MINES ParisTech</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mines-paristech.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>VEILLAS Aurélien</md:SurName>
+    <md:EmailAddress>aurelien.veillas@mines-paristech.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml
index 3dd3b8e7..cefcc409 100644
--- a/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mines.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Colorado School of Mines</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Colorado School of Mines</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVALrVjyviCwnipvwjtC7VXHNfQYsFMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5taW5lcy5lZHUwHhcNMTQwNDA3MjAzMTE4WhcN
 MzQwNDA3MjAzMTE4WjAYMRYwFAYDVQQDEw1pZHAubWluZXMuZWR1MIIBIjANBgkq
@@ -40,23 +40,23 @@ S5KdtuOu7wnrrzkKQqY3zL4TDwK4qPZxOAFZcFSYdoPNGc+fKrhw7bo6S+ZSjFtm
 pDZoqzjpdIxwH4osA5q6R8DkFUHxsOQlPHTZozbBtkIcKigYYG2sEmKmHUxmV9zu
 t6dBbef3d3Mj0qVgNOz7Nyvv1qrAUw8WUziVYMzIeS9tQJa1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mines.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mines.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mines.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mines.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mines.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mines.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVALrVjyviCwnipvwjtC7VXHNfQYsFMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC5taW5lcy5lZHUwHhcNMTQwNDA3MjAzMTE4WhcN
 MzQwNDA3MjAzMTE4WjAYMRYwFAYDVQQDEw1pZHAubWluZXMuZWR1MIIBIjANBgkq
@@ -75,22 +75,22 @@ S5KdtuOu7wnrrzkKQqY3zL4TDwK4qPZxOAFZcFSYdoPNGc+fKrhw7bo6S+ZSjFtm
 pDZoqzjpdIxwH4osA5q6R8DkFUHxsOQlPHTZozbBtkIcKigYYG2sEmKmHUxmV9zu
 t6dBbef3d3Mj0qVgNOz7Nyvv1qrAUw8WUziVYMzIeS9tQJa1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mines.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Colorado School of Mines</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Colorado School of Mines</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mines.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew B. Brookover</md:GivenName>
-      <md:EmailAddress>mbrookov@mines.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Erickson</md:GivenName>
-      <md:EmailAddress>erickson@mines.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mines.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Colorado School of Mines</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Colorado School of Mines</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mines.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew B. Brookover</md:GivenName>
+    <md:EmailAddress>mbrookov@mines.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Erickson</md:GivenName>
+    <md:EmailAddress>erickson@mines.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml
index 62a1f2eb..802689d2 100644
--- a/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mkcollege.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mkcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mkcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mkcollege.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mkcollege.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Milton Keynes College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mkcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mkcollege.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mkcollege.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Milton Keynes College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mkcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml
index e4018f7a..c43e7a30 100644
--- a/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mmu.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T15:44:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T15:44:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mmu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF7zCCBNegAwIBAgIKEQ8ZqQAFAAGwijANBgkqhkiG9w0BAQUFADBsMRIwEAYK
 						CZImiZPyLGQBGRYCdWsxEjAQBgoJkiaJk/IsZAEZFgJhYzETMBEGCgmSJomT8ixk
 						ARkWA21tdTESMBAGCgmSJomT8ixkARkWAmFkMRkwFwYDVQQDExBhZC1KREVBRE1H
@@ -46,26 +46,26 @@
 						ZRaaAx9lEqDFa/xy/J6cRxhqq+Dw3TKBvOZyetNHg38Lwy2APwzTVlgdJrbR7+Wg
 						ooB93xRbkV/WtLUE+WHNVFjsTcVoQZ/XY4FMbXl5gqji35I=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mmu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mmu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF7zCCBNegAwIBAgIKEQ8ZqQAFAAGwijANBgkqhkiG9w0BAQUFADBsMRIwEAYK
 						CZImiZPyLGQBGRYCdWsxEjAQBgoJkiaJk/IsZAEZFgJhYzETMBEGCgmSJomT8ixk
 						ARkWA21tdTESMBAGCgmSJomT8ixkARkWAmFkMRkwFwYDVQQDExBhZC1KREVBRE1H
@@ -99,25 +99,25 @@
 						ZRaaAx9lEqDFa/xy/J6cRxhqq+Dw3TKBvOZyetNHg38Lwy2APwzTVlgdJrbR7+Wg
 						ooB93xRbkV/WtLUE+WHNVFjsTcVoQZ/XY4FMbXl5gqji35I=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Manchester Metropolitan University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Manchester Metropolitan University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://icts.mmu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Servers and Storage Team</md:GivenName>
-      <md:EmailAddress>mailto:ss@mmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Servers and Storage Team</md:GivenName>
-      <md:EmailAddress>mailto:ss@mmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Manchester Metropolitan University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Manchester Metropolitan University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://icts.mmu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Servers and Storage Team</md:GivenName>
+    <md:EmailAddress>mailto:ss@mmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Servers and Storage Team</md:GivenName>
+    <md:EmailAddress>mailto:ss@mmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml
index 6a86d037..63a01055 100644
--- a/swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.morleycollege.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">morleycollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">morleycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/morleycollege.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/morleycollege.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Morley College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.morleycollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/morleycollege.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/morleycollege.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Morley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.morleycollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml
index 72d1bfc0..4061487e 100644
--- a/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.motherwell.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">motherwell.co.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">motherwell.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQCYnW4c5CPhFjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTW90aGVyd2VsbDETMBEGA1UEBxMKTW90aGVyd2VsbDEgMB4G
 						A1UEChMXTmV3IENvbGxlZ2UgTGFuYXJrc2hpcmUxHTAbBgNVBAMTFGlkcC5tb3Ro
@@ -31,26 +31,26 @@
 						zeCIZ0ypZsxScQBRzsZ9aoS70pV6aQTT4mfGvOaLtOsSg9+43cDUPb1dR7G+VZlx
 						MOK0vjPGiv0YbkI+n6sWVw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.motherwell.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">motherwell.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.motherwell.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">motherwell.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQCYnW4c5CPhFjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTW90aGVyd2VsbDETMBEGA1UEBxMKTW90aGVyd2VsbDEgMB4G
 						A1UEChMXTmV3IENvbGxlZ2UgTGFuYXJrc2hpcmUxHTAbBgNVBAMTFGlkcC5tb3Ro
@@ -71,27 +71,27 @@
 						zeCIZ0ypZsxScQBRzsZ9aoS70pV6aQTT4mfGvOaLtOsSg9+43cDUPb1dR7G+VZlx
 						MOK0vjPGiv0YbkI+n6sWVw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New College Lanarkshire</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New College Lanarkshire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.motherwell.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Jennings</md:SurName>
-      <md:EmailAddress>mailto:stephen.jennings@nclan.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Jennings</md:SurName>
-      <md:EmailAddress>mailto:stephen.jennings@nclan.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New College Lanarkshire</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New College Lanarkshire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.motherwell.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Jennings</md:SurName>
+    <md:EmailAddress>mailto:stephen.jennings@nclan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Jennings</md:SurName>
+    <md:EmailAddress>mailto:stephen.jennings@nclan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml
index d87e2563..3d8d162a 100644
--- a/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.moulton.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">moulton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">moulton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQDjRj86cKfsGTANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEQMA4GA1UEBxMHTW91bHRvbjEY
 						MBYGA1UEChMPTW91bHRvbiBDb2xsZWdlMRowGAYDVQQDExFpZHAubW91bHRvbi5h
@@ -30,26 +30,26 @@
 						PRCx2+4iNLJQRd4C/4iv1y4/Lo72pGLFW/DmJFz/34pKiAX/BX5SaCKh0FpxGD72
 						jqR9DG0tXPLWlzynHoSxh9Q98PcM0N927sPgS4ATbex8oDx+iTOADL5+roeXRu7i
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.moulton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">moulton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.moulton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">moulton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkQCCQDjRj86cKfsGTANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
 						QjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEQMA4GA1UEBxMHTW91bHRvbjEY
 						MBYGA1UEChMPTW91bHRvbiBDb2xsZWdlMRowGAYDVQQDExFpZHAubW91bHRvbi5h
@@ -69,26 +69,26 @@
 						PRCx2+4iNLJQRd4C/4iv1y4/Lo72pGLFW/DmJFz/34pKiAX/BX5SaCKh0FpxGD72
 						jqR9DG0tXPLWlzynHoSxh9Q98PcM0N927sPgS4ATbex8oDx+iTOADL5+roeXRu7i
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Moulton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Moulton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.moulton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@moulton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Giles</md:GivenName>
-      <md:SurName>Batchelor</md:SurName>
-      <md:EmailAddress>mailto:giles.batchelor@moulton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Moulton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moulton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.moulton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@moulton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Giles</md:GivenName>
+    <md:SurName>Batchelor</md:SurName>
+    <md:EmailAddress>mailto:giles.batchelor@moulton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml
index 259ae209..9f6572e6 100644
--- a/swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mrc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mrc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mrc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Medical Research Council</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mrc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mrc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mrc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Medical Research Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mrc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
index a90a1f6d..89e8e892 100644
--- a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mta.hu/idp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+        <saml:AttributeValue>mtatitk</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-test</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-          <saml:AttributeValue>mtatitk</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Akadémiai Adattár (AAT)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hungarian Academy Database (AAT)</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA Titkárság</mdui:Description>
+        <mdui:Description xml:lang="en">Hungarian Academy of Sciences</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://aat.mta.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">https://aat.mta.hu/aat/Content/documents/35_2013_aat_adatvedelem.en.pdf</mdui:PrivacyStatementURL>
+        <mdui:Logo height="73" width="64">https://aat.mta.hu/aat/Content/images/mta_logo_small.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">MTA Akadémiai Adattár (AAT)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Hungarian Academy Database (AAT)</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">MTA Titkárság</mdui:Description>
-          <mdui:Description xml:lang="en">Hungarian Academy of Sciences</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://aat.mta.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">https://aat.mta.hu/aat/Content/documents/35_2013_aat_adatvedelem.en.pdf</mdui:PrivacyStatementURL>
-          <mdui:Logo height="73" width="64">https://aat.mta.hu/aat/Content/images/mta_logo_small.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAM4B1jSKcSpIMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAkhVMQowCAYDVQQIEwEgMREwDwYDVQQHEwhCdWRhcGVzdDEMMAoGA1UEChMDTVRBMRIwEAYDVQQLEwlUaXRrYXJzYWcxEzARBgNVBAMTCmlkcC5tdGEuaHUwHhcNMTQwMjE4MDgxODQ4WhcNMzMwNDE5MDgxODQ4WjBjMQswCQYDVQQGEwJIVTEKMAgGA1UECBMBIDERMA8GA1UEBxMIQnVkYXBlc3QxDDAKBgNVBAoTA01UQTESMBAGA1UECxMJVGl0a2Fyc2FnMRMwEQYDVQQDEwppZHAubXRhLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArXgM7QbY9DMXbKVA2N0pYeN2pOpvCjfchMWdCLwccd4n02NSff/+K2gyvQutMaxsYtCY8JjY2FIeU+IMig2LjuMCMHXIpntGhULa2+T6xcyclt5sp7hp7+NdD/L6dt2GRAEFJto3ostW4PV3eX5D3r0P7NjaC3LrtcDM+iwpp6HqFsUYZXPT0EiH5tJnZDo+EhlfPm3j5fMvQOiSe0hp5hjtoSgn/etcve9WlEH7pqF8AlDk7SkSvTUgbMUtGPmvdNxk6H1ENJRsad2vf7CxxtXfKvKKi1tYEmPQsY4A/9X9FCmprWxJ4bMvGdjST/mEvRwtpKihJ7PiU1qrMU7prwIDAQABo4HIMIHFMB0GA1UdDgQWBBTHn9gU0vszSRWaAnv7wekfRqUqkzCBlQYDVR0jBIGNMIGKgBTHn9gU0vszSRWaAnv7wekfRqUqk6FnpGUwYzELMAkGA1UEBhMCSFUxCjAIBgNVBAgTASAxETAPBgNVBAcTCEJ1ZGFwZXN0MQwwCgYDVQQKEwNNVEExEjAQBgNVBAsTCVRpdGthcnNhZzETMBEGA1UEAxMKaWRwLm10YS5odYIJAM4B1jSKcSpIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABU1PdlMVAXcFlAbKRjy6Oo1Y4TkmGihKcfUooTdSU45em1ZpichtPtOM4UocQwC95HXgEk28FJqJasVAlRoGoOmtBY9+D8bitVz/xVPcHgt9U7XY8+Q0O07iCdsKFeUCO7iH9kezfIvHPL9jVm0NJMUFZzME3mFcm2+5Qq8ZmYSGTXnkdEamR9EFL2CgC8QnuMxNK3VHbmU2Wc/QjOW0Mp9DdSIBZNXc5i2ANiyHDVl2iIK6U06r4Dr3zafoaLuQrbP15bZgoSda958GYYKnCV58cj5HdXM7ugT18L4KCG+bZkSQtI6ow4aBSxUMGrlf1qJIRNci9Q8FiBbF09hrLc=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.mta.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA Titkárság</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA Titkárság</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://aat.mta.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://aat.mta.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>AAT</md:SurName>
-      <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>AAT</md:SurName>
-      <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>AAT</md:SurName>
-      <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAM4B1jSKcSpIMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAkhVMQowCAYDVQQIEwEgMREwDwYDVQQHEwhCdWRhcGVzdDEMMAoGA1UEChMDTVRBMRIwEAYDVQQLEwlUaXRrYXJzYWcxEzARBgNVBAMTCmlkcC5tdGEuaHUwHhcNMTQwMjE4MDgxODQ4WhcNMzMwNDE5MDgxODQ4WjBjMQswCQYDVQQGEwJIVTEKMAgGA1UECBMBIDERMA8GA1UEBxMIQnVkYXBlc3QxDDAKBgNVBAoTA01UQTESMBAGA1UECxMJVGl0a2Fyc2FnMRMwEQYDVQQDEwppZHAubXRhLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArXgM7QbY9DMXbKVA2N0pYeN2pOpvCjfchMWdCLwccd4n02NSff/+K2gyvQutMaxsYtCY8JjY2FIeU+IMig2LjuMCMHXIpntGhULa2+T6xcyclt5sp7hp7+NdD/L6dt2GRAEFJto3ostW4PV3eX5D3r0P7NjaC3LrtcDM+iwpp6HqFsUYZXPT0EiH5tJnZDo+EhlfPm3j5fMvQOiSe0hp5hjtoSgn/etcve9WlEH7pqF8AlDk7SkSvTUgbMUtGPmvdNxk6H1ENJRsad2vf7CxxtXfKvKKi1tYEmPQsY4A/9X9FCmprWxJ4bMvGdjST/mEvRwtpKihJ7PiU1qrMU7prwIDAQABo4HIMIHFMB0GA1UdDgQWBBTHn9gU0vszSRWaAnv7wekfRqUqkzCBlQYDVR0jBIGNMIGKgBTHn9gU0vszSRWaAnv7wekfRqUqk6FnpGUwYzELMAkGA1UEBhMCSFUxCjAIBgNVBAgTASAxETAPBgNVBAcTCEJ1ZGFwZXN0MQwwCgYDVQQKEwNNVEExEjAQBgNVBAsTCVRpdGthcnNhZzETMBEGA1UEAxMKaWRwLm10YS5odYIJAM4B1jSKcSpIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABU1PdlMVAXcFlAbKRjy6Oo1Y4TkmGihKcfUooTdSU45em1ZpichtPtOM4UocQwC95HXgEk28FJqJasVAlRoGoOmtBY9+D8bitVz/xVPcHgt9U7XY8+Q0O07iCdsKFeUCO7iH9kezfIvHPL9jVm0NJMUFZzME3mFcm2+5Qq8ZmYSGTXnkdEamR9EFL2CgC8QnuMxNK3VHbmU2Wc/QjOW0Mp9DdSIBZNXc5i2ANiyHDVl2iIK6U06r4Dr3zafoaLuQrbP15bZgoSda958GYYKnCV58cj5HdXM7ugT18L4KCG+bZkSQtI6ow4aBSxUMGrlf1qJIRNci9Q8FiBbF09hrLc=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA Titkárság</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA Titkárság</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://aat.mta.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://aat.mta.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>AAT</md:SurName>
+    <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>AAT</md:SurName>
+    <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>AAT</md:SurName>
+    <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml
index 80f95da8..4ce6e221 100644
--- a/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mtholyoke.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mtholyoke.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mount Holyoke College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mtholyoke.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mount Holyoke College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAJLHPh0wvbbq2rKg/fYPlc/eTL6CMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC5tdGhvbHlva2UuZWR1MB4XDTExMDQwNjEzNDYz
 NFoXDTMxMDQwNjEzNDYzNFowHDEaMBgGA1UEAxMRaWRwLm10aG9seW9rZS5lZHUw
@@ -38,23 +38,23 @@ cG0XRJrEP6HIdLq10N59R+sc38y3CkE0oIEQHRnXy4C6OJoM+JDou/86e/qJVbLg
 TimgEPq/+TG6lDTgqjFctblZ8vbJbJvYkAe+4fXrASxBJ7KPGRig7NtfV/Kcb34p
 cTHctQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mtholyoke.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mtholyoke.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mtholyoke.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mtholyoke.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mtholyoke.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mtholyoke.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mtholyoke.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mtholyoke.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAJLHPh0wvbbq2rKg/fYPlc/eTL6CMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC5tdGhvbHlva2UuZWR1MB4XDTExMDQwNjEzNDYz
 NFoXDTMxMDQwNjEzNDYzNFowHDEaMBgGA1UEAxMRaWRwLm10aG9seW9rZS5lZHUw
@@ -74,26 +74,26 @@ cG0XRJrEP6HIdLq10N59R+sc38y3CkE0oIEQHRnXy4C6OJoM+JDou/86e/qJVbLg
 TimgEPq/+TG6lDTgqjFctblZ8vbJbJvYkAe+4fXrASxBJ7KPGRig7NtfV/Kcb34p
 cTHctQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mount Holyoke College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mount Holyoke College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mtholyoke.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy Maryott</md:GivenName>
-      <md:EmailAddress>jmaryott@mtholyoke.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ron Peterson</md:GivenName>
-      <md:EmailAddress>rpeterso@mtholyoke.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jeremy Maryott</md:GivenName>
-      <md:EmailAddress>jmaryott@mtholyoke.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mount Holyoke College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mount Holyoke College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mtholyoke.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy Maryott</md:GivenName>
+    <md:EmailAddress>jmaryott@mtholyoke.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ron Peterson</md:GivenName>
+    <md:EmailAddress>rpeterso@mtholyoke.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jeremy Maryott</md:GivenName>
+    <md:EmailAddress>jmaryott@mtholyoke.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml
index 58e1eec3..75afadb0 100644
--- a/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.natcen.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natcen.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natcen.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/natcen.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/natcen.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Centre for Social Research</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.natcen.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/natcen.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/natcen.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Centre for Social Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.natcen.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml
index e8e3198a..5ee4cb0b 100644
--- a/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nbi.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T17:37:34Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T17:37:34Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nbi.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nbi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAP8HG8Tqa3oYPeErtZhxjc1ROFKaMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5uYmkuYWMudWswHhcNMTMwNzA5MTY0MDUwWhcN
 						MzMwNzA5MTY0MDUwWjAYMRYwFAYDVQQDEw1pZHAubmJpLmFjLnVrMIIBIjANBgkq
@@ -29,29 +29,29 @@
 						p39TmmBquj3bNJibKeCeQIM3YEwP38H74axMyVSrKyLhAI3atsZdBvpwjJ2bwbMU
 						vJg9GInLqz3AeBmDXF1Kze/Tqpmcsegii41FP5UoBUSMNhZV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nbi.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nbi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nbi.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nbi.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAP8HG8Tqa3oYPeErtZhxjc1ROFKaMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5uYmkuYWMudWswHhcNMTMwNzA5MTY0MDUwWhcN
 						MzMwNzA5MTY0MDUwWjAYMRYwFAYDVQQDEw1pZHAubmJpLmFjLnVrMIIBIjANBgkq
@@ -70,26 +70,26 @@
 						p39TmmBquj3bNJibKeCeQIM3YEwP38H74axMyVSrKyLhAI3atsZdBvpwjJ2bwbMU
 						vJg9GInLqz3AeBmDXF1Kze/Tqpmcsegii41FP5UoBUSMNhZV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NBI Partnership Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Norwich Bioscience Institutes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nbi.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computing Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:computing.helpdesk@nbi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mohamed</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:Mohamed.imran@nbi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NBI Partnership Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Norwich Bioscience Institutes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nbi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computing Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:computing.helpdesk@nbi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mohamed</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:Mohamed.imran@nbi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
index 8209d3d9..fd831045 100644
--- a/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ncirl.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncirl.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National College of Ireland</mdui:DisplayName>
+        <mdui:Description xml:lang="en">National College of Ireland</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.34900526916922,-6.243662238121033</mdui:GeolocationHint>
+        <mdui:DomainHint>ncirl.ie</mdui:DomainHint>
+        <mdui:IPHint>193.1.209.0/24</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncirl.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National College of Ireland</mdui:DisplayName>
-          <mdui:Description xml:lang="en">National College of Ireland</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
-          <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.34900526916922,-6.243662238121033</mdui:GeolocationHint>
-          <mdui:DomainHint>ncirl.ie</mdui:DomainHint>
-          <mdui:IPHint>193.1.209.0/24</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUDymT+0qnFpj+1wBK67kpD4GOwBQwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMB4XDTE0MDExNTEzNTQ0NloXDTM0
 MDExNTEzNTQ0NlowFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMIIBIjANBgkqhkiG
@@ -42,37 +42,37 @@ vELnlgNrvB9nRAbI8OfYuUhrHCEQpoEcvGNoXtZfbRCYoA0RSKZzoLMP8+mtgrMN
 QoD56UPu/9sTcUyhMp+wrXLZE2YuAru5feZwGSOWMk+CKosq75DBJ6xlJKMEMpYe
 EpAWVSexjo2IWj8KAOEJOpUl5z8XsVybIWIR1IUvYw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ncirl.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ncirl.ie/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ncirl.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National College of Ireland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National College of Ireland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://nci360.ncirl.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Duncan</md:SurName>
-      <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Duncan</md:SurName>
-      <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Duncan</md:SurName>
-      <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ncirl.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ncirl.ie/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ncirl.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National College of Ireland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National College of Ireland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://nci360.ncirl.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Duncan</md:SurName>
+    <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Duncan</md:SurName>
+    <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Duncan</md:SurName>
+    <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml
index 51089679..7b4b62fb 100644
--- a/swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ndevon.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndevon.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndevon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -38,23 +38,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ndevon.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ndevon.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Petroc College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.petroc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ndevon.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ndevon.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Petroc College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.petroc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml
index 1e391fd5..4cd8770a 100644
--- a/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ndsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://www.ndsu.edu/its/help_desk/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">North Dakota State University Main Campus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">North Dakota State University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.ndsu.edu/eci/shibboleth/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.ndsu.edu/its/security/privacy_statement/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://www.ndsu.edu/shibboleth/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://www.ndsu.edu/its/help_desk/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">North Dakota State University Main Campus</mdui:DisplayName>
-          <mdui:Description xml:lang="en">North Dakota State University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.ndsu.edu/eci/shibboleth/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.ndsu.edu/its/security/privacy_statement/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="64" width="350" xml:lang="en">https://www.ndsu.edu/shibboleth/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAJsvdlzoRM6CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5uZHN1LmVkdTAeFw0xMzA1MTMxOTMxMDVaFw0xODA1MTIxOTMxMDVa
 MBcxFTATBgNVBAMTDGlkcC5uZHN1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -41,23 +41,23 @@ nPRxc/bMRjwLBPtRcj1xRshA23oVn6lIed1X7v9dw669D1wPokxISGfyhX/VW9Hz
 1T4qDbBdK5k9K5NyX1HtLsLHWVhZoAy1AL5rpS0l0MhLohRz7ID3aclZ8BcXe4+R
 dMYsTGki/jn1sU0tN+ygdpOluNqxubLuutgONSK4fPKLr86vj0B6rzCRo1VM
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ndsu.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ndsu.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ndsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ndsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ndsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ndsu.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ndsu.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ndsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ndsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ndsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAJsvdlzoRM6CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5uZHN1LmVkdTAeFw0xMzA1MTMxOTMxMDVaFw0xODA1MTIxOTMxMDVa
 MBcxFTATBgNVBAMTDGlkcC5uZHN1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -76,22 +76,22 @@ nPRxc/bMRjwLBPtRcj1xRshA23oVn6lIed1X7v9dw669D1wPokxISGfyhX/VW9Hz
 1T4qDbBdK5k9K5NyX1HtLsLHWVhZoAy1AL5rpS0l0MhLohRz7ID3aclZ8BcXe4+R
 dMYsTGki/jn1sU0tN+ygdpOluNqxubLuutgONSK4fPKLr86vj0B6rzCRo1VM
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ndsu.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North Dakota State University Main Campus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North Dakota State University Main Campus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ndsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NDSU Help Desk</md:GivenName>
-      <md:EmailAddress>ndsu.helpdesk@ndsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NDSU Help Desk</md:GivenName>
-      <md:EmailAddress>ndsu.helpdesk@ndsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ndsu.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North Dakota State University Main Campus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North Dakota State University Main Campus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ndsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NDSU Help Desk</md:GivenName>
+    <md:EmailAddress>ndsu.helpdesk@ndsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NDSU Help Desk</md:GivenName>
+    <md:EmailAddress>ndsu.helpdesk@ndsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml
index b3d25ad3..01b20af1 100644
--- a/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ne-worcs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-13T12:19:41Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-13T12:19:41Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ne-worcs.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ne-worcs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrDCCApQCCQCVGi7e0Pph5TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEq
 						MCgGA1UECgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYD
@@ -37,26 +37,26 @@
 						uVHlFJixhZuiIvAi/QzgjZruWzKySCZGWSajHqHBdxcojzB4Oao82vsJu4S3Mv/W
 						tT1EKx/axaYI5jW/ThK191F3j5568qM0exHyrfCZbIw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ne-worcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ne-worcs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ne-worcs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ne-worcs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrDCCApQCCQCVGi7e0Pph5TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEq
 						MCgGA1UECgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYD
@@ -78,27 +78,27 @@
 						uVHlFJixhZuiIvAi/QzgjZruWzKySCZGWSajHqHBdxcojzB4Oao82vsJu4S3Mv/W
 						tT1EKx/axaYI5jW/ThK191F3j5568qM0exHyrfCZbIw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North East Worcestershire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ne-worcs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Kings</md:SurName>
-      <md:EmailAddress>mailto:dkings@howcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Kings</md:SurName>
-      <md:EmailAddress>mailto:dkings@howcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North East Worcestershire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ne-worcs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Kings</md:SurName>
+    <md:EmailAddress>mailto:dkings@howcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Kings</md:SurName>
+    <md:EmailAddress>mailto:dkings@howcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml
index 59d3c618..d91e95c8 100644
--- a/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nelson.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nelson.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nelson.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nelson.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nelson.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nelson College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nelson.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nelson.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nelson.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nelson College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nelson.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
index 406bb888..c7439b61 100644
--- a/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nescol.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-28T15:27:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-28T15:27:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescol.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescol.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAKEDzkStX1FCYI1ncdQf2sHeDpAgMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDIx
 						WhcNMzUxMDA3MDc0NDIxWjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
@@ -32,13 +32,13 @@
 						npzDfkAZg6ZDHz2b/XDpz3p07Eb7th/Uxhyhtg9YDBJji3g0ozzEC8xTVGPiXyyV
 						90sld2GFXRpujyBGKqq8A2kcuZzp/svH+PaKhkbV6fhL6RIlRemx6dEMA31Ct813
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAIMqlry3pKY0TO9+Ll0+SdKXHYjFMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE4
 						WhcNMzUxMDA3MDc0NDE4WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
@@ -57,13 +57,13 @@
 						LLZOOH1RKpXXNoRp521Lei3Mr/EYMwe3pucZu4IC4uERtbVUz/L3XmSzYcCMhCM3
 						ruIQQmwfNLTUYaaqf0RFqHo7tm1BBqeuNuw8t+lGEwI+DQkO6CTrfmct9MzHWs0V
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAPQaMyaBdI++UopEGmsCDtG4CXdlMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE5
 						WhcNMzUxMDA3MDc0NDE5WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
@@ -82,27 +82,27 @@
 						IDGil+m69K3wBXk7WnA+yAi66E2MWUwOi4qWBCtMq1icN++lpLHZoAa743qkRUly
 						zsjInuoJhw2oC82Qyj8cZIqtSa78iFkJEnih68qBekU4B54y2PvqtkvVZonmTskY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nescol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescol.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nescol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescol.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAKEDzkStX1FCYI1ncdQf2sHeDpAgMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDIx
 						WhcNMzUxMDA3MDc0NDIxWjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
@@ -121,13 +121,13 @@
 						npzDfkAZg6ZDHz2b/XDpz3p07Eb7th/Uxhyhtg9YDBJji3g0ozzEC8xTVGPiXyyV
 						90sld2GFXRpujyBGKqq8A2kcuZzp/svH+PaKhkbV6fhL6RIlRemx6dEMA31Ct813
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAIMqlry3pKY0TO9+Ll0+SdKXHYjFMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE4
 						WhcNMzUxMDA3MDc0NDE4WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
@@ -146,13 +146,13 @@
 						LLZOOH1RKpXXNoRp521Lei3Mr/EYMwe3pucZu4IC4uERtbVUz/L3XmSzYcCMhCM3
 						ruIQQmwfNLTUYaaqf0RFqHo7tm1BBqeuNuw8t+lGEwI+DQkO6CTrfmct9MzHWs0V
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAPQaMyaBdI++UopEGmsCDtG4CXdlMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE5
 						WhcNMzUxMDA3MDc0NDE5WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
@@ -171,24 +171,24 @@
 						IDGil+m69K3wBXk7WnA+yAi66E2MWUwOi4qWBCtMq1icN++lpLHZoAa743qkRUly
 						zsjInuoJhw2oC82Qyj8cZIqtSa78iFkJEnih68qBekU4B54y2PvqtkvVZonmTskY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North East Scotland College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North East Scotland College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nescol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Sherrit</md:SurName>
-      <md:EmailAddress>mailto:m.sherrit@nescol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Sherrit</md:SurName>
-      <md:EmailAddress>mailto:m.sherrit@nescol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North East Scotland College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North East Scotland College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nescol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Sherrit</md:SurName>
+    <md:EmailAddress>mailto:m.sherrit@nescol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Sherrit</md:SurName>
+    <md:EmailAddress>mailto:m.sherrit@nescol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml
index 46d673e4..da884ed7 100644
--- a/swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nescot.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescot.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nescot.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nescot.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nescot.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NESCOT (North East Surrey College of Technology)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nescot.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nescot.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nescot.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NESCOT (North East Surrey College of Technology)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nescot.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml
index f795e0d1..c88e24c5 100644
--- a/swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newbold.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newbold.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newbold.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newbold.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newbold.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newbold College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newbold.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newbold.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newbold.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newbold College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newbold.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
index ce3474f6..ceeb6383 100644
--- a/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
+++ b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newcollege.ac.uk/athensla">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:21:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:21:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newcollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">New College Swindon LA</mdui:DisplayName>
+        <mdui:Logo height="523" width="258">https://www.newcollege.ac.uk/athens/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newcollege.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">New College Swindon LA</mdui:DisplayName>
-          <mdui:Logo height="523" width="258">https://www.newcollege.ac.uk/athens/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkigAwIBAgIIDMoTE+e8SLkwDQYJKoZIhvcNAQEFBQAwRzEcMBoGA1UE
 						CgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5zcnVudGltZS5u
 						ZXdjb2xsZWdlLmFjLnVrMB4XDTE0MDkwOTEzMjk0N1oXDTI0MDkwOTEzMjk0N1ow
@@ -37,13 +37,13 @@
 						73sUhZUXRR7JmqIZsXmX80WflC+LakBe+LKGsAqzCHcYBP1dFImF5M0fDOFSOqYN
 						/0f/XA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkigAwIBAgIIDMoTE+e8SLkwDQYJKoZIhvcNAQEFBQAwRzEcMBoGA1UE
 						CgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5zcnVudGltZS5u
 						ZXdjb2xsZWdlLmFjLnVrMB4XDTE0MDkwOTEzMjk0N1oXDTI0MDkwOTEzMjk0N1ow
@@ -64,25 +64,25 @@
 						73sUhZUXRR7JmqIZsXmX80WflC+LakBe+LKGsAqzCHcYBP1dFImF5M0fDOFSOqYN
 						/0f/XA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New College Swindon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New College Swindon LA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newcollege.ac.uk/athens/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Turpin</md:SurName>
-      <md:EmailAddress>mailto:richard.turpin@newcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Hole</md:SurName>
-      <md:EmailAddress>mailto:Ian.hole@newcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New College Swindon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New College Swindon LA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newcollege.ac.uk/athens/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Turpin</md:SurName>
+    <md:EmailAddress>mailto:richard.turpin@newcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Hole</md:SurName>
+    <md:EmailAddress>mailto:Ian.hole@newcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml
index cac1eda7..a54f4dca 100644
--- a/swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newdur.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newdur.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newdur.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newdur.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newdur.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New College Durham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newdur.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newdur.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newdur.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New College Durham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newdur.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newman.ac.uk-metadata.xml b/swamid-interfederations-2.0/idp.newman.ac.uk-metadata.xml
index d01a7870..14ebab1a 100644
--- a/swamid-interfederations-2.0/idp.newman.ac.uk-metadata.xml
+++ b/swamid-interfederations-2.0/idp.newman.ac.uk-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newman.ac.uk/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newman.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newman.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newman.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newman.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newman University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newman.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newman.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newman.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newman University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newman.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
index e5bd55fc..a31f517c 100644
--- a/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newvic.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-01T11:40:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-01T11:40:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newvic.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newvic.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUc68eei2OkuHHobEIjasrgMJSBp4wDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAxMQaWRwLm5ld3ZpYy5hYy51azAeFw0xNDAzMDcwOTMyMTJa
 						Fw0zNDAzMDcwOTMyMTJaMBsxGTAXBgNVBAMTEGlkcC5uZXd2aWMuYWMudWswggEi
@@ -31,29 +31,29 @@
 						gqBLVoEVcJJVnarmoxxabzVBfVeG9/x3PbjE0rlJ64l4kp1VM8RKGW1C3RI8bxNN
 						vIEuNvfpiGOHrzJP801TYK1JLfAGxuEqpRictkktztc/gU5mjgoPsMRm6V6r0Zk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.newvic.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newvic.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.newvic.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newvic.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUc68eei2OkuHHobEIjasrgMJSBp4wDQYJKoZIhvcNAQEF
 						BQAwGzEZMBcGA1UEAxMQaWRwLm5ld3ZpYy5hYy51azAeFw0xNDAzMDcwOTMyMTJa
 						Fw0zNDAzMDcwOTMyMTJaMBsxGTAXBgNVBAMTEGlkcC5uZXd2aWMuYWMudWswggEi
@@ -72,26 +72,26 @@
 						gqBLVoEVcJJVnarmoxxabzVBfVeG9/x3PbjE0rlJ64l4kp1VM8RKGW1C3RI8bxNN
 						vIEuNvfpiGOHrzJP801TYK1JLfAGxuEqpRictkktztc/gU5mjgoPsMRm6V6r0Zk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Newham Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newham Sixth Form College (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newvic.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software Support</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Akik</md:GivenName>
-      <md:SurName>Miah</md:SurName>
-      <md:EmailAddress>mailto:amiah@newvic.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Newham Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newham Sixth Form College (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newvic.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Akik</md:GivenName>
+    <md:SurName>Miah</md:SurName>
+    <md:EmailAddress>mailto:amiah@newvic.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml
index 6ca4fd42..9de50906 100644
--- a/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nhc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-28T16:56:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-28T16:56:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUNuc5nh8nE6/6dgrZJmkSDgYUjPowDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLm5oYy5hYy51azAeFw0xMzA5MTcxNDAyNTdaFw0z
 						MzA5MTcxNDAyNTdaMBgxFjAUBgNVBAMTDWlkcC5uaGMuYWMudWswggEiMA0GCSqG
@@ -31,26 +31,26 @@
 						qnhkB5Cb3ZOmXacyhKtdqxwdetV/CeBsAgKkgQhpcfOGMVgrDev1TloiTpBhztJ8
 						KUOIvFZJgKFEIOZLmPagprpvbjZAHnZMQCyERkglvdkQ2Z0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nhc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nhc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUNuc5nh8nE6/6dgrZJmkSDgYUjPowDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLm5oYy5hYy51azAeFw0xMzA5MTcxNDAyNTdaFw0z
 						MzA5MTcxNDAyNTdaMBgxFjAUBgNVBAMTDWlkcC5uaGMuYWMudWswggEiMA0GCSqG
@@ -69,27 +69,27 @@
 						qnhkB5Cb3ZOmXacyhKtdqxwdetV/CeBsAgKkgQhpcfOGMVgrDev1TloiTpBhztJ8
 						KUOIvFZJgKFEIOZLmPagprpvbjZAHnZMQCyERkglvdkQ2Z0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North Hertfordshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North Hertfordshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nhc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Haley</md:SurName>
-      <md:EmailAddress>mailto:mhaley@nhc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Haley</md:SurName>
-      <md:EmailAddress>mailto:mhaley@nhc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North Hertfordshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North Hertfordshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nhc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Haley</md:SurName>
+    <md:EmailAddress>mailto:mhaley@nhc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Haley</md:SurName>
+    <md:EmailAddress>mailto:mhaley@nhc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nhl.nl-.xml b/swamid-interfederations-2.0/idp.nhl.nl-.xml
index cbae8880..e4fa6271 100644
--- a/swamid-interfederations-2.0/idp.nhl.nl-.xml
+++ b/swamid-interfederations-2.0/idp.nhl.nl-.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nhl.nl/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">NHL Hogeschool</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NHL Hogeschool</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">NHL Hogeschool</mdui:Description>
+        <mdui:Description xml:lang="en">NHL Hogeschool</mdui:Description>
+        <mdui:Logo height="47" width="68">https://static.surfconext.nl/logos/idp/nhl.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">NHL Hogeschool</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">NHL Hogeschool</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">NHL Hogeschool</mdui:Description>
-          <mdui:Description xml:lang="en">NHL Hogeschool</mdui:Description>
-          <mdui:Logo height="47" width="68">https://static.surfconext.nl/logos/idp/nhl.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/956bebc4302f328ea5722d84005d17ef"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NHL Hogeschool</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NHL Hogeschool</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nhl.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/956bebc4302f328ea5722d84005d17ef"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NHL Hogeschool</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NHL Hogeschool</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nhl.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
index c4f59f43..3dee11fb 100644
--- a/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niesr.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niesr.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niesr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/niesr.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/niesr.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institute of Economic &amp; Social Research</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.niesr.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/niesr.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/niesr.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute of Economic &amp; Social Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.niesr.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
index 6faa0095..f6c4159b 100644
--- a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>niifi</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+        <saml:AttributeValue>hexaa</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>niifi</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-test</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-          <saml:AttributeValue>hexaa</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.6.222.0/24</mdui:IPHint>
+        <mdui:IPHint>193.6.223.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">NIIF Intézet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NIIF Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:Description>
+        <mdui:Description xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:Description>
+        <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.6.222.0/24</mdui:IPHint>
-          <mdui:IPHint>193.6.223.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">NIIF Intézet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">NIIF Institute</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:Description>
-          <mdui:Description xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:Description>
-          <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVaFw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGmJ/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAEbQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSiuov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17egIqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uKAd98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG14Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlYMB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulksHUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbKZp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6NtocI7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDycAuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14tty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.niif.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NIIF AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NIIF AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>NIIF AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVaFw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGmJ/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAEbQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSiuov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17egIqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uKAd98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG14Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlYMB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulksHUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbKZp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6NtocI7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDycAuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14tty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml
index c7c3f9e2..3d29132a 100644
--- a/swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Northern Illinois University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Northern Illinois University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUKnaPgEQSbfYJd3gH9ZzjBNXVpDwwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLm5pdS5lZHUwHhcNMTIwNjI1MjEyMzQyWhcNMzIw
 NjI1MjEyMzQyWjAWMRQwEgYDVQQDEwtpZHAubml1LmVkdTCCASIwDQYJKoZIhvcN
@@ -40,23 +40,23 @@ UOqBrWO6GFnhn3OYsTxtSiT8RO7XI4tq3aBxKUfjd1p9eM5OtHvOFSZEjGEyFomL
 XQZKskmaxo4qmHMwKxfx3+KgBRWg2Ulsdo2LXvFPNDcpPKqxzMttT63xvyeSDICa
 H83FixTxhPWSdCCW+q92fF/ESMtrlCQHBvAy
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.niu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.niu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.niu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.niu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.niu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.niu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUKnaPgEQSbfYJd3gH9ZzjBNXVpDwwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLm5pdS5lZHUwHhcNMTIwNjI1MjEyMzQyWhcNMzIw
 NjI1MjEyMzQyWjAWMRQwEgYDVQQDEwtpZHAubml1LmVkdTCCASIwDQYJKoZIhvcN
@@ -75,26 +75,26 @@ UOqBrWO6GFnhn3OYsTxtSiT8RO7XI4tq3aBxKUfjd1p9eM5OtHvOFSZEjGEyFomL
 XQZKskmaxo4qmHMwKxfx3+KgBRWg2Ulsdo2LXvFPNDcpPKqxzMttT63xvyeSDICa
 H83FixTxhPWSdCCW+q92fF/ESMtrlCQHBvAy
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.niu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northern Illinois University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northern Illinois University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.niu.edu/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Gersic</md:GivenName>
-      <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Gersic</md:GivenName>
-      <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David Gersic</md:GivenName>
-      <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.niu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northern Illinois University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northern Illinois University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.niu.edu/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Gersic</md:GivenName>
+    <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Gersic</md:GivenName>
+    <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David Gersic</md:GivenName>
+    <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
index ba450eb0..c0bb349b 100644
--- a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nordu.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
+        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
+        <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>nordu.net</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
-          <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
-          <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>nordu.net</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
 OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
@@ -44,26 +44,26 @@ aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
 JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nordu.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nordu.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
 OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
@@ -83,32 +83,32 @@ aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
 JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>NORDUnet</md:Company>
-      <md:SurName>noc@nordu.net</md:SurName>
-      <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>NORDUnet</md:Company>
-      <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>NORDUnet</md:Company>
-      <md:SurName>NUNOC</md:SurName>
-      <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>NORDUnet</md:Company>
+    <md:SurName>noc@nordu.net</md:SurName>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>NORDUnet</md:Company>
+    <md:SurName>NUNOC</md:SurName>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
index d5eb4bff..38ff219f 100644
--- a/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.normandie-univ.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T17:47:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T17:47:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">normandie-univ.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Normandie Université</mdui:DisplayName>
+        <mdui:Logo height="12" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADAC6sfCeAAACd0lEQVQoz22Sy0tUYRjGn/f7vnPxzMXUHMUkKgwU0hbZtlYSkQuLhIhAIhdhtWnTsk1RCFHYoiAIoqBokDaZIEQIhUSUopsuUpapeGvGmTlz5ty+t4W0yucPePjx/B4CAGYQEfjbUIvV3NDRySTDIESshbRMP9xIuGtzdGHcxRYhACjd68qwk76STFud5UpkElgLAmJN2rENq+j5v2TE1xN9w5P/FfDQUbNcl77hZBKXQQAYgGkCQgBBAOgYYKC85n4gr9LTd85aG+hrcgbfaW909q6v/LqqZiYcgkF+8Xdx0TYoNOyNHwDrOFRN5QqqU47KmEoeVLVmWxbZ19lHCP4RKFdQfZXmPCAsU8FdyWHs/XTCFtrA3t3udMvuuANK7gp8v1jwRPPp1v4DKapvWCksL7xYeDgjlBYMQYSkraXUs89GqqaejzoDY+MNA3cepz1mmmDLBGvYs99VikMxWGOnRyzLuNXbeKlOkNDEzARo7fnkbLjUQOCYKUQYoXZpVWwHAAZRwRMJ1gJBHIBAEqa3U6RSy1+Z+SfWyyqKsLC4KFaFpMBQiHN5/Kky+DP5heWkE0+Wivjih5QnoUNmDrSIlaLut7nSk97b+fnceDmiqdWCaHNsBK4fSCWp6+aD5Py+1mC64gvv44x5Rklur0SbG6qYXGKAaFMeAOBUS/9JWySyBIEYPsq+5kJJTiulEzVJ0cKIghorY657y59KleIRRQC/uXpY5ee2JXuOmcXu88EEVdMrKY32SEcJy5DpHfW8XzMjjOKQgVIlKheh9fDLpadrtNU9T2TO7jGT8iJYHCdCIyBMBjMBAoQcx/H9eG7jWhZZ7y9HJjS0VZLfHQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.normandie-univ.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Normandie Université's IDP is only used by people of The Comue Normandie University and not by users members of Normandie Université</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Normandie Université</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">L'IDP Normandie Université est utilisé par les individus de la Comue Normandie Université et non par les individus des établissements qui la composent.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">normandie-univ.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Normandie Université</mdui:DisplayName>
-          <mdui:Logo height="12" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADAC6sfCeAAACd0lEQVQoz22Sy0tUYRjGn/f7vnPxzMXUHMUkKgwU0hbZtlYSkQuLhIhAIhdhtWnTsk1RCFHYoiAIoqBokDaZIEQIhUSUopsuUpapeGvGmTlz5ty+t4W0yucPePjx/B4CAGYQEfjbUIvV3NDRySTDIESshbRMP9xIuGtzdGHcxRYhACjd68qwk76STFud5UpkElgLAmJN2rENq+j5v2TE1xN9w5P/FfDQUbNcl77hZBKXQQAYgGkCQgBBAOgYYKC85n4gr9LTd85aG+hrcgbfaW909q6v/LqqZiYcgkF+8Xdx0TYoNOyNHwDrOFRN5QqqU47KmEoeVLVmWxbZ19lHCP4RKFdQfZXmPCAsU8FdyWHs/XTCFtrA3t3udMvuuANK7gp8v1jwRPPp1v4DKapvWCksL7xYeDgjlBYMQYSkraXUs89GqqaejzoDY+MNA3cepz1mmmDLBGvYs99VikMxWGOnRyzLuNXbeKlOkNDEzARo7fnkbLjUQOCYKUQYoXZpVWwHAAZRwRMJ1gJBHIBAEqa3U6RSy1+Z+SfWyyqKsLC4KFaFpMBQiHN5/Kky+DP5heWkE0+Wivjih5QnoUNmDrSIlaLut7nSk97b+fnceDmiqdWCaHNsBK4fSCWp6+aD5Py+1mC64gvv44x5Rklur0SbG6qYXGKAaFMeAOBUS/9JWySyBIEYPsq+5kJJTiulEzVJ0cKIghorY657y59KleIRRQC/uXpY5ee2JXuOmcXu88EEVdMrKY32SEcJy5DpHfW8XzMjjOKQgVIlKheh9fDLpadrtNU9T2TO7jGT8iJYHCdCIyBMBjMBAoQcx/H9eG7jWhZZ7y9HJjS0VZLfHQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.normandie-univ.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Normandie Université's IDP is only used by people of The Comue Normandie University and not by users members of Normandie Université</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Normandie Université</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">L'IDP Normandie Université est utilisé par les individus de la Comue Normandie Université et non par les individus des établissements qui la composent.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUfjtraZCnuk4ayIJfZ7jOPQ0/p80wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwcHAudW5yLXJ1bm4uZnIwHhcNMTMwMjIxMTQwODMw
 WhcNMzMwMjIxMTQwODMwWjAcMRowGAYDVQQDExFpZHBwcC51bnItcnVubi5mcjCC
@@ -40,21 +40,21 @@ yRCIhApqHi9Zy2lgW794ZMOtzPiNJ1Glj48RKGvexub/yT8ete5sk2hfDn06Z+ef
 GOF9hV4E1rvASF9pmubrSBzfuRDcwF7YEVvjUIdS0bdulO2oE+pmwowZkEEoTq9t
 7qXl
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.normandie-univ.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Normandie Université</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Normandie Université</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.normandie-univ.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>exploit@normandie-univ.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.normandie-univ.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Normandie Université</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Normandie Université</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.normandie-univ.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>exploit@normandie-univ.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml
index 5a0b16bd..515589e1 100644
--- a/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.northampton.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northampton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northampton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIJAO2YHtS7tStwMA0GCSqGSIb3DQEBBQUAMEgxJjAkBgNV
 						BAoTHVRoZSBVbml2ZXJzaXR5IG9mIE5vcnRoYW1wdG9uMR4wHAYDVQQDExVpZHAu
 						bm9ydGhhbXB0b24uYWMudWswHhcNMTEwNzAxMDkzMTA2WhcNMjEwNjI4MDkzMTA2
@@ -33,13 +33,13 @@
 						W1alcTc/bTwRSru+aCuukrK0V+jlLDxxKJEwSi3BgOL2+e+RYXOWhU/kDbnbrc1e
 						SCQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIJAO2YHtS7tStwMA0GCSqGSIb3DQEBBQUAMEgxJjAkBgNV
 						BAoTHVRoZSBVbml2ZXJzaXR5IG9mIE5vcnRoYW1wdG9uMR4wHAYDVQQDExVpZHAu
 						bm9ydGhhbXB0b24uYWMudWswHhcNMTEwNzAxMDkzMTA2WhcNMjEwNjI4MDkzMTA2
@@ -62,25 +62,25 @@
 						W1alcTc/bTwRSru+aCuukrK0V+jlLDxxKJEwSi3BgOL2+e+RYXOWhU/kDbnbrc1e
 						SCQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.northampton.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.northampton.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Northampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Northampton (IDP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northampton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Aynsworth</md:SurName>
-      <md:EmailAddress>mailto:mike.aynsworth@northampton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Aynsworth</md:SurName>
-      <md:EmailAddress>mailto:mike.aynsworth@northampton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.northampton.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.northampton.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Northampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Northampton (IDP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northampton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Aynsworth</md:SurName>
+    <md:EmailAddress>mailto:mike.aynsworth@northampton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Aynsworth</md:SurName>
+    <md:EmailAddress>mailto:mike.aynsworth@northampton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml
index 121834ac..f1e10f65 100644
--- a/swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.northern.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northern.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northern.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northern.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northern.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northern College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northern.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northern.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northern.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northern College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northern.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml
index ac97daea..1952be09 100644
--- a/swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.northland.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northland.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northland.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northland.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northland.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northumberland College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northland.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northland.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northland.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northumberland College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northland.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northlindsey.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.northlindsey.ac.uk-openathens.xml
index 95b02892..5b813d9d 100644
--- a/swamid-interfederations-2.0/idp.northlindsey.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.northlindsey.ac.uk-openathens.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.northlindsey.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-16T11:47:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-16T11:47:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northlindsey.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northlindsey.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -35,13 +35,13 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -64,23 +64,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northlindsey.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northlindsey.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North Lindsey College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North Lindsey College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northlindsey.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northlindsey.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northlindsey.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North Lindsey College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North Lindsey College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northlindsey.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
index d889bf1a..efff650c 100644
--- a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nottingham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-25T14:11:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-25T14:11:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIElDCCA3ygAwIBAgIJALURZkw6iwLLMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
 						aW5naGFtMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNV
@@ -39,26 +39,26 @@
 						Ovug2b1EsArqCTc6H4dbQbOZVdDdbp/aYgqDllPdzQgzycfFij+asND0yMxxIUIN
 						6LlTVJOiWX48GPxWBbsakO74dpdgXC/2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIElDCCA3ygAwIBAgIJALURZkw6iwLLMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
 						aW5naGFtMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNV
@@ -85,26 +85,26 @@
 						Ovug2b1EsArqCTc6H4dbQbOZVdDdbp/aYgqDllPdzQgzycfFij+asND0yMxxIUIN
 						6LlTVJOiWX48GPxWBbsakO74dpdgXC/2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nottingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Betts</md:SurName>
-      <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nottingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml
index 817889e2..0b04c622 100644
--- a/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nottingham.edu.cn/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-23T11:38:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-23T11:38:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.cn</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.cn</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwQCCQDij8AO1ZyMHzANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
 						Q04xETAPBgNVBAgTCFpoZWppYW5nMQ8wDQYDVQQHEwZOaW5nYm8xLzAtBgNVBAoT
 						JlVuaXZlcnNpdHkgb2YgTm90dGluZ2hhbSBOaW5nYm8sIENoaW5hMR0wGwYDVQQL
@@ -36,26 +36,26 @@
 						3G1n/aMnGCwRrlQ4jfISBC5nsfksXem8w6Ur+bN2NUo7igMiANRnKJzJgKnT518Z
 						jINg8Q+dQ+hdfSPa4BUC1LiOxbp8IdOkfbG5gtpnANO1Kw2HXWTBakjy+VjrejZp
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nottingham.edu.cn/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.cn</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nottingham.edu.cn/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.cn</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwQCCQDij8AO1ZyMHzANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
 						Q04xETAPBgNVBAgTCFpoZWppYW5nMQ8wDQYDVQQHEwZOaW5nYm8xLzAtBgNVBAoT
 						JlVuaXZlcnNpdHkgb2YgTm90dGluZ2hhbSBOaW5nYm8sIENoaW5hMR0wGwYDVQQL
@@ -79,25 +79,25 @@
 						3G1n/aMnGCwRrlQ4jfISBC5nsfksXem8w6Ur+bN2NUo7igMiANRnKJzJgKnT518Z
 						jINg8Q+dQ+hdfSPa4BUC1LiOxbp8IdOkfbG5gtpnANO1Kw2HXWTBakjy+VjrejZp
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nottingham Ningbo, China</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nottingham.edu.cn/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpline</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.edu.cn</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.edu.cn</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nottingham Ningbo, China</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nottingham.edu.cn/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.edu.cn</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.edu.cn</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml
index 38745aa4..1491cbdd 100644
--- a/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nottingham.edu.my/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-20T10:50:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-20T10:50:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.my</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.my</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCAroCCQCeoFvQJDQiEjANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
 						bXkxETAPBgNVBAgTCFNlbGFuZ29yMREwDwYDVQQHEwhTZW1lbnlpaDE2MDQGA1UE
 						ChMtVGhlIFVuaXZlcnNpdHkgT2YgTm90dGluZ2hhbSBNYWxheXNpYSBDYW1wdXMg
@@ -35,26 +35,26 @@
 						NlA5Oye9QvSkVvudFAiz8chuXWu+3LevA/C1IVXBfKA+ZDJ+69JbbEmhOiUceBCB
 						HQBzUZxVahSEqoMUTVycJI/zZ6WQwA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nottingham.edu.my/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.my</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nottingham.edu.my/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.edu.my</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCAroCCQCeoFvQJDQiEjANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
 						bXkxETAPBgNVBAgTCFNlbGFuZ29yMREwDwYDVQQHEwhTZW1lbnlpaDE2MDQGA1UE
 						ChMtVGhlIFVuaXZlcnNpdHkgT2YgTm90dGluZ2hhbSBNYWxheXNpYSBDYW1wdXMg
@@ -77,25 +77,25 @@
 						NlA5Oye9QvSkVvudFAiz8chuXWu+3LevA/C1IVXBfKA+ZDJ+69JbbEmhOiUceBCB
 						HQBzUZxVahSEqoMUTVycJI/zZ6WQwA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nottingham Malaysia Campus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nottingham.edu.my/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.edu.my</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.edu.my</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nottingham Malaysia Campus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nottingham.edu.my/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.edu.my</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.edu.my</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml
index 75dedf91..eff0d778 100644
--- a/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nrc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-20T16:24:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-20T16:24:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcjCCAloCCQDyu2TVCpnwTjANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJH
 						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDEVMBMGA1UEBxMMTmV3dG93bmFi
 						YmV5MSIwIAYDVQQKExlOb3J0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQD
@@ -33,26 +33,26 @@
 						fe41HZlxy6Kdw+f/F7agDCNyNUAhC2zaYCWvSgFieJ2kTW+cOyNGwu1GzrxTAj6p
 						QdVc9wctrwklGCXhXqaNBz72HCM6Pg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nrc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcjCCAloCCQDyu2TVCpnwTjANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJH
 						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDEVMBMGA1UEBxMMTmV3dG93bmFi
 						YmV5MSIwIAYDVQQKExlOb3J0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQD
@@ -73,26 +73,26 @@
 						fe41HZlxy6Kdw+f/F7agDCNyNUAhC2zaYCWvSgFieJ2kTW+cOyNGwu1GzrxTAj6p
 						QdVc9wctrwklGCXhXqaNBz72HCM6Pg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northern Regional College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northern Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nrc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:support@nrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alan</md:GivenName>
-      <md:SurName>Brown</md:SurName>
-      <md:EmailAddress>mailto:Alan.Brown@nrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northern Regional College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northern Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nrc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@nrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alan</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:Alan.Brown@nrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nss.udel.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nss.udel.edu-idp-shibboleth.xml
index 6f569748..a1e22b34 100644
--- a/swamid-interfederations-2.0/idp.nss.udel.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nss.udel.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nss.udel.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.nss.udel.edu/idp/shibboleth/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udel.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Delaware</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Delaware Shibboleth Single Sign-on Service</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.nss.udel.edu/idp/shibboleth/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udel.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Delaware</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Delaware Shibboleth Single Sign-on Service</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUEIBsQXCv84WSa00nVDkqsIYHoN4wDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLm5zcy51ZGVsLmVkdTAeFw0xNjA1MjYxNTAyMzNa
 Fw0zNjA1MjYxNTAyMzNaMBsxGTAXBgNVBAMMEGlkcC5uc3MudWRlbC5lZHUwggEi
@@ -38,24 +38,24 @@ OJVICZd+/bmr8n9tlj29qCIGCsj3L4xNiuhRuvwl211Z+iqDtKcu4v5b/q+0Tppx
 CuGuOUZKO8yTMeQuVvD9UHuYomW7Y+Mu2tHFGHqpOSo4E5S8hL9ojlO5YBO7SMxN
 xeUgbFNmZS6T+sVqSPnABKZnA9GsIQo8Bu+K8rWHS4SLbcXxVcg09+22d4w4fic=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nss.udel.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nss.udel.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nss.udel.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nss.udel.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nss.udel.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nss.udel.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udel.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nss.udel.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nss.udel.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nss.udel.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nss.udel.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nss.udel.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nss.udel.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udel.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAPphCkvaUJ4yChST74hanwncvuaKMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGlkcC5uc3MudWRlbC5lZHUwHhcNMTYwNTI2MTUwMjMz
 WhcNMzYwNTI2MTUwMjMzWjAbMRkwFwYDVQQDDBBpZHAubnNzLnVkZWwuZWR1MIIB
@@ -74,26 +74,26 @@ l55PIYfbErJa3YpUkWZyCPwnS9m/P5Cz2CcBnhzdzunI5NwVofz2TP3WtrK2wK82
 kvENlUUeMAdNQCeB9wdLbbhJY4QuphIp8a6ECXrTb7ToF36vTGifMojj24JA0d4f
 XZXfBYh8iS/r3ZPRAglnnzxoPviePFA9xtKhSHq3hNYUpn8grl8+OlvWit2N3AQo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nss.udel.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Delaware</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Delaware</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.udel.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fraser S. Gutteridge</md:GivenName>
-      <md:EmailAddress>blue@udel.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Daniel J. Grim</md:GivenName>
-      <md:EmailAddress>grim@udel.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Melvin Rau</md:GivenName>
-      <md:EmailAddress>mrau@udel.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nss.udel.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Delaware</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Delaware</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udel.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fraser S. Gutteridge</md:GivenName>
+    <md:EmailAddress>blue@udel.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daniel J. Grim</md:GivenName>
+    <md:EmailAddress>grim@udel.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Melvin Rau</md:GivenName>
+    <md:EmailAddress>mrau@udel.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nuca.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nuca.ac.uk-shibboleth.xml
index 7e935af3..e73c44d4 100644
--- a/swamid-interfederations-2.0/idp.nuca.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nuca.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuca.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuca.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuca.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nuca.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nuca.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Norwich University of the Arts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nua.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nuca.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nuca.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Norwich University of the Arts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nua.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
index 1605e491..cc51b381 100644
--- a/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuigalway.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">OÉ Gaillimh</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
+        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuigalway.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">OÉ Gaillimh</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
-          <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUaZj83WML6Ro0NOTyru/oCY9DaWcwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQaWRwLm51aWdhbHdheS5pZTAeFw0xMDA4MzAxNDUyMjJa
 Fw0zMDA4MzAxNDUyMjJaMBsxGTAXBgNVBAMTEGlkcC5udWlnYWx3YXkuaWUwggEi
@@ -38,32 +38,32 @@ xS/b1aO8RapnJUXY0Vhem17h/8bHmpw1RurScX0lXL1JA0PPEaF9nTCW5KfIOBVE
 YnwBW7s4pF85szVB4cSNiz6pRVenAw6s6bJ5AVYSXYGmkDRpm5OCzdVNzOzjlmrF
 kun2ue2G3ICbbxLefYZY3Y2Z8ASfN3caaadnEwn9ya6o47MywXTzmzIIbq1mvWc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuigalway.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuigalway.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nuigalway.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National University of Ireland, Galway</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National University of Ireland, Galway</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://nuigalway.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Diarmuid Murray</md:SurName>
-      <md:EmailAddress>mailto:diarmuid.murray@nuigalway.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Diarmuid Murray</md:SurName>
-      <md:EmailAddress>mailto:diarmuid.murray@nuigalway.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>ISS Service Desk</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@nuigalway.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuigalway.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuigalway.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nuigalway.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National University of Ireland, Galway</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National University of Ireland, Galway</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://nuigalway.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Diarmuid Murray</md:SurName>
+    <md:EmailAddress>mailto:diarmuid.murray@nuigalway.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Diarmuid Murray</md:SurName>
+    <md:EmailAddress>mailto:diarmuid.murray@nuigalway.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>ISS Service Desk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@nuigalway.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
index 62587c84..5e9b1cf1 100644
--- a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuim.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-08-16T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-08-16T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuim.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Maynooth University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://computercentre.nuim.ie/</mdui:InformationURL>
+        <mdui:Logo height="119" width="243">https://edugate.heanet.ie/rr3/logos/MaynoothUniversity.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.3846672,-6.6012125</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuim.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Maynooth University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://computercentre.nuim.ie/</mdui:InformationURL>
-          <mdui:Logo height="119" width="243">https://edugate.heanet.ie/rr3/logos/MaynoothUniversity.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.3846672,-6.6012125</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFJzCCBA+gAwIBAgIJAIJfD55vGsQ3MA0GCSqGSIb3DQEBBQUAMIG9MQswCQYD
 VQQGEwJJRTEUMBIGA1UECBMLQ28uIEtpbGRhcmUxETAPBgNVBAcTCE1heW5vb3Ro
 MTEwLwYDVQQKEyhOYXRpb25hbCBVbml2ZXJzaXR5IG9mIElyZWxhbmQsIE1heW5v
@@ -48,33 +48,33 @@ YCfuRE0VjS1C5qU3qrvQTRfm+mHIXvCJqEq+QdXMnJm2jc+rvm9s4Y3/P+dOJqZ2
 mSq9+fohezZUYgCirIJuORsZiubp0lExD9/P9hYK6tNtxCeKpOrFKfqDonlcFwq4
 08qWRqOhxna9IY/GleVcTnlR/8w9YOQ9kn0V
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuim.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuim.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nuim.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Maynooth University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Maynooth University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.maynoothuniversity.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jason</md:GivenName>
-      <md:SurName>Doran</md:SurName>
-      <md:EmailAddress>mailto:jason.doran@nuim.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Dearbhla O'Reilly</md:SurName>
-      <md:EmailAddress>mailto:dearbhla.oreilly@nuim.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>systrack@nuim.ie</md:SurName>
-      <md:EmailAddress>mailto:systrack@nuim.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuim.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuim.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nuim.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Maynooth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Maynooth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.maynoothuniversity.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jason</md:GivenName>
+    <md:SurName>Doran</md:SurName>
+    <md:EmailAddress>mailto:jason.doran@nuim.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Dearbhla O'Reilly</md:SurName>
+    <md:EmailAddress>mailto:dearbhla.oreilly@nuim.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>systrack@nuim.ie</md:SurName>
+    <md:EmailAddress>mailto:systrack@nuim.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml
index 33440e9f..4c9f69f8 100644
--- a/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nulc.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nulc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nulc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nulc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nulc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle-under-Lyme College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nulc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nulc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nulc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle-under-Lyme College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nulc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml
index 2606b1e4..4613afd9 100644
--- a/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nwhc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-15T10:33:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-15T10:33:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwhc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">North Warwickshire &amp; Hinckley College (Shibboleth)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.nwhc.ac.uk/images/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.nwhc.ac.uk/images/logo-icon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwhc.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">North Warwickshire &amp; Hinckley College (Shibboleth)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.nwhc.ac.uk/images/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.nwhc.ac.uk/images/logo-icon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAKUnamKmXgk/Lnzrnwf+feRMH4ddMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud2hjLmFjLnVrMB4XDTEzMDgwNTEwMDExOVoX
 						DTMzMDgwNTEwMDExOVowGTEXMBUGA1UEAxMOaWRwLm53aGMuYWMudWswggEiMA0G
@@ -36,29 +36,29 @@
 						NiuA0dJ/7ViPa01B7CdxRahAGUIc3VFLS3IA8JExlHuwyAy2YCQs7+W0ftZa1DID
 						myaovCB2VxASeOcSFk+AxnroXAhfkukp/5FM4lVI6rOAns40DaSHNw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nwhc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwhc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nwhc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwhc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAKUnamKmXgk/Lnzrnwf+feRMH4ddMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud2hjLmFjLnVrMB4XDTEzMDgwNTEwMDExOVoX
 						DTMzMDgwNTEwMDExOVowGTEXMBUGA1UEAxMOaWRwLm53aGMuYWMudWswggEiMA0G
@@ -77,26 +77,26 @@
 						NiuA0dJ/7ViPa01B7CdxRahAGUIc3VFLS3IA8JExlHuwyAy2YCQs7+W0ftZa1DID
 						myaovCB2VxASeOcSFk+AxnroXAhfkukp/5FM4lVI6rOAns40DaSHNw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North Warwickshire and Hinckley College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North Warwickshire &amp; Hinckley College (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nwhc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software Support</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Garry</md:GivenName>
-      <md:SurName>Plowman</md:SurName>
-      <md:EmailAddress>mailto:garry.plowman@nwhc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North Warwickshire and Hinckley College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North Warwickshire &amp; Hinckley College (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nwhc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Plowman</md:SurName>
+    <md:EmailAddress>mailto:garry.plowman@nwhc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml
index 081e328d..522150f2 100644
--- a/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nwkcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T12:01:59Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T12:01:59Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwkcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwkcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh4CCQCyyXWzJHWtUDANBgkqhkiG9w0BAQUFADBdMQswCQYDVQQGEwJH
 						QjENMAsGA1UECBMES2VudDEgMB4GA1UEChMXTm9ydGggV2VzdCBLZW50IENvbGxl
 						Z2UxHTAbBgNVBAMTFGlkcC5ud2tjb2xsZWdlLmFjLnVrMB4XDTEyMTIxMTExNDgx
@@ -30,26 +30,26 @@
 						W/0kRLt8mAFvSYVo5hAsObBzrtFNrRCDSGSRycRuLHLsSPIaL8FuuIGlpjfFpYzt
 						G9+M5fDBQwR/lA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nwkcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwkcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nwkcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwkcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh4CCQCyyXWzJHWtUDANBgkqhkiG9w0BAQUFADBdMQswCQYDVQQGEwJH
 						QjENMAsGA1UECBMES2VudDEgMB4GA1UEChMXTm9ydGggV2VzdCBLZW50IENvbGxl
 						Z2UxHTAbBgNVBAMTFGlkcC5ud2tjb2xsZWdlLmFjLnVrMB4XDTEyMTIxMTExNDgx
@@ -69,27 +69,27 @@
 						W/0kRLt8mAFvSYVo5hAsObBzrtFNrRCDSGSRycRuLHLsSPIaL8FuuIGlpjfFpYzt
 						G9+M5fDBQwR/lA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North West Kent College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North West Kent College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nwkcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Darren</md:GivenName>
-      <md:SurName>Parker</md:SurName>
-      <md:EmailAddress>mailto:darrenparker@nwkcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barb</md:GivenName>
-      <md:SurName>Playfoot</md:SurName>
-      <md:EmailAddress>mailto:barbplayfoot@nwkcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North West Kent College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North West Kent College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nwkcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Darren</md:GivenName>
+    <md:SurName>Parker</md:SurName>
+    <md:EmailAddress>mailto:darrenparker@nwkcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barb</md:GivenName>
+    <md:SurName>Playfoot</md:SurName>
+    <md:EmailAddress>mailto:barbplayfoot@nwkcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml
index c17a4dd2..ef456c0f 100644
--- a/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nwrc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-02T15:21:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-02T15:21:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwrc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAO6oka63IByOxHcRzgRXmqnXw9YmMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud3JjLmFjLnVrMB4XDTEwMDQyOTE0NTE0OFoX
 						DTMwMDQyOTE0NTE0OFowGTEXMBUGA1UEAxMOaWRwLm53cmMuYWMudWswggEiMA0G
@@ -31,26 +31,26 @@
 						fn/9qIScsT+Hzhzmc2hcQweRcIlrJ3LirbrIlV4Q0Zd9UXHE+gv85kznFM0Q63eQ
 						vTCD4rJKVHWEPxZLLwesMO2C01ivPUM+4wsEcWML3Q675AOQrC8ehQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nwrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nwrc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nwrc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAO6oka63IByOxHcRzgRXmqnXw9YmMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud3JjLmFjLnVrMB4XDTEwMDQyOTE0NTE0OFoX
 						DTMwMDQyOTE0NTE0OFowGTEXMBUGA1UEAxMOaWRwLm53cmMuYWMudWswggEiMA0G
@@ -69,27 +69,27 @@
 						fn/9qIScsT+Hzhzmc2hcQweRcIlrJ3LirbrIlV4Q0Zd9UXHE+gv85kznFM0Q63eQ
 						vTCD4rJKVHWEPxZLLwesMO2C01ivPUM+4wsEcWML3Q675AOQrC8ehQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North West Regional College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North West Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nwrc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>McNatt</md:SurName>
-      <md:EmailAddress>mailto:David.McNatt@nwrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>McNatt</md:SurName>
-      <md:EmailAddress>mailto:David.McNatt@nwrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North West Regional College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North West Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nwrc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>McNatt</md:SurName>
+    <md:EmailAddress>mailto:David.McNatt@nwrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>McNatt</md:SurName>
+    <md:EmailAddress>mailto:David.McNatt@nwrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml
index 70d7a7da..b6596d79 100644
--- a/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.oaklands.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oaklands.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oaklands.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUdO1bzlupfVEClo0yb0fopDjfnGMwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVrMB4XDTEzMDYyNDE1MTE0
 						NloXDTMzMDYyNDE1MTE0NlowHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVr
@@ -30,26 +30,26 @@
 						7B6QbgXkTZc99kGDBYkypXIig3oxA8ZWur3sNp7GzNr+8KIPf4tNuQtfTvzhOFWb
 						5FJOqBxaVg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oaklands.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oaklands.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oaklands.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oaklands.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUdO1bzlupfVEClo0yb0fopDjfnGMwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVrMB4XDTEzMDYyNDE1MTE0
 						NloXDTMzMDYyNDE1MTE0NlowHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVr
@@ -69,27 +69,27 @@
 						7B6QbgXkTZc99kGDBYkypXIig3oxA8ZWur3sNp7GzNr+8KIPf4tNuQtfTvzhOFWb
 						5FJOqBxaVg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Oaklands College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oaklands College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oaklands.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Little</md:SurName>
-      <md:EmailAddress>mailto:mark.little@oaklands.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Little</md:SurName>
-      <md:EmailAddress>mailto:mark.little@oaklands.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Oaklands College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oaklands College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oaklands.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Little</md:SurName>
+    <md:EmailAddress>mailto:mark.little@oaklands.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Little</md:SurName>
+    <md:EmailAddress>mailto:mark.little@oaklands.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml
index 574f11fd..9776c241 100644
--- a/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.oar.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.oar.net/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oar.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ohio Technology Consortium (OH-TECH)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">InCommon Federation Identity Provider for the Ohio Technology Consortium, an activity of the Ohio Board of Regents.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://iamohio.net/content/oh_tech_web_identity_services</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://ohio.gov/policies/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="149" width="353" xml:lang="en">https://idp.oar.net/images/full_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.oar.net/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oar.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ohio Technology Consortium (OH-TECH)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">InCommon Federation Identity Provider for the Ohio Technology Consortium, an activity of the Ohio Board of Regents.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://iamohio.net/content/oh_tech_web_identity_services</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://ohio.gov/policies/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="149" width="353" xml:lang="en">https://idp.oar.net/images/full_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAMDIykk/faIk0RTovrokYZYWeLfSMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5vYXIubmV0MB4XDTExMDkxNTE2MTYwOVoXDTMx
 MDkxNTE2MTYwOVowFjEUMBIGA1UEAxMLaWRwLm9hci5uZXQwggEiMA0GCSqGSIb3
@@ -44,24 +44,24 @@ xm5skvrLDBVtpf7/G/S4oSHtdN1hnXOW6WGmaqnlzPpoF6bGMXMRbW0JsZXH07HO
 2z9hWgIOvL9bjEeEct7yOgbzwWZrHSvPDVHYoSyk+G1+RyL+yokUWMRaZ9YXG8ts
 nsG1QgdEewDOGQVbtLzDHtk+EBCJu03zYZHgoQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oar.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oar.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oar.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oar.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oar.net/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.oar.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oar.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oar.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oar.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oar.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oar.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oar.net/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.oar.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oar.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAMDIykk/faIk0RTovrokYZYWeLfSMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5vYXIubmV0MB4XDTExMDkxNTE2MTYwOVoXDTMx
 MDkxNTE2MTYwOVowFjEUMBIGA1UEAxMLaWRwLm9hci5uZXQwggEiMA0GCSqGSIb3
@@ -80,31 +80,31 @@ xm5skvrLDBVtpf7/G/S4oSHtdN1hnXOW6WGmaqnlzPpoF6bGMXMRbW0JsZXH07HO
 2z9hWgIOvL9bjEeEct7yOgbzwWZrHSvPDVHYoSyk+G1+RyL+yokUWMRaZ9YXG8ts
 nsG1QgdEewDOGQVbtLzDHtk+EBCJu03zYZHgoQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oar.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oar.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ohio Technology Consortium ("OH-TECH")</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ohio Technology Consortium (OH-TECH)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://oh-tech.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark Beadles</md:GivenName>
-      <md:EmailAddress>mbeadles@oar.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OARnet Support</md:GivenName>
-      <md:EmailAddress>support@oar.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alan Edmonds</md:GivenName>
-      <md:EmailAddress>edmonds@oh-tech.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew Soter</md:GivenName>
-      <md:EmailAddress>msoter@oh-tech.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oar.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oar.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ohio Technology Consortium ("OH-TECH")</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ohio Technology Consortium (OH-TECH)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://oh-tech.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark Beadles</md:GivenName>
+    <md:EmailAddress>mbeadles@oar.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OARnet Support</md:GivenName>
+    <md:EmailAddress>support@oar.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alan Edmonds</md:GivenName>
+    <md:EmailAddress>edmonds@oh-tech.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew Soter</md:GivenName>
+    <md:EmailAddress>msoter@oh-tech.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml
index db8f973f..6e41b474 100644
--- a/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ocvc.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-19T17:55:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-19T17:55:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ocvc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ocvc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgIIJK53AJuGOYowDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
 						CgwgT3hmb3JkICYgQ2hlcndlbGwgVmFsbGV5IENvbGxlZ2UxHjAcBgNVBAMMFW9w
 						ZW5hdGhlbnMub2N2Yy5hYy51azAeFw0xMzEwMjgxNDM5NTVaFw0yMzEwMjgxMzM5
@@ -33,23 +33,23 @@
 						8xu4ferryExDoB95D0cLivnE73eO8QlsbdDVjfYRwHDvx3VFWFOwuiDakNE5ZLj8
 						fxjatX0mFmoxpNUu
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.ocvc.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.ocvc.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Activate Learning</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Activate Learning</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ocvc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Support</md:GivenName>
-      <md:EmailAddress>mailto:athens@ocvc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@ocvc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.ocvc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.ocvc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Activate Learning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Activate Learning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ocvc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Support</md:GivenName>
+    <md:EmailAddress>mailto:athens@ocvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@ocvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml
index 51250e1b..446d07ce 100644
--- a/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.okstate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.okstate.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Oklahoma State University Main Campus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Oklahoma State University System</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.it.okstate.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://stillwater.sharepoint.okstate.edu/Policies/Shared%20Documents/Family%20Educational%20Rights%20and%20Privacy%20Acts%20(B</mdui:PrivacyStatementURL>
+        <mdui:Logo height="130" width="200" xml:lang="en">https://app.it.okstate.edu/osucalendar/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.okstate.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Oklahoma State University Main Campus</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Oklahoma State University System</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.it.okstate.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://stillwater.sharepoint.okstate.edu/Policies/Shared%20Documents/Family%20Educational%20Rights%20and%20Privacy%20Acts%20(B</mdui:PrivacyStatementURL>
-          <mdui:Logo height="130" width="200" xml:lang="en">https://app.it.okstate.edu/osucalendar/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYjCCAkoCCQDzMip1XDG8GjANBgkqhkiG9w0BAQUFADBzMRgwFgYDVQQDDA9p
 ZHAub2tzdGF0ZS5lZHUxIjAgBgNVBAoMGU9rbGFob21hIFN0YXRlIFVuaXZlcnNp
 dHkxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhPa2xhaG9tYTETMBEGA1UEBwwKU3Rp
@@ -43,13 +43,13 @@ pvucaNe/bhjtGVNcPmVkJ2bTzSOlE49icSRuDbc2bkZEqTPdBpSL6b+vKMTF+tDP
 A/br3xw5PtPDxp1uBcpZFuJ6GElZj2vUqXAt+l37NZHicQSRhMzGitXpTcO7OU/g
 7+8OWNW+
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDpDCCAowCCQCjRgnERKTgvDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
 VVMxETAPBgNVBAgMCE9rbGFob21hMRMwEQYDVQQHDApTdGlsbHdhdGVyMRAwDgYD
 VQQKDAdPS1N0YXRlMQswCQYDVQQLDAJJVDEYMBYGA1UEAwwPaWRwLm9rc3RhdGUu
@@ -71,24 +71,24 @@ QWUdAUmhN1oD6YxKK3Bf9pQ2Sinafdsc4k54wvfMZCQkH1f37Pll/cSQCSFxEDKX
 IUS69CJRUBfftvG82kYGdEO5y+FAWBuLyya32MVwWKzHOqh6Q0iTbgEsfWsQL7KU
 aVziUIOjv/nrHap+xcHajNL7CKlXwKQ4
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.okstate.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.okstate.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.okstate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.okstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.okstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.okstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okstate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.okstate.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.okstate.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.okstate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.okstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.okstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.okstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okstate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYjCCAkoCCQDzMip1XDG8GjANBgkqhkiG9w0BAQUFADBzMRgwFgYDVQQDDA9p
 ZHAub2tzdGF0ZS5lZHUxIjAgBgNVBAoMGU9rbGFob21hIFN0YXRlIFVuaXZlcnNp
 dHkxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhPa2xhaG9tYTETMBEGA1UEBwwKU3Rp
@@ -109,13 +109,13 @@ pvucaNe/bhjtGVNcPmVkJ2bTzSOlE49icSRuDbc2bkZEqTPdBpSL6b+vKMTF+tDP
 A/br3xw5PtPDxp1uBcpZFuJ6GElZj2vUqXAt+l37NZHicQSRhMzGitXpTcO7OU/g
 7+8OWNW+
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDpDCCAowCCQCjRgnERKTgvDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
 VVMxETAPBgNVBAgMCE9rbGFob21hMRMwEQYDVQQHDApTdGlsbHdhdGVyMRAwDgYD
 VQQKDAdPS1N0YXRlMQswCQYDVQQLDAJJVDEYMBYGA1UEAwwPaWRwLm9rc3RhdGUu
@@ -137,27 +137,27 @@ QWUdAUmhN1oD6YxKK3Bf9pQ2Sinafdsc4k54wvfMZCQkH1f37Pll/cSQCSFxEDKX
 IUS69CJRUBfftvG82kYGdEO5y+FAWBuLyya32MVwWKzHOqh6Q0iTbgEsfWsQL7KU
 aVziUIOjv/nrHap+xcHajNL7CKlXwKQ4
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.okstate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.okstate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Oklahoma State University Main Campus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oklahoma State University System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://osu.okstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shawn Harpe</md:GivenName>
-      <md:EmailAddress>shawn.harpe@okstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tina Meier</md:GivenName>
-      <md:EmailAddress>tina.meier@okstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Raymond Smith</md:GivenName>
-      <md:EmailAddress>Raymond.Smith@okstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.okstate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.okstate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Oklahoma State University Main Campus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oklahoma State University System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://osu.okstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shawn Harpe</md:GivenName>
+    <md:EmailAddress>shawn.harpe@okstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tina Meier</md:GivenName>
+    <md:EmailAddress>tina.meier@okstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Raymond Smith</md:GivenName>
+    <md:EmailAddress>Raymond.Smith@okstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml
index 370746a9..24bed3d0 100644
--- a/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.oniris-nantes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-13T11:01:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-13T11:01:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oniris-nantes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ONIRIS</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/ico;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAklEQVQ4ja2ST2sTURTFf28yzUzmD4mTWoi2UVFapOBGEDdCS+ln8bu49RtUEPeuLIKgCwUJ7Uaq1do0tRiapH8y0+Zl3sw8F4lJUKiLelaX9847997zjtBaay4B4zKP/4uA+buY3EQIMarTTCMEGBNnf02gNWzshTx9vc/H3S6TrnzYPmSnGY6a/GmZAXDWT6i3JY+XrrNzeM5pT43IlcBHqgytNZv1IzbrR8O74bRaa12rd6kGNj86J0QSzKk8nw7OyJuCq45gsVri+fsmK4sBZS/Py40W9+Y8lu8Ggwl6cYrISfxSk4fz07RDRaVk4dkm08UCfZVRLduU3TyhTJgNLB7NXxmvMFc2ebH1hFn/Do2OpOiYlByTom2SMwy+NbtM+3kQ4ORzaA1vvxyPBaqBS6Vwn9r3mDdbxyxU3JFJcZIyU7Qwhp+g0ozbMwWifjoW6J4nLPjL7LUiHtx0aZ+ekyQKdEI/VuQQkKWcRD2OQ8m7z22uFc1xDr7WDzjoppiqz+7PPkKAbdmDHACNbkiapcjeFFEUMedZTIlsLGDrM063a/i+T5JleJ7HyuoqhmGgteao0+HV+jpOoYCWklApTtQNuLU0EBBCoJRCSklQLrPfaPBsbQ3HcUjTFMd1cV2XdquF67pIKclb1jgHk+nSWhPHMdaQcBGEEAOBfzIvwC9GKvSMrFiGLwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.oniris-nantes.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Teachers, students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ONIRIS</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les enseignants, les étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oniris-nantes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ONIRIS</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/ico;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAklEQVQ4ja2ST2sTURTFf28yzUzmD4mTWoi2UVFapOBGEDdCS+ln8bu49RtUEPeuLIKgCwUJ7Uaq1do0tRiapH8y0+Zl3sw8F4lJUKiLelaX9847997zjtBaay4B4zKP/4uA+buY3EQIMarTTCMEGBNnf02gNWzshTx9vc/H3S6TrnzYPmSnGY6a/GmZAXDWT6i3JY+XrrNzeM5pT43IlcBHqgytNZv1IzbrR8O74bRaa12rd6kGNj86J0QSzKk8nw7OyJuCq45gsVri+fsmK4sBZS/Py40W9+Y8lu8Ggwl6cYrISfxSk4fz07RDRaVk4dkm08UCfZVRLduU3TyhTJgNLB7NXxmvMFc2ebH1hFn/Do2OpOiYlByTom2SMwy+NbtM+3kQ4ORzaA1vvxyPBaqBS6Vwn9r3mDdbxyxU3JFJcZIyU7Qwhp+g0ozbMwWifjoW6J4nLPjL7LUiHtx0aZ+ekyQKdEI/VuQQkKWcRD2OQ8m7z22uFc1xDr7WDzjoppiqz+7PPkKAbdmDHACNbkiapcjeFFEUMedZTIlsLGDrM063a/i+T5JleJ7HyuoqhmGgteao0+HV+jpOoYCWklApTtQNuLU0EBBCoJRCSklQLrPfaPBsbQ3HcUjTFMd1cV2XdquF67pIKclb1jgHk+nSWhPHMdaQcBGEEAOBfzIvwC9GKvSMrFiGLwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.oniris-nantes.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Teachers, students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ONIRIS</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Les enseignants, les étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPDCCAiSgAwIBAgIVAOz8cFkBTLbxVln29ynPAKgeQJHNMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMMFGlkcC5vbmlyaXMtbmFudGVzLmZyMB4XDTE1MDkxODE0
 MjA1MVoXDTM1MDkxODE0MjA1MVowHzEdMBsGA1UEAwwUaWRwLm9uaXJpcy1uYW50
@@ -40,26 +40,26 @@ yfFkeSjliStwTQZGY6qn28he9NDqOq7M4ye6zihzbtSa0Md9bYS/OlJHU7UNqbaD
 ujowHlafOBa/eC9WGKT2m2VT2yjF7opAf0d5Y+rIgM4pDglCV2/p9Sz5GGGbO1Fe
 ZKXiB3CTQrnXASQ6EfUC+w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oniris-nantes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ONIRIS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ONIRIS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oniris-nantes.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Didier ROY</md:SurName>
-      <md:EmailAddress>didier.roy@oniris-nantes.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Gregory LEFRANC</md:SurName>
-      <md:EmailAddress>gregory.lefranc@oniris-nantes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oniris-nantes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ONIRIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ONIRIS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oniris-nantes.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Didier ROY</md:SurName>
+    <md:EmailAddress>didier.roy@oniris-nantes.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gregory LEFRANC</md:SurName>
+    <md:EmailAddress>gregory.lefranc@oniris-nantes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.open.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.open.ac.uk-openathens.xml
index c25f1b2e..1ba784a1 100644
--- a/swamid-interfederations-2.0/idp.open.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.open.ac.uk-openathens.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.open.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">open.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Open University (Athens)</mdui:DisplayName>
+        <mdui:Logo height="56" width="83">https://www.open.ac.uk/includes/headers-footers/oulogo-56.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="14">https://msds.open.ac.uk/includes/headers-footers/oulogo-16.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">open.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Open University (Athens)</mdui:DisplayName>
-          <mdui:Logo height="56" width="83">https://www.open.ac.uk/includes/headers-footers/oulogo-56.jpg</mdui:Logo>
-          <mdui:Logo height="16" width="14">https://msds.open.ac.uk/includes/headers-footers/oulogo-16.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -38,23 +38,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/open.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/open.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Open University (Athens)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.open.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/open.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/open.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Open University (Athens)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.open.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml
index 321ec79d..dcf0d48a 100644
--- a/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.osfc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-18T17:10:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-18T17:10:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEaDCCA1CgAwIBAgIJAO0V7MENsS9VMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
 						VQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMQ8wDQYDVQQHEwZP
 						bGRoYW0xIjAgBgNVBAoTGU9sZGhhbSBTaXh0aCBGb3JtIENvbGxlZ2UxFDASBgNV
@@ -38,26 +38,26 @@
 						cJkJdvZUqWpZmHLUwdS/ApQGvWPpZqoB8XHXIvjvncnpnX6wwz2wI9//KbHpEnXP
 						7dwWurC7U32FErPq2FW9K41yaFsfpI1kDXtNRw==
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.osfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.osfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEaDCCA1CgAwIBAgIJAO0V7MENsS9VMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
 						VQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMQ8wDQYDVQQHEwZP
 						bGRoYW0xIjAgBgNVBAoTGU9sZGhhbSBTaXh0aCBGb3JtIENvbGxlZ2UxFDASBgNV
@@ -83,27 +83,27 @@
 						cJkJdvZUqWpZmHLUwdS/ApQGvWPpZqoB8XHXIvjvncnpnX6wwz2wI9//KbHpEnXP
 						7dwWurC7U32FErPq2FW9K41yaFsfpI1kDXtNRw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Oldham Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oldham Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.osfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Clarke</md:SurName>
-      <md:EmailAddress>mailto:JCA@osfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Clarke</md:SurName>
-      <md:EmailAddress>mailto:JCA@osfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Oldham Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oldham Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.osfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>mailto:JCA@osfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>mailto:JCA@osfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml
index d4b5259c..b0e063f0 100644
--- a/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.overtsoftware.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overtsoftware.com</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overtsoftware.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDiDCCAnACCQDi5A+IRiQjlDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgTDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5z
 						dGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
@@ -31,29 +31,29 @@
 						+lZSS6znrw8dTZ2CYA0JGA1jE/jExB+P5rfGsBSO3ZJZG/YyOJZSxtds2iqCY055
 						apotaZklObBpbolG8BoHy6sqsIpVMVDZqFu9AF5ryJJsaVF8mcWVDDwRnXY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.overtsoftware.com/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.overtsoftware.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.overtsoftware.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol   urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overtsoftware.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.overtsoftware.com/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.overtsoftware.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.overtsoftware.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol   urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overtsoftware.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDiDCCAnACCQDi5A+IRiQjlDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgTDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5z
 						dGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
@@ -74,27 +74,27 @@
 						+lZSS6znrw8dTZ2CYA0JGA1jE/jExB+P5rfGsBSO3ZJZG/YyOJZSxtds2iqCY055
 						apotaZklObBpbolG8BoHy6sqsIpVMVDZqFu9AF5ryJJsaVF8mcWVDDwRnXY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.overtsoftware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Andre</md:SurName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Andre</md:SurName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.overtsoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Andre</md:SurName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Andre</md:SurName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml
index 6f8d4166..16634532 100644
--- a/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.painless-security.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-07T13:46:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-07T13:46:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">painless-security.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Painless Security, LLC</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Single sign-on for staff, contractors and guests of Painless Security, LLC.
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">painless-security.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Painless Security, LLC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Single sign-on for staff, contractors and guests of Painless Security, LLC.
 				</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUQynxnQARWSAiT433dOEy4rgUWoswDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
 						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
@@ -37,13 +37,13 @@
 						QTRNrAggfvMGf32MdIPPCfX9odu63lwZfx17sqPxvdQ2xq2ZL6iAXbC65rtlKTjW
 						gcWNbUNwBO9L972+8/PKLZD/V0mGrrlgDpwI6rKuIlaQTzk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAMxItCUJxrxuCYpH3cVsXJ/cZImsMA0GCSqGSIb3DQEB
 						CwUAMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVzcy1zZWN1cml0eS5jb20wHhcNMTUw
 						NjA5MTk1MjU5WhcNMzUwNjA5MTk1MjU5WjAkMSIwIAYDVQQDDBlpZHAucGFpbmxl
@@ -63,13 +63,13 @@
 						Ty+Hnn8QuOxrkKH9RPPJuzZ4GnVrKnYk6ZLR61Ycf4bpoEi74GgjBVqmwXZCET1S
 						x1XIIdYkfjFRbr2dxUIYAI+Hy5VavvRSXBWBDQChKZfE4rFt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUU5Vd+CG4Yi2i2PMHz783N0/fwl0wDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
 						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
@@ -89,26 +89,26 @@
 						btelXBScoXImhOIbPLj4gl5z1YjBf9+kQz6keSoiS1hz+UAz2jkwd5N8lqSnZem9
 						lo/z0pnYq19CeeUvOBclHgP7ADCis7+ulg7ea8s4K3pcHpA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.painless-security.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.painless-security.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.painless-security.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.painless-security.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.painless-security.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.painless-security.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">painless-security.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.painless-security.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.painless-security.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.painless-security.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.painless-security.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.painless-security.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.painless-security.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">painless-security.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUQynxnQARWSAiT433dOEy4rgUWoswDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
 						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
@@ -128,13 +128,13 @@
 						QTRNrAggfvMGf32MdIPPCfX9odu63lwZfx17sqPxvdQ2xq2ZL6iAXbC65rtlKTjW
 						gcWNbUNwBO9L972+8/PKLZD/V0mGrrlgDpwI6rKuIlaQTzk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAMxItCUJxrxuCYpH3cVsXJ/cZImsMA0GCSqGSIb3DQEB
 						CwUAMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVzcy1zZWN1cml0eS5jb20wHhcNMTUw
 						NjA5MTk1MjU5WhcNMzUwNjA5MTk1MjU5WjAkMSIwIAYDVQQDDBlpZHAucGFpbmxl
@@ -154,13 +154,13 @@
 						Ty+Hnn8QuOxrkKH9RPPJuzZ4GnVrKnYk6ZLR61Ycf4bpoEi74GgjBVqmwXZCET1S
 						x1XIIdYkfjFRbr2dxUIYAI+Hy5VavvRSXBWBDQChKZfE4rFt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUU5Vd+CG4Yi2i2PMHz783N0/fwl0wDQYJKoZIhvcNAQEL
 						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
 						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
@@ -180,34 +180,34 @@
 						btelXBScoXImhOIbPLj4gl5z1YjBf9+kQz6keSoiS1hz+UAz2jkwd5N8lqSnZem9
 						lo/z0pnYq19CeeUvOBclHgP7ADCis7+ulg7ea8s4K3pcHpA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.painless-security.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Painless Security, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Painless Security, LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.painless-security.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Hartman</md:SurName>
-      <md:EmailAddress>mailto:hartmans@painless-security.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Donnelly</md:SurName>
-      <md:EmailAddress>mailto:mark@painless-security.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Hartman</md:SurName>
-      <md:EmailAddress>mailto:hartmans@painless-security.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Donnelly</md:SurName>
-      <md:EmailAddress>mailto:mark@painless-security.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.painless-security.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Painless Security, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Painless Security, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.painless-security.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Hartman</md:SurName>
+    <md:EmailAddress>mailto:hartmans@painless-security.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Donnelly</md:SurName>
+    <md:EmailAddress>mailto:mark@painless-security.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Hartman</md:SurName>
+    <md:EmailAddress>mailto:hartmans@painless-security.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Donnelly</md:SurName>
+    <md:EmailAddress>mailto:mark@painless-security.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.palmers.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.palmers.ac.uk-shibboleth.xml
index 8c2aca6a..9c5b0e7d 100644
--- a/swamid-interfederations-2.0/idp.palmers.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.palmers.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.palmers.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">palmers.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">palmers.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/palmers.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/palmers.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Palmer's College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palmers.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/palmers.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/palmers.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Palmer's College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palmers.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml
index 81ff1c7a..e62c3390 100644
--- a/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.parchment.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parchment.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Parchment, Inc.</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parchment.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Parchment, Inc.</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFpTCCBI2gAwIBAgIRAOvwTZoQX/74EujZauqakIowDQYJKoZIhvcNAQEFBQAw
 gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
@@ -51,24 +51,24 @@ gqOWebh3VgXbxSxE8+uYvJ4+eS13iIy0thwr+Xl1sw9ymXgsxs9FVOA9oPURLzz0
 L40uf/jZGnuHXaQh/XRUbsHUOTa0glWs0lRADrGSQBhRYJxNFgWW4rYntPtYYS92
 LbnhhG02Fwo/
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.parchment.com/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.parchment.com/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.parchment.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parchment.com/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parchment.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.parchment.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parchment.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.parchment.com/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.parchment.com/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.parchment.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parchment.com/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parchment.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.parchment.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parchment.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFpTCCBI2gAwIBAgIRAOvwTZoQX/74EujZauqakIowDQYJKoZIhvcNAQEFBQAw
 gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
@@ -101,22 +101,22 @@ gqOWebh3VgXbxSxE8+uYvJ4+eS13iIy0thwr+Xl1sw9ymXgsxs9FVOA9oPURLzz0
 L40uf/jZGnuHXaQh/XRUbsHUOTa0glWs0lRADrGSQBhRYJxNFgWW4rYntPtYYS92
 LbnhhG02Fwo/
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.parchment.com/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Parchment, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Parchment, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.parchment.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Scanlon</md:GivenName>
-      <md:EmailAddress>jscanlon@parchment.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew Lillie</md:GivenName>
-      <md:EmailAddress>alillie@parchment.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.parchment.com/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Parchment, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Parchment, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.parchment.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Scanlon</md:GivenName>
+    <md:EmailAddress>jscanlon@parchment.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew Lillie</md:GivenName>
+    <md:EmailAddress>alillie@parchment.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
index 784c0382..93709beb 100644
--- a/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.parisdescartes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-09-09T17:29:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-09-09T17:29:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parisdescartes.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris5.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABnElEQVQoz7WSQW7aQBiF/3/sCTgxg42La1SmUiuidFcrEcomd6gq7tELIOUW3IMblC1iRxArUqcSIlG8wC3YnsB4pgtLVZS2Cxb9V++X3tu876HWGg45cpAbAMwXfxzHSZJQSqWUhBDbtn3f/0tguVzO5/NcCJFlgOi6bpqmGiDdbpvNptY6DMNWqwUAuF6vR6MREsxzUWdMCGHbtmVZaBgmNeM4durOw8O9571ChIvzC3MymXieFwTBbrfjnAOAUooQ4/rq05HHKpRKpaLbbxat5FBsf25Mx3EajUYURWEYrlarLMuEEG3Ob2++kvr7vVJ+5cSh9C55rBlHjFLS7XbH47GUslqtcs5ns1me5285D+H0yYQ1ke7xyTGt/NC7DciP7DWWHBaLxWAw6HQ6vV4vCAIAuMYPtU47ypObNE6Lp/Na653lAEH8DW44HPb7fcbYdDrNsux5lZ/9s0v2Zq8LJAT/JJ0kieu6APCFd9tVprQutFKgAQAJeQkOAIQQpZC62KuitP6TdFlrKTbL7xk0nwcQDPzv4zs48AsHHLsLw+Z4gAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.parisdescartes.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parisdescartes.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris5.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABnElEQVQoz7WSQW7aQBiF/3/sCTgxg42La1SmUiuidFcrEcomd6gq7tELIOUW3IMblC1iRxArUqcSIlG8wC3YnsB4pgtLVZS2Cxb9V++X3tu876HWGg45cpAbAMwXfxzHSZJQSqWUhBDbtn3f/0tguVzO5/NcCJFlgOi6bpqmGiDdbpvNptY6DMNWqwUAuF6vR6MREsxzUWdMCGHbtmVZaBgmNeM4durOw8O9571ChIvzC3MymXieFwTBbrfjnAOAUooQ4/rq05HHKpRKpaLbbxat5FBsf25Mx3EajUYURWEYrlarLMuEEG3Ob2++kvr7vVJ+5cSh9C55rBlHjFLS7XbH47GUslqtcs5ns1me5285D+H0yYQ1ke7xyTGt/NC7DciP7DWWHBaLxWAw6HQ6vV4vCAIAuMYPtU47ypObNE6Lp/Na653lAEH8DW44HPb7fcbYdDrNsux5lZ/9s0v2Zq8LJAT/JJ0kieu6APCFd9tVprQutFKgAQAJeQkOAIQQpZC62KuitP6TdFlrKTbL7xk0nwcQDPzv4zs48AsHHLsLw+Z4gAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.parisdescartes.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUCeX+1RyxljYfEToWmdNXc2pDXeEwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2FydGVzLmZyMB4XDTExMDcxODA5
 NDAxN1oXDTMxMDcxODA5NDAxN1owIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2Fy
@@ -39,21 +39,21 @@ ojtsnvw3I3/6jj6JRcNsp3Qlbi7lsrYlqIPtuzdNR3YcDu+XpBfhl3geqTrCjS2O
 Hmjpc9MLvwXTRloHXrKPzQo7qBSID6wZnNC/cArK2ZYK6XiUR5I0AqOI2i5bWSYe
 26qh1S8ToVhwUvbZyVO+SyqjLw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parisdescartes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris 5 - Paris Descartes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.parisdescartes.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>adm-fed@parisdescartes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parisdescartes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 5 - Paris Descartes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.parisdescartes.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>adm-fed@parisdescartes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml b/swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml
index f6375dc5..fb9ceed3 100644
--- a/swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml
+++ b/swamid-interfederations-2.0/idp.parliament.uk-openaccess.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.parliament.uk/openaccess">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parliament.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parliament.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/parliament.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/parliament.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">House of Commons</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.parliament.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/parliament.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/parliament.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">House of Commons</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.parliament.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
index bb20d3c7..12c8aca3 100644
--- a/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pasteur.fr-idp-shibboleth.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pasteur.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-06T15:53:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-06T15:53:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pasteur.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institut Pasteur</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAxZJREFUOBFNU0toVEkUvbfqvf69MSZqT4vjh8nCvzCMoMysXEhAgpKFUSHJ+KENuFB36kobXQjD4IyCC02Q2Om40I0rQZAZRUEFFxpFiYtEEn8d2yZmjN39XtW93uo2YMGjbtU799xzP4Xw/eq8quHaDlu/6szFFgbLFkXWJJFpSmNyulhNVGHNc4ZcjmbdkHOgAHKAuRMMgJzp6fvZMhxAwDZEXsIMTQIuM+J5o/W5qYG9UwCMDQKcNRrH+V39uxXS3+inWoAiuURgG30SdCcRGUB1WCEOTBay1xseQjuRX7xx3tzXE0FhYMtPAfSHJOrI1r1ReR6B7Srls1cWdPc/0EHLRpopl0BhG0E0+TF/4A2+H/JtlaJy+39nm0fNPK+FK1HEqFD7WqK/+FCbuy6T+Dif2BuWqBlAUcXULSmuFsg/SnvRkeHS1sAwjKGtjbOX8AWo60DAEVdUy0rLHUsKsqEIgJIYm4yxf6j0zhv5bfc7Xo1MN29vD2+2RmF4Qn7+j7GUbI2FXkycMUI/ITQ0huS/FWOtlHCX+nXP+PrWlLcqkwwv/5toW14ayp6UQv1OX6YeOLGOgk3ozDSYEJTiXqvsZowF0h1eqd5ZnfpMFljHflEMD9NdFw8WB7PPPhT2/0bKHHQExLUZAR9DNq1kVIjMpzmquF8/KIOq4sKwDV2b5qAfP5fu6XskVc8mIFV1qPLQoemQTN4CdoDim6B0XBQ5eaEShhFp2ydx9oSF2NRIzPU6MacvpOiCI8j05ANf+3d1LDgjRUwI3kiXUBryVBWv7BuV+PekUAJFGQJUbE3ExgVnN4UQuUlmSFJdNjdGXRojCgquL64/f0lkZ3ryOYAMX31a62AVD1yW5tu1kWAeR9WXRMlLSh6GKhX235aMjmMsCZKf67mScgse42LPLs9pRhWLkwlDRu4tD3VPOwLHDkJyCqLqUcmvKMcKhxV5WvB41lv2LzKZlm3tiVbcXhrsvQM5dmFcKg29k4PZP2U811nWG1jxinSt6ZgjKC2dmEFNHWRp7Y+15g3FfO8tpxxySF8BHZ54NL0wTpgAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.pasteur.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Institut Pasteur's staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Institut Pasteur</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel de l'Institut Pasteur</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pasteur.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institut Pasteur</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAAxZJREFUOBFNU0toVEkUvbfqvf69MSZqT4vjh8nCvzCMoMysXEhAgpKFUSHJ+KENuFB36kobXQjD4IyCC02Q2Om40I0rQZAZRUEFFxpFiYtEEn8d2yZmjN39XtW93uo2YMGjbtU799xzP4Xw/eq8quHaDlu/6szFFgbLFkXWJJFpSmNyulhNVGHNc4ZcjmbdkHOgAHKAuRMMgJzp6fvZMhxAwDZEXsIMTQIuM+J5o/W5qYG9UwCMDQKcNRrH+V39uxXS3+inWoAiuURgG30SdCcRGUB1WCEOTBay1xseQjuRX7xx3tzXE0FhYMtPAfSHJOrI1r1ReR6B7Srls1cWdPc/0EHLRpopl0BhG0E0+TF/4A2+H/JtlaJy+39nm0fNPK+FK1HEqFD7WqK/+FCbuy6T+Dif2BuWqBlAUcXULSmuFsg/SnvRkeHS1sAwjKGtjbOX8AWo60DAEVdUy0rLHUsKsqEIgJIYm4yxf6j0zhv5bfc7Xo1MN29vD2+2RmF4Qn7+j7GUbI2FXkycMUI/ITQ0huS/FWOtlHCX+nXP+PrWlLcqkwwv/5toW14ayp6UQv1OX6YeOLGOgk3ozDSYEJTiXqvsZowF0h1eqd5ZnfpMFljHflEMD9NdFw8WB7PPPhT2/0bKHHQExLUZAR9DNq1kVIjMpzmquF8/KIOq4sKwDV2b5qAfP5fu6XskVc8mIFV1qPLQoemQTN4CdoDim6B0XBQ5eaEShhFp2ydx9oSF2NRIzPU6MacvpOiCI8j05ANf+3d1LDgjRUwI3kiXUBryVBWv7BuV+PekUAJFGQJUbE3ExgVnN4UQuUlmSFJdNjdGXRojCgquL64/f0lkZ3ryOYAMX31a62AVD1yW5tu1kWAeR9WXRMlLSh6GKhX235aMjmMsCZKf67mScgse42LPLs9pRhWLkwlDRu4tD3VPOwLHDkJyCqLqUcmvKMcKhxV5WvB41lv2LzKZlm3tiVbcXhrsvQM5dmFcKg29k4PZP2U811nWG1jxinSt6ZgjKC2dmEFNHWRp7Y+15g3FfO8tpxxySF8BHZ54NL0wTpgAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.pasteur.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Institut Pasteur's staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Institut Pasteur</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel de l'Institut Pasteur</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAM8NHj+g2+LDA3cgW3pLZnacQa9QMA0GCSqGSIb3DQEB BQUAMBkxFzAVBgNVBAMTDmlkcC5wYXN0ZXVyLmZyMB4XDTEzMTAxNTEwMzQzN1oX DTMzMTAxNTEwMzQzN1owGTEXMBUGA1UEAxMOaWRwLnBhc3RldXIuZnIwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvDkYEJsGc0q44FM+vk1gvd2olN2Oa QS5MEJrvSsgNaL6b8bzgPhqOCfAeSLc9mVmp+j7MuFWQEboy0OAmsFzSD3YVBipJ AMa8+bwk5jhvB3BJ/YbsjSYdx3nP/W3um9kjx0L44bfrsFltA8ShGx3TzgFkYk5D U8yynYz0azOBTrswm+OMKNbFf6kg3ApWsIX0EsYwtzKrbF/NKlCiUovdj9/ZEZU3 Ofk07Q0Ugi21HusAM9wWBhVmeuOnnIxR+4lWLwocfUBFDsSyyD9mjxqXMqU24N7R vs/mSIYGZe18H8zS26YS0IMVzlPVZSIF8j9XMFLTvprk28SYXnc0cxmlAgMBAAGj YzBhMEAGA1UdEQQ5MDeCDmlkcC5wYXN0ZXVyLmZyhiVodHRwczovL2lkcC5wYXN0 ZXVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRgZUBj6mFNK1rhpOxmhCa5 42xG9TANBgkqhkiG9w0BAQUFAAOCAQEAo3GFGV2Y3sb2QENh8ZJI+4hG2Pg4Adoj umDi7S6mXttNFcoC3LPVQuC/nsZsSz0ssmgHNFyvXOpLvITrUftdtS+zmCFwGlBV nWXF0sk2inc2xJRwYz6WolTj8I8J4Y2XvRMKu53Ysg4JPioE2nNtJs5PVsbkLpVU sF9M03mahyLDFNydv7ZTesTkN9r5+3WjZJVSQw5O8qAKllCo4t7+LS4JIl7Vg7a0 j3JcaueG6lbWSn82ib/oZcGGC8TpM4BrD+hrRuMrsHv0vuoFuzOlLjZVD89XuuLO GE+WCIfpIz0LEDbzBnZwm6z24itrreAnY1PWyGfl0Pj8fPDxoyaZNw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institut Pasteur</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institut Pasteur</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pasteur.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@pasteur.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pasteur.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pasteur.fr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institut Pasteur</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institut Pasteur</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pasteur.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@pasteur.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml
index d8e52795..861da7e3 100644
--- a/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pct.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pct.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Pennsylvania College of Technology</mdui:DisplayName>
+        <mdui:Logo height="69" width="100" xml:lang="en">https://idp.pct.edu/idp/images/pctlogo-mobile.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pct.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Pennsylvania College of Technology</mdui:DisplayName>
-          <mdui:Logo height="69" width="100" xml:lang="en">https://idp.pct.edu/idp/images/pctlogo-mobile.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPXmOxKE87b9Gpy8v4ZkBQZyM5s7MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5wY3QuZWR1MB4XDTEzMTExMzE0NDAxNFoXDTMz
 MTExMzE0NDAxNFowFjEUMBIGA1UEAxMLaWRwLnBjdC5lZHUwggEiMA0GCSqGSIb3
@@ -38,23 +38,23 @@ pKpuJzdJRb15tTfBN9wL2vlohxJs9So5LyX/u3iTxe0f2HilfWP7prEwvvp5665W
 XZjl65JBgM51Vdxba40Gv6eyRaCM5SvD+3CD7CdAM/tBrFxYiLawxq0qJWr5G/DT
 Ywq4xGOo7ofdpFvfetqvGHrsBuQv2gyG/y7Aew==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pct.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pct.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pct.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pct.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pct.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pct.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pct.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pct.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pct.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pct.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pct.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pct.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPXmOxKE87b9Gpy8v4ZkBQZyM5s7MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC5wY3QuZWR1MB4XDTEzMTExMzE0NDAxNFoXDTMz
 MTExMzE0NDAxNFowFjEUMBIGA1UEAxMLaWRwLnBjdC5lZHUwggEiMA0GCSqGSIb3
@@ -73,26 +73,26 @@ pKpuJzdJRb15tTfBN9wL2vlohxJs9So5LyX/u3iTxe0f2HilfWP7prEwvvp5665W
 XZjl65JBgM51Vdxba40Gv6eyRaCM5SvD+3CD7CdAM/tBrFxYiLawxq0qJWr5G/DT
 Ywq4xGOo7ofdpFvfetqvGHrsBuQv2gyG/y7Aew==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pct.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pennsylvania College of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pennsylvania College of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pct.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mike Rae</md:GivenName>
-      <md:EmailAddress>mrae@pct.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert Belles</md:GivenName>
-      <md:EmailAddress>robert.belles@pct.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike Rae</md:GivenName>
-      <md:EmailAddress>mrae@pct.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pct.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pennsylvania College of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pennsylvania College of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pct.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mike Rae</md:GivenName>
+    <md:EmailAddress>mrae@pct.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert Belles</md:GivenName>
+    <md:EmailAddress>robert.belles@pct.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike Rae</md:GivenName>
+    <md:EmailAddress>mrae@pct.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml
index 389ffc70..848e9a8f 100644
--- a/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pembrokeshire.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T15:22:26Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T15:22:26Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pembrokeshire.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pembrokeshire.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQDRXJmAKdWRAzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjEWMBQGA1UECBMNUGVtYnJva2VzaGlyZTEWMBQGA1UEBxMNSGF2ZXJmb3Jkd2Vz
 						dDEeMBwGA1UEChMVUGVtYnJva2VzaGlyZSBDb2xsZWdlMSAwHgYDVQQDExdpZHAu
@@ -31,26 +31,26 @@
 						elD+LKh00BMxGfto3F4AuID2qRcaI+BHK2nK1tKYJgOJ57TarUPbevYx+MN5zUaQ
 						qGIbeRaq+jbj1N5J6kc5YbZDPuvT6BjH0yqKQBCI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pembrokeshire.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pembrokeshire.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pembrokeshire.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pembrokeshire.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQDRXJmAKdWRAzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjEWMBQGA1UECBMNUGVtYnJva2VzaGlyZTEWMBQGA1UEBxMNSGF2ZXJmb3Jkd2Vz
 						dDEeMBwGA1UEChMVUGVtYnJva2VzaGlyZSBDb2xsZWdlMSAwHgYDVQQDExdpZHAu
@@ -71,26 +71,26 @@
 						elD+LKh00BMxGfto3F4AuID2qRcaI+BHK2nK1tKYJgOJ57TarUPbevYx+MN5zUaQ
 						qGIbeRaq+jbj1N5J6kc5YbZDPuvT6BjH0yqKQBCI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pembrokeshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pembrokeshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pembrokeshire.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support Dept</md:GivenName>
-      <md:EmailAddress>mailto:mekon@pembrokeshire.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Gardner</md:SurName>
-      <md:EmailAddress>mailto:r.gardner@pembrokeshire.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pembrokeshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pembrokeshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pembrokeshire.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support Dept</md:GivenName>
+    <md:EmailAddress>mailto:mekon@pembrokeshire.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Gardner</md:SurName>
+    <md:EmailAddress>mailto:r.gardner@pembrokeshire.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml
index f739a257..2f9a6490 100644
--- a/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pennkey.upenn.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upenn.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Pennsylvania</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.upenn.edu/computing/weblogin/shibboleth/attribute.html</mdui:InformationURL>
+        <mdui:Logo height="150" width="466" xml:lang="en">https://idp.pennkey.upenn.edu/UPenn_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upenn.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Pennsylvania</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.upenn.edu/computing/weblogin/shibboleth/attribute.html</mdui:InformationURL>
-          <mdui:Logo height="150" width="466" xml:lang="en">https://idp.pennkey.upenn.edu/UPenn_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAIW7U17BF4OIuf7KKeJ2n7iZo4sLMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFWlkcC5wZW5ua2V5LnVwZW5uLmVkdTAeFw0xMTAzMzEx
 NTU0MDRaFw0zMTAzMzExNTU0MDRaMCAxHjAcBgNVBAMTFWlkcC5wZW5ua2V5LnVw
@@ -43,28 +43,28 @@ Y/REplQZ1ZwSoTxRxPhDa/Hflq+6mzWGdyCYDdq2Nn4Qk0bMnsNvZj3svVJeBfiG
 lnWwaH354x1lW83hhH/URqtxrgkftZ/oUVZCUruU3b5ytcHOYs/vXRTkRFsnb/EN
 iWe0xy1RO5prB/x5xli9fGaUdwE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pennkey.upenn.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pennkey.upenn.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pennkey.upenn.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upenn.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UPenn WebLogin Support</md:GivenName>
-      <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>UPenn WebLogin Support</md:GivenName>
-      <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UPenn WebLogin Support</md:GivenName>
-      <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pennkey.upenn.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pennkey.upenn.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pennkey.upenn.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upenn.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UPenn WebLogin Support</md:GivenName>
+    <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>UPenn WebLogin Support</md:GivenName>
+    <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UPenn WebLogin Support</md:GivenName>
+    <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml
index 641fe19c..3d83545c 100644
--- a/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.phlu.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-03T15:20:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://hotline.hslu.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-03T15:20:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phlu.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">PHLU - Pädagogische Hochschule Luzern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PHLU - University of Teacher Education Lucerne</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Pädagogische Hochschule Luzern</mdui:Description>
+        <mdui:Description xml:lang="en">University of Teacher Education Lucerne</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAB2SURBVDhPnczbCYAwDIXhLuebU/ngGkUXaUHco91CEIkcEPGStkl+OE8Jn0vB0zJ05rlj3yjHmT1K5ugqx4l9aO0GkAV5AUiL/ACkQVgASZEigCRIFUAtpAmgGiICUAkRA4hDVAD6ImoAPRETgICsY28HUAqeToLAQo/m8xMUAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="33" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAhCAYAAABObyzJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpCMTdBOUZEMDMxMUExMUU1OUY3QTkyN0RCRUJCRjc2NiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5MkE4RkUwODQwMzIxMUU1OUI2NERCOEIxQUUyOTRCMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5MkE4RkUwNzQwMzIxMUU1OUI2NERCOEIxQUUyOTRCMSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpjMGM5NGQ0MS1hZGZlLTQzNDItYjkwMi04NzUyYjQ2ZDI0NDkiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDpmNDk3NGYxZi0zNmFjLTExZTUtYWQxYS1lOTNm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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.phlu.ch/ph-lucerne/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.phlu.ch</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>phlu.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.051064,8.302218</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://hotline.hslu.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phlu.ch</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">PHLU - Pädagogische Hochschule Luzern</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">PHLU - University of Teacher Education Lucerne</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Pädagogische Hochschule Luzern</mdui:Description>
-          <mdui:Description xml:lang="en">University of Teacher Education Lucerne</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAB2SURBVDhPnczbCYAwDIXhLuebU/ngGkUXaUHco91CEIkcEPGStkl+OE8Jn0vB0zJ05rlj3yjHmT1K5ugqx4l9aO0GkAV5AUiL/ACkQVgASZEigCRIFUAtpAmgGiICUAkRA4hDVAD6ImoAPRETgICsY28HUAqeToLAQo/m8xMUAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:Logo height="33" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAhCAYAAABObyzJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpCMTdBOUZEMDMxMUExMUU1OUY3QTkyN0RCRUJCRjc2NiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5MkE4RkUwODQwMzIxMUU1OUI2NERCOEIxQUUyOTRCMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5MkE4RkUwNzQwMzIxMUU1OUI2NERCOEIxQUUyOTRCMSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpjMGM5NGQ0MS1hZGZlLTQzNDItYjkwMi04NzUyYjQ2ZDI0NDkiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDpmNDk3NGYxZi0zNmFjLTExZTUtYWQxYS1lOTNm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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.phlu.ch/ph-lucerne/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="de">http://www.phlu.ch</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>phlu.ch</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:47.051064,8.302218</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDDCCAfSgAwIBAgIJAMz6yMoxs++OMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC5waGx1LmNoMB4XDTE0MDQxMTA4MjMwMloXDTE3MDQxMDA4MjMwMlow
 FjEUMBIGA1UEAxMLaWRwLnBobHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -51,24 +51,24 @@ Ijzb+o+OlesBN5vYLw/gdf7F2UBQGwTPw3sjkwb13E3w/9fEVIj6gVhj+LAHsXu2
 mZkGrkn8dxV7P3DW8tZZeobO1hevdx/r6POebiXSAWvC9sztV9c7XRv/+KDUrM0z
 UJeTOp8z5dn7ZqOHT7wP8w==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.phlu.ch/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.phlu.ch/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.phlu.ch/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phlu.ch</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.phlu.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.phlu.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.phlu.ch/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phlu.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDDCCAfSgAwIBAgIJAMz6yMoxs++OMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC5waGx1LmNoMB4XDTE0MDQxMTA4MjMwMloXDTE3MDQxMDA4MjMwMlow
 FjEUMBIGA1UEAxMLaWRwLnBobHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -87,31 +87,31 @@ Ijzb+o+OlesBN5vYLw/gdf7F2UBQGwTPw3sjkwb13E3w/9fEVIj6gVhj+LAHsXu2
 mZkGrkn8dxV7P3DW8tZZeobO1hevdx/r6POebiXSAWvC9sztV9c7XRv/+KDUrM0z
 UJeTOp8z5dn7ZqOHT7wP8w==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.phlu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.phlu.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">phlu.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">PHLU - Pädagogische Hochschule Luzern</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">PHLU - University of Teacher Education Lucerne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.phlu.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.phlu.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-      <md:SurName>(Hotline)</md:SurName>
-      <md:EmailAddress>mailto:informatikhotline@hslu.ch</md:EmailAddress>
-      <md:TelephoneNumber>+41 41 228 21 21</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-      <md:SurName>(AAI Technician)</md:SurName>
-      <md:EmailAddress>mailto:aai@hslu.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.phlu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.phlu.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">phlu.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">PHLU - Pädagogische Hochschule Luzern</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PHLU - University of Teacher Education Lucerne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.phlu.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.phlu.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
+    <md:SurName>(Hotline)</md:SurName>
+    <md:EmailAddress>mailto:informatikhotline@hslu.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41 41 228 21 21</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
+    <md:SurName>(AAI Technician)</md:SurName>
+    <md:EmailAddress>mailto:aai@hslu.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml
index f82dc1db..dce79e53 100644
--- a/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pima.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pima.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Pima County Community College District</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.pima.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.pima.edu/privacy-policy/index.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pima.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Pima County Community College District</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.pima.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.pima.edu/privacy-policy/index.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAI8RApJaLNJSvMXpCrnt7hb5JMR2MA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTAeFw0xMzEyMTExNjE3MTFaFw0z
 MzEyMTExNjE3MTFaMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTCCASIwDQYJKoZI
@@ -39,23 +39,23 @@ t5zmwZkNEhDFpzYjlDAf8czEvAPFeO53kxILu42BEntqyEPqBH8L+8mifwcOiZTr
 DNcSc3EJTHGKT8FTBZ4AhAqFSC7Y8szne3fNsoCZgy3JUCiYvFqkeZNXqRsWAfh4
 0Tv6+3GYpfV3wLPnSTqH/35dNRD3MJebUFZzPCZdc2E=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pima.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pima.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pima.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pima.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pima.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pima.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pima.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pima.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pima.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pima.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pima.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pima.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAI8RApJaLNJSvMXpCrnt7hb5JMR2MA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTAeFw0xMzEyMTExNjE3MTFaFw0z
 MzEyMTExNjE3MTFaMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTCCASIwDQYJKoZI
@@ -74,30 +74,30 @@ t5zmwZkNEhDFpzYjlDAf8czEvAPFeO53kxILu42BEntqyEPqBH8L+8mifwcOiZTr
 DNcSc3EJTHGKT8FTBZ4AhAqFSC7Y8szne3fNsoCZgy3JUCiYvFqkeZNXqRsWAfh4
 0Tv6+3GYpfV3wLPnSTqH/35dNRD3MJebUFZzPCZdc2E=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pima.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pima County Community College District</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pima County Community College District</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pima.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Erik Jerue</md:GivenName>
-      <md:EmailAddress>ejerue@pima.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kellen Renshaw</md:GivenName>
-      <md:EmailAddress>krenshaw@pima.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chris Bonhorst</md:GivenName>
-      <md:EmailAddress>cbonhorst@pima.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Matt Weber</md:GivenName>
-      <md:EmailAddress>mweber3@pima.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pima.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pima County Community College District</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pima County Community College District</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pima.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Erik Jerue</md:GivenName>
+    <md:EmailAddress>ejerue@pima.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kellen Renshaw</md:GivenName>
+    <md:EmailAddress>krenshaw@pima.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Bonhorst</md:GivenName>
+    <md:EmailAddress>cbonhorst@pima.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Matt Weber</md:GivenName>
+    <md:EmailAddress>mweber3@pima.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml
index 3832fe8f..5ed4bc14 100644
--- a/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pitt.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.pitt.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Pittsburgh</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="en">http://technology.pitt.edu/research-computing/rc-incommon-shibboleth/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="400" width="400" xml:lang="en">https://www.pitt.edu/seal/seal-400x400-72rgb.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.pitt.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Pittsburgh</mdui:DisplayName>
-          <mdui:PrivacyStatementURL xml:lang="en">http://technology.pitt.edu/research-computing/rc-incommon-shibboleth/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="400" width="400" xml:lang="en">https://www.pitt.edu/seal/seal-400x400-72rgb.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAK/m2puIvEaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5waXR0LmVkdTAeFw0xMDAyMjQyMTE1NDRaFw0xMzAyMjMyMTE1NDRa
 MBcxFTATBgNVBAMTDGlkcC5waXR0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -42,13 +42,13 @@ YhVUcKSUzBNlGJdSYl4CDXWt+e6EVvnyWvAmk4psrqlXeGzBxhSjHrJGQqEDuBjZ
 Rf8ZaY9CbLGbOm/g++Szj1E+1s1cyiBQ5D316JimJ3U5Io2NHV+nSUdYOC8256+j
 dalrcnm0K9z3483QueZhUmPtapzeJz617znahr+cgz1fLZJTtP34AmIUOiVu
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEdDCCA1ygAwIBAgIJAIPyxwkgHIJiMA0GCSqGSIb3DQEBBQUAMIGCMQswCQYD
 VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1
 cmdoMSEwHwYDVQQKExhVbml2ZXJzaXR5IE9mIFBpdHRzYnVyZ2gxDTALBgNVBAsT
@@ -74,23 +74,23 @@ kxZC6m7oRw+a9ApJBWV6DB/QKAslvD45aifKijte3plakx2gzbukNhkahUxf+erg
 WSvG0BUC/zdv9BpJuwgRCUq6l58xfgHSXlrbc3gYc74pa/xMHIu82xhZFzmsMnIV
 IBWDyMtrjsnhtDNz0G0ydy2irh47nkM5oANXm5wVre55cfB6zPhK5Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pitt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pitt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pitt.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pitt.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.pitt.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pitt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pitt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pitt.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pitt.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.pitt.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAK/m2puIvEaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGlkcC5waXR0LmVkdTAeFw0xMDAyMjQyMTE1NDRaFw0xMzAyMjMyMTE1NDRa
 MBcxFTATBgNVBAMTDGlkcC5waXR0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -109,13 +109,13 @@ YhVUcKSUzBNlGJdSYl4CDXWt+e6EVvnyWvAmk4psrqlXeGzBxhSjHrJGQqEDuBjZ
 Rf8ZaY9CbLGbOm/g++Szj1E+1s1cyiBQ5D316JimJ3U5Io2NHV+nSUdYOC8256+j
 dalrcnm0K9z3483QueZhUmPtapzeJz617znahr+cgz1fLZJTtP34AmIUOiVu
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEdDCCA1ygAwIBAgIJAIPyxwkgHIJiMA0GCSqGSIb3DQEBBQUAMIGCMQswCQYD
 VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1
 cmdoMSEwHwYDVQQKExhVbml2ZXJzaXR5IE9mIFBpdHRzYnVyZ2gxDTALBgNVBAsT
@@ -141,27 +141,27 @@ kxZC6m7oRw+a9ApJBWV6DB/QKAslvD45aifKijte3plakx2gzbukNhkahUxf+erg
 WSvG0BUC/zdv9BpJuwgRCUq6l58xfgHSXlrbc3gYc74pa/xMHIu82xhZFzmsMnIV
 IBWDyMtrjsnhtDNz0G0ydy2irh47nkM5oANXm5wVre55cfB6zPhK5Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pitt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pitt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Pittsburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Pittsburgh</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pitt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Christopher Keslar</md:GivenName>
-      <md:EmailAddress>crk4@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technology Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technology Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pitt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pitt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Pittsburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Pittsburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pitt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Christopher Keslar</md:GivenName>
+    <md:EmailAddress>crk4@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technology Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technology Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml
index d2823fc6..25d3d827 100644
--- a/swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.plumpton.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.plumpton.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-11T17:22:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-11T17:22:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plumpton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plumpton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/plumpton.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/plumpton.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Plumpton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.plumpton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/plumpton.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/plumpton.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Plumpton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.plumpton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml
index 1761b004..c2190b4a 100644
--- a/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.plymouthart.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouthart.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouthart.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDH/h0V1jAUjzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMSAwHgYDVQQKExdQ
 						bHltb3V0aCBDb2xsZWdlIG9mIEFydDEeMBwGA1UEAxMVaWRwLnBseW1vdXRoYXJ0
@@ -31,26 +31,26 @@
 						+EG3KzV7yU41ZjcAeT1E+q9juJDmBlpMppWPUxnIC/1YUSaS97pdCoBJP048VYB6
 						I4JArg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.plymouthart.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouthart.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.plymouthart.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouthart.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDH/h0V1jAUjzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMSAwHgYDVQQKExdQ
 						bHltb3V0aCBDb2xsZWdlIG9mIEFydDEeMBwGA1UEAxMVaWRwLnBseW1vdXRoYXJ0
@@ -71,27 +71,27 @@
 						+EG3KzV7yU41ZjcAeT1E+q9juJDmBlpMppWPUxnIC/1YUSaS97pdCoBJP048VYB6
 						I4JArg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Plymouth College of Art</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Plymouth College of Art</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.plymouthart.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Perry</md:GivenName>
-      <md:SurName>Middleton</md:SurName>
-      <md:EmailAddress>mailto:pmiddleton@plymouthart.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Perry</md:GivenName>
-      <md:SurName>Middleton</md:SurName>
-      <md:EmailAddress>mailto:pmiddleton@plymouthart.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Plymouth College of Art</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Plymouth College of Art</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.plymouthart.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Perry</md:GivenName>
+    <md:SurName>Middleton</md:SurName>
+    <md:EmailAddress>mailto:pmiddleton@plymouthart.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Perry</md:GivenName>
+    <md:SurName>Middleton</md:SurName>
+    <md:EmailAddress>mailto:pmiddleton@plymouthart.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
index d8747b58..29211fed 100644
--- a/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.poliba.it/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-01T08:06:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-01T08:06:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poliba.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.poliba.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Politecnico di Bari</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Politecnico di Bari</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the users of Politecnico di Bari</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Bari</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.poliba.it/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.poliba.it/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.poliba.it/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.poliba.it/logo16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:41.109481,16.878798</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poliba.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.poliba.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Politecnico di Bari</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Politecnico di Bari</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for the users of Politecnico di Bari</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Bari</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.poliba.it/logo80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp.poliba.it/logo80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.poliba.it/logo16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.poliba.it/logo16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:41.109481,16.878798</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEEzCCAvugAwIBAgIJAKbucxOGsbx5MA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxHDAaBgNVBAoM
 E1BvbGl0ZWNuaWNvIGRpIEJhcmkxFDASBgNVBAsMC1NldHRvcmUgSUNUMRcwFQYD
@@ -54,13 +54,13 @@ QM7qOcq58voRCohpfUeVG6V3BkpKyx/VHFaJpkucI1U/Gw4S/6Slp4qLJ6eHIbQB
 bBEuc7suv0QEIC2VgbkdQ1muEZJfGPaxTYn00BZCPgUG2ka7hgRmKzNDdGjRe8YT
 ICP6wM+pztMtIPWic53DejjEukR860nQx4/53saWj3RRjkuTouv2
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEEzCCAvugAwIBAgIJAKbucxOGsbx5MA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxHDAaBgNVBAoM
 E1BvbGl0ZWNuaWNvIGRpIEJhcmkxFDASBgNVBAsMC1NldHRvcmUgSUNUMRcwFQYD
@@ -84,28 +84,28 @@ QM7qOcq58voRCohpfUeVG6V3BkpKyx/VHFaJpkucI1U/Gw4S/6Slp4qLJ6eHIbQB
 bBEuc7suv0QEIC2VgbkdQ1muEZJfGPaxTYn00BZCPgUG2ka7hgRmKzNDdGjRe8YT
 ICP6wM+pztMtIPWic53DejjEukR860nQx4/53saWj3RRjkuTouv2
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Politecnico di Bari</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Politecnico di Bari</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Politecnico di Bari</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Politecnico di Bari</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.poliba.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.poliba.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem-support@poliba.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:luigi.gatto@poliba.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:giuseppe.lucatorto@poliba.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Politecnico di Bari</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Politecnico di Bari</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Politecnico di Bari</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Politecnico di Bari</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.poliba.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.poliba.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem-support@poliba.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:luigi.gatto@poliba.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:giuseppe.lucatorto@poliba.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml
index 8f5cdec2..cffb05e2 100644
--- a/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.polytechnique.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-04T14:05:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-04T14:05:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polytechnique.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Polytechnique - Palaiseau</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABTklEQVQ4y52TvUtCARTFf7m3hw6N/RENLfl0rRAqiUgivxAKN5GMwD4kHCTKQgqE0PdSoSGiIJOGkJYIqlmIGiISCYmIuE1Cqc9ene1y7zn3cLgXADQxkxb+AxMArzxytV8wxNAENu4H0JoXpp7HcUQqukQRmD+N4Vy5QZPu9kOu9SLO5eu2ZPfWEUOhh872sgL2wCe+1CHyzaInlcHuF3JGctKkH5tPiJzFAIjfhVC8gipW49EulFZRPEL0IobVLQRzm8bJDUzGSwzOCGNLl53GTLqderUHuqBeM5ORPwrMqllqT324kw7eahaKyRPj1vfeHSheIfPhAUCVYRSvsFsN/E7OCdj9raFFy4vYfNJ6fc2YWCvjSpR+3EAD7m2VkXBFX2TnZZrR6K2uuAhMJc4JH0damwcCwbxmKKM5tUC22UVeLIbfOS2gSm+j/ALc64of8IctPgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OCswMjowMED16QsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDAxqFG3AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.polytechnique.edu/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">IDP Ecole Polytechnique - Palaiseau</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Polytechnique - Palaiseau</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">IDP Ecole Polytechnique - Palaiseau</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polytechnique.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Polytechnique - Palaiseau</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABTklEQVQ4y52TvUtCARTFf7m3hw6N/RENLfl0rRAqiUgivxAKN5GMwD4kHCTKQgqE0PdSoSGiIJOGkJYIqlmIGiISCYmIuE1Cqc9ene1y7zn3cLgXADQxkxb+AxMArzxytV8wxNAENu4H0JoXpp7HcUQqukQRmD+N4Vy5QZPu9kOu9SLO5eu2ZPfWEUOhh872sgL2wCe+1CHyzaInlcHuF3JGctKkH5tPiJzFAIjfhVC8gipW49EulFZRPEL0IobVLQRzm8bJDUzGSwzOCGNLl53GTLqderUHuqBeM5ORPwrMqllqT324kw7eahaKyRPj1vfeHSheIfPhAUCVYRSvsFsN/E7OCdj9raFFy4vYfNJ6fc2YWCvjSpR+3EAD7m2VkXBFX2TnZZrR6K2uuAhMJc4JH0damwcCwbxmKKM5tUC22UVeLIbfOS2gSm+j/ALc64of8IctPgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OCswMjowMED16QsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDAxqFG3AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.polytechnique.edu/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">IDP Ecole Polytechnique - Palaiseau</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Polytechnique - Palaiseau</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">IDP Ecole Polytechnique - Palaiseau</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDOzCCAiOgAwIBAgIUenAlQJGY5nvpRbOTuDq3P/4fTVYwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAwwUaWRwLnBvbHl0ZWNobmlxdWUuZnIwHhcNMTUwMTI5MTUy
 MzQwWhcNMzUwMTI5MTUyMzQwWjAfMR0wGwYDVQQDDBRpZHAucG9seXRlY2huaXF1
@@ -40,21 +40,21 @@ pK8FvrHJzFKiz/jLrrhIFuGOXG6oiitYVvc09Mv6a00sMjpDViwtHMVXmNkQN+HZ
 sqcrjIGFkPOyHZqYr2I9f4VKX7/FZn63ID4N2WdU+e3D6ACnJiLpe5tG9vwNPfk5
 rmrzBJcTpS6kyxMBlKCw
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.polytechnique.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.polytechnique.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.polytechnique.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Polytechnique - Palaiseau</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Polytechnique - Palaiseau</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.polytechnique.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@polytechnique.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.polytechnique.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.polytechnique.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.polytechnique.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Polytechnique - Palaiseau</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Polytechnique - Palaiseau</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.polytechnique.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@polytechnique.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
index f5fd413c..f0c37d70 100644
--- a/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.port.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">port.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">port.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEIjCCAwqgAwIBAgIJALf8bLjT1bnmMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRo
 						MSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFElu
@@ -35,26 +35,26 @@
 						KnGXAg5ikRPxi2wV6VGgyXCqoFhMFVQE/3zlNd8sPy6uEqHUo0gwE6amJJeafsN5
 						tetph4SV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.port.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.port.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.port.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">port.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.port.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.port.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.port.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">port.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEIjCCAwqgAwIBAgIJALf8bLjT1bnmMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRo
 						MSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFElu
@@ -79,26 +79,26 @@
 						KnGXAg5ikRPxi2wV6VGgyXCqoFhMFVQE/3zlNd8sPy6uEqHUo0gwE6amJJeafsN5
 						tetph4SV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.port.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.port.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Portsmouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Portsmouth - Legacy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.port.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@port.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Burland</md:SurName>
-      <md:EmailAddress>mailto:phil.burland@port.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.port.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.port.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Portsmouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Portsmouth - Legacy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.port.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@port.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Burland</md:SurName>
+    <md:EmailAddress>mailto:phil.burland@port.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
index 17457cba..e16da703 100644
--- a/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ppke.hu/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>ppke</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+        <saml:AttributeValue>sotelib-vs-ppke</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>ppke</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-          <saml:AttributeValue>sotelib-vs-ppke</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.225.109.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.48841,19.0784</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Pázmány Péter Katolikus Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Pazmany Peter Catholic University</mdui:Description>
+        <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ppke.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">login.ppke.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.225.109.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:47.48841,19.0784</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Pázmány Péter Katolikus Egyetem</mdui:Description>
-          <mdui:Description xml:lang="en">Pazmany Peter Catholic University</mdui:Description>
-          <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ppke.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">login.ppke.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.ppke.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ppke.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.ppke.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Pázmány Péter Catholic University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Pázmány Péter Catholic University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.itk.ppke.hu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.en.itk.ppke.hu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Detrich Bertalan</md:SurName>
-      <md:EmailAddress>mailto:detrich.bertalan@it.ppke.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Pásztor János</md:SurName>
-      <md:EmailAddress>mailto:pasztor.janos@it.ppke.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Zsombory Gábor</md:SurName>
-      <md:EmailAddress>mailto:zsombory.gabor@it.ppke.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ppke.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ppke.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ppke.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Pázmány Péter Catholic University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Pázmány Péter Catholic University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.itk.ppke.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.en.itk.ppke.hu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Detrich Bertalan</md:SurName>
+    <md:EmailAddress>mailto:detrich.bertalan@it.ppke.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Pásztor János</md:SurName>
+    <md:EmailAddress>mailto:pasztor.janos@it.ppke.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Zsombory Gábor</md:SurName>
+    <md:EmailAddress>mailto:zsombory.gabor@it.ppke.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml
index 61daab59..36565d2f 100644
--- a/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.princeton.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">princeton.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Princeton University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">princeton.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Princeton University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUMfmaP7flCY4+d5Gnju4bntgM57wwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnByaW5jZXRvbi5lZHUwHhcNMDkxMDMwMTI1MTM5
 WhcNMjkxMDMwMTI1MTM5WjAcMRowGAYDVQQDExFpZHAucHJpbmNldG9uLmVkdTCC
@@ -38,23 +38,23 @@ FEsLXa42F1nmdBDGrI2woHNEr2diujL5EOxqIsunquUXuu2dFuNtqA0HRK6wj32b
 fsZT9KwTEdLv/oAbgQ8zlVXErx54GJFg1ksGAJY3lsGY+XdvcUaKuVD2IWOrbCtP
 qZfT
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.princeton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.princeton.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.princeton.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.princeton.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.princeton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">princeton.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.princeton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.princeton.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.princeton.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.princeton.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.princeton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">princeton.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUMfmaP7flCY4+d5Gnju4bntgM57wwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnByaW5jZXRvbi5lZHUwHhcNMDkxMDMwMTI1MTM5
 WhcNMjkxMDMwMTI1MTM5WjAcMRowGAYDVQQDExFpZHAucHJpbmNldG9uLmVkdTCC
@@ -74,23 +74,23 @@ FEsLXa42F1nmdBDGrI2woHNEr2diujL5EOxqIsunquUXuu2dFuNtqA0HRK6wj32b
 fsZT9KwTEdLv/oAbgQ8zlVXErx54GJFg1ksGAJY3lsGY+XdvcUaKuVD2IWOrbCtP
 qZfT
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.princeton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.princeton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Steven Niedzwiecki</md:GivenName>
-      <md:EmailAddress>steven@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Security and Data Protection</md:GivenName>
-      <md:EmailAddress>sdp@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.princeton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.princeton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Steven Niedzwiecki</md:GivenName>
+    <md:EmailAddress>steven@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Security and Data Protection</md:GivenName>
+    <md:EmailAddress>sdp@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml b/swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml
index a15e03f5..b478c81f 100644
--- a/swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.progressivedigitalmedia.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-07T14:36:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-07T14:36:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/UKfederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/UKfederation" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/UKfederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/UKfederation" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJAJ0anKvb8NpwMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXBkbS1kZXYtd2ViMDEwHhcNMTYwMTIyMTcxMTQ4WhcNMjYwMTE5MTcxMTQ4
 						WjAYMRYwFAYDVQQDEw1wZG0tZGV2LXdlYjAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -49,43 +49,43 @@
 						ddwE8o3bWp7Nvl+OuquXBPI2dLrDHL6mYaKW1AJteYgpxSsj4jw4KlugOlrcaYum
 						lXL+Gte857dAAqPxxmXJdHnUDpWHAoIl9dSmoPTNpK9Yyw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MarketLine Dev</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MarketLine Dev</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml b/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml
index 3028f318..0f0aa10c 100644
--- a/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml
+++ b/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.protectnetwork.org/protectnetwork-idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMDCCAxigAwIBAgIJALJxC01MGf/hMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
 						BAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEPMA0GA1UEBxMGQXVzdGluMRcwFQYDVQQK
 						Ew5Qcm90ZWN0TmV0d29yazEkMCIGA1UEAxMbdGNhcy1pZHAucHJvdGVjdG5ldHdv
@@ -35,27 +35,27 @@
 						fouPZ1KljFoiTY8iwjRUUNV2Lx2hZUsDHj/4Ea23TY+fc/7OSS4K0BIO4LmUQo1Z
 						qg057Ao66R7RAwvB3jNS9ydAiNM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">9Star Research, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProtectNetwork</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.protectnetwork.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>mailto:support@protectnetwork.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>mailto:support@protectnetwork.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">9Star Research, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProtectNetwork</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.protectnetwork.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>mailto:support@protectnetwork.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>mailto:support@protectnetwork.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.prz.edu.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.prz.edu.pl-idp-shibboleth.xml
index b905734a..4bb23157 100644
--- a/swamid-interfederations-2.0/idp.prz.edu.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.prz.edu.pl-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.prz.edu.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2016-03-17T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2016-03-17T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prz.edu.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rzeszow University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">Politechnika Rzeszowska</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Rzeszow University of Technology Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="pl">Dostawca Tożsamości Politechniki Rzeszowskiej</mdui:Description>
+        <mdui:Logo height="88" width="222" xml:lang="en">https://w.prz.edu.pl/themes/prz/images/logop_prz.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prz.edu.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rzeszow University of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">Politechnika Rzeszowska</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Rzeszow University of Technology Identity Provider</mdui:Description>
-          <mdui:Description xml:lang="pl">Dostawca Tożsamości Politechniki Rzeszowskiej</mdui:Description>
-          <mdui:Logo height="88" width="222" xml:lang="en">https://w.prz.edu.pl/themes/prz/images/logop_prz.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUSxn45JYq8osLNyE19Vpt1mgep1kwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOaWRwLnByei5lZHUucGwwHhcNMTUwNDE0MDczMDM4WhcN
 MzUwNDE0MDczMDM4WjAZMRcwFQYDVQQDDA5pZHAucHJ6LmVkdS5wbDCCASIwDQYJ
@@ -43,13 +43,13 @@ fyBH/DdAi/e2JzvdJRllwYFZXyqbjphcdDbQRPMJDwX64IsLgz3qhshKGMSrPT4e
 qRtuTFz7D6/iwuNxyweebhuSDrOesH0kHEue9NVjyLLezHjGSifWTnAjn3KHB3H9
 y+8rrRJX8fOM6kTfnrL40Ir6vu9ZQacVERazVeNuhthXjAEgTdLx
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPJvJR0LcPazVISXYG6X06yC9ndaMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5wcnouZWR1LnBsMB4XDTE1MDQxNDA3MzAyOVoX
 DTM1MDQxNDA3MzAyOVowGTEXMBUGA1UEAwwOaWRwLnByei5lZHUucGwwggEiMA0G
@@ -68,13 +68,13 @@ DdebvnqXiSjSewgIuLCn+CINvW9SybvcatlJ+M2/6t2N07WgnbJN9uixvscnRepm
 0IDe6O9v5abiq2VG7AIViFWC+a9ccNIzuxyOjYfY9iPLnP838xTbuQ0MSN8eBDEZ
 UneQJVy3VT/nkjcAT7M6lhk0XgexjrWz1AoKMtbCkuNNGVkm2K+QmA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUTHsEb6D9StQBPMYXHN1HAZ3bU5YwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOaWRwLnByei5lZHUucGwwHhcNMTUwNDE0MDczMDM3WhcN
 MzUwNDE0MDczMDM3WjAZMRcwFQYDVQQDDA5pZHAucHJ6LmVkdS5wbDCCASIwDQYJ
@@ -93,30 +93,30 @@ YRyeJfn5DyUaMdXA1APINzZNCeq47d4DSiV+f587VJ37w3n6/ySYzc2lQYlYvAkT
 VsFx2s8OuccXXNppTDaVgdDGlLpk8LNHyT2IuOacxwOmbuYVqzwipW/k082UbRc+
 3/XMEQRfdUtgr6G7tbTDuzIkfIsuD6LQwCLHrpKhPb9IgBO7VlCu
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.prz.edu.pl/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.prz.edu.pl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.prz.edu.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prz.edu.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.prz.edu.pl/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.prz.edu.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.prz.edu.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.prz.edu.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prz.edu.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUSxn45JYq8osLNyE19Vpt1mgep1kwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOaWRwLnByei5lZHUucGwwHhcNMTUwNDE0MDczMDM4WhcN
 MzUwNDE0MDczMDM4WjAZMRcwFQYDVQQDDA5pZHAucHJ6LmVkdS5wbDCCASIwDQYJ
@@ -135,13 +135,13 @@ fyBH/DdAi/e2JzvdJRllwYFZXyqbjphcdDbQRPMJDwX64IsLgz3qhshKGMSrPT4e
 qRtuTFz7D6/iwuNxyweebhuSDrOesH0kHEue9NVjyLLezHjGSifWTnAjn3KHB3H9
 y+8rrRJX8fOM6kTfnrL40Ir6vu9ZQacVERazVeNuhthXjAEgTdLx
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPJvJR0LcPazVISXYG6X06yC9ndaMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC5wcnouZWR1LnBsMB4XDTE1MDQxNDA3MzAyOVoX
 DTM1MDQxNDA3MzAyOVowGTEXMBUGA1UEAwwOaWRwLnByei5lZHUucGwwggEiMA0G
@@ -160,13 +160,13 @@ DdebvnqXiSjSewgIuLCn+CINvW9SybvcatlJ+M2/6t2N07WgnbJN9uixvscnRepm
 0IDe6O9v5abiq2VG7AIViFWC+a9ccNIzuxyOjYfY9iPLnP838xTbuQ0MSN8eBDEZ
 UneQJVy3VT/nkjcAT7M6lhk0XgexjrWz1AoKMtbCkuNNGVkm2K+QmA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUTHsEb6D9StQBPMYXHN1HAZ3bU5YwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOaWRwLnByei5lZHUucGwwHhcNMTUwNDE0MDczMDM3WhcN
 MzUwNDE0MDczMDM3WjAZMRcwFQYDVQQDDA5pZHAucHJ6LmVkdS5wbDCCASIwDQYJ
@@ -185,21 +185,21 @@ YRyeJfn5DyUaMdXA1APINzZNCeq47d4DSiV+f587VJ37w3n6/ySYzc2lQYlYvAkT
 VsFx2s8OuccXXNppTDaVgdDGlLpk8LNHyT2IuOacxwOmbuYVqzwipW/k082UbRc+
 3/XMEQRfdUtgr6G7tbTDuzIkfIsuD6LQwCLHrpKhPb9IgBO7VlCu
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pl">Politechnika Rzeszowska</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Rzeszow University of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="pl">Politechnika Rzeszowska</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Rzeszow University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="pl">http://portal.prz.edu.pl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://portal.prz.edu.pl/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Administrative Support</md:GivenName>
-      <md:EmailAddress>sysadmin@prz.edu.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.prz.edu.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pl">Politechnika Rzeszowska</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Rzeszow University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="pl">Politechnika Rzeszowska</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Rzeszow University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pl">http://portal.prz.edu.pl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://portal.prz.edu.pl/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Administrative Support</md:GivenName>
+    <md:EmailAddress>sysadmin@prz.edu.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml
index 21cef3f8..29779195 100644
--- a/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.psc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfTCCA2WgAwIBAgIJAJTGWyU15DqcMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVy
 						MR4wHAYDVQQKExVQZXRlciBTeW1vbmRzIENvbGxlZ2UxFTATBgNVBAsTDFdlYiBT
@@ -37,26 +37,26 @@
 						xMEs4UauNisdmYN9OkMv7J2qgFfm0hLdDqOfzJ7W5zoIXHzjaQpHYYYIUzInI96M
 						jw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.psc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.psc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfTCCA2WgAwIBAgIJAJTGWyU15DqcMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVy
 						MR4wHAYDVQQKExVQZXRlciBTeW1vbmRzIENvbGxlZ2UxFTATBgNVBAsTDFdlYiBT
@@ -83,27 +83,27 @@
 						xMEs4UauNisdmYN9OkMv7J2qgFfm0hLdDqOfzJ7W5zoIXHzjaQpHYYYIUzInI96M
 						jw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Peter Symonds' College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Peter Symonds College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.psc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>King</md:SurName>
-      <md:EmailAddress>mailto:sking@psc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>King</md:SurName>
-      <md:EmailAddress>mailto:sking@psc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Peter Symonds' College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Peter Symonds College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.psc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>King</md:SurName>
+    <md:EmailAddress>mailto:sking@psc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>King</md:SurName>
+    <md:EmailAddress>mailto:sking@psc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
index 61eabfb0..ad9945ab 100644
--- a/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.psu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-25T15:25:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-25T15:25:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider PSU AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance PSÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.psu.cas.cz/about</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.psu.cas.cz/about</mdui:InformationURL>
+        <mdui:Logo height="44" width="43">https://jiftach.cas.cz/loga/logo-psu-44.png</mdui:Logo>
+        <mdui:Logo height="200" width="197">https://jiftach.cas.cz/loga/logo-psu-200.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider PSU AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance PSÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.psu.cas.cz/about</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.psu.cas.cz/about</mdui:InformationURL>
-          <mdui:Logo height="44" width="43">https://jiftach.cas.cz/loga/logo-psu-44.png</mdui:Logo>
-          <mdui:Logo height="200" width="197">https://jiftach.cas.cz/loga/logo-psu-200.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
 MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ SEBa4KldPbiyJ1lbTk5Lckt7Se3n1riY1wIy8jTfPGiytQqupxBwrKHSQHRa10Au
 RzpU/YfIzxlDG61GIAa1poZ/OlrgKIhdI13Gh9EWt2fMYAd7WP50
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.psu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.psu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
 MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ SEBa4KldPbiyJ1lbTk5Lckt7Se3n1riY1wIy8jTfPGiytQqupxBwrKHSQHRa10Au
 RzpU/YfIzxlDG61GIAa1poZ/OlrgKIhdI13Gh9EWt2fMYAd7WP50
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Psychologický ústav Akademie věd České republiky</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic, Public Research Institution</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky, v.v.i. </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.psu.cas.cz/about</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.psu.cas.cz/about</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Psychologický ústav Akademie věd České republiky</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic, Public Research Institution</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky, v.v.i. </md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.psu.cas.cz/about</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.psu.cas.cz/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
index f82014c3..49f997f0 100644
--- a/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.puc-campinas.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</mdui:Description>
-          <mdui:Description xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
 T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
 A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
@@ -46,26 +46,26 @@ RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
 TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
 myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
 T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
@@ -91,24 +91,24 @@ TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
 myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Carlos Cesar Braga</md:SurName>
-      <md:EmailAddress>cesar@puc-campinas.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Cesar Braga</md:SurName>
+    <md:EmailAddress>cesar@puc-campinas.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml
index 80d608a7..f86e3b09 100644
--- a/swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.pugetsound.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pugetsound.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Puget Sound</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the University of Puget Sound</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pugetsound.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Puget Sound</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for the University of Puget Sound</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAOCcreUOmiOG3xoRIC3Ym1PXDT9rMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC5wdWdldHNvdW5kLmVkdTAeFw0xNDA0MDQyMDI2
 MTNaFw0zNDA0MDQyMDI2MTNaMB0xGzAZBgNVBAMTEmlkcC5wdWdldHNvdW5kLmVk
@@ -39,27 +39,27 @@ DDLKGMpQHM8nP7V9l8tr69Wk7n8L/FSC7lK4rv2acn5l0akFQKp0NBg2ImeRBuZY
 qdWHUVixGVEY5CgV9iwp1JqiADrKNRol15RSTTW11sOpWjvmMAIUzXYCk5l9lkJB
 b/3hR0no3ho=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pugetsound.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pugetsound.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Puget Sound</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Puget Sound</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pugetsound.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark Young</md:GivenName>
-      <md:EmailAddress>myoung@pugetsound.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark Young</md:GivenName>
-      <md:EmailAddress>myoung@pugetsound.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jared Hoover</md:GivenName>
-      <md:EmailAddress>jhoover@pugetsound.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pugetsound.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pugetsound.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Puget Sound</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Puget Sound</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pugetsound.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark Young</md:GivenName>
+    <md:EmailAddress>myoung@pugetsound.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark Young</md:GivenName>
+    <md:EmailAddress>myoung@pugetsound.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jared Hoover</md:GivenName>
+    <md:EmailAddress>jhoover@pugetsound.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml
index d20871bb..657c8f77 100644
--- a/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.purdue.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">purdue.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Purdue University Main Campus</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.purdue.edu/policies/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="80" width="215" xml:lang="en">https://www.purdue.edu//purdue/globals/graphics/v4_purdue/PU_signature_white_bg_215x80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">purdue.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Purdue University Main Campus</mdui:DisplayName>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.purdue.edu/policies/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="80" width="215" xml:lang="en">https://www.purdue.edu//purdue/globals/graphics/v4_purdue/PU_signature_white_bg_215x80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUL2tBWJ/vs2e4Qf4PHC+BalWFzDwwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnB1cmR1ZS5lZHUwHhcNMTEwNTEwMTkwNjM3WhcN
 MzEwNTEwMTkwNjM3WjAZMRcwFQYDVQQDEw5pZHAucHVyZHVlLmVkdTCCASIwDQYJ
@@ -42,33 +42,33 @@ wwHJPWtEWmgyco8e1843rS5fCXYB6JD+zJgK9f1dm91cJnTAI3rq7u2A+p4V6Umo
 LupT/r3MCfWJjCiG6bV98tLeoSHrAME5EXI5pRSedGHkRdHoOT5ONWzj16pnaGsh
 B6EDsv+wL3C3eeQWHJQIYMTpI+DP3bJmfNSPOBnrHbtx2q4ydRF4
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.purdue.edu/apps/idphs/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Purdue University Main Campus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Purdue University Main Campus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.purdue.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
-      <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
-      <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
-      <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Purdue Security Team</md:GivenName>
-      <md:EmailAddress>abuse@purdue.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.purdue.edu/apps/idphs/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Purdue University Main Campus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Purdue University Main Campus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.purdue.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
+    <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
+    <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
+    <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Purdue Security Team</md:GivenName>
+    <md:EmailAddress>abuse@purdue.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml
index 0a9b00f2..696e0da8 100644
--- a/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.qatar-weill.cornell.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qatar-weill.cornell.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Weill Cornell Medical College in Qatar</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qatar-weill.cornell.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Weill Cornell Medical College in Qatar</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkCgAwIBAgIVAOjd1DnJt9+wai5RSTs4dU7Z3uVDMA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMTG2lkcC5xYXRhci13ZWlsbC5jb3JuZWxsLmVkdTAeFw0x
 NDA2MDMwNzI3NTdaFw0zNDA2MDMwNzI3NTdaMCYxJDAiBgNVBAMTG2lkcC5xYXRh
@@ -38,23 +38,23 @@ CS2nRgHvacwUcMn4jubuUxNFfGk2rrZ+32v+KKfcJP6tIh/u7IbMmQ0VQhEYOai6
 mgJ6/63J0fFOShYaGfVzsJk4VtKoO1VeF80vDTWcQ65sCT0vHG79MMizEX5N+9fQ
 ULb3rAmKgl6xBpBfo+sBJMTbsZsIG/ev/mSRyHhKra1GIAA4GTcBYaeOOt8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.qatar-weill.cornell.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.qatar-weill.cornell.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.qatar-weill.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qatar-weill.cornell.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.qatar-weill.cornell.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.qatar-weill.cornell.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.qatar-weill.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qatar-weill.cornell.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkCgAwIBAgIVAOjd1DnJt9+wai5RSTs4dU7Z3uVDMA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMTG2lkcC5xYXRhci13ZWlsbC5jb3JuZWxsLmVkdTAeFw0x
 NDA2MDMwNzI3NTdaFw0zNDA2MDMwNzI3NTdaMCYxJDAiBgNVBAMTG2lkcC5xYXRh
@@ -74,26 +74,26 @@ CS2nRgHvacwUcMn4jubuUxNFfGk2rrZ+32v+KKfcJP6tIh/u7IbMmQ0VQhEYOai6
 mgJ6/63J0fFOShYaGfVzsJk4VtKoO1VeF80vDTWcQ65sCT0vHG79MMizEX5N+9fQ
 ULb3rAmKgl6xBpBfo+sBJMTbsZsIG/ev/mSRyHhKra1GIAA4GTcBYaeOOt8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Weill Cornell Medical College in Qatar</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College in Qatar</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qatar-med.cornell.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam Agnew</md:GivenName>
-      <md:EmailAddress>saa2012@qatar-med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ala' Aljaser</md:GivenName>
-      <md:EmailAddress>ama2027@qatar-med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam Elrowmeim</md:GivenName>
-      <md:EmailAddress>ade2003@qatar-med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Weill Cornell Medical College in Qatar</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College in Qatar</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qatar-med.cornell.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam Agnew</md:GivenName>
+    <md:EmailAddress>saa2012@qatar-med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ala' Aljaser</md:GivenName>
+    <md:EmailAddress>ama2027@qatar-med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam Elrowmeim</md:GivenName>
+    <md:EmailAddress>ade2003@qatar-med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.qeliz.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.qeliz.ac.uk-shibboleth.xml
index 4bf611a9..a84ab2e5 100644
--- a/swamid-interfederations-2.0/idp.qeliz.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.qeliz.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.qeliz.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qeliz.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qeliz.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/qeliz.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/qeliz.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Elizabeth Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qeliz.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/qeliz.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/qeliz.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Elizabeth Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qeliz.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.qmc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.qmc.ac.uk-shibboleth.xml
index e5982411..ef02979c 100644
--- a/swamid-interfederations-2.0/idp.qmc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.qmc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.qmc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/qmc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/qmc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary's College, Basingstoke</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/qmc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/qmc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary's College, Basingstoke</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml
index 1f5f3704..8b0282e5 100644
--- a/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.qmu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T13:55:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T13:55:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUeld6GBPF1gEMJF1Cbn4IarRMleUwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNaWRwLnFtdS5hYy51azAeFw0xNTA4MjUxMzI1NTRaFw0z
 						NTA4MjUxMzI1NTRaMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswggEiMA0GCSqG
@@ -36,13 +36,13 @@
 						V+EK/7pRHMo+7Lzphh4M+JsfJ2UNGp/mkLeTD6focMqJyQen/YpL/1QR8nu3o5Wb
 						xQfQRA9vi20FOGF8jZCNLk3ywdmThRrTB+tdowQmVlTGmEw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
 						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -61,13 +61,13 @@
 						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
 						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
 						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -86,13 +86,13 @@
 						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
 						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIURpdjTjwcGImbW/r7Ao0+z0pBc3IwDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMB4XDTE2MDUxNjA5MzQwMloX
 						DTM2MDUxNjA5MzQwMlowGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMIIBIjAN
@@ -111,26 +111,26 @@
 						z37vNMXQier73zDk2HVG5WcWiaES3PTfNl079s0nxaAM0rDPXj5oiz+f1R5qrRav
 						XO4oH51Nh8eXR90oA0t+1LhpLw5tCg5UNDCRJU3YcvxVXZf14DhcyQVZvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUeld6GBPF1gEMJF1Cbn4IarRMleUwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNaWRwLnFtdS5hYy51azAeFw0xNTA4MjUxMzI1NTRaFw0z
 						NTA4MjUxMzI1NTRaMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswggEiMA0GCSqG
@@ -149,13 +149,13 @@
 						V+EK/7pRHMo+7Lzphh4M+JsfJ2UNGp/mkLeTD6focMqJyQen/YpL/1QR8nu3o5Wb
 						xQfQRA9vi20FOGF8jZCNLk3ywdmThRrTB+tdowQmVlTGmEw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
 						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -174,13 +174,13 @@
 						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
 						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
 						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -199,13 +199,13 @@
 						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
 						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIURpdjTjwcGImbW/r7Ao0+z0pBc3IwDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMB4XDTE2MDUxNjA5MzQwMloX
 						DTM2MDUxNjA5MzQwMlowGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMIIBIjAN
@@ -224,24 +224,24 @@
 						z37vNMXQier73zDk2HVG5WcWiaES3PTfNl079s0nxaAM0rDPXj5oiz+f1R5qrRav
 						XO4oH51Nh8eXR90oA0t+1LhpLw5tCg5UNDCRJU3YcvxVXZf14DhcyQVZvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh TEST (Do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Garry</md:GivenName>
-      <md:SurName>Haining</md:SurName>
-      <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Garry</md:GivenName>
-      <md:SurName>Haining</md:SurName>
-      <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh TEST (Do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Haining</md:SurName>
+    <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Haining</md:SurName>
+    <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml
index e8fec953..82ad7f9e 100644
--- a/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rac.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-30T15:44:04Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-30T15:44:04Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rac.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rac.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIIYso0tsUAlx0wDQYJKoZIhvcNAQEFBQAwPTEjMCEGA1UE
 						CgwaUm95YWwgQWdyaWN1bHR1cmFsIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC5yYWMu
 						YWMudWswHhcNMTIwNzE4MTEyMDI1WhcNMjIwNzE4MTEyMDI1WjA9MSMwIQYDVQQK
@@ -30,13 +30,13 @@
 						d0oNG8oZer9agEzQh2gGenDzVmHWTp/n6j+dSjq0TfNXkd3skkcaXv/KXgpzuv3L
 						WZWU2kY5guo5wEXb3L9cxzFAZ+OaHFp31a/I2e0kHS0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIIYso0tsUAlx0wDQYJKoZIhvcNAQEFBQAwPTEjMCEGA1UE
 						CgwaUm95YWwgQWdyaWN1bHR1cmFsIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC5yYWMu
 						YWMudWswHhcNMTIwNzE4MTEyMDI1WhcNMjIwNzE4MTEyMDI1WjA9MSMwIQYDVQQK
@@ -56,25 +56,25 @@
 						d0oNG8oZer9agEzQh2gGenDzVmHWTp/n6j+dSjq0TfNXkd3skkcaXv/KXgpzuv3L
 						WZWU2kY5guo5wEXb3L9cxzFAZ+OaHFp31a/I2e0kHS0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rac.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rac.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Agricultural University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Agricultural University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rac.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Brooks</md:SurName>
-      <md:EmailAddress>mailto:peter.brooks@rau.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Griffin</md:SurName>
-      <md:EmailAddress>mailto:james.griffin@rau.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rac.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rac.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Agricultural University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Agricultural University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rac.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Brooks</md:SurName>
+    <md:EmailAddress>mailto:peter.brooks@rau.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Griffin</md:SurName>
+    <md:EmailAddress>mailto:james.griffin@rau.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml
index 65880bb0..d3644d49 100644
--- a/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.racc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-16T09:00:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-16T09:00:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Richmond Adult Community College</mdui:DisplayName>
+        <mdui:Logo height="71" width="154">https://www.racc.ac.uk/files/images/racclogo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.racc.ac.uk/files/images/smallracclogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racc.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Richmond Adult Community College</mdui:DisplayName>
-          <mdui:Logo height="71" width="154">https://www.racc.ac.uk/files/images/racclogo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.racc.ac.uk/files/images/smallracclogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUf8EAs09RQNjeRsweRhhhdo0gIh4wDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLnJhY2MuYWMudWswHhcNMTQwODEyMTUzMzExWhcN
 						MzQwODEyMTUzMzExWjAZMRcwFQYDVQQDEw5pZHAucmFjYy5hYy51azCCASIwDQYJ
@@ -36,29 +36,29 @@
 						eSrWyEExSZKTu9diPVDG/ChJCFRBGLR3CScBgaoT6+d6WRYUX8bbeao89JjBm0Nf
 						ACWJFCPa6s7SURC2luCO0NnF6QxNTCBrkXI8Amw4U+Bvpv7v3Fhg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.racc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.racc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.racc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.racc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.racc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.racc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUf8EAs09RQNjeRsweRhhhdo0gIh4wDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLnJhY2MuYWMudWswHhcNMTQwODEyMTUzMzExWhcN
 						MzQwODEyMTUzMzExWjAZMRcwFQYDVQQDEw5pZHAucmFjYy5hYy51azCCASIwDQYJ
@@ -77,27 +77,27 @@
 						eSrWyEExSZKTu9diPVDG/ChJCFRBGLR3CScBgaoT6+d6WRYUX8bbeao89JjBm0Nf
 						ACWJFCPa6s7SURC2luCO0NnF6QxNTCBrkXI8Amw4U+Bvpv7v3Fhg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Richmond Adult Community College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Richmond Adult Community College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.racc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Matthews</md:SurName>
-      <md:EmailAddress>mailto:ray.matthews@racc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Matthews</md:SurName>
-      <md:EmailAddress>mailto:ray.matthews@racc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Richmond Adult Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Richmond Adult Community College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.racc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Matthews</md:SurName>
+    <md:EmailAddress>mailto:ray.matthews@racc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Matthews</md:SurName>
+    <md:EmailAddress>mailto:ray.matthews@racc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml
index d65460f2..a8bd73e5 100644
--- a/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.radford.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radford.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Radford University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radford.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Radford University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDpTCCAo2gAwIBAgIJANeIL5N/K7s2MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJWQTEQMA4GA1UEBwwHUmFkZm9yZDEUMBIGA1UECgwL
 cmFkZm9yZC5lZHUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ucmFkZm9yZC5l
@@ -40,26 +40,26 @@ FDELTQ+nBfCrIa9letM+SoIU4znIvOfd4Z6k4uU11aDaZKej6/9rwMuo4EfgUFTR
 16SeaJX8wNydS4+68Ch9U5Z3saWWuC3aU4pNnMQW1VUt0bqVhtgPkcTaS7uZeYhC
 5ZxW63cQCq8Tt4xwbP8uzhoMCBiAWn+H1g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.radford.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.radford.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.radford.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.radford.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.radford.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.radford.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.radford.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.radford.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radford.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.radford.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.radford.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.radford.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.radford.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.radford.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.radford.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.radford.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.radford.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radford.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDpTCCAo2gAwIBAgIJANeIL5N/K7s2MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIDAJWQTEQMA4GA1UEBwwHUmFkZm9yZDEUMBIGA1UECgwL
 cmFkZm9yZC5lZHUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ucmFkZm9yZC5l
@@ -81,18 +81,18 @@ FDELTQ+nBfCrIa9letM+SoIU4znIvOfd4Z6k4uU11aDaZKej6/9rwMuo4EfgUFTR
 16SeaJX8wNydS4+68Ch9U5Z3saWWuC3aU4pNnMQW1VUt0bqVhtgPkcTaS7uZeYhC
 5ZxW63cQCq8Tt4xwbP8uzhoMCBiAWn+H1g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.radford.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Radford University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Radford University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.radford.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Todd Joyce</md:GivenName>
-      <md:EmailAddress>tjoyce@radford.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.radford.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Radford University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Radford University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.radford.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Todd Joyce</md:GivenName>
+    <md:EmailAddress>tjoyce@radford.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ram.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ram.ac.uk-shibboleth.xml
index b18bc724..e2322cea 100644
--- a/swamid-interfederations-2.0/idp.ram.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ram.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ram.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ram.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ram.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ram.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ram.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Academy of Music</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ram.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ram.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ram.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Academy of Music</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ram.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml
index 7c5e9324..a02ecf80 100644
--- a/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rca.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-06T13:38:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-06T13:38:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rca.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rca.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIIZiSQ6tfQBJIwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
 						CgwUUm95YWwgQ29sbGVnZSBvZiBBcnQxFjAUBgNVBAMMDWlkcC5yY2EuYWMudWsw
 						HhcNMTIwNjI3MTUxOTA4WhcNMjIwNjI3MTUxOTA4WjA3MR0wGwYDVQQKDBRSb3lh
@@ -32,13 +32,13 @@
 						ZXH1VCl39wBsLDA9tIFFP0j9wrqL0zB/O5Q+MpbXdogr1o1Plf3WT9Gs5X+qxKwQ
 						1PCtHEiZPbi8Pd4Iw2QAOFaTOnE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIIZiSQ6tfQBJIwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
 						CgwUUm95YWwgQ29sbGVnZSBvZiBBcnQxFjAUBgNVBAMMDWlkcC5yY2EuYWMudWsw
 						HhcNMTIwNjI3MTUxOTA4WhcNMjIwNjI3MTUxOTA4WjA3MR0wGwYDVQQKDBRSb3lh
@@ -58,25 +58,25 @@
 						ZXH1VCl39wBsLDA9tIFFP0j9wrqL0zB/O5Q+MpbXdogr1o1Plf3WT9Gs5X+qxKwQ
 						1PCtHEiZPbi8Pd4Iw2QAOFaTOnE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rca.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rca.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal College of Art</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Art</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rca.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Elizabeth</md:GivenName>
-      <md:SurName>Oliver</md:SurName>
-      <md:EmailAddress>mailto:elizabeth.oliver@rca.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Keene</md:SurName>
-      <md:EmailAddress>mailto:paul.keene@rca.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rca.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rca.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal College of Art</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Art</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rca.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elizabeth</md:GivenName>
+    <md:SurName>Oliver</md:SurName>
+    <md:EmailAddress>mailto:elizabeth.oliver@rca.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Keene</md:SurName>
+    <md:EmailAddress>mailto:paul.keene@rca.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml
index 6ea2469f..47dcd43b 100644
--- a/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rcpch.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-12T09:11:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-12T09:11:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Royal College of Paediatrics and Child Health</mdui:DisplayName>
+        <mdui:Logo height="168" width="238">https://www.rcpch.ac.uk/sites/default/themes/rcpch/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.rcpch.ac.uk/sites/default/themes/rcpch/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Royal College of Paediatrics and Child Health</mdui:DisplayName>
-          <mdui:Logo height="168" width="238">https://www.rcpch.ac.uk/sites/default/themes/rcpch/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.rcpch.ac.uk/sites/default/themes/rcpch/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUJdj239A2eY7O8uJt78R/EdkY8fwwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMB4XDTE0MTEyNTEwMTcxNloX
 						DTM0MTEyNTEwMTcxNlowGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMIIBIjAN
@@ -36,29 +36,29 @@
 						NxhnmRLKM0uOMAxtL2/DLfpCJ8w8a6of61Y6l9BqAD5+MYU8Ve4upV+4VGHIbkoB
 						Y3epTNgBJ8fJ+qQVJknINlO/fKJTQmAvap3uwSHeh0mt3tQxEtr1nPoX6A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rcpch.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rcpch.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUJdj239A2eY7O8uJt78R/EdkY8fwwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMB4XDTE0MTEyNTEwMTcxNloX
 						DTM0MTEyNTEwMTcxNlowGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMIIBIjAN
@@ -77,25 +77,25 @@
 						NxhnmRLKM0uOMAxtL2/DLfpCJ8w8a6of61Y6l9BqAD5+MYU8Ve4upV+4VGHIbkoB
 						Y3epTNgBJ8fJ+qQVJknINlO/fKJTQmAvap3uwSHeh0mt3tQxEtr1nPoX6A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal College of Paediatrics and Child Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Paediatrics and Child Health</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcpch.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Overt Software</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal College of Paediatrics and Child Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Paediatrics and Child Health</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcpch.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Overt Software</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml
index bf4f9ae6..81542b50 100644
--- a/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rcpi.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2014-08-26T12:51:59Z"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2014-08-26T12:51:59Z"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpi.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Royal College of Physicians of Ireland</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.rcpi.ie/</mdui:InformationURL>
+        <mdui:Logo height="150" width="150">https://idp.rcpi.ie/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpi.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Royal College of Physicians of Ireland</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.rcpi.ie/</mdui:InformationURL>
-          <mdui:Logo height="150" width="150">https://idp.rcpi.ie/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUH9bbvnLR0v9pD3ammqi5YFwsHv0wDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnJjcGkuaWUwHhcNMTIxMjEwMTUzNTUwWhcNMzIx
 MjEwMTUzNTUwWjAWMRQwEgYDVQQDEwtpZHAucmNwaS5pZTCCASIwDQYJKoZIhvcN
@@ -40,35 +40,35 @@ YINLSp6w3cT9k2al0TQwNlzhwGwK9JvFUuzUU5SK0viHoIxdlFSxzZhJxggzmrW8
 8s9Q6HryWs7l9TSCCHb740jYCApjJ1vafAHbgbtBMtHg6mqPLrDDbBTO3Vq0JnmP
 28uRVtp9EMa9ZdTxX444lGzBxeNZWeerUjQG
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcpi.ie/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Eibrand</md:SurName>
-      <md:EmailAddress>mailto:richardeibrand@rcpi.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Rath</md:SurName>
-      <md:EmailAddress>mailto:AdrianRath@RCPI.IE</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>RCPI</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@rcpi.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcpi.ie/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Eibrand</md:SurName>
+    <md:EmailAddress>mailto:richardeibrand@rcpi.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Rath</md:SurName>
+    <md:EmailAddress>mailto:AdrianRath@RCPI.IE</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>RCPI</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@rcpi.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml
index ec2e691a..c8dad263 100644
--- a/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rcplondon.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcplondon.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcplondon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/rcplondon.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/rcplondon.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Physicians of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcplondon.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/rcplondon.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/rcplondon.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Physicians of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcplondon.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml
index 5e7fed81..96a95e5c 100644
--- a/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reed.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reed.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Reed College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reed.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Reed College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAPuLDfin459bH1TviFJwMkClxzSZMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTAeFw0xMDEwMTMxODE1MjJaFw0z
 MDEwMTMxODE1MjJaMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTCCASIwDQYJKoZI
@@ -40,23 +40,23 @@ Tg5D2SHhV9dQur/QGSlkJ2REjrqKhyw9yAogB3AH0IY3rGnpmbmAc3ian+C6IZXH
 BpQPMrLCFksiKP4tBOH88PLItWn3uFc4Q8f1s+5qDxVIqWVTdjOkZnysMRob1y+w
 ROMyInz+7gYPcFok9V3ghjhHj3POw+ZqlJA25Ap6v9Y=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reed.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reed.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reed.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reed.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reed.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reed.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reed.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reed.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reed.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reed.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reed.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reed.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAPuLDfin459bH1TviFJwMkClxzSZMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTAeFw0xMDEwMTMxODE1MjJaFw0z
 MDEwMTMxODE1MjJaMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTCCASIwDQYJKoZI
@@ -75,30 +75,30 @@ Tg5D2SHhV9dQur/QGSlkJ2REjrqKhyw9yAogB3AH0IY3rGnpmbmAc3ian+C6IZXH
 BpQPMrLCFksiKP4tBOH88PLItWn3uFc4Q8f1s+5qDxVIqWVTdjOkZnysMRob1y+w
 ROMyInz+7gYPcFok9V3ghjhHj3POw+ZqlJA25Ap6v9Y=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reed.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reed College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://reed.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben Poliakoff</md:GivenName>
-      <md:EmailAddress>benp@reed.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marianne Colgrove</md:GivenName>
-      <md:EmailAddress>mcolgrov@reed.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computer User Services</md:GivenName>
-      <md:EmailAddress>cus@reed.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technology Infrastucture Services</md:GivenName>
-      <md:EmailAddress>tis@reed.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reed.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reed College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://reed.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben Poliakoff</md:GivenName>
+    <md:EmailAddress>benp@reed.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marianne Colgrove</md:GivenName>
+    <md:EmailAddress>mcolgrov@reed.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computer User Services</md:GivenName>
+    <md:EmailAddress>cus@reed.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technology Infrastucture Services</md:GivenName>
+    <md:EmailAddress>tis@reed.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml
index b2823d40..ec788eff 100644
--- a/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reigate.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T13:32:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T13:32:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reigate.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reigate.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAPBD4Ch8c1eFKJwVl1SVemY1lNWFMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMMEWlkcC5yZWlnYXRlLmFjLnVrMB4XDTE1MDkwMzEyNDQz
 						NFoXDTM1MDkwMzEyNDQzNFowHDEaMBgGA1UEAwwRaWRwLnJlaWdhdGUuYWMudWsw
@@ -32,29 +32,29 @@
 						zUyyzg1bGcmlKawqZ+Yoegt2JNa9yhAsUfvv909vTYw6Uw0LzzEmjZFMc40W3R9c
 						YrbmYw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reigate.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reigate.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reigate.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reigate.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAPBD4Ch8c1eFKJwVl1SVemY1lNWFMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMMEWlkcC5yZWlnYXRlLmFjLnVrMB4XDTE1MDkwMzEyNDQz
 						NFoXDTM1MDkwMzEyNDQzNFowHDEaMBgGA1UEAwwRaWRwLnJlaWdhdGUuYWMudWsw
@@ -74,27 +74,27 @@
 						zUyyzg1bGcmlKawqZ+Yoegt2JNa9yhAsUfvv909vTYw6Uw0LzzEmjZFMc40W3R9c
 						YrbmYw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reigate College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reigate College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reigate.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ash</md:GivenName>
-      <md:SurName>Farbrother</md:SurName>
-      <md:EmailAddress>mailto:ash.farbrother@reigate.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Freeman</md:SurName>
-      <md:EmailAddress>mailto:Michael.Freeman@reigate.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reigate College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reigate College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reigate.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ash</md:GivenName>
+    <md:SurName>Farbrother</md:SurName>
+    <md:EmailAddress>mailto:ash.farbrother@reigate.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Freeman</md:SurName>
+    <md:EmailAddress>mailto:Michael.Freeman@reigate.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
index d4070ed6..73f71a10 100644
--- a/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renata.edu.co/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2014-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2014-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
                     http://colfire.co/Politica_IdP.pdf
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.co</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.co</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">
                         RENATA - Red Nacional Academica de Tecnologia Avanzada
                 </mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">
+        <mdui:DisplayName xml:lang="es">
                         RENATA - Red Nacional Academica de Tecnologia Avanzada
                 </mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+        <mdui:Description xml:lang="en">
                         RENATA - Red Nacional Academica de Tecnologia Avanzada
                 </mdui:Description>
-          <mdui:Description xml:lang="es">
+        <mdui:Description xml:lang="es">
                         RENATA - Red Nacional Academica de Tecnologia Avanzada
                 </mdui:Description>
-          <mdui:InformationURL xml:lang="en">
+        <mdui:InformationURL xml:lang="en">
                         http://www.renata.edu.co
                 </mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">
+        <mdui:InformationURL xml:lang="es">
                         http://www.renata.edu.co
                 </mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIG3jCCBcagAwIBAgIQA7a3wqJ79UaLPv5KuUFPwzANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwMjAxMDAwMDAwWhcN
@@ -73,29 +73,29 @@ yk4E0ftsgBvF+ABPh7UncA7g7Xib9JAApCuO4cVoT+ZCSjiFRwW8IDVgcCZENdeP
 yh4ohtfLM8hd099K6Tk5TKIRt+SW1KRgEga4jRrOxMQ0bKjxQWydo93HVfMPiBhn
 FtZcGPmpg9fHry1cbwDW0660J/yOZsUbhNuUu5xv06SOqA==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renata.edu.co/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.co</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renata.edu.co/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.co</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIG3jCCBcagAwIBAgIQA7a3wqJ79UaLPv5KuUFPwzANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwMjAxMDAwMDAwWhcN
@@ -134,48 +134,48 @@ yk4E0ftsgBvF+ABPh7UncA7g7Xib9JAApCuO4cVoT+ZCSjiFRwW8IDVgcCZENdeP
 yh4ohtfLM8hd099K6Tk5TKIRt+SW1KRgEga4jRrOxMQ0bKjxQWydo93HVfMPiBhn
 FtZcGPmpg9fHry1cbwDW0660J/yOZsUbhNuUu5xv06SOqA==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="es">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="es">
 		RENATA - Red Nacional Académica de Tecnología Avanzada
 	</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">
+    <md:OrganizationName xml:lang="en">
 		RENATA - Red Nacional Académica de Tecnología Avanzada
 	</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="es">
+    <md:OrganizationDisplayName xml:lang="es">
 		RENATA - Red Nacional Académica de Tecnología Avanzada
 	</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
 		RENATA - Red Nacional Académica de Tecnología Avanzada
 	</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="es">
+    <md:OrganizationURL xml:lang="es">
 		http://www.renata.edu.co
 	</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
 		http://www.renata.edu.co
 	</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>
 		Hernan Garcia
 	</md:SurName>
-      <md:EmailAddress>
+    <md:EmailAddress>
 		elcira@renata.edu.co
 	</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>
 		Javier Enrique Lizarazo
 	</md:SurName>
-      <md:EmailAddress>
+    <md:EmailAddress>
 		tecnico@renata.edu.co
 	</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
index 643c0cdf..4a0798bb 100644
--- a/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renater.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-15T16:51:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-15T16:51:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GIP RENATER</mdui:DisplayName>
+        <mdui:Logo height="15" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAIAAABiEdh4AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADwCRnKNdAAACBElEQVQoz22RPWgTcRjGn/vf5S7XJk1Ja0mDpEYF0cZmMwhpcRI/6GIpXTToIjpUnERQUHQoioM4FQoOFSo6qB3EoKCoKFIdbEBqMKDRpDS9NunFXD7v/q9DNe3VPuvz/njf53lBm2nFqOLI1dv3X/5vMWymh88/olg5fyd++saDDZYNePc5xYkACAAgwC1PxGd7Y7eevEnwfzPC96yWyRXcLU6PWx1//F6VpcP7d+8LBTXd6D83npwvQGQo1eFSrg1HBgf6hKlnM5+SGVVxMECRJSLUGqa/s+3M0IAF6hwe00tViAxEKFQux6ICEf1cyE+/ThR+l0X290LT4opDunjyYHohv23oJtqdAJArfX10gQEI+LyjIwdcqkJEq4AkslrDnHz6ocfnPXUohLoFvXp8MLwr0LUWOtLb07Ca2SCJbO7HolGpHY2GsFK5FOu/d+WEraU92/2c0/rSZElM/dJ8XhcY69vZremGDSgalY3vEGBaVlbT4RRHRieXi2UbsFQoMUGwAYS2VnX67RcoEtyyLEs2IJHKiqLtj0RUrptTr+bgEAGoirwGVOuNVGaZrVvAOYV2dF+/G4eDAYDH6T82pukGa26PhoOAUK2bnMi0uMV5Ir3Y4BQOdGCpDJPPTpzd4mkVmt2v6ls692ImubXLE9kb7Gx3i0wAkC+WSUCHuwXAH/rb+m9hYGX6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAw1DjCNgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMCswMjowMKVleooAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">GIP RENATER</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GIP RENATER</mdui:DisplayName>
-          <mdui:Logo height="15" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAIAAABiEdh4AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADwCRnKNdAAACBElEQVQoz22RPWgTcRjGn/vf5S7XJk1Ja0mDpEYF0cZmMwhpcRI/6GIpXTToIjpUnERQUHQoioM4FQoOFSo6qB3EoKCoKFIdbEBqMKDRpDS9NunFXD7v/q9DNe3VPuvz/njf53lBm2nFqOLI1dv3X/5vMWymh88/olg5fyd++saDDZYNePc5xYkACAAgwC1PxGd7Y7eevEnwfzPC96yWyRXcLU6PWx1//F6VpcP7d+8LBTXd6D83npwvQGQo1eFSrg1HBgf6hKlnM5+SGVVxMECRJSLUGqa/s+3M0IAF6hwe00tViAxEKFQux6ICEf1cyE+/ThR+l0X290LT4opDunjyYHohv23oJtqdAJArfX10gQEI+LyjIwdcqkJEq4AkslrDnHz6ocfnPXUohLoFvXp8MLwr0LUWOtLb07Ca2SCJbO7HolGpHY2GsFK5FOu/d+WEraU92/2c0/rSZElM/dJ8XhcY69vZremGDSgalY3vEGBaVlbT4RRHRieXi2UbsFQoMUGwAYS2VnX67RcoEtyyLEs2IJHKiqLtj0RUrptTr+bgEAGoirwGVOuNVGaZrVvAOYV2dF+/G4eDAYDH6T82pukGa26PhoOAUK2bnMi0uMV5Ir3Y4BQOdGCpDJPPTpzd4mkVmt2v6ls692ImubXLE9kb7Gx3i0wAkC+WSUCHuwXAH/rb+m9hYGX6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAw1DjCNgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMCswMjowMKVleooAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">GIP RENATER</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAOKBqJWqJFq6T2dHTEfrhVJRssecMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEzMDMwMTEwMjUwNVoX
 DTMzMDMwMTEwMjUwNVowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
@@ -37,21 +37,21 @@ xY7nHrrdSo+QUQSyIYb/Ue7003/wr+8yRc42lx/hbHAcj9vIkrVvFpPCAg86rS0N
 Ber/c4EoBOTHkNkGxaFSWKA8trRJUecsobHum/jjuwwJBahR8Jvf+p0a0ADCrsqN
 JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renater.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renater.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support@support.renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support@support.renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
index b6546b2c..9c1c5fd8 100644
--- a/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reuna.cl/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2012-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2012-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
 http://cofre.reuna.cl/index.php/es/reglas-federacion
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reuna.cl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">REUNA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">REUNA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">REUNA</mdui:Description>
+        <mdui:Description xml:lang="es">REUNA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.reuna.cl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.reuna.cl</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reuna.cl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">REUNA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">REUNA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">REUNA</mdui:Description>
-          <mdui:Description xml:lang="es">REUNA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.reuna.cl</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.reuna.cl</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE 6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6 lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
 urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 </md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reuna.cl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reuna.cl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reuna.cl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reuna.cl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reuna.cl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reuna.cl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reuna.cl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reuna.cl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reuna.cl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reuna.cl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE 6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6 lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
 urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 </md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">REUNA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">REUNA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reuna.cl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>REUNA NOC</md:GivenName>
-      <md:EmailAddress>operaciones@reuna.cl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Alejandro</md:GivenName>
-      <md:SurName>Lara</md:SurName>
-      <md:EmailAddress>cofre@reuna.cl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">REUNA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">REUNA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reuna.cl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>REUNA NOC</md:GivenName>
+    <md:EmailAddress>operaciones@reuna.cl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Alejandro</md:GivenName>
+    <md:SurName>Lara</md:SurName>
+    <md:EmailAddress>cofre@reuna.cl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml
index 1f24c5b8..1fad194c 100644
--- a/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rhodes.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://www.rhodes.edu/barret/help.asp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhodes.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rhodes College</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.rhodes.edu/barret/24351.asp</mdui:InformationURL>
+        <mdui:Logo height="160" width="320" xml:lang="en">https://www.rhodes.edu/images/content/Communications/Full_Color_Logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://www.rhodes.edu/barret/help.asp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhodes.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rhodes College</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.rhodes.edu/barret/24351.asp</mdui:InformationURL>
-          <mdui:Logo height="160" width="320" xml:lang="en">https://www.rhodes.edu/images/content/Communications/Full_Color_Logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEsDCCA5igAwIBAgIQdL5J8ozn++NOGdIt+ubUoDANBgkqhkiG9w0BAQsFADBB
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
 aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUwNDIyMDAwMDAwWhcNMTcwNDIxMjM1OTU5
@@ -48,23 +48,23 @@ xVQB7Aban4DI6j/1nP6LxhXFSE0Z/TqA+PyTniUpIG4Gmr8djgwKtWEBljhuaBeG
 KZW8QpiEtyd6IT9DlHYBLdupCdP2tR2kk7QAvQNkRQ2bvEbRzupHtzyUYJkRWc8K
 YblxuA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rhodes.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rhodes.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhodes.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rhodes.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhodes.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhodes.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rhodes.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rhodes.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhodes.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rhodes.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhodes.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhodes.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEsDCCA5igAwIBAgIQdL5J8ozn++NOGdIt+ubUoDANBgkqhkiG9w0BAQsFADBB
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
 aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUwNDIyMDAwMDAwWhcNMTcwNDIxMjM1OTU5
@@ -92,30 +92,30 @@ xVQB7Aban4DI6j/1nP6LxhXFSE0Z/TqA+PyTniUpIG4Gmr8djgwKtWEBljhuaBeG
 KZW8QpiEtyd6IT9DlHYBLdupCdP2tR2kk7QAvQNkRQ2bvEbRzupHtzyUYJkRWc8K
 YblxuA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rhodes.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rhodes College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rhodes College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rhodes.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Doug Walker</md:GivenName>
-      <md:EmailAddress>walkerd@rhodes.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Arthur Rosario</md:GivenName>
-      <md:EmailAddress>rosarioa@rhodes.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk@Rhodes</md:GivenName>
-      <md:EmailAddress>helpdesk@rhodes.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Richie Trenthem</md:GivenName>
-      <md:EmailAddress>trenthem@rhodes.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rhodes.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rhodes College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rhodes College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rhodes.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Doug Walker</md:GivenName>
+    <md:EmailAddress>walkerd@rhodes.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arthur Rosario</md:GivenName>
+    <md:EmailAddress>rosarioa@rhodes.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk@Rhodes</md:GivenName>
+    <md:EmailAddress>helpdesk@rhodes.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Richie Trenthem</md:GivenName>
+    <md:EmailAddress>trenthem@rhodes.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
index 6015e0a8..c5653f9f 100644
--- a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
+++ b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.rhul.ac.uk/oala">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T11:59:06Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T11:59:06Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhul.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhul.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkigAwIBAgIIS43HU8EXmhwwDQYJKoZIhvcNAQEFBQAwRzEsMCoGA1UE
 						CgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24xFzAVBgNVBAMM
 						DmlkcC5yaHVsLmFjLnVrMB4XDTEyMTIxMjEyMjAyM1oXDTIyMTIxMjEyMjAyM1ow
@@ -31,13 +31,13 @@
 						LugYUaKfJyWtcrBUW24OQqf77hwQjtWox3tW9FXGMc3YvBGWFeKlJXMADaqtig1i
 						fRVknA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkigAwIBAgIIS43HU8EXmhwwDQYJKoZIhvcNAQEFBQAwRzEsMCoGA1UE
 						CgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24xFzAVBgNVBAMM
 						DmlkcC5yaHVsLmFjLnVrMB4XDTEyMTIxMjEyMjAyM1oXDTIyMTIxMjEyMjAyM1ow
@@ -58,24 +58,24 @@
 						LugYUaKfJyWtcrBUW24OQqf77hwQjtWox3tW9FXGMc3YvBGWFeKlJXMADaqtig1i
 						fRVknA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhul.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhul.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Holloway and Bedford New College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Holloway, University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rhul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library Systems Team</md:GivenName>
-      <md:EmailAddress>mailto:libsysteam@rhul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Kiely</md:SurName>
-      <md:EmailAddress>mailto:Peter.Kiely@rhul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhul.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhul.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Holloway and Bedford New College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Holloway, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rhul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:libsysteam@rhul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Kiely</md:SurName>
+    <md:EmailAddress>mailto:Peter.Kiely@rhul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml
index f56cb10a..ed4f1148 100644
--- a/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rice.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rice.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rice University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Rice University Identity Provider</mdui:Description>
+        <mdui:Logo height="60" width="152" xml:lang="en">https://idp.rice.edu/idp/images/RiceLogo_small.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rice.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rice University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Rice University Identity Provider</mdui:Description>
-          <mdui:Logo height="60" width="152" xml:lang="en">https://idp.rice.edu/idp/images/RiceLogo_small.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUNB1FAd9Ux2knx5u0LT/2TS1LGcYwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MB4XDTA5MTAyOTE5NTYzMVoXDTI5
 MTAyOTE5NTYzMVowFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MIIBIjANBgkqhkiG
@@ -42,27 +42,27 @@ v+P0jZo3wAfCgA7hw84PHU/Az7nB9sawg2s082B0QKpMfeIjtrmWlRqyZiUxOpyC
 u6hryK6pnoO5TWNzyFnOZq8oNpXi+6+ulfu6Gf8ENofwnhxtj30Drh/uzGjJfwhb
 YGiGeQcYxxiDQvtt3hzYv/pHQ1/6svEiUxzRpwvC7Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rice.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rice.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rice.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rice.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rice.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rice.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rice.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rice.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rice.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rice.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rice.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rice.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rice.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rice.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rice.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rice.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUNB1FAd9Ux2knx5u0LT/2TS1LGcYwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MB4XDTA5MTAyOTE5NTYzMVoXDTI5
 MTAyOTE5NTYzMVowFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MIIBIjANBgkqhkiG
@@ -81,23 +81,23 @@ v+P0jZo3wAfCgA7hw84PHU/Az7nB9sawg2s082B0QKpMfeIjtrmWlRqyZiUxOpyC
 u6hryK6pnoO5TWNzyFnOZq8oNpXi+6+ulfu6Gf8ENofwnhxtj30Drh/uzGjJfwhb
 YGiGeQcYxxiDQvtt3hzYv/pHQ1/6svEiUxzRpwvC7Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rice.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rice University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rice University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rice.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul Engle</md:GivenName>
-      <md:EmailAddress>pengle@rice.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Dean Lane</md:GivenName>
-      <md:EmailAddress>dlane@rice.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rice.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rice University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rice University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rice.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul Engle</md:GivenName>
+    <md:EmailAddress>pengle@rice.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dean Lane</md:GivenName>
+    <md:EmailAddress>dlane@rice.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml
index ab531fa0..d8e0d291 100644
--- a/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.richardtaunton.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-17T17:45:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-17T17:45:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richardtaunton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richardtaunton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcjCCAlqgAwIBAgIIP9vOoGDWheQwDQYJKoZIhvcNAQEFBQAwUDErMCkGA1UE
 						CgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0gQ29sbGVnZTEhMB8GA1UEAwwY
 						aWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMB4XDTE0MDIxMzE0MzI0MVoXDTI0MDIx
@@ -33,13 +33,13 @@
 						vJLm/3QphXsGgRuXU06Uv84xWffF1zyS74OgLq3xZ0kTWZ9MLfAz2lGiONkBfwUX
 						qfAWYGdWHfXUpfYTT+9iNCwqnPTlvA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcjCCAlqgAwIBAgIIP9vOoGDWheQwDQYJKoZIhvcNAQEFBQAwUDErMCkGA1UE
 						CgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0gQ29sbGVnZTEhMB8GA1UEAwwY
 						aWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMB4XDTE0MDIxMzE0MzI0MVoXDTI0MDIx
@@ -60,25 +60,25 @@
 						vJLm/3QphXsGgRuXU06Uv84xWffF1zyS74OgLq3xZ0kTWZ9MLfAz2lGiONkBfwUX
 						qfAWYGdWHfXUpfYTT+9iNCwqnPTlvA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richardtaunton.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richardtaunton.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Richard Taunton Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Richard Taunton Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.richardtaunton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sharon</md:GivenName>
-      <md:SurName>Abbott</md:SurName>
-      <md:EmailAddress>mailto:abbotts@richardtaunton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Coxson</md:SurName>
-      <md:EmailAddress>mailto:syssco@richardtaunton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richardtaunton.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richardtaunton.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Richard Taunton Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Richard Taunton Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.richardtaunton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sharon</md:GivenName>
+    <md:SurName>Abbott</md:SurName>
+    <md:EmailAddress>mailto:abbotts@richardtaunton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Coxson</md:SurName>
+    <md:EmailAddress>mailto:syssco@richardtaunton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
index c4ea4c35..5b3ad941 100644
--- a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.richuish.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-17T13:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-17T13:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richuish.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richuish.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
 						NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
@@ -32,26 +32,26 @@
 						Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
 						RHU9aHXUNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richuish.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richuish.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richuish.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richuish.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUbnfzbJZ/O+fV1NexL4aBnpXq2EwwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVrMB4XDTE2MDQwODEzMTA1
 						NloXDTM2MDQwODEzMTA1NlowHTEbMBkGA1UEAwwSaWRwLnJpY2h1aXNoLmFjLnVr
@@ -71,37 +71,37 @@
 						Z1CAsGL1edbXdxYGrBIwg2Vx5utHfnLcjqWCgcK3dc/o+jUiNcEj7fXi51xY/50J
 						RHU9aHXUNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Richard Huish College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Richard Huish College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.richuish.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:richarda@richuish.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Upham</md:SurName>
-      <md:EmailAddress>mailto:scottu@richuish.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:richarda@richuish.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Upham</md:SurName>
-      <md:EmailAddress>mailto:scottu@richuish.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Richard Huish College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Richard Huish College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.richuish.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:richarda@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Upham</md:SurName>
+    <md:EmailAddress>mailto:scottu@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:richarda@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Upham</md:SurName>
+    <md:EmailAddress>mailto:scottu@richuish.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
index f88ec6b3..3d1a142d 100644
--- a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rkh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rkh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Red Cross University College</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Röda Korsets Högskola</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish Red Cross University College</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.rkh.se/sv/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.rkh.se/en</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="90" width="165">https://dw.rkh.se/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="90" width="165">https://dw.rkh.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>rkh.se</mdui:DomainHint>
+        <mdui:IPHint>193.11.166.66/32</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rkh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Swedish Red Cross University College</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Röda Korsets Högskola</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Swedish Red Cross University College</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.rkh.se/sv/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.rkh.se/en</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="90" width="165">https://dw.rkh.se/logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="90" width="165">https://dw.rkh.se/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>rkh.se</mdui:DomainHint>
-          <mdui:IPHint>193.11.166.66/32</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUSxTqdp7tDACfsf1wsKvgXqio4y8wDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUSxTqdp7tDACfsf1wsKvgXqio4y8wDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnJraC5zZTAeFw0xMjExMTIxMzQ4MzZaFw0zMjEx
 MTIxMzQ4MzZaMBUxEzARBgNVBAMTCmlkcC5ya2guc2UwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQCF9AP/NqQC4kdNom3wMY/3DF38Tdgy9bY5qyy/RlOo
@@ -48,26 +48,26 @@ ele3AfWv2twARiowDSQuskUNoqiRTA14IXROrRFzr3urcR3V67zS0vdYZmM02+Pu
 nSHk2aE+g4n5CZd5VJYi41Aq17QXnpn+AQGoGGLy88MADah5olUphcwr/GYBLGw2
 pdeXtXJxxPV13GCms9LWYEUHf5JLBCsXPNGOe+6c7qWLVSi1Tn12ZFOOH4JCcoKr
 MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rkh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rkh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rkh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rkh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rkh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUSxTqdp7tDACfsf1wsKvgXqio4y8wDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rkh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rkh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rkh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rkh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rkh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUSxTqdp7tDACfsf1wsKvgXqio4y8wDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnJraC5zZTAeFw0xMjExMTIxMzQ4MzZaFw0zMjEx
 MTIxMzQ4MzZaMBUxEzARBgNVBAMTCmlkcC5ya2guc2UwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQCF9AP/NqQC4kdNom3wMY/3DF38Tdgy9bY5qyy/RlOo
@@ -84,35 +84,35 @@ ele3AfWv2twARiowDSQuskUNoqiRTA14IXROrRFzr3urcR3V67zS0vdYZmM02+Pu
 nSHk2aE+g4n5CZd5VJYi41Aq17QXnpn+AQGoGGLy88MADah5olUphcwr/GYBLGw2
 pdeXtXJxxPV13GCms9LWYEUHf5JLBCsXPNGOe+6c7qWLVSi1Tn12ZFOOH4JCcoKr
 MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Red Cross University College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rkh.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Swedish Red Cross University College</md:Company>
-      <md:SurName>IT-support</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46858751607/+46858751603</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Swedish Red Cross University College</md:Company>
-      <md:SurName>IT-support</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46858751607</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Swedish Red Cross University College</md:Company>
-      <md:SurName>IT-Support Röda Korsets Högskola</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Red Cross University College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rkh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Red Cross University College</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46858751607/+46858751603</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Red Cross University College</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46858751607</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Red Cross University College</md:Company>
+    <md:SurName>IT-Support Röda Korsets Högskola</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
index acdae037..443d1f63 100644
--- a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rnp.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
-          <mdui:Description xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
 VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
 NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
@@ -40,26 +40,26 @@ kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
 IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
 ktvi8RxRxbw=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
 VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
@@ -79,24 +79,24 @@ IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
 ktvi8RxRxbw=
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>GTI/RNP</md:SurName>
-      <md:EmailAddress>servnac@rnp.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>GTI/RNP</md:SurName>
+    <md:EmailAddress>servnac@rnp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.roehampton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.roehampton.ac.uk-shibboleth.xml
index 8642440e..bab3d6bf 100644
--- a/swamid-interfederations-2.0/idp.roehampton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.roehampton.ac.uk-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.roehampton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">roehampton.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Roehampton (Athens)</mdui:DisplayName>
+        <mdui:Logo height="60" width="166">https://www2.roehampton.ac.uk/roehampton/resources/images/url-logo-166x60.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www2.roehampton.ac.uk/roehampton/resources/images/url-quad.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">roehampton.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Roehampton (Athens)</mdui:DisplayName>
-          <mdui:Logo height="60" width="166">https://www2.roehampton.ac.uk/roehampton/resources/images/url-logo-166x60.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www2.roehampton.ac.uk/roehampton/resources/images/url-quad.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -43,23 +43,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/roehampton.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/roehampton.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Roehampton (Athens)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.roehampton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/roehampton.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/roehampton.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Roehampton (Athens)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.roehampton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
index acc377d9..48117a59 100644
--- a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rrz.uni-koeln.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-01-14T13:33:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-01-14T13:33:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität zu Köln</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität zu Köln</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Universität zu Köln</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider der Universität zu Köln</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.rrz.uni-koeln.de/idp/images/UzK-favicon.png</mdui:Logo>
+        <mdui:Logo height="100" width="100">https://idp.rrz.uni-koeln.de/idp/images/siegel.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-koeln.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-koeln.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität zu Köln</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität zu Köln</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Universität zu Köln</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider der Universität zu Köln</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.rrz.uni-koeln.de/idp/images/UzK-favicon.png</mdui:Logo>
-          <mdui:Logo height="100" width="100">https://idp.rrz.uni-koeln.de/idp/images/siegel.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-koeln.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-koeln.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
 EwJERTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBL
 b2VsbjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFz
 dGVyQHVuaS1rb2Vsbi5kZTAeFw0xNDEyMDgwODE1MjJaFw0xOTA3MDkyMzU5MDBa
@@ -58,28 +58,28 @@ pHG5aE5lGbCixxFuLT0oor49sDQoVEGX2RSFk+2qpS3JaqhviVie2m0v+1BB7x4D
 NPX6heGTUiNU+OLZAssrrb9s21PeVetFPlc0p+MzE8s8IWTdsKMWkkqSHPkonE7+
 8FOfm4jYwW4p+TqXvGRe+NI3Z3INTLM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
 EwJERTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBL
 b2VsbjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFz
 dGVyQHVuaS1rb2Vsbi5kZTAeFw0xNDEyMDgwODE1MjJaFw0xOTA3MDkyMzU5MDBa
@@ -112,35 +112,35 @@ pHG5aE5lGbCixxFuLT0oor49sDQoVEGX2RSFk+2qpS3JaqhviVie2m0v+1BB7x4D
 NPX6heGTUiNU+OLZAssrrb9s21PeVetFPlc0p+MzE8s8IWTdsKMWkkqSHPkonE7+
 8FOfm4jYwW4p+TqXvGRe+NI3Z3INTLM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e36</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e36</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität zu Köln</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cologne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-koeln.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-koeln.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Beate</md:GivenName>
-      <md:SurName>Schlesiona</md:SurName>
-      <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Beate</md:GivenName>
-      <md:SurName>Schlesiona</md:SurName>
-      <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Beate</md:GivenName>
-      <md:SurName>Schlesiona</md:SurName>
-      <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e36</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e36</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität zu Köln</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cologne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-koeln.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-koeln.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Beate</md:GivenName>
+    <md:SurName>Schlesiona</md:SurName>
+    <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Beate</md:GivenName>
+    <md:SurName>Schlesiona</md:SurName>
+    <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Beate</md:GivenName>
+    <md:SurName>Schlesiona</md:SurName>
+    <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rsceng.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.rsceng.ac.uk-openathens.xml
index 0933cbde..05c0fe2a 100644
--- a/swamid-interfederations-2.0/idp.rsceng.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.rsceng.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rsceng.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcseng.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcseng.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/rcseng.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/rcseng.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Surgeons of England</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcseng.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/rcseng.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/rcseng.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Surgeons of England</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcseng.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml
index a3015a48..5d8be161 100644
--- a/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rsmith.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-07T10:42:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-07T10:42:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsmith.org.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rhys Smith</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Rhys Smith's development IdP</mdui:Description>
+        <mdui:Logo height="160" width="160">https://idp.rsmith.org.uk/me_160x160.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsmith.org.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rhys Smith</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Rhys Smith's development IdP</mdui:Description>
-          <mdui:Logo height="160" width="160">https://idp.rsmith.org.uk/me_160x160.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUK9DEIGDv4Ff0Wi8/uvBeGd5eyBswDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTEy
 						WhcNMzUwODI0MTQ1MTEyWjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
@@ -42,13 +42,13 @@
 						p10apvU7O4BFOqWg+8deIyCGZoAHpTm22MeyoLo9LlCvXNdzYRwURxGq36jRnuCL
 						He9a
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUYnvfoMBUueVONNjmaouAYnntwdUwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA4
 						WhcNMzUwODI0MTQ1MTA4WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
@@ -68,13 +68,13 @@
 						LwRivthQNpAmJNymJsAPIh1vJ4DK2NxzIbtDEVOawuPgtb8ACjcpBbeVMmKrBRpE
 						RVjJ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUZzaEwAwF83jA7Z8vp4qVNNq1yD8wDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA5
 						WhcNMzUwODI0MTQ1MTA5WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
@@ -94,31 +94,31 @@
 						dAQ40T5IMDyhZ95T7NVp1jRGcFYAPNwrBTlYOq85hGwlae+5Ma1dzFqU79resaAs
 						QpNX
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rsmith.org.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsmith.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rsmith.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsmith.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUK9DEIGDv4Ff0Wi8/uvBeGd5eyBswDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTEy
 						WhcNMzUwODI0MTQ1MTEyWjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
@@ -138,13 +138,13 @@
 						p10apvU7O4BFOqWg+8deIyCGZoAHpTm22MeyoLo9LlCvXNdzYRwURxGq36jRnuCL
 						He9a
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUYnvfoMBUueVONNjmaouAYnntwdUwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA4
 						WhcNMzUwODI0MTQ1MTA4WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
@@ -164,13 +164,13 @@
 						LwRivthQNpAmJNymJsAPIh1vJ4DK2NxzIbtDEVOawuPgtb8ACjcpBbeVMmKrBRpE
 						RVjJ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUZzaEwAwF83jA7Z8vp4qVNNq1yD8wDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA5
 						WhcNMzUwODI0MTQ1MTA5WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
@@ -190,25 +190,25 @@
 						dAQ40T5IMDyhZ95T7NVp1jRGcFYAPNwrBTlYOq85hGwlae+5Ma1dzFqU79resaAs
 						QpNX
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rhys Smith</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rhys Smith</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmith.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rhys</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:rhys@rsmith.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rhys</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:rhys@rsmith.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rhys Smith</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rhys Smith</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmith.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:rhys@rsmith.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:rhys@rsmith.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml
index 5529d743..eef91a55 100644
--- a/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ruskin.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruskin.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruskin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjQCCQCeO7iggJ8z5DANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UE
 						ChMOUnVza2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswHhcN
@@ -30,26 +30,26 @@
 						+ZwcGmKwLJavwEiBhafJxXrup5yvzIPOzW0skgpxK2jcfQqWO8I90dF7eqKDaUYW
 						139vmCjkaZwlSi/F6jOBEEseHoL4lXr//gWKExA6bhk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ruskin.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruskin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ruskin.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruskin.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjQCCQCeO7iggJ8z5DANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UE
 						ChMOUnVza2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswHhcN
@@ -69,27 +69,27 @@
 						+ZwcGmKwLJavwEiBhafJxXrup5yvzIPOzW0skgpxK2jcfQqWO8I90dF7eqKDaUYW
 						139vmCjkaZwlSi/F6jOBEEseHoL4lXr//gWKExA6bhk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ruskin College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ruskin College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ruskin.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bill</md:GivenName>
-      <md:SurName>Dewhurst</md:SurName>
-      <md:EmailAddress>mailto:bdewhrst@ruskin.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bill</md:GivenName>
-      <md:SurName>Dewhurst</md:SurName>
-      <md:EmailAddress>mailto:bdewhrst@ruskin.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ruskin College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ruskin College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ruskin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bill</md:GivenName>
+    <md:SurName>Dewhurst</md:SurName>
+    <md:EmailAddress>mailto:bdewhrst@ruskin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bill</md:GivenName>
+    <md:SurName>Dewhurst</md:SurName>
+    <md:EmailAddress>mailto:bdewhrst@ruskin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml
index d6f19e86..548b0bb2 100644
--- a/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rvc.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T14:01:49Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T14:01:49Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rvc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rvc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIIBIqWvTgzVRkwDQYJKoZIhvcNAQEFBQAwOzEhMB8GA1UE
 						CgwYUm95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFj
 						LnVrMB4XDTEyMDgxMzE0MzUyNloXDTIyMDgxMzE0MzUyNlowOzEhMB8GA1UECgwY
@@ -30,13 +30,13 @@
 						nk0Yl612TV8ifddkDqmIV6C7iExDA5vZp7VxagIbt7GF8c8ER2nmfp9RKB7Kv8ci
 						hh4lW/+CyvCPkKidV/SU/saCVq78gF2/0QF16w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIIBIqWvTgzVRkwDQYJKoZIhvcNAQEFBQAwOzEhMB8GA1UE
 						CgwYUm95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFj
 						LnVrMB4XDTEyMDgxMzE0MzUyNloXDTIyMDgxMzE0MzUyNlowOzEhMB8GA1UECgwY
@@ -56,25 +56,25 @@
 						nk0Yl612TV8ifddkDqmIV6C7iExDA5vZp7VxagIbt7GF8c8ER2nmfp9RKB7Kv8ci
 						hh4lW/+CyvCPkKidV/SU/saCVq78gF2/0QF16w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rvc.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rvc.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Veterinary College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Veterinary College: OpenAthens LA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rvc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alison</md:GivenName>
-      <md:SurName>Shearer</md:SurName>
-      <md:EmailAddress>mailto:ashearer@rvc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alison</md:GivenName>
-      <md:SurName>Shearer</md:SurName>
-      <md:EmailAddress>mailto:ashearer@rvc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rvc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rvc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Veterinary College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Veterinary College: OpenAthens LA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rvc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alison</md:GivenName>
+    <md:SurName>Shearer</md:SurName>
+    <md:EmailAddress>mailto:ashearer@rvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alison</md:GivenName>
+    <md:SurName>Shearer</md:SurName>
+    <md:EmailAddress>mailto:ashearer@rvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml
index d78174bd..5d071f29 100644
--- a/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sandwell.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandwell.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandwell.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAPG65DBJJFPh5Jipeuryxop1mT/zMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51azAeFw0xMjExMjgxMjQ3
 						MDFaFw0zMjExMjgxMjQ3MDFaMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51
@@ -30,26 +30,26 @@
 						HXt7U0zNsoKb3p7Jbx5SlDztMdz52mSSYLa4SuFbE1u6ooMYb7lFWfL1rlDv0SiT
 						MA3XVUiG45c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sandwell.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandwell.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sandwell.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandwell.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAPG65DBJJFPh5Jipeuryxop1mT/zMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51azAeFw0xMjExMjgxMjQ3
 						MDFaFw0zMjExMjgxMjQ3MDFaMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51
@@ -69,25 +69,25 @@
 						HXt7U0zNsoKb3p7Jbx5SlDztMdz52mSSYLa4SuFbE1u6ooMYb7lFWfL1rlDv0SiT
 						MA3XVUiG45c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sandwell College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sandwell College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sandwell.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Network Operations</md:GivenName>
-      <md:EmailAddress>mailto:operations@sandwell.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Network Operations</md:GivenName>
-      <md:EmailAddress>mailto:operations@sandwell.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sandwell College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sandwell College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sandwell.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Network Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@sandwell.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Network Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@sandwell.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml
index 3f2b53a9..93d948fd 100644
--- a/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sanger.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-13T11:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-13T11:49:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sanger.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sanger.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAKQYJxHECH4G5xoOCxtCz43WOfkYMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5zYW5nZXIuYWMudWswHhcNMTQwMzI3MTMyMDM0
 						WhcNMzQwMzI3MTIyMDM0WjAbMRkwFwYDVQQDExBpZHAuc2FuZ2VyLmFjLnVrMIIB
@@ -31,26 +31,26 @@
 						dnZI4GN5IWgtKyLa4PrxWjtPPt+JTbx2iaclyk7AUlB1bN02JZF0BlW35oygFZLd
 						e1ezwFWxhm6gCPNfBWDWNeRZBidDsz193MDbIS/mWBzyAYXot1TxBRXiBeXbaWmB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sanger.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sanger.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sanger.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sanger.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAKQYJxHECH4G5xoOCxtCz43WOfkYMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5zYW5nZXIuYWMudWswHhcNMTQwMzI3MTMyMDM0
 						WhcNMzQwMzI3MTIyMDM0WjAbMRkwFwYDVQQDExBpZHAuc2FuZ2VyLmFjLnVrMIIB
@@ -69,26 +69,26 @@
 						dnZI4GN5IWgtKyLa4PrxWjtPPt+JTbx2iaclyk7AUlB1bN02JZF0BlW35oygFZLd
 						e1ezwFWxhm6gCPNfBWDWNeRZBidDsz193MDbIS/mWBzyAYXot1TxBRXiBeXbaWmB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Genome Research Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wellcome Trust Sanger Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sanger.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sanger Institute Systems Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@sanger.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Fraser</md:SurName>
-      <md:EmailAddress>mailto:srf@sanger.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Genome Research Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wellcome Trust Sanger Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sanger.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sanger Institute Systems Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@sanger.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Fraser</md:SurName>
+    <md:EmailAddress>mailto:srf@sanger.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sans-ec.nl.xml b/swamid-interfederations-2.0/idp.sans-ec.nl.xml
index 9b87b797..f4a8c63b 100644
--- a/swamid-interfederations-2.0/idp.sans-ec.nl.xml
+++ b/swamid-interfederations-2.0/idp.sans-ec.nl.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sans-ec.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-03-09T11:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-03-09T11:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sans-ec.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SaNS Expertisecentrum</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SaNS Expertisecentrum</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SaNS Expertisecentrum</mdui:Description>
+        <mdui:Description xml:lang="en">SaNS Expertisecentrum</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/sansec.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">sans samenwerking nieuw sis</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">sans samenwerking nieuw sis</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sans-ec.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">SaNS Expertisecentrum</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SaNS Expertisecentrum</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">SaNS Expertisecentrum</mdui:Description>
-          <mdui:Description xml:lang="en">SaNS Expertisecentrum</mdui:Description>
-          <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/sansec.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">sans samenwerking nieuw sis</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">sans samenwerking nieuw sis</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/7e77e73001803e8ba5c0122b7dd2f024"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SaNS Expertisecentrum</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SaNS Expertisecentrum</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sans-ec.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/7e77e73001803e8ba5c0122b7dd2f024"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SaNS Expertisecentrum</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SaNS Expertisecentrum</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sans-ec.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml
index bf9b89eb..4f89b024 100644
--- a/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sbcc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbcc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Santa Barbara City College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Santa Barbara City College Shibboleth and CAS server</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.sbcc.edu/boardoftrustees/files/policies/AP%203720%20Electronic%20Communication%20Procedures.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbcc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Santa Barbara City College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Santa Barbara City College Shibboleth and CAS server</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.sbcc.edu/boardoftrustees/files/policies/AP%203720%20Electronic%20Communication%20Procedures.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUMMHZfx7g7KGhvDSG44Watjbf8nAwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MB4XDTExMDMzMDIyMDY0MFoXDTMx
 MDMzMDIyMDY0MFowFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MIIBIjANBgkqhkiG
@@ -39,26 +39,26 @@ mKGlFTzgPur0sqyyd86chFfmtkTvOPsTBaGuBoz4L9Pnl+moxlzMhQBC2Mxmr/FG
 eOKM7YKGt4+pqKx5cp4GeYWHYS8d0/XRF2vyCLwdLLOTai0cRqx+LRNtpEAV6z74
 QnbddsPUWZfmg0tNJbc8OhZPVC6Z0dq++C4sZqhJjw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbcc.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbcc.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbcc.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbcc.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbcc.edu/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sbcc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbcc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbcc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbcc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbcc.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbcc.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbcc.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbcc.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbcc.edu/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sbcc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbcc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbcc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbcc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUMMHZfx7g7KGhvDSG44Watjbf8nAwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MB4XDTExMDMzMDIyMDY0MFoXDTMx
 MDMzMDIyMDY0MFowFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MIIBIjANBgkqhkiG
@@ -77,18 +77,18 @@ mKGlFTzgPur0sqyyd86chFfmtkTvOPsTBaGuBoz4L9Pnl+moxlzMhQBC2Mxmr/FG
 eOKM7YKGt4+pqKx5cp4GeYWHYS8d0/XRF2vyCLwdLLOTai0cRqx+LRNtpEAV6z74
 QnbddsPUWZfmg0tNJbc8OhZPVC6Z0dq++C4sZqhJjw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbcc.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Santa Barbara City College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Santa Barbara City College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sbcc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael Ghens</md:GivenName>
-      <md:EmailAddress>mghens@sbcc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbcc.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Santa Barbara City College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Santa Barbara City College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sbcc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael Ghens</md:GivenName>
+    <md:EmailAddress>mghens@sbcc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
index 675c67da..54fc64fe 100644
--- a/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scc.kit.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-03-15T10:30:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-03-15T10:30:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Karlsruher Institut für Technologie - Universität des Landes Baden-Württemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft</mdui:Description>
+        <mdui:Description xml:lang="en">Karlsruhe Institute of Technology - University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.scc.kit.edu/logo/kit-logo-small.png</mdui:Logo>
+        <mdui:Logo height="120" width="260">https://idp.scc.kit.edu/logo/kit-logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.scc.kit.edu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.scc.kit.edu/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Karlsruher Institut für Technologie - Universität des Landes Baden-Württemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft</mdui:Description>
-          <mdui:Description xml:lang="en">Karlsruhe Institute of Technology - University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.scc.kit.edu/logo/kit-logo-small.png</mdui:Logo>
-          <mdui:Logo height="120" width="260">https://idp.scc.kit.edu/logo/kit-logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.scc.kit.edu/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.scc.kit.edu/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
 bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
 Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
@@ -65,36 +65,36 @@ uk6L8FgX8L8oIsCafeAx9d2J/DozuHzpl1sAozMbjko6oFQS+jefrshY/8sOrC2Z
 /Qu/RelkUt/17g7WYLHI2CQ/TWjYDe+tPKaLoCrUqNV1Se3pm/f0lcsOrOdNJXp/
 DDtygfMFcJ7uU7YOIBUyd7s1m23ZZzi6HkTPEtM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
 bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
 Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
@@ -127,36 +127,36 @@ uk6L8FgX8L8oIsCafeAx9d2J/DozuHzpl1sAozMbjko6oFQS+jefrshY/8sOrC2Z
 /Qu/RelkUt/17g7WYLHI2CQ/TWjYDe+tPKaLoCrUqNV1Se3pm/f0lcsOrOdNJXp/
 DDtygfMFcJ7uU7YOIBUyd7s1m23ZZzi6HkTPEtM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Simon</md:SurName>
-      <md:EmailAddress>mailto:simon@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sebastian</md:GivenName>
-      <md:SurName>Labitzke</md:SurName>
-      <md:EmailAddress>mailto:labitzke@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SCC</md:GivenName>
-      <md:SurName>Servicedesk</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@scc.kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Simon</md:SurName>
+    <md:EmailAddress>mailto:simon@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sebastian</md:GivenName>
+    <md:SurName>Labitzke</md:SurName>
+    <md:EmailAddress>mailto:labitzke@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SCC</md:GivenName>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@scc.kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml
index 41335e8a..4efa07dc 100644
--- a/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sccb.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-06T11:40:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-06T11:40:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sccb.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sccb.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9jCCAt4CCQCXolHXaIzX9DANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgMDVdlc3QgTWlkbGFuZHMxEzARBgNVBAcMCkJpcm1pbmdoYW0x
 						KjAoBgNVBAoMIVNvdXRoIGFuZCBDaXR5IENvbGxlZ2UgQmlybWluZ2hhbTEUMBIG
@@ -36,29 +36,29 @@
 						bqq0+6Ei2JA3AUJaN1EMIIwSv+VG5HhYpNwKA2vOG0E9zMa1ZCIjSZEEWmAyW7iI
 						sKgqO2e98R+sJg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sccb.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sccb.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sccb.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sccb.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9jCCAt4CCQCXolHXaIzX9DANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgMDVdlc3QgTWlkbGFuZHMxEzARBgNVBAcMCkJpcm1pbmdoYW0x
 						KjAoBgNVBAoMIVNvdXRoIGFuZCBDaXR5IENvbGxlZ2UgQmlybWluZ2hhbTEUMBIG
@@ -82,27 +82,27 @@
 						bqq0+6Ei2JA3AUJaN1EMIIwSv+VG5HhYpNwKA2vOG0E9zMa1ZCIjSZEEWmAyW7iI
 						sKgqO2e98R+sJg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South &amp; City College Birmingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South and City College Birmingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sccb.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Whinnery</md:SurName>
-      <md:EmailAddress>mailto:martin.whinnery@sccb.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Birks</md:SurName>
-      <md:EmailAddress>mailto:david.birks@sccb.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South &amp; City College Birmingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South and City College Birmingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sccb.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Whinnery</md:SurName>
+    <md:EmailAddress>mailto:martin.whinnery@sccb.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Birks</md:SurName>
+    <md:EmailAddress>mailto:david.birks@sccb.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
index d5c15e1c..1624c473 100644
--- a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sciencelib.ge/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2016-05-11T14:04:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2016-05-11T14:04:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Scientific Library - Georgia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">National Scientific Library - Georgia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://sciencelib.ge</mdui:InformationURL>
+        <mdui:Logo width="24" height="23" xml:lang="en">http://www.sciencelib.ge/themes/pushbutton/icon-block.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>217.147.239.76/32</mdui:IPHint>
+        <mdui:DomainHint>idp.sciencelib.ge</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:41.704855,44.787059</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Scientific Library - Georgia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">National Scientific Library - Georgia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://sciencelib.ge</mdui:InformationURL>
-          <mdui:Logo width="24" height="23" xml:lang="en">http://www.sciencelib.ge/themes/pushbutton/icon-block.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>217.147.239.76/32</mdui:IPHint>
-          <mdui:DomainHint>idp.sciencelib.ge</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:41.704855,44.787059</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDzTCCArWgAwIBAgIJAOZZxvcv0ZIWMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
 BAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQHDAdUYmlsaXNpMS4wLAYD
 VQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkgLSBHZW9yZ2lhMRowGAYD
@@ -45,13 +45,13 @@ ea8/gyK/sFRzez2C8GECAN9DKX9//TJZyVFXKW0NdfvVx69mk4BYE6eycI3fAtIx
 3odqTMpbrMsVQkrJlVSj2dBrvkbnZ+ih1X/QV3T1f8/kiqOQuuGAFuvcl51JsyEH
 W/y6xadzVAo5iK7XtTnwSy0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDzTCCArWgAwIBAgIJAOZZxvcv0ZIWMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
 BAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQHDAdUYmlsaXNpMS4wLAYD
 VQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkgLSBHZW9yZ2lhMRowGAYD
@@ -74,21 +74,21 @@ ea8/gyK/sFRzez2C8GECAN9DKX9//TJZyVFXKW0NdfvVx69mk4BYE6eycI3fAtIx
 3odqTMpbrMsVQkrJlVSj2dBrvkbnZ+ih1X/QV3T1f8/kiqOQuuGAFuvcl51JsyEH
 W/y6xadzVAo5iK7XtTnwSy0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Scientific Library - Georgia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Scientific Library - Georgia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://sciencelib.ge/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Temur</md:GivenName>
-      <md:SurName>Maisuradze</md:SurName>
-      <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Scientific Library - Georgia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Scientific Library - Georgia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://sciencelib.ge/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Temur</md:GivenName>
+    <md:SurName>Maisuradze</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencespo-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sciencespo-lyon.fr-idp-shibboleth.xml
index 7ebffdc7..f6082643 100644
--- a/swamid-interfederations-2.0/idp.sciencespo-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sciencespo-lyon.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sciencespo-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-08-26T10:26:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-08-26T10:26:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sciences Po Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAADs4dEAgaDxAPn28QDw59kA+PTuAJjG9QDj0LYA8ergADZm6QBonPAAYoPtAPXw6AAjhO0AUn/tABti6ADX4PkAXIPsABFh6QDg8PoAMr72AP39/ADo2cQAZontALzS+ADK2fgAKG7qAKbF9gBFdesA6/P6APn6+gAdW+cATXvsAObXwAAiVeYA7uTVAMPo+QAZTuYA8OjaAPv8/ADgy68A7ODPAOfYxAB+wPUAK3HpADSr8gD4+/0A8/j8AFSB7ABZgewAZ6PxAA1l6gDi7fwAUq7zAPr49ADo28kA6+HRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQUFBQUFBQCAgcUDxwgBxQUFBQUFBQCIAcDIBoPAQEUFBQUFBQUAgA3JwcBGgEKFBQUFBQUFBQCHRQUDS8KCAslAgcCHQcHAgICHRswCiQoKAMlFScEAwMDKAMvMDAhBgIDNicpNRUAACgDLxYKISg2ByAANiIpCxUoAy8KCggmJhQtFBQUFBQUFBQILy8QFCYuFBQUFBQUFBQuDi8fARQuJi0uFBQUFBQUFwgeKyMUFC4SFBIUFBQUFAkZJAwUFBQuLgcUIxQUFDMOETIaFBQUFBIHIwcPFBQ0MjIxFBQUFBQUByMjBxgMEQwFAhQUFBQUFBQjBSwrEyoHJhQUFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.sciencespo-lyon.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Teachers, staff and students of the Institute of Political Studies of Lyon (Sciences Po Lyon)</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Sciences Po Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Enseignants, personnels et étudiants de l'Institut Politiques de Lyon 'Sciences Po Lyon)</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-lyon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sciences Po Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAADs4dEAgaDxAPn28QDw59kA+PTuAJjG9QDj0LYA8ergADZm6QBonPAAYoPtAPXw6AAjhO0AUn/tABti6ADX4PkAXIPsABFh6QDg8PoAMr72AP39/ADo2cQAZontALzS+ADK2fgAKG7qAKbF9gBFdesA6/P6APn6+gAdW+cATXvsAObXwAAiVeYA7uTVAMPo+QAZTuYA8OjaAPv8/ADgy68A7ODPAOfYxAB+wPUAK3HpADSr8gD4+/0A8/j8AFSB7ABZgewAZ6PxAA1l6gDi7fwAUq7zAPr49ADo28kA6+HRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQUFBQUFBQCAgcUDxwgBxQUFBQUFBQCIAcDIBoPAQEUFBQUFBQUAgA3JwcBGgEKFBQUFBQUFBQCHRQUDS8KCAslAgcCHQcHAgICHRswCiQoKAMlFScEAwMDKAMvMDAhBgIDNicpNRUAACgDLxYKISg2ByAANiIpCxUoAy8KCggmJhQtFBQUFBQUFBQILy8QFCYuFBQUFBQUFBQuDi8fARQuJi0uFBQUFBQUFwgeKyMUFC4SFBIUFBQUFAkZJAwUFBQuLgcUIxQUFDMOETIaFBQUFBIHIwcPFBQ0MjIxFBQUFBQUByMjBxgMEQwFAhQUFBQUFBQjBSwrEyoHJhQUFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.sciencespo-lyon.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Teachers, staff and students of the Institute of Political Studies of Lyon (Sciences Po Lyon)</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Sciences Po Lyon</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Enseignants, personnels et étudiants de l'Institut Politiques de Lyon 'Sciences Po Lyon)</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTzCCAjegAwIBAgIUXLqHydv3VZl0xKs9sRfIKmyga50wDQYJKoZIhvcNAQEL
 BQAwJDEiMCAGA1UEAwwZc3YtaWRwLnNjaWVuY2VzcG8tbHlvbi5mcjAeFw0xNjAz
 MzExMzM3NDBaFw0zNjAzMzExMzM3NDBaMCQxIjAgBgNVBAMMGXN2LWlkcC5zY2ll
@@ -40,22 +40,22 @@ LL3dnobwOcCOpGGD+XwBvdOz3VI2D9apOLOwpJFgEmb8PDqXzb5w1Yk/jODOLuNO
 nkX1/OfYak3iDArae53V/DsgvpYzBfWHPCh1D7QmawhOH79HcVG1BHfx3kSNKQ74
 RupASGUYB7jzkz8sl1KTlE5b39Qqm2cw4NbyAK6APEKutv0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sciencespo-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespo-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespo-lyon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sciences Po Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sciences Po Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sciencespo-lyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>BRENAS Emmanuel</md:SurName>
-      <md:EmailAddress>emmanuel.brenas@sciencespo-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sciencespo-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespo-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespo-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sciences Po Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sciences Po Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sciencespo-lyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>BRENAS Emmanuel</md:SurName>
+    <md:EmailAddress>emmanuel.brenas@sciencespo-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
index f0e93d89..529e0788 100644
--- a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sciencespobordeaux.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-29T13:03:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-29T13:03:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespobordeaux.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpobx.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sciences Po Bordeaux</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXUlEQVQoz42SP2gTYQDF33ff5XK96yUYkl7/pCgRaVESIkY6uAnucSgFNx1cBHHrLA4Ozlm6WDertItDqIglEBxCEhcjFEyqTUga05pccnc5knzf52DB6tQ3veXxfjweaTQahmHgfHJdVzYMwzgZQJExYcKywTi8ETFDotkhsSgYE+1fmPKDSiQ4TQOGBC5YrsjefgDjkCS0Orz0FaGg+N5ku59AKSBErQEu2Jv3AIjV7RrDMQLTcIYYuJApxhP4KFmYEfYQo7Ho28SvCNcjMyFXocSyrEAg8B/rxsbG8fGxaZqrq6u5XG55eXk0GlFKFxcXJQgxyWyxbH7yYlN0++xjQTQ75c2tV0+fFwoF27Z3dnYymYyu60dHRwAkEIKTHkDEtzp7l+Ovd8l85IcmvQxenZ2ddRzHdd1EIqFpWjQaBSCdQnQt+vgemY9A8QFYuHQx5jeWlpYcx+Gc7+3tZbNZVVXPBC4EpWuX6a3r8PsA/Pz8pXnnRjwePzw89Pv9Qoi1tTVJkgDIEEK6e5sEdACY8vuePRLNTvJmSntyv1QqMcZSqdRgMBiPx/V6PRgMyiBEil/5O5CmEk1NP3wwHA63t7cPDg5WVlbS6XSlUrFt+wzSv7Jte39/3/M8Qsj6+nqv16vVap7nASCWZVFKLcsqFouRSMQ0zVgs1u/3dV0HIISglP4xhBDXdWUAnudVKpVwOFytVhVFyefzoVCo3W4nk0lVVRljiqK4rqtp2mlDvV7nnE8mE13XOeeDwWBubq5cLlNKw+Ew59w0zWq1mkgkZFkmrVbr/Pd2HOc3KmApaPfUDdwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MzUrMDI6MDAIj+pyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjM1KzAyOjAwedJSzgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.sciencespobordeaux.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Sciences Po Bordeaux</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespobordeaux.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpobx.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sciences Po Bordeaux</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXUlEQVQoz42SP2gTYQDF33ff5XK96yUYkl7/pCgRaVESIkY6uAnucSgFNx1cBHHrLA4Ozlm6WDertItDqIglEBxCEhcjFEyqTUga05pccnc5knzf52DB6tQ3veXxfjweaTQahmHgfHJdVzYMwzgZQJExYcKywTi8ETFDotkhsSgYE+1fmPKDSiQ4TQOGBC5YrsjefgDjkCS0Orz0FaGg+N5ku59AKSBErQEu2Jv3AIjV7RrDMQLTcIYYuJApxhP4KFmYEfYQo7Ho28SvCNcjMyFXocSyrEAg8B/rxsbG8fGxaZqrq6u5XG55eXk0GlFKFxcXJQgxyWyxbH7yYlN0++xjQTQ75c2tV0+fFwoF27Z3dnYymYyu60dHRwAkEIKTHkDEtzp7l+Ovd8l85IcmvQxenZ2ddRzHdd1EIqFpWjQaBSCdQnQt+vgemY9A8QFYuHQx5jeWlpYcx+Gc7+3tZbNZVVXPBC4EpWuX6a3r8PsA/Pz8pXnnRjwePzw89Pv9Qoi1tTVJkgDIEEK6e5sEdACY8vuePRLNTvJmSntyv1QqMcZSqdRgMBiPx/V6PRgMyiBEil/5O5CmEk1NP3wwHA63t7cPDg5WVlbS6XSlUrFt+wzSv7Jte39/3/M8Qsj6+nqv16vVap7nASCWZVFKLcsqFouRSMQ0zVgs1u/3dV0HIISglP4xhBDXdWUAnudVKpVwOFytVhVFyefzoVCo3W4nk0lVVRljiqK4rqtp2mlDvV7nnE8mE13XOeeDwWBubq5cLlNKw+Ew59w0zWq1mkgkZFkmrVbr/Pd2HOc3KmApaPfUDdwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MzUrMDI6MDAIj+pyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjM1KzAyOjAwedJSzgAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.sciencespobordeaux.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Sciences Po Bordeaux</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEuzCCA6OgAwIBAgIRAJ6cVoL9srwAECkklTq3u2gwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
@@ -47,13 +47,13 @@ qiZBvL/hVr86AIxZvzIzphIpy9Qq4GEnItVFhGOycQklELgKWE0nkfAqPfVEa6et
 xeoFJ3AMgEwyT4aPKYtJjFlKbGLLtW/CicdeXeWR7THWoA8uDWm1AnilOO6+YgM2
 BplU9dtwphlM6oz1pTHl
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEkDCCA3igAwIBAgIRAJzjTT6bg4+QhDI8IGescp8wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMTAyMDgwMDAwMDBaFw0xNDAyMDcyMzU5NTlaMGExCzAJBgNV
@@ -80,22 +80,22 @@ YKnhDvtia42oMyL42dNmMt3WC6fgacHKK5gn854jExb1zxOZ0EZ5Se0nWmUift1I
 xr6/zUxLKQsLBvsoMidrpEdtqp9m/OkQh5w2yKN4SzxuPzZsfMWK5p/jEgm7MMY5
 qdkYclgdqLgBlFr/yaGI1mcNQMY=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespobordeaux.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sciences Po Bordeaux</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sciences Po Bordeaux</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sciencespobordeaux.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Rouger</md:SurName>
-      <md:EmailAddress>p.rouger@sciencespobordeaux.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespobordeaux.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sciences Po Bordeaux</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sciences Po Bordeaux</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sciencespobordeaux.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Rouger</md:SurName>
+    <md:EmailAddress>p.rouger@sciencespobordeaux.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml b/swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml
index 695e10ea..53364be0 100644
--- a/swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml
+++ b/swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scng.si/idp/20130321">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-04-09T10:04:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-04-09T10:04:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scng.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsc.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Campus Nova Gorica</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Kampus Nova Gorica</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization Campus Nova Gorica</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Kampus Nova Gorica</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization Campus Nova Gorica</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Kampus Nova Gorica</mdui:Keywords>
+        <mdui:Logo height="259" width="200">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.scng.si/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.scng.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scng.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsc.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Campus Nova Gorica</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Kampus Nova Gorica</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization Campus Nova Gorica</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Kampus Nova Gorica</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization Campus Nova Gorica</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Kampus Nova Gorica</mdui:Keywords>
-          <mdui:Logo height="259" width="200">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.scng.si/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.scng.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDizCCAnOgAwIBAgIFLuqUH18wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCU0kxFDASBgNVBAcMC05vdmEgR29yaWNhMTkwNwYDVQQDDDBBcm5lc0FBSSBGZWRlcmF0aW9uIC0gSWRQIGZvciBDYW1wdXMgTm92YSBHb3JpY2EwHhcNMTUwNDA4MTMzNTU0WhcNMzQxMjI0MTMzNTU0WjBeMQswCQYDVQQGEwJTSTEUMBIGA1UEBwwLTm92YSBHb3JpY2ExOTA3BgNVBAMMMEFybmVzQUFJIEZlZGVyYXRpb24gLSBJZFAgZm9yIENhbXB1cyBOb3ZhIEdvcmljYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANg/oLtcllF/db1++GiXDaZ1dZhMYvILPVhkHhyOj6bXzCA0YyqYUqW63pNyODL+tMZ7p8SXw78Cvvdzd3Pzowv5Yr2soRq9YiRzZn2ELJnITiDfdrWigtJRYssVbA7IGDGyCwVDGwwJIp9GWGMeWWPBDfowy/pQ68oyhUHkRk6sNlyZt5KPhQGDBlMn48UfT+szWpcIhJ+aogeoDtR/JwQDn5Sx8XCCCkmQtEEHRCiIUNY1q2HK1EvQmHzI7yGjIqfaMdxtQMzcDEZAgwI7LMMdi17ojN0eAFQFgfKekeZtCYwNfiIGY4a3yThep2GIRyrWQOavvP3vO+7KrdLVuccCAwEAAaNQME4wHQYDVR0OBBYEFH5hfLauj1fjDi2nQ6GiEfMuRUbQMB8GA1UdIwQYMBaAFH5hfLauj1fjDi2nQ6GiEfMuRUbQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY59Oav1ERYNvaK3vB24nhRNH+CJ3LM38ZYRsLc5rZ3fwLJMP0716N8jS+rsb+REtWFKgg2+b6Gsuwpu/0L/P+WMHmGREvsKDERr2i8aFGqEbvfDhgd8+hS332JoZ+xfWdmWAOOidFPfBD0CZ+hS6U0b0UWchAHKr83m0SLa2tRGz79oQyVC2ndZgJ1Zu44452MZBqZjRNdAxMJ10DYGDc5uAIpoUlK/wxHeU0rTEwLPbnyYdCHdXDpnn+nqVhTSgeGmbk1zcBlGuw/f3vcBoyZHsFj5h/7pgesXmJIfiHugJEvSGKE+mHm0IQwetQJVafpRS0tWVAywznGtGI6pLI=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDizCCAnOgAwIBAgIFLuqUH18wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCU0kxFDASBgNVBAcMC05vdmEgR29yaWNhMTkwNwYDVQQDDDBBcm5lc0FBSSBGZWRlcmF0aW9uIC0gSWRQIGZvciBDYW1wdXMgTm92YSBHb3JpY2EwHhcNMTUwNDA4MTMzNTU0WhcNMzQxMjI0MTMzNTU0WjBeMQswCQYDVQQGEwJTSTEUMBIGA1UEBwwLTm92YSBHb3JpY2ExOTA3BgNVBAMMMEFybmVzQUFJIEZlZGVyYXRpb24gLSBJZFAgZm9yIENhbXB1cyBOb3ZhIEdvcmljYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANg/oLtcllF/db1++GiXDaZ1dZhMYvILPVhkHhyOj6bXzCA0YyqYUqW63pNyODL+tMZ7p8SXw78Cvvdzd3Pzowv5Yr2soRq9YiRzZn2ELJnITiDfdrWigtJRYssVbA7IGDGyCwVDGwwJIp9GWGMeWWPBDfowy/pQ68oyhUHkRk6sNlyZt5KPhQGDBlMn48UfT+szWpcIhJ+aogeoDtR/JwQDn5Sx8XCCCkmQtEEHRCiIUNY1q2HK1EvQmHzI7yGjIqfaMdxtQMzcDEZAgwI7LMMdi17ojN0eAFQFgfKekeZtCYwNfiIGY4a3yThep2GIRyrWQOavvP3vO+7KrdLVuccCAwEAAaNQME4wHQYDVR0OBBYEFH5hfLauj1fjDi2nQ6GiEfMuRUbQMB8GA1UdIwQYMBaAFH5hfLauj1fjDi2nQ6GiEfMuRUbQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY59Oav1ERYNvaK3vB24nhRNH+CJ3LM38ZYRsLc5rZ3fwLJMP0716N8jS+rsb+REtWFKgg2+b6Gsuwpu/0L/P+WMHmGREvsKDERr2i8aFGqEbvfDhgd8+hS332JoZ+xfWdmWAOOidFPfBD0CZ+hS6U0b0UWchAHKr83m0SLa2tRGz79oQyVC2ndZgJ1Zu44452MZBqZjRNdAxMJ10DYGDc5uAIpoUlK/wxHeU0rTEwLPbnyYdCHdXDpnn+nqVhTSgeGmbk1zcBlGuw/f3vcBoyZHsFj5h/7pgesXmJIfiHugJEvSGKE+mHm0IQwetQJVafpRS0tWVAywznGtGI6pLI=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scng.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scng.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ŠOLSKI CENTER NOVA GORICA</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">ŠOLSKI CENTER NOVA GORICA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ŠOLSKI CENTER NOVA GORICA</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">ŠOLSKI CENTER NOVA GORICA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scng.si/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.scng.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janko</md:GivenName>
-      <md:SurName>Harej</md:SurName>
-      <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Egon</md:GivenName>
-      <md:SurName>Pipan</md:SurName>
-      <md:EmailAddress>mailto:Egon.Pipan@tsc.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:podpora@scng.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Janko</md:GivenName>
-      <md:SurName>Harej</md:SurName>
-      <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Milan</md:GivenName>
-      <md:SurName>Podbršček</md:SurName>
-      <md:EmailAddress>mailto:milanp@scng.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janko</md:GivenName>
-      <md:SurName>Harej</md:SurName>
-      <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Božič</md:SurName>
-      <md:EmailAddress>mailto:martin.bozic@scng.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Milan</md:GivenName>
-      <md:SurName>Podbršček</md:SurName>
-      <md:EmailAddress>mailto:milanp@scng.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Milan</md:GivenName>
-      <md:SurName>Podbrscek</md:SurName>
-      <md:EmailAddress>mailto:milan.podbrscek@tsc.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Božič</md:SurName>
-      <md:EmailAddress>mailto:martin.bozic@scng.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gregor</md:GivenName>
-      <md:SurName>Cimerman</md:SurName>
-      <md:EmailAddress>mailto:gregor.cimerman@guest.arnes.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDizCCAnOgAwIBAgIFLuqUH18wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCU0kxFDASBgNVBAcMC05vdmEgR29yaWNhMTkwNwYDVQQDDDBBcm5lc0FBSSBGZWRlcmF0aW9uIC0gSWRQIGZvciBDYW1wdXMgTm92YSBHb3JpY2EwHhcNMTUwNDA4MTMzNTU0WhcNMzQxMjI0MTMzNTU0WjBeMQswCQYDVQQGEwJTSTEUMBIGA1UEBwwLTm92YSBHb3JpY2ExOTA3BgNVBAMMMEFybmVzQUFJIEZlZGVyYXRpb24gLSBJZFAgZm9yIENhbXB1cyBOb3ZhIEdvcmljYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANg/oLtcllF/db1++GiXDaZ1dZhMYvILPVhkHhyOj6bXzCA0YyqYUqW63pNyODL+tMZ7p8SXw78Cvvdzd3Pzowv5Yr2soRq9YiRzZn2ELJnITiDfdrWigtJRYssVbA7IGDGyCwVDGwwJIp9GWGMeWWPBDfowy/pQ68oyhUHkRk6sNlyZt5KPhQGDBlMn48UfT+szWpcIhJ+aogeoDtR/JwQDn5Sx8XCCCkmQtEEHRCiIUNY1q2HK1EvQmHzI7yGjIqfaMdxtQMzcDEZAgwI7LMMdi17ojN0eAFQFgfKekeZtCYwNfiIGY4a3yThep2GIRyrWQOavvP3vO+7KrdLVuccCAwEAAaNQME4wHQYDVR0OBBYEFH5hfLauj1fjDi2nQ6GiEfMuRUbQMB8GA1UdIwQYMBaAFH5hfLauj1fjDi2nQ6GiEfMuRUbQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY59Oav1ERYNvaK3vB24nhRNH+CJ3LM38ZYRsLc5rZ3fwLJMP0716N8jS+rsb+REtWFKgg2+b6Gsuwpu/0L/P+WMHmGREvsKDERr2i8aFGqEbvfDhgd8+hS332JoZ+xfWdmWAOOidFPfBD0CZ+hS6U0b0UWchAHKr83m0SLa2tRGz79oQyVC2ndZgJ1Zu44452MZBqZjRNdAxMJ10DYGDc5uAIpoUlK/wxHeU0rTEwLPbnyYdCHdXDpnn+nqVhTSgeGmbk1zcBlGuw/f3vcBoyZHsFj5h/7pgesXmJIfiHugJEvSGKE+mHm0IQwetQJVafpRS0tWVAywznGtGI6pLI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDizCCAnOgAwIBAgIFLuqUH18wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCU0kxFDASBgNVBAcMC05vdmEgR29yaWNhMTkwNwYDVQQDDDBBcm5lc0FBSSBGZWRlcmF0aW9uIC0gSWRQIGZvciBDYW1wdXMgTm92YSBHb3JpY2EwHhcNMTUwNDA4MTMzNTU0WhcNMzQxMjI0MTMzNTU0WjBeMQswCQYDVQQGEwJTSTEUMBIGA1UEBwwLTm92YSBHb3JpY2ExOTA3BgNVBAMMMEFybmVzQUFJIEZlZGVyYXRpb24gLSBJZFAgZm9yIENhbXB1cyBOb3ZhIEdvcmljYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANg/oLtcllF/db1++GiXDaZ1dZhMYvILPVhkHhyOj6bXzCA0YyqYUqW63pNyODL+tMZ7p8SXw78Cvvdzd3Pzowv5Yr2soRq9YiRzZn2ELJnITiDfdrWigtJRYssVbA7IGDGyCwVDGwwJIp9GWGMeWWPBDfowy/pQ68oyhUHkRk6sNlyZt5KPhQGDBlMn48UfT+szWpcIhJ+aogeoDtR/JwQDn5Sx8XCCCkmQtEEHRCiIUNY1q2HK1EvQmHzI7yGjIqfaMdxtQMzcDEZAgwI7LMMdi17ojN0eAFQFgfKekeZtCYwNfiIGY4a3yThep2GIRyrWQOavvP3vO+7KrdLVuccCAwEAAaNQME4wHQYDVR0OBBYEFH5hfLauj1fjDi2nQ6GiEfMuRUbQMB8GA1UdIwQYMBaAFH5hfLauj1fjDi2nQ6GiEfMuRUbQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY59Oav1ERYNvaK3vB24nhRNH+CJ3LM38ZYRsLc5rZ3fwLJMP0716N8jS+rsb+REtWFKgg2+b6Gsuwpu/0L/P+WMHmGREvsKDERr2i8aFGqEbvfDhgd8+hS332JoZ+xfWdmWAOOidFPfBD0CZ+hS6U0b0UWchAHKr83m0SLa2tRGz79oQyVC2ndZgJ1Zu44452MZBqZjRNdAxMJ10DYGDc5uAIpoUlK/wxHeU0rTEwLPbnyYdCHdXDpnn+nqVhTSgeGmbk1zcBlGuw/f3vcBoyZHsFj5h/7pgesXmJIfiHugJEvSGKE+mHm0IQwetQJVafpRS0tWVAywznGtGI6pLI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scng.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scng.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ŠOLSKI CENTER NOVA GORICA</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">ŠOLSKI CENTER NOVA GORICA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ŠOLSKI CENTER NOVA GORICA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">ŠOLSKI CENTER NOVA GORICA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scng.si/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.scng.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janko</md:GivenName>
+    <md:SurName>Harej</md:SurName>
+    <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Egon</md:GivenName>
+    <md:SurName>Pipan</md:SurName>
+    <md:EmailAddress>mailto:Egon.Pipan@tsc.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:podpora@scng.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Janko</md:GivenName>
+    <md:SurName>Harej</md:SurName>
+    <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Milan</md:GivenName>
+    <md:SurName>Podbršček</md:SurName>
+    <md:EmailAddress>mailto:milanp@scng.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janko</md:GivenName>
+    <md:SurName>Harej</md:SurName>
+    <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Božič</md:SurName>
+    <md:EmailAddress>mailto:martin.bozic@scng.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Milan</md:GivenName>
+    <md:SurName>Podbršček</md:SurName>
+    <md:EmailAddress>mailto:milanp@scng.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Milan</md:GivenName>
+    <md:SurName>Podbrscek</md:SurName>
+    <md:EmailAddress>mailto:milan.podbrscek@tsc.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Božič</md:SurName>
+    <md:EmailAddress>mailto:martin.bozic@scng.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gregor</md:GivenName>
+    <md:SurName>Cimerman</md:SurName>
+    <md:EmailAddress>mailto:gregor.cimerman@guest.arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml b/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml
index 4b53a4e2..780af699 100644
--- a/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml
+++ b/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scptuj.si/idp/20111102">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T08:01:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T08:01:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scptuj.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ŠC Ptuj</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">ŠC Ptuj</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization ŠC Ptuj</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije ŠC Ptuj</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization ŠC Ptuj</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije ŠC Ptuj</mdui:Keywords>
+        <mdui:Logo height="70" width="298">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.scptuj.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.scptuj.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scptuj.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ŠC Ptuj</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">ŠC Ptuj</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization ŠC Ptuj</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije ŠC Ptuj</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization ŠC Ptuj</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije ŠC Ptuj</mdui:Keywords>
-          <mdui:Logo height="70" width="298">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.scptuj.si</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.scptuj.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scptuj.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scptuj.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ŠOLSKI CENTER PTUJ</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">ŠOLSKI CENTER PTUJ</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ŠOLSKI CENTER PTUJ</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">ŠOLSKI CENTER PTUJ</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scptuj.si</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.scptuj.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Branko</md:GivenName>
-      <md:SurName>Kumer</md:SurName>
-      <md:EmailAddress>mailto:branko.kumer@scptuj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Terbuc</md:SurName>
-      <md:EmailAddress>mailto:martin.terbuc@scptuj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marjan</md:GivenName>
-      <md:SurName>Čeh</md:SurName>
-      <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>CEH</md:GivenName>
-      <md:SurName>Čeh</md:SurName>
-      <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGPTCCBCWgAwIBAgIJAK6vqafsmOe8MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYDVQQGEwJTSTENMAsGA1UEBwwEUHR1ajFCMEAGA1UECgw5U0MgUHR1aixBcm5lc0FBSSBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgb2YgT3JnYW5pemF0aW9uMTowOAYDVQQLDDFBcm5lc0FBSSBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgb2YgT3JnYW5pemF0aW9uMRYwFAYDVQQDDA1pZHAuc2NwdHVqLnNpMB4XDTE1MDEwODA5MjgyMloXDTM1MDEwNzA5MjgyMlowgbQxCzAJBgNVBAYTAlNJMQ0wCwYDVQQHDARQdHVqMUIwQAYDVQQKDDlTQyBQdHVqLEFybmVzQUFJIEZlZGVyYXRpb24gLSBQcmltYXJ5IElkUCBvZiBPcmdhbml6YXRpb24xOjA4BgNVBAsMMUFybmVzQUFJIEZlZGVyYXRpb24gLSBQcmltYXJ5IElkUCBvZiBPcmdhbml6YXRpb24xFjAUBgNVBAMMDWlkcC5zY3B0dWouc2kwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDP/Wj/9glEDta/8/Hp6TT4BhedyepX76DqqUa9QXG1wyqRBbAU66KwUUC1E/xr80Z+oPXK5W2AzQQ9wLgJTQbNEVhWh5zFUzOlG/9xT8coKTpsiJ8qo9DC99GvyO1SbJjNDTSaK5JMoMu5Lb1q7+QzD+QWjMbIiqOzGouzVbxtrJ5gTpEJhr34kt3OjAGR0sWBlspKm1Aocdbn6yvgpL0TQ0Ei25+oAXEC/anAXvHzyLzdgYjsMW+mqDks9FuNyV98SCLPytZ0Ef/pIRT3rYx7pgLpnSagIcbVBKBpHSPyssIfMAgknvB+JrIoI2eRZ54zlac5RO6oXrFQyfc3glZRdWbaSWulpynjhxFCBPPJPuUdfO0It62fJrBu5VYuX20SXQhFpb22UqNcom9J8FuIH7pBrgC4j6RNJg7KtwefhG3SZ1Hh/vlZ4OlD3av9eLo4NQz8cgD/KHW52AiDQLc6tW9Ag5Yhyk9PERFzZa4em/poEywz5FsUjPGNmwo7jAmH7RwW8D9c3zt7oiUj89YeK45DlU8BrvMgWggxhXoEQFJ3o0PQpxkgloYkNnHD9M9D/RbANR9rR5u9wuuSi+VwwY5X76JeEpt7yk2Wqdh8IEcSD3ZZp1i8xejLbNEwqX+mAa6pXR+n/6+0vV1hI4DTtSj9LoR+qkpb54AaEGh9YQIDAQABo1AwTjAdBgNVHQ4EFgQUsGFsy7qHbZ5YYUahAVxhvAEFUSwwHwYDVR0jBBgwFoAUsGFsy7qHbZ5YYUahAVxhvAEFUSwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAgEAggstfbPgOhidpE7Q58NY7/r/eO5/aNxjNSD4JB6d2IAia9yhyzMp2jsVMXDRQ8o98mZmHJYgdxicscIKGYD3yFJmfKfXKEx3mwCTbUsTjVNIZMDmuFZgVdnZYVyEx0zCDFwBkFmJfX4DOlxTeihwe6fNFlk8kdQWtsu2eRid44Kd8EWLeqIIraxMEpNgaAO+f2+lLMC6y+/Rdl4sWoUaZ3n7hBMiXAFyScjJpQ4XltO2DC8zKxUH87FEkPkrQRCMbbqbi0q1pzm5ICnPDVfGwn3T9lDdDolvvq3RthIS292ZMaRrqbWRA/jeO8b5qSHP/Afp9QjA6HqbM7EeqYTauJiuFqxNFIWhV+Vu+O6j9MWM7CI39KwinWkW6IpOCJQS5DZo0+J1Q4Tp6gpniEhGrAOUk5c5GN7ZolwMT8GwydoS3fOgNEZU4cDq4mh6SUFjhoYjz50R8JFsl5QPOIOekY/uEuJPtvljNvQEAVQHGtfJ7BCB3oKwMUOHWf4lp+p8/T1/Pxj2MrlE9yiAlGIm3ZjbzLc7oJiFDm+Lk3eLu+i1+221EBgBLiS6zVe6tPv9M1rzsxaGMXvAprDO7ybqJcsUZHrN+Jo5IBgmm2mzJqec01VivezLoRMBEQ+XLL9kog5pLm3wCNFye5PEFHZudV2NQPtiwyi9Jt6Y0s8OwJw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scptuj.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scptuj.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ŠOLSKI CENTER PTUJ</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">ŠOLSKI CENTER PTUJ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ŠOLSKI CENTER PTUJ</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">ŠOLSKI CENTER PTUJ</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scptuj.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.scptuj.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Branko</md:GivenName>
+    <md:SurName>Kumer</md:SurName>
+    <md:EmailAddress>mailto:branko.kumer@scptuj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Terbuc</md:SurName>
+    <md:EmailAddress>mailto:martin.terbuc@scptuj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marjan</md:GivenName>
+    <md:SurName>Čeh</md:SurName>
+    <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CEH</md:GivenName>
+    <md:SurName>Čeh</md:SurName>
+    <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml
index c73603ac..8f2a1dbe 100644
--- a/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sdsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">San Diego State University</mdui:DisplayName>
+        <mdui:Logo height="162" width="235" xml:lang="en">https://newscenter.sdsu.edu/brand/images/primary3color.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">San Diego State University</mdui:DisplayName>
-          <mdui:Logo height="162" width="235" xml:lang="en">https://newscenter.sdsu.edu/brand/images/primary3color.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMWWto0I48RmvkuXkJ+lKemaw/hrMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTAeFw0xMTA1MjAxODU0MTJaFw0z
 MTA1MjAxODU0MTJaMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTCCASIwDQYJKoZI
@@ -41,21 +41,21 @@ grlHPK6YpLkl/yFUyG674xclGFYbO5e1oSTo2RI8Prq5SFMm+ZTM8RpJE4S8N2KK
 /xmDUZex0G3l2kQXG453HGvKmtyfatFO0EQsKSXR7TDUA5DlKaTR7TTqJIoQK0th
 H0EQISNFETzOPvigNzdVOpw9ywvLIgC4MAevthLo5ek=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sdsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sdsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sdsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sdsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sdsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sdsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMWWto0I48RmvkuXkJ+lKemaw/hrMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTAeFw0xMTA1MjAxODU0MTJaFw0z
 MTA1MjAxODU0MTJaMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTCCASIwDQYJKoZI
@@ -74,27 +74,27 @@ grlHPK6YpLkl/yFUyG674xclGFYbO5e1oSTo2RI8Prq5SFMm+ZTM8RpJE4S8N2KK
 /xmDUZex0G3l2kQXG453HGvKmtyfatFO0EQsKSXR7TDUA5DlKaTR7TTqJIoQK0th
 H0EQISNFETzOPvigNzdVOpw9ywvLIgC4MAevthLo5ek=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sdsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sdsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">San Diego State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">San Diego State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sdsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marcus Jeffers</md:GivenName>
-      <md:EmailAddress>mjeffers@mail.sdsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marcus Jeffers</md:GivenName>
-      <md:EmailAddress>mjeffers@mail.sdsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ETS Help Desk</md:GivenName>
-      <md:EmailAddress>etshelpdesk@mail.sdsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sdsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sdsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">San Diego State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">San Diego State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sdsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marcus Jeffers</md:GivenName>
+    <md:EmailAddress>mjeffers@mail.sdsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marcus Jeffers</md:GivenName>
+    <md:EmailAddress>mjeffers@mail.sdsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ETS Help Desk</md:GivenName>
+    <md:EmailAddress>etshelpdesk@mail.sdsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml
index 65f7d262..5f8ed6a5 100644
--- a/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sfsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">San Francisco State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">San Francisco State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUaVXwsxeZ7HtpgzDRqkb/SXmxNCUwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MB4XDTEwMDExMjE3NTg0OVoXDTMw
 MDExMjE3NTg0OVowFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MIIBIjANBgkqhkiG
@@ -37,24 +37,24 @@ Ww8M8pNXffLcYo8NAdTY1ZddhYsqcAduFzL4Q0u/+QpV4K2qpMOK57sJ/4GuI0i4
 TF+IPVqP9ibO/PX7scYZDBm8wGCQ3G3UwADAQxJlSTJzyP7PthgH3ublYb3IbrY6
 OQKTDUHTSx//VpESlGrhleDG/BalOfbtxZka2UF05A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sfsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sfsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sfsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sfsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sfsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sfsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sfsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sfsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sfsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sfsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUaVXwsxeZ7HtpgzDRqkb/SXmxNCUwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MB4XDTEwMDExMjE3NTg0OVoXDTMw
 MDExMjE3NTg0OVowFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MIIBIjANBgkqhkiG
@@ -73,31 +73,31 @@ Ww8M8pNXffLcYo8NAdTY1ZddhYsqcAduFzL4Q0u/+QpV4K2qpMOK57sJ/4GuI0i4
 TF+IPVqP9ibO/PX7scYZDBm8wGCQ3G3UwADAQxJlSTJzyP7PthgH3ublYb3IbrY6
 OQKTDUHTSx//VpESlGrhleDG/BalOfbtxZka2UF05A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sfsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sfsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">San Francisco State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">San Francisco State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sfsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Supakit Kiatrungrit</md:GivenName>
-      <md:EmailAddress>supakitk@sfsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Joellen Fung</md:GivenName>
-      <md:EmailAddress>jfung@sfsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical support</md:GivenName>
-      <md:EmailAddress>systems@sfsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Supakit Kiatrungrit</md:GivenName>
-      <md:EmailAddress>supakitk@sfsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sfsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sfsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">San Francisco State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">San Francisco State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sfsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Supakit Kiatrungrit</md:GivenName>
+    <md:EmailAddress>supakitk@sfsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Joellen Fung</md:GivenName>
+    <md:EmailAddress>jfung@sfsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical support</md:GivenName>
+    <md:EmailAddress>systems@sfsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Supakit Kiatrungrit</md:GivenName>
+    <md:EmailAddress>supakitk@sfsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
index 0f158410..e08a9e9d 100644
--- a/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sgi.cefetmg.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefetmg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cefetmg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.cefetmg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefetmg.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
-          <mdui:Description xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.cefetmg.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.cefetmg.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
 MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
 LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
@@ -45,26 +45,26 @@ YCq8RxeRlzv+nC8jsKRLX0f/MkoViUs8SqSUVwbFd/9m2aWfwm083pQCjHMxPJ6R
 AmQ7M4Sp8I/jlW+U3rinliikdU8/OtJfK5ul3VJJwDdiZSSKBTpgMK7I0ErMdGge
 ygq02Y9TwNW87ZDtaYEO9eei
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgi.cefetmg.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefetmg.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgi.cefetmg.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefetmg.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
 MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
@@ -89,24 +89,24 @@ AmQ7M4Sp8I/jlW+U3rinliikdU8/OtJfK5ul3VJJwDdiZSSKBTpgMK7I0ErMdGge
 ygq02Y9TwNW87ZDtaYEO9eei
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cefetmg.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.cefetmg.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Clever de O. Junior</md:SurName>
-      <md:EmailAddress>clever@dri.cefetmg.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cefetmg.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.cefetmg.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Clever de O. Junior</md:SurName>
+    <md:EmailAddress>clever@dri.cefetmg.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml
index c24cc34f..a90637ef 100644
--- a/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sgscol.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-04T16:23:54Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-04T16:23:54Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgscol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgscol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDjDCCAnQCCQDoMDHwmgfPnzANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgMD0dsb3VjZXN0ZXJzaGlyZTEQMA4GA1UEBwwHQnJpc3RvbDEx
 						MC8GA1UECgwoU291dGggR2xvdWNlc3RlcnNoaXJlIGFuZCBTdHJvdWQgQ29sbGVn
@@ -31,26 +31,26 @@
 						TAOMx4B1IsMnOqA1T+jbYjxN+vWFZ4cjjsK3uDJhLMZJsxc172bF6PmT9cEo+B2S
 						mBhOt3wdkDpzPoqztKmUb3IgdWt4uShjsiUL0m8sClh3fvQ5YcnTxma7Q2/skBYK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgscol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgscol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgscol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgscol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDjDCCAnQCCQDoMDHwmgfPnzANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgMD0dsb3VjZXN0ZXJzaGlyZTEQMA4GA1UEBwwHQnJpc3RvbDEx
 						MC8GA1UECgwoU291dGggR2xvdWNlc3RlcnNoaXJlIGFuZCBTdHJvdWQgQ29sbGVn
@@ -71,27 +71,27 @@
 						TAOMx4B1IsMnOqA1T+jbYjxN+vWFZ4cjjsK3uDJhLMZJsxc172bF6PmT9cEo+B2S
 						mBhOt3wdkDpzPoqztKmUb3IgdWt4uShjsiUL0m8sClh3fvQ5YcnTxma7Q2/skBYK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The South Gloucestershire and Stroud College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Gloucestershire and Stroud College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sgscol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Aaron</md:GivenName>
-      <md:SurName>Hope</md:SurName>
-      <md:EmailAddress>mailto:aaron.hope@sgscol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Aaron</md:GivenName>
-      <md:SurName>Hope</md:SurName>
-      <md:EmailAddress>mailto:aaron.hope@sgscol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The South Gloucestershire and Stroud College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Gloucestershire and Stroud College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sgscol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Hope</md:SurName>
+    <md:EmailAddress>mailto:aaron.hope@sgscol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron</md:GivenName>
+    <md:SurName>Hope</md:SurName>
+    <md:EmailAddress>mailto:aaron.hope@sgscol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml
index f724088c..11242386 100644
--- a/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shef.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-24T12:26:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-24T12:26:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFCjCCA/KgAwIBAgIUTWCw0LmBsiIH8aCwZ/lqP++FKzYwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQxNDA4MzEy
@@ -41,26 +41,26 @@
 						p0Uv8uSz9S1+hpGnKzutBJ4d5h8AbjoKjYsUFQed5nI0KQ3ea6v34JvyrZVaTMxm
 						ULmwAyJq1ECXaA9gz5jfeNcUUec5SHel2G9VpFacSQVv8RrNh/yeUpeIye+3Fg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shef.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shef.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFCjCCA/KgAwIBAgIUTWCw0LmBsiIH8aCwZ/lqP++FKzYwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQxNDA4MzEy
@@ -89,27 +89,27 @@
 						p0Uv8uSz9S1+hpGnKzutBJ4d5h8AbjoKjYsUFQed5nI0KQ3ea6v34JvyrZVaTMxm
 						ULmwAyJq1ECXaA9gz5jfeNcUUec5SHel2G9VpFacSQVv8RrNh/yeUpeIye+3Fg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Sheffield</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sheffield</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nomit</md:GivenName>
-      <md:SurName>Babraa</md:SurName>
-      <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nomit</md:GivenName>
-      <md:SurName>Babraa</md:SurName>
-      <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Sheffield</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sheffield</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nomit</md:GivenName>
+    <md:SurName>Babraa</md:SurName>
+    <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nomit</md:GivenName>
+    <md:SurName>Babraa</md:SurName>
+    <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml
index 8cb4c3c4..0b5a2638 100644
--- a/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sheffcol.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-25T14:08:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-25T14:08:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffcol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8DCCAtgCCQD+MvDrUqcVKDANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgTD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBxMJU2hlZmZpZWxk
 						MR4wHAYDVQQKExVUaGUgU2hlZmZpZWxkIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNl
@@ -36,26 +36,26 @@
 						7iyFOrc1qevyiD5j7phHJ3th6ePeplPOwpUS/AejrJ8MeeQO4ZobKumOahHt2wkJ
 						x5QCzw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sheffcol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sheffcol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffcol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8DCCAtgCCQD+MvDrUqcVKDANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgTD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBxMJU2hlZmZpZWxk
 						MR4wHAYDVQQKExVUaGUgU2hlZmZpZWxkIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNl
@@ -79,27 +79,27 @@
 						7iyFOrc1qevyiD5j7phHJ3th6ePeplPOwpUS/AejrJ8MeeQO4ZobKumOahHt2wkJ
 						x5QCzw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Sheffield College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Sheffield College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sheffcol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Humphrey</md:SurName>
-      <md:EmailAddress>mailto:michael.humphrey@sheffcol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Humphrey</md:SurName>
-      <md:EmailAddress>mailto:michael.humphrey@sheffcol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Sheffield College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Sheffield College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sheffcol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Humphrey</md:SurName>
+    <md:EmailAddress>mailto:michael.humphrey@sheffcol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Humphrey</md:SurName>
+    <md:EmailAddress>mailto:michael.humphrey@sheffcol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shi.com.xml b/swamid-interfederations-2.0/idp.shi.com.xml
index 30463eea..761e8d7e 100644
--- a/swamid-interfederations-2.0/idp.shi.com.xml
+++ b/swamid-interfederations-2.0/idp.shi.com.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shi.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sp.shi.com/notice/invalidrequest" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shi.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SHI International Corporation</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Development IdP for SHI</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sp.shi.com/notice/invalidrequest" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shi.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SHI International Corporation</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Development IdP for SHI</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMj1ttF2FaMwn9EUKVTXpmbK6XOXMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGludGVybmFsLnNoaS5jb20wHhcNMTQwMzExMTYxNjM3
 WhcNMzQwMzExMTcxNjM3WjAbMRkwFwYDVQQDExBpbnRlcm5hbC5zaGkuY29tMIIB
@@ -38,27 +38,27 @@ WCVrkk3V9kytghLysWaiQGIVmBent6ecy/si6q0vjgblabG8+468gaFcLHROarat
 d62gDKCcpQsPbjFSbMLSTwsk2OyxG9MSxlOQESMpCFP0VwvbMBtBBMc4w/ky+ZrT
 w6F+iNsK/mzhVXrfr4xtUW0NEDTEEu+DMbTyQGKfRtVZAi/nxfZrik7hBBxKih3W
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://internal.shi.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.shi.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.shi.com/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.shi.com/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.shi.com:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://internal.shi.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.shi.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://internal.shi.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.shi.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shi.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://internal.shi.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.shi.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.shi.com/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.shi.com/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.shi.com:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://internal.shi.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.shi.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://internal.shi.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.shi.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shi.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMj1ttF2FaMwn9EUKVTXpmbK6XOXMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGludGVybmFsLnNoaS5jb20wHhcNMTQwMzExMTYxNjM3
 WhcNMzQwMzExMTcxNjM3WjAbMRkwFwYDVQQDExBpbnRlcm5hbC5zaGkuY29tMIIB
@@ -77,22 +77,22 @@ WCVrkk3V9kytghLysWaiQGIVmBent6ecy/si6q0vjgblabG8+468gaFcLHROarat
 d62gDKCcpQsPbjFSbMLSTwsk2OyxG9MSxlOQESMpCFP0VwvbMBtBBMc4w/ky+ZrT
 w6F+iNsK/mzhVXrfr4xtUW0NEDTEEu+DMbTyQGKfRtVZAi/nxfZrik7hBBxKih3W
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://internal.shi.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SHI International Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SHI International Corporation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://shi.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ken Kapes</md:GivenName>
-      <md:EmailAddress>ken_kapes@shi.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kurt Schreckengost</md:GivenName>
-      <md:EmailAddress>Kurt_Schreckengost@shi.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://internal.shi.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SHI International Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SHI International Corporation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://shi.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ken Kapes</md:GivenName>
+    <md:EmailAddress>ken_kapes@shi.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kurt Schreckengost</md:GivenName>
+    <md:EmailAddress>Kurt_Schreckengost@shi.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
index 76e395a3..f69f13ce 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:22:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:22:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
-          <mdui:Description xml:lang="en">An identity provider hosted and used by the
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An identity provider hosted and used by the
 					developers of Shibboleth.</mdui:Description>
-          <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
 						MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
@@ -46,36 +46,36 @@
 						Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
 						BXD36HfGBXk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Shibboleth.net</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shibboleth.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth.Net Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:contact@shibboleth.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Cantor</md:SurName>
-      <md:EmailAddress>mailto:cantor.2@osu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:ukfed@iay.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shibboleth.net</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shibboleth.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth.Net Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:contact@shibboleth.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Cantor</md:SurName>
+    <md:EmailAddress>mailto:cantor.2@osu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:ukfed@iay.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
index 8d5b7102..9fb1d412 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.qmul.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-13T20:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-13T20:40:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmul.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Queen Mary, University of London</mdui:DisplayName>
+        <mdui:Logo height="53" width="200">https://idcheck.qmul.ac.uk/data/qmul_black.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmul.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Queen Mary, University of London</mdui:DisplayName>
-          <mdui:Logo height="53" width="200">https://idcheck.qmul.ac.uk/data/qmul_black.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIHnTCCBoWgAwIBAgIQYq4ht/OC7BIxhYZg2e2WcDANBgkqhkiG9w0BAQsFADCB
 						kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
@@ -59,26 +59,26 @@
 						xXV2KDU0rxMp4uv0an+P+O7ePMr9j6d5+heLkBoM+InoJAoh62GJnZXjr6H2bpJR
 						fvD/ZPNVxn4N4iHxZDaxWwINXVwOgDHod2aU6e61XAve
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmul.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmul.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIHnTCCBoWgAwIBAgIQYq4ht/OC7BIxhYZg2e2WcDANBgkqhkiG9w0BAQsFADCB
 						kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
@@ -121,31 +121,31 @@
 						xXV2KDU0rxMp4uv0an+P+O7ePMr9j6d5+heLkBoM+InoJAoh62GJnZXjr6H2bpJR
 						fvD/ZPNVxn4N4iHxZDaxWwINXVwOgDHod2aU6e61XAve
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary, University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Evans</md:SurName>
-      <md:EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Jordaan</md:SurName>
-      <md:EmailAddress>mailto:steven.t.s.jordaan@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Evans</md:SurName>
+    <md:EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Jordaan</md:SurName>
+    <md:EmailAddress>mailto:steven.t.s.jordaan@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
index 9878e812..8da53c40 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.stir.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUbZSEbusfMF9L8dG2tMTBbcHOLgkwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC5zdGlyLmFjLnVrMB4XDTE2MDMxMTEw
 						MTA1OVoXDTM2MDMxMTEwMTA1OVowIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC5zdGly
@@ -30,26 +30,26 @@
 						wEH5lnbR/BzHdUXSVBOEmF9tvzpSRwnvulmZ8qYpGucNdvtJ/+pCnxAmOmwdW2yb
 						Po48+yaXB6j2o1B0bvfg74oZBw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUbZSEbusfMF9L8dG2tMTBbcHOLgkwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC5zdGlyLmFjLnVrMB4XDTE2MDMxMTEw
 						MTA1OVoXDTM2MDMxMTEwMTA1OVowIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC5zdGly
@@ -69,26 +69,26 @@
 						wEH5lnbR/BzHdUXSVBOEmF9tvzpSRwnvulmZ8qYpGucNdvtJ/+pCnxAmOmwdW2yb
 						Po48+yaXB6j2o1B0bvfg74oZBw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Stirling</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Stirling</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stir.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Centre</md:GivenName>
-      <md:EmailAddress>mailto:infocentre@stir.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>White</md:SurName>
-      <md:EmailAddress>mailto:michael.white@stir.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Stirling</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Stirling</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stir.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Centre</md:GivenName>
+    <md:EmailAddress>mailto:infocentre@stir.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>White</md:SurName>
+    <md:EmailAddress>mailto:michael.white@stir.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml
index 88261cd6..7c75ab54 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.ttu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Texas Tech University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Texas Tech University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAPD3XAIRckWiM8m7Oiu6nDm4mM/QMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMMFmlkcC5zaGliYm9sZXRoLnR0dS5lZHUwHhcNMTUwNDAx
 MTQyOTU0WhcNMzUwNDAxMTQyOTU0WjAhMR8wHQYDVQQDDBZpZHAuc2hpYmJvbGV0
@@ -38,23 +38,23 @@ oQb5rHmWTJWcROONosbFNaGMIv204ljvkxN4JPAtpGSyVcDYUElbZcUgWmAZ7Y4c
 vVObMDl/Nb5UoB1tj4zq8Gf1WpDj1iOpv9QkH9+X1jZWlrnTNqc5pTgXu9Jd4WtM
 p/PLUr+DuI3pWSnU6Qfj7IpU/pTFoIOR
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.ttu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.ttu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.ttu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.ttu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.ttu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.ttu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAPD3XAIRckWiM8m7Oiu6nDm4mM/QMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMMFmlkcC5zaGliYm9sZXRoLnR0dS5lZHUwHhcNMTUwNDAx
 MTQyOTU0WhcNMzUwNDAxMTQyOTU0WjAhMR8wHQYDVQQDDBZpZHAuc2hpYmJvbGV0
@@ -74,26 +74,26 @@ oQb5rHmWTJWcROONosbFNaGMIv204ljvkxN4JPAtpGSyVcDYUElbZcUgWmAZ7Y4c
 vVObMDl/Nb5UoB1tj4zq8Gf1WpDj1iOpv9QkH9+X1jZWlrnTNqc5pTgXu9Jd4WtM
 p/PLUr+DuI3pWSnU6Qfj7IpU/pTFoIOR
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Texas Tech University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Texas Tech University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ttu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Telecommunications Network Systems</md:GivenName>
-      <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Telecommunications Network Systems</md:GivenName>
-      <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Telecommunications Network Systems</md:GivenName>
-      <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Texas Tech University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Texas Tech University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ttu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Telecommunications Network Systems</md:GivenName>
+    <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Telecommunications Network Systems</md:GivenName>
+    <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Telecommunications Network Systems</md:GivenName>
+    <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml
index d7f246f2..909bb04a 100644
--- a/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ship.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.ship.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ship.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shippensburg University of Pennsylvania</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Shippensburg, Pennsylvania</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ship.edu/technology</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ship.edu/Technology/Policies/Computing_and_Information_Network_Usage_Policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="900" width="1200" xml:lang="en">https://idp.ship.edu/ShipLogo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.ship.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ship.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Shippensburg University of Pennsylvania</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Shippensburg, Pennsylvania</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ship.edu/technology</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ship.edu/Technology/Policies/Computing_and_Information_Network_Usage_Policy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="900" width="1200" xml:lang="en">https://idp.ship.edu/ShipLogo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFgDCCBGigAwIBAgIQIIqv7avkn41Rrf4h3IiBujANBgkqhkiG9w0BAQsFADB2
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
@@ -54,23 +54,23 @@ wPwL6yo+Dk5PsGngpwy+ujQOhSJoCCbzoBFlDzpTHp8gl2hpScUQOLziW8M1BpRP
 LJQxOR1AvCp9E0gAFMTuOWaDR1Ybwllg3C7YizSUcK669Z4zjx/0+hcgDFbNpBov
 IvnQF4KSwZqAOukHhzVkzkfPjiI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ship.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ship.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ship.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ship.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ship.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ship.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ship.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ship.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ship.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ship.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ship.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ship.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFgDCCBGigAwIBAgIQIIqv7avkn41Rrf4h3IiBujANBgkqhkiG9w0BAQsFADB2
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
@@ -102,26 +102,26 @@ wPwL6yo+Dk5PsGngpwy+ujQOhSJoCCbzoBFlDzpTHp8gl2hpScUQOLziW8M1BpRP
 LJQxOR1AvCp9E0gAFMTuOWaDR1Ybwllg3C7YizSUcK669Z4zjx/0+hcgDFbNpBov
 IvnQF4KSwZqAOukHhzVkzkfPjiI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ship.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Shippensburg University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Shippensburg University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ship.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shippensburg University Computing Technologies Center</md:GivenName>
-      <md:EmailAddress>idp@ship.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shippensburg University Computing Technologies Center</md:GivenName>
-      <md:EmailAddress>idp@ship.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shippensburg University Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@ship.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ship.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Shippensburg University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shippensburg University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ship.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shippensburg University Computing Technologies Center</md:GivenName>
+    <md:EmailAddress>idp@ship.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shippensburg University Computing Technologies Center</md:GivenName>
+    <md:EmailAddress>idp@ship.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shippensburg University Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@ship.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shipley.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.shipley.ac.uk-openathens.xml
index 08248d47..35baf560 100644
--- a/swamid-interfederations-2.0/idp.shipley.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.shipley.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shipley.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shipley.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shipley.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/shipley.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/shipley.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Shipley College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shipley.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/shipley.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/shipley.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shipley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shipley.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml
index 3798a256..c1dd582a 100644
--- a/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shu.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sheffield Hallam University</mdui:DisplayName>
+        <mdui:Logo height="43" width="80">https://extra.shu.ac.uk/ukfed/shu-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sheffield Hallam University</mdui:DisplayName>
-          <mdui:Logo height="43" width="80">https://extra.shu.ac.uk/ukfed/shu-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEPjCCAyagAwIBAgIJANXnLNjnFdG5MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
 						ZmllbGQxJDAiBgNVBAoTG1NoZWZmaWVsZCBIYWxsYW0gVW5pdmVyc2l0eTEkMCIG
@@ -39,26 +39,26 @@
 						eW2XrAsGKATf6ILhGnVWK2tGOekfyb5qaa3rAlTiAxeXYvO7GVo1KDKIt7T/4RiD
 						WFFlehGW+U5vzTOD62jQeVmq/gcPZqB5TkizAcYdMnzoWw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEPjCCAyagAwIBAgIJANXnLNjnFdG5MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
 						ZmllbGQxJDAiBgNVBAoTG1NoZWZmaWVsZCBIYWxsYW0gVW5pdmVyc2l0eTEkMCIG
@@ -83,31 +83,31 @@
 						eW2XrAsGKATf6ILhGnVWK2tGOekfyb5qaa3rAlTiAxeXYvO7GVo1KDKIt7T/4RiD
 						WFFlehGW+U5vzTOD62jQeVmq/gcPZqB5TkizAcYdMnzoWw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sheffield Hallam University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sheffield Hallam University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Help</md:GivenName>
-      <md:EmailAddress>mailto:ithelp@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Turner</md:SurName>
-      <md:EmailAddress>mailto:a.p.turner@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gavin</md:GivenName>
-      <md:SurName>Moore</md:SurName>
-      <md:EmailAddress>mailto:g.r.moore@shu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sheffield Hallam University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sheffield Hallam University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help</md:GivenName>
+    <md:EmailAddress>mailto:ithelp@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Turner</md:SurName>
+    <md:EmailAddress>mailto:a.p.turner@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gavin</md:GivenName>
+    <md:SurName>Moore</md:SurName>
+    <md:EmailAddress>mailto:g.r.moore@shu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml
index 9e8142e2..91e1bf7f 100644
--- a/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.si.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">si.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Smithsonian Institution</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">si.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Smithsonian Institution</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIURicbi+W5DJNnSH6V80PzY0w8bqowDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnNpLmVkdTAeFw0xMTA4MTYxMzE4NDRaFw0zMTA4
 MTYxMzE4NDRaMBUxEzARBgNVBAMTCmlkcC5zaS5lZHUwggEiMA0GCSqGSIb3DQEB
@@ -40,33 +40,33 @@ vcfm468S++LCzuKnkKiOYXSxaQlAjZDD5zOH8CBADP/A/CEzdf3mPBCMx/Hhtcsk
 BOetPLICbnq+Qh8VieTSm1b2EcS/c2NqtwbBv0RSsjN/LwIMmyTyUTagP360Nhvb
 RfYItwvvswQ2wtebkQpbdpNcuE7Ng8g=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.si.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.si.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.si.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.si.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Smithsonian Institution</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Smithsonian Institution</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.si.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeffrey McAvoy</md:GivenName>
-      <md:EmailAddress>mcavoyj@si.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Weber Wung</md:GivenName>
-      <md:EmailAddress>wungw@si.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex Aveta</md:GivenName>
-      <md:EmailAddress>AvetaA@si.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jas Jamwal</md:GivenName>
-      <md:EmailAddress>JamwalJ@si.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.si.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.si.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.si.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.si.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Smithsonian Institution</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Smithsonian Institution</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.si.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeffrey McAvoy</md:GivenName>
+    <md:EmailAddress>mcavoyj@si.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Weber Wung</md:GivenName>
+    <md:EmailAddress>wungw@si.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Aveta</md:GivenName>
+    <md:EmailAddress>AvetaA@si.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jas Jamwal</md:GivenName>
+    <md:EmailAddress>JamwalJ@si.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
index 313088fe..2ad8d619 100644
--- a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sics.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0                                                 urn:oasis:names:tc:SAML:1.1:protocol                                                 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sics.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
+        <mdui:Logo height="95" width="328">https://www.sics.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>sics.se</mdui:DomainHint>
+        <mdui:DomainHint>tii.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.64.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.135.0/24</mdui:IPHint>
+        <mdui:IPHint>192.71.100.0/25</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0                                                 urn:oasis:names:tc:SAML:1.1:protocol                                                 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sics.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
-          <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
-          <mdui:Logo height="95" width="328">https://www.sics.se/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>sics.se</mdui:DomainHint>
-          <mdui:DomainHint>tii.se</mdui:DomainHint>
-          <mdui:IPHint>193.10.64.0/22</mdui:IPHint>
-          <mdui:IPHint>193.10.135.0/24</mdui:IPHint>
-          <mdui:IPHint>192.71.100.0/25</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUAvD+MUK/yy94JHWzinDjgSCX0/swDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAwwLaWRwLnNpY3Muc2UwHhcNMTYwMzA4MTM1MDEyWhcNMjEw
 MzA4MTM1MDEyWjAWMRQwEgYDVQQDDAtpZHAuc2ljcy5zZTCCASIwDQYJKoZIhvcN
@@ -46,28 +46,28 @@ hzN9ux1HmiI6RYduAv/3Ep1LGBrWh5PyAgPFcErAla+OOijqWMu+09ccOZxbQLLZ
 ymKPX/tMuL8Nyv4SJOV76Ja4FtcJ4fQLFLJsHev2ByQdNLB6dbzjQeHzXMKr9nWy
 pM5riVx3/xM8O8O7qu76POFup5Bz23btNiSK
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sics.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol                                                             urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sics.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sics.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol                                                             urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sics.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUAvD+MUK/yy94JHWzinDjgSCX0/swDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAwwLaWRwLnNpY3Muc2UwHhcNMTYwMzA4MTM1MDEyWhcNMjEw
 MzA4MTM1MDEyWjAWMRQwEgYDVQQDDAtpZHAuc2ljcy5zZTCCASIwDQYJKoZIhvcN
@@ -86,23 +86,23 @@ hzN9ux1HmiI6RYduAv/3Ep1LGBrWh5PyAgPFcErAla+OOijqWMu+09ccOZxbQLLZ
 ymKPX/tMuL8Nyv4SJOV76Ja4FtcJ4fQLFLJsHev2ByQdNLB6dbzjQeHzXMKr9nWy
 pM5riVx3/xM8O8O7qu76POFup5Bz23btNiSK
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SICS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SICS</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">SICS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.sics.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>SICS</md:Company>
-      <md:SurName>CRIT</md:SurName>
-      <md:EmailAddress>mailto:crit@sics.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SICS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SICS</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">SICS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sics.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SICS</md:Company>
+    <md:SurName>CRIT</md:SurName>
+    <md:EmailAddress>mailto:crit@sics.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
index 35fbaf1e..5b50dd41 100644
--- a/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sissa.it/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-03T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
                     https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sissa.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
+        <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sissa.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-          <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
 MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
@@ -45,26 +45,26 @@ j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
 NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
 Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sissa.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sissa.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
 MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
@@ -83,28 +83,28 @@ j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
 NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
 Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SISSA</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">SISSA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sissa.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.sissa.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Massimiliano</md:GivenName>
-      <md:SurName>Ritossa</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@sissa.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:helpdesk@sissa.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SISSA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SISSA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sissa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.sissa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Massimiliano</md:GivenName>
+    <md:SurName>Ritossa</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@sissa.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:helpdesk@sissa.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml
index 7538843c..e6ad2a38 100644
--- a/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.slcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-30T12:06:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-30T12:06:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slcollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">South Leicestershire College (Shibboleth)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.slcollege.ac.uk/images/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.slcollege.ac.uk/images/logo-icon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slcollege.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">South Leicestershire College (Shibboleth)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.slcollege.ac.uk/images/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.slcollege.ac.uk/images/logo-icon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAL6tdh1Q1lgaE74wTineZn7NGaKtMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcC5zbGNvbGxlZ2UuYWMudWswHhcNMTQwNDAxMTA1
 						NDIxWhcNMzQwNDAxMTA1NDIxWjAeMRwwGgYDVQQDExNpZHAuc2xjb2xsZWdlLmFj
@@ -37,29 +37,29 @@
 						q3+sje0KNER0ehuD6eKVixp6SOf6RXLVLtB7m+eI3V/gRRjnckVd2mRXj7bLuQru
 						yaqmpEaqpQzn1fUy
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.slcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.slcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAL6tdh1Q1lgaE74wTineZn7NGaKtMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcC5zbGNvbGxlZ2UuYWMudWswHhcNMTQwNDAxMTA1
 						NDIxWhcNMzQwNDAxMTA1NDIxWjAeMRwwGgYDVQQDExNpZHAuc2xjb2xsZWdlLmFj
@@ -79,27 +79,27 @@
 						q3+sje0KNER0ehuD6eKVixp6SOf6RXLVLtB7m+eI3V/gRRjnckVd2mRXj7bLuQru
 						yaqmpEaqpQzn1fUy
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Leicestershire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Leicestershire College (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.slcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Austen</md:GivenName>
-      <md:SurName>Lowe</md:SurName>
-      <md:EmailAddress>mailto:austen.lowe@slcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Austen</md:GivenName>
-      <md:SurName>Lowe</md:SurName>
-      <md:EmailAddress>mailto:austen.lowe@slcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Leicestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Leicestershire College (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.slcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Austen</md:GivenName>
+    <md:SurName>Lowe</md:SurName>
+    <md:EmailAddress>mailto:austen.lowe@slcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Austen</md:GivenName>
+    <md:SurName>Lowe</md:SurName>
+    <md:EmailAddress>mailto:austen.lowe@slcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.smu.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.smu.ac.uk-openathens.xml
index 112da739..f66cfa53 100644
--- a/swamid-interfederations-2.0/idp.smu.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.smu.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.smu.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/smu.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/smu.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wales Trinity Saint David: Swansea</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.smu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/smu.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/smu.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wales Trinity Saint David: Swansea</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.smu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml
index 6cd1efaf..73f360f3 100644
--- a/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.smu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Southern Methodist University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Logon service for Southern Methodist University</mdui:Description>
+        <mdui:Logo height="80" width="260" xml:lang="en">https://idp.smu.edu/SMU-logo-1.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Southern Methodist University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Logon service for Southern Methodist University</mdui:Description>
-          <mdui:Logo height="80" width="260" xml:lang="en">https://idp.smu.edu/SMU-logo-1.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUMOoO5C0NUcKkug58h0G2G7wcwLswDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnNtdS5lZHUwHhcNMTIwNTMwMDUyNDE2WhcNMzIw
 NTMwMDUyNDE2WjAWMRQwEgYDVQQDEwtpZHAuc211LmVkdTCCASIwDQYJKoZIhvcN
@@ -42,23 +42,23 @@ zq6H/1+gZBLHh4L/sUJLWXksJA+3axQt0YthytYVp2sDK4yx9LnPIkUt1nE7CxY7
 mRJSSLjES5YYMYZG1NFfLbBgSoJo5jv+aTCmFTFApialLSb7DgOij0DUH+HwYeD4
 Ir3OTZqI0Gdw9VqbNRO6qHpf+GgkmMJN1mVW
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUMOoO5C0NUcKkug58h0G2G7wcwLswDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnNtdS5lZHUwHhcNMTIwNTMwMDUyNDE2WhcNMzIw
 NTMwMDUyNDE2WjAWMRQwEgYDVQQDEwtpZHAuc211LmVkdTCCASIwDQYJKoZIhvcN
@@ -77,18 +77,18 @@ zq6H/1+gZBLHh4L/sUJLWXksJA+3axQt0YthytYVp2sDK4yx9LnPIkUt1nE7CxY7
 mRJSSLjES5YYMYZG1NFfLbBgSoJo5jv+aTCmFTFApialLSb7DgOij0DUH+HwYeD4
 Ir3OTZqI0Gdw9VqbNRO6qHpf+GgkmMJN1mVW
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southern Methodist University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southern Methodist University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.smu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tommy Doan</md:GivenName>
-      <md:EmailAddress>tdoan@smu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southern Methodist University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southern Methodist University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.smu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tommy Doan</md:GivenName>
+    <md:EmailAddress>tdoan@smu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
index b82e2419..87ffa164 100644
--- a/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.snc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-17T13:55:33Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-17T13:55:33Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAILTn2HBBdNo1ahq8UPWTUXgGC1eMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5zbmMuYWMudWswHhcNMTIwMjEwMTE0NDQzWhcN
 						MzIwMjEwMTE0NDQzWjAYMRYwFAYDVQQDEw1pZHAuc25jLmFjLnVrMIIBIjANBgkq
@@ -29,26 +29,26 @@
 						uWqgokIPrf+ZsLcolDoA0Bc/toNjwVNsA3Kcx8Umq/A2bbS68WxUymINL90Dd4rl
 						/MOmOshdOUiRjf0TvUvtbBqWQ2YfQdTu4yXa1EifVkd7tzIg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.snc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.snc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.snc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.snc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.snc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.snc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.snc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.snc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAILTn2HBBdNo1ahq8UPWTUXgGC1eMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5zbmMuYWMudWswHhcNMTIwMjEwMTE0NDQzWhcN
 						MzIwMjEwMTE0NDQzWjAYMRYwFAYDVQQDEw1pZHAuc25jLmFjLnVrMIIBIjANBgkq
@@ -67,27 +67,27 @@
 						uWqgokIPrf+ZsLcolDoA0Bc/toNjwVNsA3Kcx8Umq/A2bbS68WxUymINL90Dd4rl
 						/MOmOshdOUiRjf0TvUvtbBqWQ2YfQdTu4yXa1EifVkd7tzIg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Central College Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Central College Nottingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://idp.snc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Hall</md:SurName>
-      <md:EmailAddress>mailto:webmaster@centralnottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Hall</md:SurName>
-      <md:EmailAddress>mailto:webmaster@centralnottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Central College Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Central College Nottingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://idp.snc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Hall</md:SurName>
+    <md:EmailAddress>mailto:webmaster@centralnottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Hall</md:SurName>
+    <md:EmailAddress>mailto:webmaster@centralnottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml
index 82adb765..af4f9136 100644
--- a/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.soas.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-13T17:38:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-13T17:38:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soas.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SOAS, University of London</mdui:DisplayName>
+        <mdui:Logo height="64" width="204">https://inet.soas.ac.uk/images/soas204-64.gif</mdui:Logo>
+        <mdui:Logo height="110" width="350">https://inet.soas.ac.uk/images/soas350-110.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soas.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SOAS, University of London</mdui:DisplayName>
-          <mdui:Logo height="64" width="204">https://inet.soas.ac.uk/images/soas204-64.gif</mdui:Logo>
-          <mdui:Logo height="110" width="350">https://inet.soas.ac.uk/images/soas350-110.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUHu+w7DSrNlupuFhKVEzWgnZN6howDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLnNvYXMuYWMudWswHhcNMTQwNDA4MjIxNzAxWhcN
 						MzQwNDA4MjIxNzAxWjAZMRcwFQYDVQQDEw5pZHAuc29hcy5hYy51azCCASIwDQYJ
@@ -36,26 +36,26 @@
 						4/6sLo9MlO7/xwhDBD783cYX2jYNmMjS7w01L5JUbVxyB2AOv+vlZbtBZqTtCIXN
 						Z5pa5LX39aBuc/C0sjpUNCe4fkjCXfFXP+74dO/rCiGkXkAT2b/5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soas.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUHu+w7DSrNlupuFhKVEzWgnZN6howDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwLnNvYXMuYWMudWswHhcNMTQwNDA4MjIxNzAxWhcN
 						MzQwNDA4MjIxNzAxWjAZMRcwFQYDVQQDEw5pZHAuc29hcy5hYy51azCCASIwDQYJ
@@ -74,26 +74,26 @@
 						4/6sLo9MlO7/xwhDBD783cYX2jYNmMjS7w01L5JUbVxyB2AOv+vlZbtBZqTtCIXN
 						Z5pa5LX39aBuc/C0sjpUNCe4fkjCXfFXP+74dO/rCiGkXkAT2b/5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">School of Oriental and African Studies</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SOAS, University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.soas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SOAS IT helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@soas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Douglas</md:SurName>
-      <md:EmailAddress>mailto:Md11@soas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">School of Oriental and African Studies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SOAS, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.soas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SOAS IT helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@soas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Douglas</md:SurName>
+    <md:EmailAddress>mailto:Md11@soas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
index c1b55912..490ae240 100644
--- a/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.soc.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-24T14:09:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-24T14:09:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soc.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Sociology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Sociologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider SOU AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SOÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.soc.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.soc.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="70">https://jiftach.cas.cz/loga/logo-soc-44.png</mdui:Logo>
+        <mdui:Logo height="1237" width="1959">https://jiftach.cas.cz/loga/logo-soc-1237.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soc.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Sociology AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Sociologický ústav AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider SOU AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SOÚ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.soc.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.soc.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="70">https://jiftach.cas.cz/loga/logo-soc-44.png</mdui:Logo>
-          <mdui:Logo height="1237" width="1959">https://jiftach.cas.cz/loga/logo-soc-1237.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
 DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ O7+c6VYyjsE8KPx9JoSjkoD05nPA06Irj0aAXPUrTHXk0UaFU8uHGzh06u/mtlVK
 IaV6L2n5KTVFbtfvJSuGFGB/t3VqhVLT7svoSLCvwetSHRXNmlLnqg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.soc.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soc.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.soc.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soc.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
 DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ O7+c6VYyjsE8KPx9JoSjkoD05nPA06Irj0aAXPUrTHXk0UaFU8uHGzh06u/mtlVK
 IaV6L2n5KTVFbtfvJSuGFGB/t3VqhVLT7svoSLCvwetSHRXNmlLnqg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Sociology of the Academy of Sciences of the Czech Republic</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Sociologický ústav AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Sociology, Public Research Institution</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Sociologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.soc.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.soc.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Sociology of the Academy of Sciences of the Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Sociologický ústav AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Sociology, Public Research Institution</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Sociologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.soc.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.soc.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml
index d78a7323..bf4ba120 100644
--- a/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.solihull.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-26T11:41:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-26T11:41:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solihull.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solihull.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsagAwIBAgIJAM+AyetIYqR6MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
 						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMREwDwYDVQQHEwhTb2xpaHVs
 						bDEZMBcGA1UEChMQU29saWh1bGwgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLnNvbGlo
@@ -35,26 +35,26 @@
 						mvdU+n4JipEfEVM2GgPtgov6Fj5D5+qVj6UzJa6FF8PEXcGrFoSmUO0TSGee0qXm
 						KHpoixwcL60Mgq6hMlXKmT7Vs0IMQzx/FImSMNwaJDmy8Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.solihull.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solihull.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.solihull.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solihull.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsagAwIBAgIJAM+AyetIYqR6MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
 						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMREwDwYDVQQHEwhTb2xpaHVs
 						bDEZMBcGA1UEChMQU29saWh1bGwgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLnNvbGlo
@@ -77,27 +77,27 @@
 						mvdU+n4JipEfEVM2GgPtgov6Fj5D5+qVj6UzJa6FF8PEXcGrFoSmUO0TSGee0qXm
 						KHpoixwcL60Mgq6hMlXKmT7Vs0IMQzx/FImSMNwaJDmy8Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Solihull College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Solihull College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.solihull.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Stebbens</md:SurName>
-      <md:EmailAddress>mailto:ian.stebbens@solihull.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Gartside</md:SurName>
-      <md:EmailAddress>mailto:dave.gartside@solihull.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Solihull College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Solihull College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.solihull.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Stebbens</md:SurName>
+    <md:EmailAddress>mailto:ian.stebbens@solihull.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Gartside</md:SurName>
+    <md:EmailAddress>mailto:dave.gartside@solihull.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml
index ba0040ef..b099a57e 100644
--- a/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.solihullsfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solihullsfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solihullsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/solihullsfc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/solihullsfc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sixth Form College, Solihull</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.solihullsfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/solihullsfc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/solihullsfc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sixth Form College, Solihull</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.solihullsfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
index 697c0a15..afed4b73 100644
--- a/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sorbonne-universites.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-26T18:20:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-26T18:20:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorbonne-universites.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sorbonne University</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAD////////////////s5d//uZ2H/41eOv92PhP/bDEC/2wwAv91PRL/jmA9/76jj//x6+f////////////////////////////VxLf/iFgy/2swA/9oKgD/ay8C/3A2Cf9wNgj/ai4B/2gqAP9tMgT/kGNA/+DUyv/////////////////czsP/e0Yd/2gqAP93PxX/onxf/7+mkf+8oYz/up6J/7ichf+VaUj/bjMH/2grAP+HVjH/6eHa///////59/X/mXBR/2cqAP+GVjD/283B/+ng2v+feFn/ekQZ/3lCGP+acVH/4tbN/7yhi/9xNwv/aSwA/62Mc/////7/4NPJ/3dAFv9xNwr/08K0//79/f+ifWD/aCsA/2ouAP9qLgD/aCoA/6yKcf/8+vn/on1f/2gqAP+FUy3/8Onl/8q0pP9tMgT/eUMY/+fd1v/h1Mv/eEEY/2ouAP9rLwD/ay8A/2grAP+feFv//////825qf9sMQL/dj4T/9/SyP/ErZr/bTED/2wxA/+MXTn/hVMt/2svAP9rLwD/ay8A/2otAP9xNwz/zbio///////UwrX/bjMF/3M6Dv/azMD/xK2a/20yA/9rLwD/aSwA/2otAP9rLwD/ai4A/2ksAP97Rh3/waiV//z6+f//////up6I/2otAP9zOw7/2szA/8Stmv9tMgP/ay8A/2svAP9rLgD/aSwA/3U+E/+ng2f/5NnR//7+/v//////5tzU/4NRKv9pLAD/czsO/9rMwP/ErZr/bTID/2svAP9qLgD/bzQI/5tzU//czcL//Pv6///////+/f3/3M3C/4xdOf9qLQD/ay4A/3M7Dv/azMD/xK2a/20yA/9qLgD/czoO/7+kkP/59/X///////7+/v/n3tf/ro1z/3hBF/9pLQD/ay8A/2suAP9zOw7/2szA/8Stmv9tMgP/ai0A/6uJbv/9/Pz//////+7n4v+1l4D/fUkg/2otAP9qLgD/ay8A/2svAP9rLgD/czsO/9rMwP/ErZr/bTED/240Bv/UwrX//////9nJvf+IVzH/ai4B/2otAP9rLwD/ay8A/281CP9vNAb/ai4A/3M7Dv/azMD/xK2a/20xA/9vNQf/1sa5//n39f+OYT7/aCsA/2svAP9rLwD/ay8A/2ktAP+XbU3/hVMt/2ksAP9zOw7/2szA/8Ssmv9rMAP/aCsA/7CReP/18u7/i105/2ksAP9rLwD/ay8A/2ouAP9yOQ3/x7Cf/4ZVMP9nKgD/cjkO/9rLwP/TwbT/kWVC/49iPv+feFr/7ufi/8q0o/93QBX/ai4A/2svAP9wNgn/r492//Dq5v+jfWD/j2E9/5ZsS//k2ND/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.sorbonne-universites.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Sorbonne Universités</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels de la ComUE</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorbonne-universites.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sorbonne University</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAD////////////////s5d//uZ2H/41eOv92PhP/bDEC/2wwAv91PRL/jmA9/76jj//x6+f////////////////////////////VxLf/iFgy/2swA/9oKgD/ay8C/3A2Cf9wNgj/ai4B/2gqAP9tMgT/kGNA/+DUyv/////////////////czsP/e0Yd/2gqAP93PxX/onxf/7+mkf+8oYz/up6J/7ichf+VaUj/bjMH/2grAP+HVjH/6eHa///////59/X/mXBR/2cqAP+GVjD/283B/+ng2v+feFn/ekQZ/3lCGP+acVH/4tbN/7yhi/9xNwv/aSwA/62Mc/////7/4NPJ/3dAFv9xNwr/08K0//79/f+ifWD/aCsA/2ouAP9qLgD/aCoA/6yKcf/8+vn/on1f/2gqAP+FUy3/8Onl/8q0pP9tMgT/eUMY/+fd1v/h1Mv/eEEY/2ouAP9rLwD/ay8A/2grAP+feFv//////825qf9sMQL/dj4T/9/SyP/ErZr/bTED/2wxA/+MXTn/hVMt/2svAP9rLwD/ay8A/2otAP9xNwz/zbio///////UwrX/bjMF/3M6Dv/azMD/xK2a/20yA/9rLwD/aSwA/2otAP9rLwD/ai4A/2ksAP97Rh3/waiV//z6+f//////up6I/2otAP9zOw7/2szA/8Stmv9tMgP/ay8A/2svAP9rLgD/aSwA/3U+E/+ng2f/5NnR//7+/v//////5tzU/4NRKv9pLAD/czsO/9rMwP/ErZr/bTID/2svAP9qLgD/bzQI/5tzU//czcL//Pv6///////+/f3/3M3C/4xdOf9qLQD/ay4A/3M7Dv/azMD/xK2a/20yA/9qLgD/czoO/7+kkP/59/X///////7+/v/n3tf/ro1z/3hBF/9pLQD/ay8A/2suAP9zOw7/2szA/8Stmv9tMgP/ai0A/6uJbv/9/Pz//////+7n4v+1l4D/fUkg/2otAP9qLgD/ay8A/2svAP9rLgD/czsO/9rMwP/ErZr/bTED/240Bv/UwrX//////9nJvf+IVzH/ai4B/2otAP9rLwD/ay8A/281CP9vNAb/ai4A/3M7Dv/azMD/xK2a/20xA/9vNQf/1sa5//n39f+OYT7/aCsA/2svAP9rLwD/ay8A/2ktAP+XbU3/hVMt/2ksAP9zOw7/2szA/8Ssmv9rMAP/aCsA/7CReP/18u7/i105/2ksAP9rLwD/ay8A/2ouAP9yOQ3/x7Cf/4ZVMP9nKgD/cjkO/9rLwP/TwbT/kWVC/49iPv+feFr/7ufi/8q0o/93QBX/ai4A/2svAP9wNgn/r492//Dq5v+jfWD/j2E9/5ZsS//k2ND/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.sorbonne-universites.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Sorbonne Universités</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels de la ComUE</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDWDCCAkCgAwIBAgIVAMCWhvwrPX40LIYm8wCIRHvjylE5MA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMMG2lkcC5zb3Jib25uZS11bml2ZXJzaXRlcy5mcjAeFw0x
 NTAyMjQwOTA1MjdaFw0zNTAyMjQwOTA1MjdaMCYxJDAiBgNVBAMMG2lkcC5zb3Ji
@@ -39,29 +39,29 @@ NeqGnYiwYcv0be6zZI3gmQx1C+RIPnBsR1lXQLva9DKE1tPqxS9b7bVFOrpiDTPv
 TkxTBptc5wAcDYEjc2QYww0sYsc9PpgLKVULmyDMLvxpdk57oxffe+bQnehP52oJ
 +vcJHLp21oBmTlJ5IztBiQLEzPgbLC1AZNFEt7XIdmfAYeupF++ocnD7M5w=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sorbonne-universites.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sorbonne Universités</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sorbonne Universités</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sorbonne-universites.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Frédérick Bigrat</md:SurName>
-      <md:EmailAddress>frederick.bigrat@sorbonne-universites.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christophe Fillot</md:SurName>
-      <md:EmailAddress>cf@utc.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sorbonne-universites.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sorbonne Universités</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sorbonne Universités</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sorbonne-universites.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frédérick Bigrat</md:SurName>
+    <md:EmailAddress>frederick.bigrat@sorbonne-universites.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christophe Fillot</md:SurName>
+    <md:EmailAddress>cf@utc.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml
index 63504615..a201aa24 100644
--- a/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.south-thames.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">south-thames.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">south-thames.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEtjCCA56gAwIBAgIJAMdBpEKv0PKbMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECBMOR3JlYXRlciBMb25kb24xEzARBgNVBAcTCldhbmRz
 						d29ydGgxHTAbBgNVBAoTFFNvdXRoIFRoYW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJ
@@ -38,26 +38,26 @@
 						KSbNeuimMuY8lzN58ApFP/KrMKBqsasswF49RT+59AfkkB+tPd+rbVTy+0w8RzR7
 						l9bf6g+JAxTWng==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.south-thames.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">south-thames.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.south-thames.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">south-thames.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEtjCCA56gAwIBAgIJAMdBpEKv0PKbMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECBMOR3JlYXRlciBMb25kb24xEzARBgNVBAcTCldhbmRz
 						d29ydGgxHTAbBgNVBAoTFFNvdXRoIFRoYW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJ
@@ -85,27 +85,27 @@
 						KSbNeuimMuY8lzN58ApFP/KrMKBqsasswF49RT+59AfkkB+tPd+rbVTy+0w8RzR7
 						l9bf6g+JAxTWng==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Thames College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Thames College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.south-thames.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ewa</md:GivenName>
-      <md:SurName>Wraga</md:SurName>
-      <md:EmailAddress>mailto:Ewa.wraga@south-thames.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Raymond</md:GivenName>
-      <md:SurName>Oliver</md:SurName>
-      <md:EmailAddress>mailto:Raymond.Oliver@south-thames.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Thames College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Thames College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.south-thames.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ewa</md:GivenName>
+    <md:SurName>Wraga</md:SurName>
+    <md:EmailAddress>mailto:Ewa.wraga@south-thames.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Raymond</md:GivenName>
+    <md:SurName>Oliver</md:SurName>
+    <md:EmailAddress>mailto:Raymond.Oliver@south-thames.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml
index 437cbf1c..0bb51d20 100644
--- a/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southampton-city.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southampton-city.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southampton-city.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQCGmA+P9dNGWjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjESMBAGA1UECBMJSGFtcHNoaXJlMRQwEgYDVQQHEwtTb3V0aGFtcHRvbjEhMB8G
 						A1UEChMYU291dGhhbXB0b24gQ2l0eSBDb2xsZWdlMSMwIQYDVQQDExppZHAuc291
@@ -31,26 +31,26 @@
 						n3hwtOex8KPZr1hGB0gtwm115YUmedoe/o5/jR5isTEep84Bs9qNVZrEi2MWPgij
 						UwJvvyH8Sng7jzbRp8AbC5r0Wv8EsWjv4iC7bb9b
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southampton-city.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southampton-city.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southampton-city.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southampton-city.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDejCCAmICCQCGmA+P9dNGWjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
 						QjESMBAGA1UECBMJSGFtcHNoaXJlMRQwEgYDVQQHEwtTb3V0aGFtcHRvbjEhMB8G
 						A1UEChMYU291dGhhbXB0b24gQ2l0eSBDb2xsZWdlMSMwIQYDVQQDExppZHAuc291
@@ -71,26 +71,26 @@
 						n3hwtOex8KPZr1hGB0gtwm115YUmedoe/o5/jR5isTEep84Bs9qNVZrEi2MWPgij
 						UwJvvyH8Sng7jzbRp8AbC5r0Wv8EsWjv4iC7bb9b
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southampton City College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southampton City College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southampton-city.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@southampton-city.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Soanes</md:SurName>
-      <md:EmailAddress>mailto:martin.soanes@southampton-city.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southampton City College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southampton City College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southampton-city.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@southampton-city.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Soanes</md:SurName>
+    <md:EmailAddress>mailto:martin.soanes@southampton-city.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
index 123de7c8..eea79509 100644
--- a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southdevon.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdevon.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdevon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
 						VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
 						VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
@@ -36,13 +36,13 @@
 						As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
 						9Ia6HkphVIymnefQl1ZO/Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
@@ -71,26 +71,26 @@
 						/+1GTST3DkvMiNpzOdE9ryueHBpQ7W5S+JuRbQ7BZUgFxBrbSPmFsCiPCKFmJ3KA
 						9a0UDu0T7vU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southdevon.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdevon.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southdevon.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdevon.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXDCCA0SgAwIBAgIJAKyPn9Ts3+81MA0GCSqGSIb3DQEBCwUAMIGzMQswCQYD
 						VQQGEwJHQjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBhaWdudG9uMRwwGgYD
 						VQQKDBNTb3V0aCBEZXZvbiBDb2xsZWdlMRowGAYDVQQLDBFDb21wdXRlciBTZXJ2
@@ -116,13 +116,13 @@
 						As5id/Pz62Gwe5qtzQSiWo9G1zkAw2PODKY0rA4JNAvwT9whv2A/Ef8ggRmiJGu6
 						9Ia6HkphVIymnefQl1ZO/Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
@@ -151,27 +151,27 @@
 						/+1GTST3DkvMiNpzOdE9ryueHBpQ7W5S+JuRbQ7BZUgFxBrbSPmFsCiPCKFmJ3KA
 						9a0UDu0T7vU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Devon College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Devon College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southdevon.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kelly</md:GivenName>
-      <md:SurName>Cassidy</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@southdevon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Turner</md:SurName>
-      <md:EmailAddress>mailto:dturner@southdevon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Devon College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Devon College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southdevon.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kelly</md:GivenName>
+    <md:SurName>Cassidy</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@southdevon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Turner</md:SurName>
+    <md:EmailAddress>mailto:dturner@southdevon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
index 380c28ce..30932513 100644
--- a/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southdowns.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-13T13:31:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-13T13:31:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdowns.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdowns.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUYHmDs/az55KjV5rkUaoUYXIIy5owDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
 						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
@@ -32,13 +32,13 @@
 						HqIoomwHimq/YI3YLG1lctf7bmH/fyvG/pZkVBA8FVr3Ex8HKiiRep67LUeei/uw
 						sgqZQgD6qpDN/0gCtjl6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMFezK1HZGgJj+eQYT5V8m5r7asnMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFGlkcC5zb3V0aGRvd25zLmFjLnVrMB4XDTE1MDkwMjEz
 						MTEyMloXDTM1MDkwMjEzMTEyMlowHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMu
@@ -58,13 +58,13 @@
 						sbbLV0dPkIADL7SSkQIOD1fBgIVeYQf60AF1FQwWi0rXxZNvZevsji8k+gjZ7YCK
 						wibNrb/diFicd5nzUvOpQQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUfNUZc3yh6hhcTZJFXiiWY/Nf9IMwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
 						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
@@ -84,26 +84,26 @@
 						HyQKxKQl7wh7guZ9VrDhYt+LZvhNMy2yXVeyBDEJ/EbVTDGC9oCqS/g2JDDTaIVm
 						1U1lZKF34YlBgsYQnovH
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdowns.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southdowns.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUYHmDs/az55KjV5rkUaoUYXIIy5owDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
 						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
@@ -123,13 +123,13 @@
 						HqIoomwHimq/YI3YLG1lctf7bmH/fyvG/pZkVBA8FVr3Ex8HKiiRep67LUeei/uw
 						sgqZQgD6qpDN/0gCtjl6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMFezK1HZGgJj+eQYT5V8m5r7asnMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFGlkcC5zb3V0aGRvd25zLmFjLnVrMB4XDTE1MDkwMjEz
 						MTEyMloXDTM1MDkwMjEzMTEyMlowHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMu
@@ -149,13 +149,13 @@
 						sbbLV0dPkIADL7SSkQIOD1fBgIVeYQf60AF1FQwWi0rXxZNvZevsji8k+gjZ7YCK
 						wibNrb/diFicd5nzUvOpQQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUfNUZc3yh6hhcTZJFXiiWY/Nf9IMwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
 						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
@@ -175,34 +175,34 @@
 						HyQKxKQl7wh7guZ9VrDhYt+LZvhNMy2yXVeyBDEJ/EbVTDGC9oCqS/g2JDDTaIVm
 						1U1lZKF34YlBgsYQnovH
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Downs College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Downs College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southdowns.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Ward</md:SurName>
-      <md:EmailAddress>mailto:adam.ward@migliori.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Allison</md:SurName>
-      <md:EmailAddress>mailto:spallison@southdowns.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Allison</md:SurName>
-      <md:EmailAddress>mailto:spallison@southdowns.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Mcqueen</md:SurName>
-      <md:EmailAddress>mailto:nmcqueen@southdowns.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Downs College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Downs College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southdowns.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Ward</md:SurName>
+    <md:EmailAddress>mailto:adam.ward@migliori.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Allison</md:SurName>
+    <md:EmailAddress>mailto:spallison@southdowns.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Allison</md:SurName>
+    <md:EmailAddress>mailto:spallison@southdowns.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Mcqueen</md:SurName>
+    <md:EmailAddress>mailto:nmcqueen@southdowns.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml
index 525736a7..092fca85 100644
--- a/swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southend.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southend.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southend.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/southend.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/southend.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Essex College of Further and Higher Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southessex.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/southend.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/southend.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Essex College of Further and Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southessex.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml
index 2ef02aa2..dcb2909f 100644
--- a/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southport-college.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-07T10:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-07T10:31:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southport-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southport-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEsTCCA5mgAwIBAgIRAM4+u1j8tHGyZ3CJGu2RVKAwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMjAzMDgwMDAwMDBaFw0xNTAzMDgyMzU5NTlaMIGGMQswCQYD
@@ -40,26 +40,26 @@
 						50+UYVHEgeODj4CfHLA5JCobZ60OtcOW/ROAPOrU80RM378D05Yyx48DecUZLmRM
 						RYYdy9o=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.southport.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southport-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.southport.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southport-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEsTCCA5mgAwIBAgIRAM4+u1j8tHGyZ3CJGu2RVKAwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMjAzMDgwMDAwMDBaFw0xNTAzMDgyMzU5NTlaMIGGMQswCQYD
@@ -87,27 +87,27 @@
 						50+UYVHEgeODj4CfHLA5JCobZ60OtcOW/ROAPOrU80RM378D05Yyx48DecUZLmRM
 						RYYdy9o=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southport College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southport College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southport-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Arun</md:GivenName>
-      <md:SurName>Gambhir</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@southport.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Benson</md:SurName>
-      <md:EmailAddress>mailto:james@southport.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southport College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southport College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southport-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Arun</md:GivenName>
+    <md:SurName>Gambhir</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@southport.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Benson</md:SurName>
+    <md:EmailAddress>mailto:james@southport.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
index 8ba7e6b0..91b5a1c0 100644
--- a/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southstaffs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEADCCAugCCQDq7fzogZjavTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQw
 						IgYDVQQKExtTb3V0aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lU
@@ -34,26 +34,26 @@
 						HGMSdGf19+/k58X3xxk+amHzW1QWkXJzWmjds5vuG/ni8EQyAnkV3Jx0+XblP4f6
 						fwNx1H4ChYP4eEBqGjsRQKkDWr0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southstaffs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.southstaffs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southstaffs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEADCCAugCCQDq7fzogZjavTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQw
 						IgYDVQQKExtTb3V0aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lU
@@ -77,27 +77,27 @@
 						HGMSdGf19+/k58X3xxk+amHzW1QWkXJzWmjds5vuG/ni8EQyAnkV3Jx0+XblP4f6
 						fwNx1H4ChYP4eEBqGjsRQKkDWr0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Staffordshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Staffordshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southstaffs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Booth</md:SurName>
-      <md:EmailAddress>mailto:gary.booth@southstaffs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Booth</md:SurName>
-      <md:EmailAddress>mailto:gary.booth@southstaffs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Staffordshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Staffordshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southstaffs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Booth</md:SurName>
+    <md:EmailAddress>mailto:gary.booth@southstaffs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Booth</md:SurName>
+    <md:EmailAddress>mailto:gary.booth@southstaffs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sparsholt.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.sparsholt.ac.uk-shibboleth.xml
index 8ad1c26e..ccbc595b 100644
--- a/swamid-interfederations-2.0/idp.sparsholt.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sparsholt.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sparsholt.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sparsholt.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sparsholt.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/sparsholt.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/sparsholt.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sparsholt College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sparsholt.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/sparsholt.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/sparsholt.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sparsholt College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sparsholt.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml
index 174841d1..02223dea 100644
--- a/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.src.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-11T11:20:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-11T11:20:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">src.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">src.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQCKPT5imLa/BjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDESMBAGA1UEBxMJUG9ydGFkb3du
 						MSIwIAYDVQQKExlTb3V0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQDEw1p
@@ -33,26 +33,26 @@
 						bKQM8n3dmoAEec+lEpstACCdtI6QGLtrNhTau3o+iLlvMHU6DCoduw/oYp06jkkP
 						AumZKaDE5XZJXS0yDbD+PQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.src.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.src.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.src.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.src.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.src.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.src.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">src.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.src.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.src.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.src.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.src.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.src.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.src.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">src.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQCKPT5imLa/BjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDESMBAGA1UEBxMJUG9ydGFkb3du
 						MSIwIAYDVQQKExlTb3V0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQDEw1p
@@ -73,37 +73,37 @@
 						bKQM8n3dmoAEec+lEpstACCdtI6QGLtrNhTau3o+iLlvMHU6DCoduw/oYp06jkkP
 						AumZKaDE5XZJXS0yDbD+PQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.src.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.src.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southern Regional College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southern Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.src.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Purcell</md:SurName>
-      <md:EmailAddress>mailto:purcellm@src.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Shirley</md:SurName>
-      <md:EmailAddress>mailto:shirleyt@src.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Purcell</md:SurName>
-      <md:EmailAddress>mailto:purcellm@src.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Shirley</md:SurName>
-      <md:EmailAddress>mailto:shirleyt@src.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.src.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.src.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southern Regional College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southern Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.src.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Purcell</md:SurName>
+    <md:EmailAddress>mailto:purcellm@src.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Shirley</md:SurName>
+    <md:EmailAddress>mailto:shirleyt@src.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Purcell</md:SurName>
+    <md:EmailAddress>mailto:purcellm@src.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Shirley</md:SurName>
+    <md:EmailAddress>mailto:shirleyt@src.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml
index 6109bae0..5e62d56f 100644
--- a/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sru.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.sru.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sru.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Slippery Rock University of Pennsylvania</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Slippery Rock University of Pennsylvania</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.sru.edu/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sru.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Slippery Rock University of Pennsylvania</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Slippery Rock University of Pennsylvania</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQC4QuY3Kem21zANBgkqhkiG9w0BAQUFADBrMRQwEgYDVQQDDAtp
 ZHAuc3J1LmVkdTEhMB8GA1UECgwYU2xpcHBlcnkgUm9jayBVbml2ZXJzaXR5MQsw
 CQYDVQQGEwJVUzELMAkGA1UECAwCUEExFjAUBgNVBAcMDVNsaXBwZXJ5IFJvY2sw
@@ -39,24 +39,24 @@ lgJNjFcB0Sq5hCpIZ/nDbEveFJGw820KK4T1429H1WAzahf/Nu52kZOZC2nVahe4
 FNTCh5GCTEEwP+oWWYizGWNo/1pJmSZZlvj/3d/JoNWbc+q2b3ig6FSTXkonXgdA
 +FrbfgLPw5cs4D4ECPBvlgj6hTbyG7HWRgT9XH6S67PDWvpvpWM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sru.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sru.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sru.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sru.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sru.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sru.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sru.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sru.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sru.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sru.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjoCCQC4QuY3Kem21zANBgkqhkiG9w0BAQUFADBrMRQwEgYDVQQDDAtp
 ZHAuc3J1LmVkdTEhMB8GA1UECgwYU2xpcHBlcnkgUm9jayBVbml2ZXJzaXR5MQsw
 CQYDVQQGEwJVUzELMAkGA1UECAwCUEExFjAUBgNVBAcMDVNsaXBwZXJ5IFJvY2sw
@@ -76,19 +76,19 @@ lgJNjFcB0Sq5hCpIZ/nDbEveFJGw820KK4T1429H1WAzahf/Nu52kZOZC2nVahe4
 FNTCh5GCTEEwP+oWWYizGWNo/1pJmSZZlvj/3d/JoNWbc+q2b3ig6FSTXkonXgdA
 +FrbfgLPw5cs4D4ECPBvlgj6hTbyG7HWRgT9XH6S67PDWvpvpWM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sru.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Slippery Rock University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Slippery Rock University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sru.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Henry Magusiak</md:GivenName>
-      <md:EmailAddress>henry.magusiak@sru.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sru.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Slippery Rock University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Slippery Rock University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sru.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Henry Magusiak</md:GivenName>
+    <md:EmailAddress>henry.magusiak@sru.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml
index 6ed7594e..32e3f9c0 100644
--- a/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sruc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T16:10:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T16:10:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sruc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sruc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAMisBG8/pYaTN/dKjE96UJTj0pHnMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMTDmlkcC5zcnVjLmFjLnVrMB4XDTEzMDgxNTE4MzUyMVoX
 						DTMzMDgxNTE4MzUyMVowGTEXMBUGA1UEAxMOaWRwLnNydWMuYWMudWswggEiMA0G
@@ -31,26 +31,26 @@
 						Fknd4XDnhT0wz9uDxT1gTsXCRe/DP/Ql8iviaG1f9fENTz7MrcvKawLMqaRQpL6Z
 						9rbQkno5Y20gWQLAD3AF1pceBNBCO/6G/GCzRkdsGCtVNNXfnnsc3Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sruc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sruc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sruc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sruc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAMisBG8/pYaTN/dKjE96UJTj0pHnMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMTDmlkcC5zcnVjLmFjLnVrMB4XDTEzMDgxNTE4MzUyMVoX
 						DTMzMDgxNTE4MzUyMVowGTEXMBUGA1UEAxMOaWRwLnNydWMuYWMudWswggEiMA0G
@@ -69,30 +69,30 @@
 						Fknd4XDnhT0wz9uDxT1gTsXCRe/DP/Ql8iviaG1f9fENTz7MrcvKawLMqaRQpL6Z
 						9rbQkno5Y20gWQLAD3AF1pceBNBCO/6G/GCzRkdsGCtVNNXfnnsc3Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SRUC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SRUC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sruc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:SidIS@sruc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Gowler</md:SurName>
-      <md:EmailAddress>mailto:Peter.Gowler@sruc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Edinburgh Library</md:GivenName>
-      <md:EmailAddress>mailto:edinburghlibrary@sruc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SRUC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SRUC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sruc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:SidIS@sruc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Gowler</md:SurName>
+    <md:EmailAddress>mailto:Peter.Gowler@sruc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Edinburgh Library</md:GivenName>
+    <md:EmailAddress>mailto:edinburghlibrary@sruc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
index 5ae83c07..35b58632 100644
--- a/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ssc.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-06T11:08:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-06T11:08:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssc.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Centre of Administration and Operations of AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Středisko společných činností AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider SSC AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SSČ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ssc.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ssc.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="74">https://jiftach.cas.cz/loga/logo-ssc-44.png</mdui:Logo>
+        <mdui:Logo height="638" width="1080">https://jiftach.cas.cz/loga/logo-ssc-638.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssc.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Centre of Administration and Operations of AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Středisko společných činností AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider SSC AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SSČ AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ssc.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ssc.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="74">https://jiftach.cas.cz/loga/logo-ssc-44.png</mdui:Logo>
-          <mdui:Logo height="638" width="1080">https://jiftach.cas.cz/loga/logo-ssc-638.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
 DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
@@ -51,30 +51,30 @@ Jy+EMpZzHBrcYckNCLqr8PsQxGAM6g7mUC8ebGVX9bjkOGplkUUzlsNQE4djcNvY
 qOgmzrGDcWxrRDaRKM2/jYdmcKg6FmAZE1Vpdy+W7j2tbvLDXjLpOg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ssc.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssc.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ssc.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssc.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
 DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
@@ -94,25 +94,25 @@ Jy+EMpZzHBrcYckNCLqr8PsQxGAM6g7mUC8ebGVX9bjkOGplkUUzlsNQE4djcNvY
 qOgmzrGDcWxrRDaRKM2/jYdmcKg6FmAZE1Vpdy+W7j2tbvLDXjLpOg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Centre of Administration and Operations of ASCR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Středisko společných činností AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Centre of Administration and Operations of ASCR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Středisko společných činností AV ČR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ssc.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ssc.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Centre of Administration and Operations of ASCR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Středisko společných činností AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Centre of Administration and Operations of ASCR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Středisko společných činností AV ČR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ssc.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ssc.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
index 15c63d5a..0b3cf47b 100644
--- a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sssup.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-08T10:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-08T10:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssup.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scuola Superiore Sant'Anna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Scuola Superiore Sant'Anna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Scuola Superiore Sant'Anna users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Scuola Superiore Sant'Anna</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.sssup.it/idem/idem.en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.sssup.it/idem/idem.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.sssup.it/idem/privacy.en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.sssup.it/idem/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssup.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Scuola Superiore Sant'Anna</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Scuola Superiore Sant'Anna</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for Scuola Superiore Sant'Anna users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti della Scuola Superiore Sant'Anna</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.sssup.it/idem/idem.en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.sssup.it/idem/idem.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.sssup.it/idem/privacy.en.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.sssup.it/idem/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
 MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
@@ -41,26 +41,26 @@ eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
 AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
 O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sssup.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sssup.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sssup.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sssup.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssup.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sssup.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sssup.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sssup.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sssup.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssup.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
 MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
@@ -79,23 +79,23 @@ eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
 AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
 O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scuola Superiore Sant'Anna</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Scuola Superiore Sant'Anna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.santannaschool.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.sssup.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:helpdesk@sssup.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scuola Superiore Sant'Anna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Scuola Superiore Sant'Anna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.santannaschool.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.sssup.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:helpdesk@sssup.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml
index 00893a99..26dffa33 100644
--- a/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.st-andrews.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-01-16T14:59:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-01-16T14:59:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFTDCCBDSgAwIBAgICEKgwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
 						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
 						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
@@ -43,26 +43,26 @@
 						ahQL5K+/ebdMh89ffv7SK9aDp/RPJu77ggTRXK0+fKkoy9JJYX/mh99r5cClGhGs
 						3nwOT+n5Ge0J+NSey+6Otg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.st-andrews.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.st-andrews.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFTDCCBDSgAwIBAgICEKgwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
 						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
 						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
@@ -93,27 +93,27 @@
 						ahQL5K+/ebdMh89ffv7SK9aDp/RPJu77ggTRXK0+fKkoy9JJYX/mh99r5cClGhGs
 						3nwOT+n5Ge0J+NSey+6Otg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of St Andrews</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of St Andrews</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.st-andrews.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Duncan</md:GivenName>
-      <md:SurName>Brannen</md:SurName>
-      <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Duncan</md:GivenName>
-      <md:SurName>Brannen</md:SurName>
-      <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of St Andrews</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of St Andrews</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.st-andrews.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Duncan</md:GivenName>
+    <md:SurName>Brannen</md:SurName>
+    <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Duncan</md:GivenName>
+    <md:SurName>Brannen</md:SurName>
+    <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
index 1f428790..85042bf3 100644
--- a/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.st-davids-coll.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-davids-coll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-davids-coll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlICCQCTJJAxaWzfAzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAhBgNVBAoTGlN0
 						IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAuc3QtZGF2aWRz
@@ -31,26 +31,26 @@
 						4Os8vJ7kUY0JJ2pGbN+1FwEU6e2hKEWwrX7Iet4mBkC9L2qnDRxsFzyNir1bAJLx
 						mxjEbDBSMeoSEI5WYOQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.st-davids-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-davids-coll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.st-davids-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-davids-coll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlICCQCTJJAxaWzfAzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAhBgNVBAoTGlN0
 						IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAuc3QtZGF2aWRz
@@ -71,27 +71,27 @@
 						4Os8vJ7kUY0JJ2pGbN+1FwEU6e2hKEWwrX7Iet4mBkC9L2qnDRxsFzyNir1bAJLx
 						mxjEbDBSMeoSEI5WYOQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St David's Catholic College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St David's Catholic College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.st-davids-coll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Vinall</md:SurName>
-      <md:EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Vinall</md:SurName>
-      <md:EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St David's Catholic College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St David's Catholic College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.st-davids-coll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Vinall</md:SurName>
+    <md:EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Vinall</md:SurName>
+    <md:EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml
index 81f0c8bd..44858238 100644
--- a/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.staffordcoll.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-27T12:38:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-27T12:38:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffordcoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffordcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsYCCQDD9aF4VF27mzANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcMCFN0YWZmb3JkMRkw
 						FwYDVQQKDBBTdGFmZm9yZCBDb2xsZWdlMQwwCgYDVQQLDANJVFUxHzAdBgNVBAMM
@@ -35,26 +35,26 @@
 						G/i+xOpFajMPA7nOiFBF5YXT2X5yAFGw6TSkNn1zP6vIXiPAj1nG5lpDzWp2yLvO
 						86nKIfSGai7d0vsFvkCSlcRe8G5bO4rC4ajsJXg5kd46xA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.staffordcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffordcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.staffordcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffordcoll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsYCCQDD9aF4VF27mzANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcMCFN0YWZmb3JkMRkw
 						FwYDVQQKDBBTdGFmZm9yZCBDb2xsZWdlMQwwCgYDVQQLDANJVFUxHzAdBgNVBAMM
@@ -77,37 +77,37 @@
 						G/i+xOpFajMPA7nOiFBF5YXT2X5yAFGw6TSkNn1zP6vIXiPAj1nG5lpDzWp2yLvO
 						86nKIfSGai7d0vsFvkCSlcRe8G5bO4rC4ajsJXg5kd46xA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stafford College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stafford College (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.staffordcoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Nicholls</md:SurName>
-      <md:EmailAddress>mailto:r.nicholls@staffordcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Dunning</md:SurName>
-      <md:EmailAddress>mailto:m.dunning@staffordcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Nicholls</md:SurName>
-      <md:EmailAddress>mailto:r.nicholls@staffordcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Dunning</md:SurName>
-      <md:EmailAddress>mailto:m.dunning@staffordcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stafford College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stafford College (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.staffordcoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Nicholls</md:SurName>
+    <md:EmailAddress>mailto:r.nicholls@staffordcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Dunning</md:SurName>
+    <md:EmailAddress>mailto:m.dunning@staffordcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Nicholls</md:SurName>
+    <md:EmailAddress>mailto:r.nicholls@staffordcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Dunning</md:SurName>
+    <md:EmailAddress>mailto:m.dunning@staffordcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml
index 949689cb..b3c86cf8 100644
--- a/swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stanmore.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanmore.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanmore.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stanmore.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stanmore.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanmore College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stanmore.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stanmore.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stanmore.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanmore College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stanmore.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.statistics.gov.uk-openathens.xml b/swamid-interfederations-2.0/idp.statistics.gov.uk-openathens.xml
index 593e60d5..89e9ec19 100644
--- a/swamid-interfederations-2.0/idp.statistics.gov.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.statistics.gov.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.statistics.gov.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statistics.gov.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statistics.gov.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/statistics.gov.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/statistics.gov.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Office for National Statistics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.statistics.gov.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/statistics.gov.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/statistics.gov.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Office for National Statistics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.statistics.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml
index 43cd7ef9..ec3a7ce9 100644
--- a/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stbrn.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-13T10:51:30Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-13T10:51:30Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stbrn.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="80" width="60">https://moodle.stbrn.ac.uk/shibicons/shibbolethlogo.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://moodle.stbrn.ac.uk/shibicons/shibbolethicon.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://moodle.stbrn.ac.uk/shibicons/shibbolethicontrans.gif</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">St Brendan's Sixth Form College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stbrn.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="80" width="60">https://moodle.stbrn.ac.uk/shibicons/shibbolethlogo.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://moodle.stbrn.ac.uk/shibicons/shibbolethicon.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://moodle.stbrn.ac.uk/shibicons/shibbolethicontrans.gif</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">St Brendan's Sixth Form College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUDq8zPYO8IuaH20QyJWXiNuoDZnEwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMB4XDTEzMDYxMjA5MDM1MFoX
 						DTMzMDYxMjA5MDM1MFowGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMIIBIjAN
@@ -35,26 +35,26 @@
 						ONoVLg0LGIEx//rH3NTNu9HF5h6Uq5f2LpjC8w982y8b7oZfoz/kPGOTdQTS2QyU
 						aj2gY1UTsZ4o65PCDdoLrjSXFShP6dDCjo/d8lFyD87+KbWJtwiT0cORaQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stbrn.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stbrn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stbrn.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stbrn.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUDq8zPYO8IuaH20QyJWXiNuoDZnEwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMB4XDTEzMDYxMjA5MDM1MFoX
 						DTMzMDYxMjA5MDM1MFowGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMIIBIjAN
@@ -73,27 +73,27 @@
 						ONoVLg0LGIEx//rH3NTNu9HF5h6Uq5f2LpjC8w982y8b7oZfoz/kPGOTdQTS2QyU
 						aj2gY1UTsZ4o65PCDdoLrjSXFShP6dDCjo/d8lFyD87+KbWJtwiT0cORaQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St Brendan's Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Brendan's Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stbrn.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Wiles</md:SurName>
-      <md:EmailAddress>mailto:maw@stbrn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonny</md:GivenName>
-      <md:SurName>Howse</md:SurName>
-      <md:EmailAddress>mailto:jonny@stbrn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St Brendan's Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Brendan's Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stbrn.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Wiles</md:SurName>
+    <md:EmailAddress>mailto:maw@stbrn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonny</md:GivenName>
+    <md:SurName>Howse</md:SurName>
+    <md:EmailAddress>mailto:jonny@stbrn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
index c55410eb..7af08a57 100644
--- a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-28T12:33:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-28T12:33:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
 						czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
@@ -38,26 +38,26 @@
 						jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
 						nO1NevMrfrw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
 						czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
@@ -83,26 +83,26 @@
 						jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
 						nO1NevMrfrw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Tyneside College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Tyneside College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@stc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Scott</md:SurName>
-      <md:EmailAddress>mailto:craig.scott@stc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Tyneside College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Tyneside College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@stc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Scott</md:SurName>
+    <md:EmailAddress>mailto:craig.scott@stc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml
index 9fbeb88c..dc7342e9 100644
--- a/swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stcharles.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stcharles.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stcharles.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stcharles.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stcharles.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Charles Catholic Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stcharles.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stcharles.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stcharles.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Charles Catholic Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stcharles.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml
index 7c20bb5c..d323cd43 100644
--- a/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stephensoncoll.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-02T14:19:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-02T14:19:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stephensoncoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stephensoncoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUjCCAjqgAwIBAgIIfT3WdIwbJEkwDQYJKoZIhvcNAQEFBQAwQDEbMBkGA1UE
 						CgwSU3RlcGhlbnNvbiBDb2xsZWdlMSEwHwYDVQQDDBhpZHAuc3RlcGhlbnNvbmNv
 						bGwuYWMudWswHhcNMTMxMTA1MTcyMzMyWhcNMjMxMTA1MTcyMzMyWjBAMRswGQYD
@@ -32,29 +32,29 @@
 						f0ULIm3qzXRm+c5J53XwQunZ8M8bdXu0kWoObJX95hqxbT5yRe8v3JQz7pogI6cj
 						PBmeqvbMw2skz8O3eiRr/9AI2YZBzaRMpZ4QwgfHF/Owg5NONWo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stephensoncoll.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stephensoncoll.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stephenson College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stephenson College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stephensoncoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@stephensoncoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jason</md:GivenName>
-      <md:SurName>Spencer</md:SurName>
-      <md:EmailAddress>mailto:jspencer@stephensoncoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Calcutt</md:SurName>
-      <md:EmailAddress>mailto:scalcutt@stephensoncoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stephensoncoll.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stephensoncoll.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stephenson College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stephenson College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stephensoncoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@stephensoncoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jason</md:GivenName>
+    <md:SurName>Spencer</md:SurName>
+    <md:EmailAddress>mailto:jspencer@stephensoncoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Calcutt</md:SurName>
+    <md:EmailAddress>mailto:scalcutt@stephensoncoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
index 964d009d..41e0ba9d 100644
--- a/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sthelens.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T09:19:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T09:19:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sthelens.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sthelens.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUefeWPtobMsRj91ZcJr632XXNAJQwDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc1
 						MloXDTM1MDcxMzA5MTc1MlowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
@@ -32,13 +32,13 @@
 						Z6++KzCFtBpmip6fxXOxq+T9DCtObKuu/Zwj7ALaV2Anx3+1eV9xUXvPyKKowtio
 						xGWZquR2PA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUSnhx1xX6LnWWTI0VWAtszPKeSlQwDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc0
 						OVoXDTM1MDcxMzA5MTc0OVowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
@@ -58,13 +58,13 @@
 						EKZxmfNDR/osPrE+Imy1pWidTkSoe23dKlk+nqKWedsYEr+HKMS5NSTUY9X4+ul1
 						XEMB4j98UA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVANqZjdgjQDinPjHK15o/evwkJ47nMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51azAeFw0xNTA3MTMwOTE3
 						NTBaFw0zNTA3MTMwOTE3NTBaMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51
@@ -84,26 +84,26 @@
 						gQv8K/szMt60cSeU+yWCjRT3tGsEOe+Upn041k4KHZUvg4pXtNe0ssienaJjd2bv
 						PIGItBCgWGc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sthelens.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sthelens.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sthelens.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sthelens.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUefeWPtobMsRj91ZcJr632XXNAJQwDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc1
 						MloXDTM1MDcxMzA5MTc1MlowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
@@ -123,13 +123,13 @@
 						Z6++KzCFtBpmip6fxXOxq+T9DCtObKuu/Zwj7ALaV2Anx3+1eV9xUXvPyKKowtio
 						xGWZquR2PA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUSnhx1xX6LnWWTI0VWAtszPKeSlQwDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc0
 						OVoXDTM1MDcxMzA5MTc0OVowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
@@ -149,13 +149,13 @@
 						EKZxmfNDR/osPrE+Imy1pWidTkSoe23dKlk+nqKWedsYEr+HKMS5NSTUY9X4+ul1
 						XEMB4j98UA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVANqZjdgjQDinPjHK15o/evwkJ47nMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51azAeFw0xNTA3MTMwOTE3
 						NTBaFw0zNTA3MTMwOTE3NTBaMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51
@@ -175,24 +175,24 @@
 						gQv8K/szMt60cSeU+yWCjRT3tGsEOe+Upn041k4KHZUvg4pXtNe0ssienaJjd2bv
 						PIGItBCgWGc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St Helens College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Helens College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sthelens.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Karl</md:GivenName>
-      <md:SurName>Brooker</md:SurName>
-      <md:EmailAddress>mailto:kbrooker@sthelens.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Karl</md:GivenName>
-      <md:SurName>Brooker</md:SurName>
-      <md:EmailAddress>mailto:kbrooker@sthelens.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St Helens College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Helens College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sthelens.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Karl</md:GivenName>
+    <md:SurName>Brooker</md:SurName>
+    <md:EmailAddress>mailto:kbrooker@sthelens.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karl</md:GivenName>
+    <md:SurName>Brooker</md:SurName>
+    <md:EmailAddress>mailto:kbrooker@sthelens.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stmarys-ca.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stmarys-ca.edu-idp-shibboleth.xml
index baaeac91..3612c6e5 100644
--- a/swamid-interfederations-2.0/idp.stmarys-ca.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stmarys-ca.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stmarys-ca.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stmarys-ca.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Saint Mary's College of California</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stmarys-ca.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Saint Mary's College of California</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE8TCCA9mgAwIBAgIQPQ5qs8hiYocGXjklCAkjJzANBgkqhkiG9w0BAQsFADBD
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMR0wGwYDVQQDExR0
 aGF3dGUgU0hBMjU2IFNTTCBDQTAeFw0xNjAxMTUwMDAwMDBaFw0xODAxMTQyMzU5
@@ -48,26 +48,26 @@ JLaK7lWRqbvdIzFYaN7jmjB4vX8+/b/nTanTwzrNxvpvcDPgJY298SXlNIosTvjp
 Rn/kBPDYvknAeBVbNwuSMonjbDNbVp3zuURtAR7gO7Iv4G6F3bdwIohR7i/oqTBg
 dvC1WawxFysNCZo9DQO6ou9n8Vj/
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://my.stmarys-ca.edu/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Saint Mary's College of California</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Saint Mary's College of California</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stmarys-ca.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ruben Reyes</md:GivenName>
-      <md:EmailAddress>rbr3@stmarys-ca.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Frank Pinkela</md:GivenName>
-      <md:EmailAddress>fpinkela@stmarys-ca.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jason Stofer</md:GivenName>
-      <md:EmailAddress>jgs8@stmarys-ca.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://my.stmarys-ca.edu/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Saint Mary's College of California</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Saint Mary's College of California</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stmarys-ca.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ruben Reyes</md:GivenName>
+    <md:EmailAddress>rbr3@stmarys-ca.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Frank Pinkela</md:GivenName>
+    <md:EmailAddress>fpinkela@stmarys-ca.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jason Stofer</md:GivenName>
+    <md:EmailAddress>jgs8@stmarys-ca.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml
index 018e1bc7..8c8b9bac 100644
--- a/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stmarysblackburn.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-09T09:00:58Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-09T09:00:58Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stmarysblackburn.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">St Mary's Blackburn College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://moodle.stmarysblackburn.ac.uk/images/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://moodle.stmarysblackburn.ac.uk/images/logo-icon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stmarysblackburn.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">St Mary's Blackburn College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://moodle.stmarysblackburn.ac.uk/images/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://moodle.stmarysblackburn.ac.uk/images/logo-icon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDgDCCAmgCCQC1ZXdEMSkHoTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgMCkxhbmNhc2hpcmUxEjAQBgNVBAcMCUJsYWNrYnVybjEkMCIG
 						A1UECgwbU3QgTWFyeSdzIENvbGxlZ2UgQmxhY2tidXJuMSMwIQYDVQQDDBppZHAu
@@ -36,26 +36,26 @@
 						qhcvXbr3A6zI+vTJxGGyGo4Lt8mD0aQBg43Oxv+lOlKo4uayr4spvv1ZqUfwkkYP
 						LKRxyHZph1dvVcdhDGXoTYr9SGxFP3969/Fei+O6fD6GP2xT
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stmarysblackburn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stmarysblackburn.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDgDCCAmgCCQC1ZXdEMSkHoTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgMCkxhbmNhc2hpcmUxEjAQBgNVBAcMCUJsYWNrYnVybjEkMCIG
 						A1UECgwbU3QgTWFyeSdzIENvbGxlZ2UgQmxhY2tidXJuMSMwIQYDVQQDDBppZHAu
@@ -76,27 +76,27 @@
 						qhcvXbr3A6zI+vTJxGGyGo4Lt8mD0aQBg43Oxv+lOlKo4uayr4spvv1ZqUfwkkYP
 						LKRxyHZph1dvVcdhDGXoTYr9SGxFP3969/Fei+O6fD6GP2xT
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St Mary's College, Blackburn</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Mary's Blackburn College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stmarysblackburn.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Holmes</md:SurName>
-      <md:EmailAddress>mailto:p.holmes@stmarysblackburn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Holmes</md:SurName>
-      <md:EmailAddress>mailto:p.holmes@stmarysblackburn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St Mary's College, Blackburn</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Mary's Blackburn College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stmarysblackburn.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Holmes</md:SurName>
+    <md:EmailAddress>mailto:p.holmes@stmarysblackburn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Holmes</md:SurName>
+    <md:EmailAddress>mailto:p.holmes@stmarysblackburn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml
index ec51f23b..e2f02b1a 100644
--- a/swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stockton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stockton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stockton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stockton.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stockton.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stockton Riverside College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stockton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stockton.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stockton.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockton Riverside College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stockton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
index 3236c66f..0c122400 100644
--- a/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stokecoll.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokecoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokecoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAOCqTm8BSRjHD01zcVqQKEU41GmFMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMME2lkcC5zdG9rZWNvbGwuYWMudWswHhcNMTUxMTAyMTQz
 						MzQxWhcNMzUxMTAyMTQzMzQxWjAeMRwwGgYDVQQDDBNpZHAuc3Rva2Vjb2xsLmFj
@@ -30,26 +30,26 @@
 						KJyA0eEShvBL36YxCvQD5YPmoDI7hlQ4Erj+Ge8AR1ImHFCHh8h4hif1E7dXG0rS
 						codng9Xuyk8xt0/m
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stokecoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokecoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stokecoll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokecoll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAOCqTm8BSRjHD01zcVqQKEU41GmFMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMME2lkcC5zdG9rZWNvbGwuYWMudWswHhcNMTUxMTAyMTQz
 						MzQxWhcNMzUxMTAyMTQzMzQxWjAeMRwwGgYDVQQDDBNpZHAuc3Rva2Vjb2xsLmFj
@@ -69,26 +69,26 @@
 						KJyA0eEShvBL36YxCvQD5YPmoDI7hlQ4Erj+Ge8AR1ImHFCHh8h4hif1E7dXG0rS
 						codng9Xuyk8xt0/m
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stoke-on-Trent College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stoke-on-Trent College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stokecoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@stokecoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Guy</md:GivenName>
-      <md:SurName>Hodson</md:SurName>
-      <md:EmailAddress>mailto:guy.hodson@stokecoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stoke-on-Trent College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stoke-on-Trent College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stokecoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@stokecoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Guy</md:GivenName>
+    <md:SurName>Hodson</md:SurName>
+    <md:EmailAddress>mailto:guy.hodson@stokecoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml
index 0d18148c..3e10c11d 100644
--- a/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stokesfc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokesfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokesfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwQCCQCpm5jjooFexjANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxFzAVBgNVBAcTDlN0b2tlLW9uLVRy
 						ZW50MTIwMAYDVQQKEylDaXR5IG9mIFN0b2tlLW9uLVRyZW50IFNpeHRoIEZvcm0g
@@ -34,26 +34,26 @@
 						A0AaAacEjqmWd/WUYVMUZE9hdM5VNzB2CftZSLGfrtxTlMmxDSdluqScwcqgIEnH
 						oByp0h8HreFUu0YUaExOhUEQPmCEQpRuWK9GtOeARWbC1mSOaIGMMrPYKiN7XKYa
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stokesfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokesfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stokesfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokesfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwQCCQCpm5jjooFexjANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
 						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxFzAVBgNVBAcTDlN0b2tlLW9uLVRy
 						ZW50MTIwMAYDVQQKEylDaXR5IG9mIFN0b2tlLW9uLVRyZW50IFNpeHRoIEZvcm0g
@@ -77,27 +77,27 @@
 						A0AaAacEjqmWd/WUYVMUZE9hdM5VNzB2CftZSLGfrtxTlMmxDSdluqScwcqgIEnH
 						oByp0h8HreFUu0YUaExOhUEQPmCEQpRuWK9GtOeARWbC1mSOaIGMMrPYKiN7XKYa
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City of Stoke-on-Trent Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stoke Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stokesfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Thacker</md:SurName>
-      <md:EmailAddress>mailto:Lee.Thacker@stokesfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>Mason</md:SurName>
-      <md:EmailAddress>mailto:will.mason@stokesfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City of Stoke-on-Trent Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stoke Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stokesfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Thacker</md:SurName>
+    <md:EmailAddress>mailto:Lee.Thacker@stokesfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Mason</md:SurName>
+    <md:EmailAddress>mailto:will.mason@stokesfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml
index e05bf7ff..97db7e74 100644
--- a/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stourbridge.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-01-10T15:29:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-01-10T15:29:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stourbridge.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stourbridge College</mdui:DisplayName>
+        <mdui:Logo height="36" width="114">https://idp.stourbridge.ac.uk/sc-logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stourbridge.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stourbridge College</mdui:DisplayName>
-          <mdui:Logo height="36" width="114">https://idp.stourbridge.ac.uk/sc-logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEuzCCA6OgAwIBAgIRAJM3bbt+OVuVVDiHzCVYDr8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMjAxMDkwMDAwMDBaFw0xNTAxMDgyMzU5NTlaMIGPMQswCQYD
@@ -44,26 +44,26 @@
 						BhOxxXd7otU19GIBeyuODYEorcvrmJ3tWAnZC1ZSFmblkg8M4ZcmmeRJsD1Ni7iz
 						Gm5ypqt+ahzVPgRU51on
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stourbridge.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stourbridge.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stourbridge.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stourbridge.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEuzCCA6OgAwIBAgIRAJM3bbt+OVuVVDiHzCVYDr8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMjAxMDkwMDAwMDBaFw0xNTAxMDgyMzU5NTlaMIGPMQswCQYD
@@ -91,27 +91,27 @@
 						BhOxxXd7otU19GIBeyuODYEorcvrmJ3tWAnZC1ZSFmblkg8M4ZcmmeRJsD1Ni7iz
 						Gm5ypqt+ahzVPgRU51on
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stourbridge College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stourbridge College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stourbridge.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Cropley</md:SurName>
-      <md:EmailAddress>mailto:graham@expresscommerce.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Cropley</md:SurName>
-      <md:EmailAddress>mailto:graham@expresscommerce.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stourbridge College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stourbridge College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stourbridge.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Cropley</md:SurName>
+    <md:EmailAddress>mailto:graham@expresscommerce.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Cropley</md:SurName>
+    <md:EmailAddress>mailto:graham@expresscommerce.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
index 39508bb9..38b4d36c 100644
--- a/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.strasbourg.archi.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T15:09:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T15:09:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strasbourg.archi.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSA Strasbourg</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAHQSAAB0EgAAAAAAAAAAAAD///8A////AKmf7gCEd+cAo5rtAI6B6Rt+ceZLkYXpAX5x5gC8tfIAnZLrAIR35wD///8A////AP///wD///8A////AP///wC3r/EAkofqAIJ05zNBLdrlRzPcynNl5QBwYeQA08/2AJiN6gCEd+cA////AP///wD///8A////AP///wD///8AnpPsJ0Yy28MmD9X/DwDR/0g03LlqWeIAs6vwAP///wCQhOkAgnXmAP///wD///8A////AP///wD///8A////AFRD3pcRANL/KxTW/yQN1f9LONy5cmPkAMO88wDW0/Ygh3rnLJGG6QD///8A////AP///wD///8A////AP///wBZSN+UIgrV/y8Z1/8jC9X/SzjcuXhp5QCpoe4AqaHuNj8q2u1/cuYw////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/IwvV/0s43Ll2Z+UAr6fvAL+58iAjDNX/QCzaqf///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/yML1f9MOd25dGXkAK6l7wC+uPIgLhjX/z4p2a3///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8jDNX/Szfct3Rk5AC2r/AAwLryIC0X1/9CLdqq////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/HQbU/0473b3EvfMAysT0ALmx8R8uGNf/QS3aqv///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/ysU1v8wGtf/ZFThwoF05iyime0TOiXZ/0Es2qv///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8xG9f/LBXW/xYB0v8gC9T/Qi3a3C8Z1/9JNtyf////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/LxnX/y8Z1/8wGtf/LRbX/yIK1P8jC9X/TjvcnP///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/y8Z1/8vGdf/LxnX/y8Z1/8vGdf/Jg/V/0w53Jz///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8vGdf/LxnX/y8Z1/8vGdf/LxnX/yYP1f9MOdyc////AP///wD///8A////AP///wD///8AUT/emiUO1f8vGdf/LxnX/y8Z1/8vGdf/LxnX/y8Z1/8mD9X/TDnco////wD///8A////AP///wD///8A////AG5f41ocBNO9LxnXoi8Z16IvGdeiLxnXoi8Z16IvGdeiJg/VvUw53GD///8A////AP///wD///8A+P8AAPH/AADB/wAAwZ8AAMGPAADBjwAAwY8AAMGPAADBjwAAwA8AAMAPAADADwAAwA8AAMAPAADADwAAwA8AAA==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.strasbourg.archi.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">ENSAS' students, teachers and staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Architecture de Strasbourg</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants, enseignants et personnel ATOS de l'ENSAS</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strasbourg.archi.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSA Strasbourg</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAHQSAAB0EgAAAAAAAAAAAAD///8A////AKmf7gCEd+cAo5rtAI6B6Rt+ceZLkYXpAX5x5gC8tfIAnZLrAIR35wD///8A////AP///wD///8A////AP///wC3r/EAkofqAIJ05zNBLdrlRzPcynNl5QBwYeQA08/2AJiN6gCEd+cA////AP///wD///8A////AP///wD///8AnpPsJ0Yy28MmD9X/DwDR/0g03LlqWeIAs6vwAP///wCQhOkAgnXmAP///wD///8A////AP///wD///8A////AFRD3pcRANL/KxTW/yQN1f9LONy5cmPkAMO88wDW0/Ygh3rnLJGG6QD///8A////AP///wD///8A////AP///wBZSN+UIgrV/y8Z1/8jC9X/SzjcuXhp5QCpoe4AqaHuNj8q2u1/cuYw////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/IwvV/0s43Ll2Z+UAr6fvAL+58iAjDNX/QCzaqf///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/yML1f9MOd25dGXkAK6l7wC+uPIgLhjX/z4p2a3///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8jDNX/Szfct3Rk5AC2r/AAwLryIC0X1/9CLdqq////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/HQbU/0473b3EvfMAysT0ALmx8R8uGNf/QS3aqv///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/ysU1v8wGtf/ZFThwoF05iyime0TOiXZ/0Es2qv///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8xG9f/LBXW/xYB0v8gC9T/Qi3a3C8Z1/9JNtyf////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/LxnX/y8Z1/8wGtf/LRbX/yIK1P8jC9X/TjvcnP///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/y8Z1/8vGdf/LxnX/y8Z1/8vGdf/Jg/V/0w53Jz///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8vGdf/LxnX/y8Z1/8vGdf/LxnX/yYP1f9MOdyc////AP///wD///8A////AP///wD///8AUT/emiUO1f8vGdf/LxnX/y8Z1/8vGdf/LxnX/y8Z1/8mD9X/TDnco////wD///8A////AP///wD///8A////AG5f41ocBNO9LxnXoi8Z16IvGdeiLxnXoi8Z16IvGdeiJg/VvUw53GD///8A////AP///wD///8A+P8AAPH/AADB/wAAwZ8AAMGPAADBjwAAwY8AAMGPAADBjwAAwA8AAMAPAADADwAAwA8AAMAPAADADwAAwA8AAA==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.strasbourg.archi.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">ENSAS' students, teachers and staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Architecture de Strasbourg</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants, enseignants et personnel ATOS de l'ENSAS</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRzCCAi+gAwIBAgIUXRRxYrjEVT64C9zybFH9tlnZ/5wwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXaWRwLnN0cmFzYm91cmcuYXJjaGkuZnIwHhcNMTQwNDE3
 MDk1OTQ1WhcNMzQwNDE3MDk1OTQ1WjAiMSAwHgYDVQQDExdpZHAuc3RyYXNib3Vy
@@ -40,13 +40,13 @@ biEhRmJIckZgK3axgHcpzrrv6TJME0JsZNbh9nNjWu5ahjhxzGXzw7W1MzSWzaqk
 5YjDMooSN+djy/xITu54R3DfPFnXp7nGCqEq7mIO6kQQHVUK//ViMGcJ0hQSh54v
 rtnbjNGSrgbwkVabvcN+Gtc2+uEO8c/ozrhm
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEezCCA2OgAwIBAgIQFl8uHwbutP9D8H8eK6oUajANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxNzAwMDAwMFoXDTE3MDQxNjIzNTk1OVowRTEhMB8GA1UE
@@ -72,19 +72,19 @@ ICFIMEAht/4ZWBBBgV+WuAq/8l5s+dF5tNpX1mKZaB9n2Id5QqVQGK9vhNzfRhYx
 UZEkRNOijgmcRNgjllmGqE3kD69a7KxcvedRPDRt3bweBdgFw2Gw2hLjYxn4ojMm
 ade38YYscP19cjJ5xgSciH1tHTO7eNq7iirrjgxn9nM1Cxpq716Kv1DwnyFT9IA=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.strasbourg.archi.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@strasbourg.archi.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.strasbourg.archi.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@strasbourg.archi.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml
index e0d26ccb..c8adab06 100644
--- a/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.stratford.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-08T17:41:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-08T17:41:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stratford.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stratford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUHUDFCEinVS2/oqpWRjzbVISrlKIwDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTaWRwLnN0cmF0Zm9yZC5hYy51azAeFw0xNDA4MTkxNDM2
 						MzFaFw0zNDA4MTkxNDM2MzFaMB4xHDAaBgNVBAMME2lkcC5zdHJhdGZvcmQuYWMu
@@ -32,26 +32,26 @@
 						FWoWYXavsqXe6P6DUNnqnBUhicJtx+YalauPcXILOZEuGU7fY0qk1fDwRQemMEDJ
 						TOavKjmM2o9UJkU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stratford.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stratford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stratford.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stratford.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUHUDFCEinVS2/oqpWRjzbVISrlKIwDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTaWRwLnN0cmF0Zm9yZC5hYy51azAeFw0xNDA4MTkxNDM2
 						MzFaFw0zNDA4MTkxNDM2MzFaMB4xHDAaBgNVBAMME2lkcC5zdHJhdGZvcmQuYWMu
@@ -71,27 +71,27 @@
 						FWoWYXavsqXe6P6DUNnqnBUhicJtx+YalauPcXILOZEuGU7fY0qk1fDwRQemMEDJ
 						TOavKjmM2o9UJkU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stratford-upon-Avon College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stratford-upon-Avon College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stratford.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nicola</md:GivenName>
-      <md:SurName>Sparkes</md:SurName>
-      <md:EmailAddress>mailto:nicolasparkes@stratford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:richardmorris@stratford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stratford-upon-Avon College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stratford-upon-Avon College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stratford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nicola</md:GivenName>
+    <md:SurName>Sparkes</md:SurName>
+    <md:EmailAddress>mailto:nicolasparkes@stratford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:richardmorris@stratford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml
index 3ef72929..bd931807 100644
--- a/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.strodes.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16:02:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16:02:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strodes.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strodes.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiwCCQDcWa6x9ZbwJjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MQ4wDAYDVQQHEwVFZ2hhbTEYMBYGA1UEChMPU3Ry
 						b2RlcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuc3Ryb2Rlcy5hYy51azAeFw0xMzEw
@@ -32,26 +32,26 @@
 						x5WyEEVfjbFIBjxXKUXp1zHdcCxDuL/GE0wKHpCffnk3e11MzT7KO1YaGQyXQEQ/
 						fAFKolTZXDqFqiudmlPOb4sxvpmQ7jUs
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.strodes.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strodes.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.strodes.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strodes.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiwCCQDcWa6x9ZbwJjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MQ4wDAYDVQQHEwVFZ2hhbTEYMBYGA1UEChMPU3Ry
 						b2RlcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuc3Ryb2Rlcy5hYy51azAeFw0xMzEw
@@ -71,27 +71,27 @@
 						x5WyEEVfjbFIBjxXKUXp1zHdcCxDuL/GE0wKHpCffnk3e11MzT7KO1YaGQyXQEQ/
 						fAFKolTZXDqFqiudmlPOb4sxvpmQ7jUs
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Strode's College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Strode's College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.strodes.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Roberts</md:GivenName>
-      <md:SurName>Disbury</md:SurName>
-      <md:EmailAddress>mailto:rdisbury@strodes.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roberts</md:GivenName>
-      <md:SurName>Disbury</md:SurName>
-      <md:EmailAddress>mailto:rdisbury@strodes.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Strode's College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Strode's College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.strodes.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Roberts</md:GivenName>
+    <md:SurName>Disbury</md:SurName>
+    <md:EmailAddress>mailto:rdisbury@strodes.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roberts</md:GivenName>
+    <md:SurName>Disbury</md:SurName>
+    <md:EmailAddress>mailto:rdisbury@strodes.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
index 97ea7843..165846c8 100644
--- a/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.student.bth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter - OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students - OLD</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter - OLD</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students - OLD</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter - OLD</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students - OLD</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter - OLD</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students - OLD</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-          <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>bth.se</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
 OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
@@ -48,26 +48,26 @@ E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
 TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
 nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
 4NzN1iC8kg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
 OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
@@ -85,36 +85,36 @@ E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
 TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
 nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
 4NzN1iC8kg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">STUDENTS-BTH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter - OLD</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students - OLD</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Blekinge Institute of Technology - Students</md:Company>
-      <md:SurName>IT Help Desk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Blekinge Institute of Technology - Students</md:Company>
-      <md:SurName>IT Help Desk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Blekinge Institute of Technology - Students</md:Company>
-      <md:SurName>IT Help Desk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">STUDENTS-BTH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter - OLD</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students - OLD</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Blekinge Institute of Technology - Students</md:Company>
+    <md:SurName>IT Help Desk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Blekinge Institute of Technology - Students</md:Company>
+    <md:SurName>IT Help Desk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Blekinge Institute of Technology - Students</md:Company>
+    <md:SurName>IT Help Desk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surf.nl.xml b/swamid-interfederations-2.0/idp.surf.nl.xml
index 490994c6..9eb10434 100644
--- a/swamid-interfederations-2.0/idp.surf.nl.xml
+++ b/swamid-interfederations-2.0/idp.surf.nl.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.surf.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surf.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SURF (nieuw)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURF (nieuw)</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Coöperatie SURF U.A.</mdui:Description>
+        <mdui:Description xml:lang="en">Coöperatie SURF U.A.</mdui:Description>
+        <mdui:Logo height="86" width="44">https://static.surfconext.nl/logos/idp/surf.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">SURF coöperatie cooperatie</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">SURF coöperatie cooperatie</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surf.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">SURF (nieuw)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SURF (nieuw)</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Coöperatie SURF U.A.</mdui:Description>
-          <mdui:Description xml:lang="en">Coöperatie SURF U.A.</mdui:Description>
-          <mdui:Logo height="86" width="44">https://static.surfconext.nl/logos/idp/surf.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">SURF coöperatie cooperatie</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">SURF coöperatie cooperatie</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/adc14b08480e6f3288d996344c6f4459"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coöperatie SURF U.A.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SURF (nieuw)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.surf.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/adc14b08480e6f3288d996344c6f4459"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coöperatie SURF U.A.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SURF (nieuw)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.surf.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
index e6cbc1b3..36ca9af8 100644
--- a/swamid-interfederations-2.0/idp.surfnet.nl.xml
+++ b/swamid-interfederations-2.0/idp.surfnet.nl.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.surfnet.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfnet.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SURFnet bv</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFnet bv</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFnet bv</mdui:Description>
+        <mdui:Description xml:lang="en">SURFnet bv</mdui:Description>
+        <mdui:Logo height="44" width="108">https://static.surfconext.nl/logos/idp/surfnet.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">HAAS SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">HAAS SURFnet bv SURF konijn powered by</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfnet.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">SURFnet bv</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SURFnet bv</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">SURFnet bv</mdui:Description>
-          <mdui:Description xml:lang="en">SURFnet bv</mdui:Description>
-          <mdui:Logo height="44" width="108">https://static.surfconext.nl/logos/idp/surfnet.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">HAAS SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">HAAS SURFnet bv SURF konijn powered by</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/ba573f07093978e3852ddef0d2465b84"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SURFnet bv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SURFnet bv</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/ba573f07093978e3852ddef0d2465b84"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SURFnet bv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SURFnet bv</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml
index a76da3ca..5f8b176e 100644
--- a/swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sussex.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Sussex</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Sussex</mdui:Description>
+        <mdui:Logo height="60" width="147">https://www.sussex.ac.uk/includes/images/external/logo.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.sussex.ac.uk/includes/images/external/favicon.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Sussex</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Sussex</mdui:Description>
-          <mdui:Logo height="60" width="147">https://www.sussex.ac.uk/includes/images/external/logo.jpg</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.sussex.ac.uk/includes/images/external/favicon.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAL/cBrEESZ0ZPT7d+5iLH4sqVPESMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5zdXNzZXguYWMudWswHhcNMTMwODAxMTQ0NzE2
 						WhcNMzMwODAxMTQ0NzE2WjAbMRkwFwYDVQQDExBpZHAuc3Vzc2V4LmFjLnVrMIIB
@@ -35,27 +35,27 @@
 						hXl7a/FvOINuTcakieicxaKoY8SLwlPSohC5MY7JrRYuoGc72ROnYh41NN7DKmcl
 						9i3j/XWPg4DPCgnybKfTsjUDXFGJsKprFqXkTm2t9sAytMmdCHUYvCGzbMk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sussex.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sussex.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAL/cBrEESZ0ZPT7d+5iLH4sqVPESMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC5zdXNzZXguYWMudWswHhcNMTMwODAxMTQ0NzE2
 						WhcNMzMwODAxMTQ0NzE2WjAbMRkwFwYDVQQDExBpZHAuc3Vzc2V4LmFjLnVrMIIB
@@ -74,28 +74,28 @@
 						hXl7a/FvOINuTcakieicxaKoY8SLwlPSohC5MY7JrRYuoGc72ROnYh41NN7DKmcl
 						9i3j/XWPg4DPCgnybKfTsjUDXFGJsKprFqXkTm2t9sAytMmdCHUYvCGzbMk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Sussex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sussex</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sussex.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dave</md:GivenName>
-      <md:SurName>Lewney</md:SurName>
-      <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dave</md:GivenName>
-      <md:SurName>Lewney</md:SurName>
-      <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Sussex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sussex</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sussex.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Lewney</md:SurName>
+    <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Lewney</md:SurName>
+    <md:EmailAddress>mailto:d.m.lewney@sussex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml
index 8067f5ae..c6b6bf2f 100644
--- a/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sussexcoast.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-22T13:54:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-22T13:54:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexcoast.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexcoast.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAPawddu40r8UEYXiRI2PCN7NZhVUMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2FzdC5hYy51azAeFw0xMzA4MTUx
 						NTM2MjRaFw0zMzA4MTUxNTM2MjRaMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2Fz
@@ -32,29 +32,29 @@
 						77Z19XW7izNdrg9EIjkLKsMdqukXpi/UkMc3QXOvBnppPp03GFVZERTUCB6WrCnR
 						PKGUsR8JV4C/b+aw7Qy977lXij4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sussexcoast.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexcoast.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sussexcoast.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexcoast.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAPawddu40r8UEYXiRI2PCN7NZhVUMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2FzdC5hYy51azAeFw0xMzA4MTUx
 						NTM2MjRaFw0zMzA4MTUxNTM2MjRaMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2Fz
@@ -74,27 +74,27 @@
 						77Z19XW7izNdrg9EIjkLKsMdqukXpi/UkMc3QXOvBnppPp03GFVZERTUCB6WrCnR
 						PKGUsR8JV4C/b+aw7Qy977lXij4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sussex Coast College Hastings</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sussex Coast College Hastings</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sussexcoast.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Henderson</md:SurName>
-      <md:EmailAddress>mailto:phenderson@sussexcoast.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Falla</md:SurName>
-      <md:EmailAddress>mailto:MFalla@sussexcoast.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sussex Coast College Hastings</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sussex Coast College Hastings</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sussexcoast.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:phenderson@sussexcoast.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Falla</md:SurName>
+    <md:EmailAddress>mailto:MFalla@sussexcoast.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml
index 4ca74723..e416d4e1 100644
--- a/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sussexdowns.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-02T14:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-02T14:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexdowns.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexdowns.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIURAFiqUwkPEeqc96JttxXGAE26L4wDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
 						MTkzN1oXDTM1MTIxNzExMTkzN1owIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
@@ -32,13 +32,13 @@
 						qRGS+ddJ2d88CbPTgU0IIAKzNK3OnmEX/PJ/WJOgKV1ThFXs2d3EWeL46AKrgHMW
 						t52x/Ffb6//Lld/tcohp/7D89g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAOIaZM3vDoHKS6s49KFRowGWMrhoMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3ducy5hYy51azAeFw0xNTEyMTcx
 						MTE5MzVaFw0zNTEyMTcxMTE5MzVaMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3du
@@ -58,13 +58,13 @@
 						NYbRkFbjPKQhDvO4kI4QqLYBCvVWEsba+Z+/scBMWwHU4fHONpP4s/54gYifgH/e
 						APhr3gWeqRKI8ywdO1Rm4eziOxE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUa5OG5i1Wpluu9P44ecwPAnoEUWowDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
 						MTkzNloXDTM1MTIxNzExMTkzNlowIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
@@ -84,26 +84,26 @@
 						Q16I9/JE3NKX6hVlO19PFwBeJ9ZlVh53zBDSfIuZPlGYK5KFlC3PE/HowDnPa3Xv
 						cd/dBsqyzhYBk6a6l0Gi7CukFQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sussexdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexdowns.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sussexdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussexdowns.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIURAFiqUwkPEeqc96JttxXGAE26L4wDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
 						MTkzN1oXDTM1MTIxNzExMTkzN1owIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
@@ -123,13 +123,13 @@
 						qRGS+ddJ2d88CbPTgU0IIAKzNK3OnmEX/PJ/WJOgKV1ThFXs2d3EWeL46AKrgHMW
 						t52x/Ffb6//Lld/tcohp/7D89g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAOIaZM3vDoHKS6s49KFRowGWMrhoMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3ducy5hYy51azAeFw0xNTEyMTcx
 						MTE5MzVaFw0zNTEyMTcxMTE5MzVaMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3du
@@ -149,13 +149,13 @@
 						NYbRkFbjPKQhDvO4kI4QqLYBCvVWEsba+Z+/scBMWwHU4fHONpP4s/54gYifgH/e
 						APhr3gWeqRKI8ywdO1Rm4eziOxE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUa5OG5i1Wpluu9P44ecwPAnoEUWowDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
 						MTkzNloXDTM1MTIxNzExMTkzNlowIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
@@ -175,26 +175,26 @@
 						Q16I9/JE3NKX6hVlO19PFwBeJ9ZlVh53zBDSfIuZPlGYK5KFlC3PE/HowDnPa3Xv
 						cd/dBsqyzhYBk6a6l0Gi7CukFQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sussex Downs College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sussex Downs College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sussexdowns.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gavin</md:GivenName>
-      <md:SurName>Counahan</md:SurName>
-      <md:EmailAddress>mailto:gavin.counahan@sussexdowns.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gavin</md:GivenName>
-      <md:SurName>Counahan</md:SurName>
-      <md:EmailAddress>mailto:gavin.counahan@sussexdowns.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sussex Downs College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sussex Downs College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sussexdowns.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gavin</md:GivenName>
+    <md:SurName>Counahan</md:SurName>
+    <md:EmailAddress>mailto:gavin.counahan@sussexdowns.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gavin</md:GivenName>
+    <md:SurName>Counahan</md:SurName>
+    <md:EmailAddress>mailto:gavin.counahan@sussexdowns.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml
index 07f8f942..c1ee9e26 100644
--- a/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.swc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-08T11:18:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-08T11:18:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAigCCQCSYynTzFCVFjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFT21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0
 						aCBXZXN0IENvbGxlZ2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswHhcNMTQwODI5
@@ -32,26 +32,26 @@
 						CWSnvr24qUPXRs7RVa43Ndvt0ADtrepiClWUq/cMEQLVmfsX4tcLoHA8XxlQCdxE
 						n6mX/l4jcIebGBXQCe6F5fRd01U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.swc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.swc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.swc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.swc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.swc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.swc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.swc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.swc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAigCCQCSYynTzFCVFjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFT21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0
 						aCBXZXN0IENvbGxlZ2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswHhcNMTQwODI5
@@ -71,27 +71,27 @@
 						CWSnvr24qUPXRs7RVa43Ndvt0ADtrepiClWUq/cMEQLVmfsX4tcLoHA8XxlQCdxE
 						n6mX/l4jcIebGBXQCe6F5fRd01U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South West College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South West College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ciara</md:GivenName>
-      <md:SurName>Duffy</md:SurName>
-      <md:EmailAddress>mailto:ciara.duffy@swc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ciara</md:GivenName>
-      <md:SurName>Duffy</md:SurName>
-      <md:EmailAddress>mailto:ciara.duffy@swc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South West College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South West College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ciara</md:GivenName>
+    <md:SurName>Duffy</md:SurName>
+    <md:EmailAddress>mailto:ciara.duffy@swc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ciara</md:GivenName>
+    <md:SurName>Duffy</md:SurName>
+    <md:EmailAddress>mailto:ciara.duffy@swc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
index cf4a4e23..12557c65 100644
--- a/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.swindon-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-25T16:02:25Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-25T16:02:25Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swindon-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swindon-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALJupNJrLD9f0qZUHM/Xl8rlpql8MA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGWlkcC5zd2luZG9uLWNvbGxlZ2UuYWMudWswHhcNMTIw
 						MzEzMDk0NTM3WhcNMzIwMzEzMDk0NTM3WjAkMSIwIAYDVQQDExlpZHAuc3dpbmRv
@@ -30,26 +30,26 @@
 						L5TwUarch4qcWhlgoOXHypMC4SlzWT6yLOzOC2hg+e/0PLMENqU8Z2SrERRKYVlv
 						EVsYTrzNM4kJzpBen+xuMmmnajrIEneDpaX9x1neqDj7QEfr
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.swindon-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swindon-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.swindon-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swindon-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALJupNJrLD9f0qZUHM/Xl8rlpql8MA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGWlkcC5zd2luZG9uLWNvbGxlZ2UuYWMudWswHhcNMTIw
 						MzEzMDk0NTM3WhcNMzIwMzEzMDk0NTM3WjAkMSIwIAYDVQQDExlpZHAuc3dpbmRv
@@ -69,25 +69,25 @@
 						L5TwUarch4qcWhlgoOXHypMC4SlzWT6yLOzOC2hg+e/0PLMENqU8Z2SrERRKYVlv
 						EVsYTrzNM4kJzpBen+xuMmmnajrIEneDpaX9x1neqDj7QEfr
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Swindon College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Swindon College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swindon-college.ac.uk/campus-info/computer-services/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computer Services Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@swindon-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDP Admins</md:GivenName>
-      <md:EmailAddress>mailto:support@swindon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swindon College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swindon College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swindon-college.ac.uk/campus-info/computer-services/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computer Services Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@swindon-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDP Admins</md:GivenName>
+    <md:EmailAddress>mailto:support@swindon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml
index faf06aea..c0e6c492 100644
--- a/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sworcs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-10T14:56:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-10T14:56:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evesham.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">South Worcestershire College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://internal.evesham.ac.uk/intranet/img/icons/swc80x60pix.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evesham.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">South Worcestershire College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://internal.evesham.ac.uk/intranet/img/icons/swc80x60pix.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAMBmzKWXYajA+5lcrW5Mg1lfTNGuMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzNDEz
 						WhcNMzUwMjA1MDkzNDEzWjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
@@ -35,13 +35,13 @@
 						TAgbjues+fafbNzKe6g96t8NRA5c+BegBm0cApLTI/zzDjba2uPSRCLbyED4QI2T
 						ps+pb/QgzksAN5Wj7M+takiz36hRSUYMH5AJTm/MeTKZ3DDpmHs9TZRf+4rIRbif
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVALRHbvHVOp59HaRxJ3BO3VYBu6htMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzMzU0
 						WhcNMzUwMjA1MDkzMzU0WjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
@@ -60,13 +60,13 @@
 						NpCaqWu34Y3xLq3zkalUWImULao/4fZtz4OVuvm+mZVGFjJWC3FwKOj46uDTv+1X
 						mm72OxqpBVn6xiBTGOPANTruUzKvuFa7Ohbznc2gQXvGGUeUw6T3CaBCAei3pfKC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUR2mkXU3i/AK0KOIvY/W7Q557Ig8wDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwLnN3b3Jjcy5hYy51azAeFw0xNTAyMDUwOTM0MTJa
 						Fw0zNTAyMDUwOTM0MTJaMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswggEi
@@ -85,30 +85,30 @@
 						tMukNkGXjxDlGU7yN4Bb7bZI0bWLfQYIKMlDSnHP0utWX9CF6P31kBhDg4KdQ9sA
 						4fMj1TQAMC8N11H7WA2qUpQtO09IQwfdyawo1LZS1+/lfV1QXz3hFOh5J/sSB64=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sworcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evesham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sworcs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evesham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAMBmzKWXYajA+5lcrW5Mg1lfTNGuMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzNDEz
 						WhcNMzUwMjA1MDkzNDEzWjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
@@ -127,13 +127,13 @@
 						TAgbjues+fafbNzKe6g96t8NRA5c+BegBm0cApLTI/zzDjba2uPSRCLbyED4QI2T
 						ps+pb/QgzksAN5Wj7M+takiz36hRSUYMH5AJTm/MeTKZ3DDpmHs9TZRf+4rIRbif
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVALRHbvHVOp59HaRxJ3BO3VYBu6htMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzMzU0
 						WhcNMzUwMjA1MDkzMzU0WjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
@@ -152,13 +152,13 @@
 						NpCaqWu34Y3xLq3zkalUWImULao/4fZtz4OVuvm+mZVGFjJWC3FwKOj46uDTv+1X
 						mm72OxqpBVn6xiBTGOPANTruUzKvuFa7Ohbznc2gQXvGGUeUw6T3CaBCAei3pfKC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUR2mkXU3i/AK0KOIvY/W7Q557Ig8wDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwLnN3b3Jjcy5hYy51azAeFw0xNTAyMDUwOTM0MTJa
 						Fw0zNTAyMDUwOTM0MTJaMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswggEi
@@ -177,23 +177,23 @@
 						tMukNkGXjxDlGU7yN4Bb7bZI0bWLfQYIKMlDSnHP0utWX9CF6P31kBhDg4KdQ9sA
 						4fMj1TQAMC8N11H7WA2qUpQtO09IQwfdyawo1LZS1+/lfV1QXz3hFOh5J/sSB64=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Worcestershire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Worcestershire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sworcs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@sworcs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tony</md:GivenName>
-      <md:SurName>Neath</md:SurName>
-      <md:EmailAddress>mailto:tneath@sworcs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Worcestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Worcestershire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sworcs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@sworcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tony</md:GivenName>
+    <md:SurName>Neath</md:SurName>
+    <md:EmailAddress>mailto:tneath@sworcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml
index a98ce375..ec14e8f6 100644
--- a/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.symplicity.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">symplicity.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Symplicity Corporation</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">symplicity.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Symplicity Corporation</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUOfQaXCnZp3MxcogT32JCn+X8E3gwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAwwSaWRwLnN5bXBsaWNpdHkuY29tMB4XDTE0MDkxMTExNTQx
 MloXDTE3MDkxMTExNTQxMlowHTEbMBkGA1UEAwwSaWRwLnN5bXBsaWNpdHkuY29t
@@ -38,23 +38,23 @@ Fy6QTkjoS5QSPQbYxi5SheX67dXNoaCCSWFTf+je1KNo5e9ju/Hlxsidy9wYeqiL
 tCgoORm4fTJOpIXoEmbWitHVX1wIDgxQoeKrAcA9hFtzuQHutF7FVHWtUFE9LwWy
 yH/KgXL8Rg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.symplicity.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.symplicity.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.symplicity.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.symplicity.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.symplicity.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">symplicity.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.symplicity.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.symplicity.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.symplicity.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.symplicity.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.symplicity.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">symplicity.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUeeI0i2k070NGLhN7XvLms1eA/AMwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnN5bXBsaWNpdHkuY29tMB4XDTE0MDcxNDIwMjcw
 NFoXDTM0MDcxNDIwMjcwNFowHTEbMBkGA1UEAxMSaWRwLnN5bXBsaWNpdHkuY29t
@@ -74,18 +74,18 @@ L7437D6m6sbkpUy6oQRnh0rTX+p2R+g/KCF1e+gSLmCoiPNiZ80CThR5TpDbNRa5
 /zv2vpZCvvCBm3OBsv3vPOSpSYFVu+WulI9sRxtFqeWbFHIHBzNDFe+tjft/SU66
 Ql9RAWG4Dg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.symplicity.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Symplicity Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Symplicity Corporation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.symplicity.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>shib@symplicity.com</md:GivenName>
-      <md:EmailAddress>shib@symplicity.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.symplicity.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Symplicity Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Symplicity Corporation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.symplicity.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>shib@symplicity.com</md:GivenName>
+    <md:EmailAddress>shib@symplicity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
index 98ff3905..e4cfadb6 100644
--- a/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sze.hu/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>sze</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-test</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>sze</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Széchenyi István Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Széchenyi István University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Széchenyi István Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Széchenyi István University</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">Széchenyi István Egyetem</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Széchenyi István University</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Széchenyi István Egyetem</mdui:Description>
-          <mdui:Description xml:lang="en">Széchenyi István University</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.sze.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sze.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.sze.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">Széchenyi István Egyetem</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Széchenyi István Egyetem</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Széchenyi István Egyetem</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://sze.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://sze.hu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Csábi Béla</md:SurName>
-      <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Csábi Béla</md:SurName>
-      <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Csábi Béla</md:SurName>
-      <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.sze.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sze.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.sze.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">Széchenyi István Egyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Széchenyi István Egyetem</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Széchenyi István Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://sze.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://sze.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Csábi Béla</md:SurName>
+    <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Csábi Béla</md:SurName>
+    <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Csábi Béla</md:SurName>
+    <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
index b3b9822c..cf470794 100644
--- a/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.szie.hu/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>szie</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-test</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>szie</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:47.59387252831956,19.361040115356445</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Szent István Egyetem SSO szolgáltatás</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">http://ifo.szie.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://ifo.szie.hu</mdui:PrivacyStatementURL>
+        <mdui:Logo height="78" width="111">https://idp.szie.hu/szie-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:47.59387252831956,19.361040115356445</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Szent István Egyetem SSO szolgáltatás</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">http://ifo.szie.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://ifo.szie.hu</mdui:PrivacyStatementURL>
-          <mdui:Logo height="78" width="111">https://idp.szie.hu/szie-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUSscIknb+7vqGVUw6Kl9kxz2bcWAwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLnN6aWUuaHUwHhcNMTAxMTA4MTExOTEzWhcNMzAxMTA4MTExOTEzWjAWMRQwEgYDVQQDEwtpZHAuc3ppZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ3NmFZGZxB5neVKIfq5+RTZO1apk0MNGinQYVD8T9PXXm4g4d8ZkNAdY/eUW8z3IdkStf0I/7imKjnnC4Px5ImUJ4tOblJ1n1DDYmqYf7ivNuM89gpt8yE+ffGa/EZeGizeVLJLDT0X3+k22otLEZt3s/gDgCRBal80VtiE0IPT9y2L9XOyzzawRAWlfnjCxBrQiJb35OlUnctOHGc4004Jp+3O9xCr9lOqO/UaQPKpTUFQvK9NIBaV8VqCA62+SQsiSjWtg8Rc/AcdBjrmVcMrU8mia26VyRwtZ0vZpIlpiUhKnuwmWuFMJvAymXI74OwrmYkudzqGgvbk+N10snMCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLnN6aWUuaHWGImh0dHBzOi8vaWRwLnN6aWUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ/ZbxqsxhPifPOOGn+OHtet0wYvMA0GCSqGSIb3DQEBBQUAA4IBAQBHjf0B9D8VtyZu2zstLmGw9Mw+f/dRxOBhzXLJVMxHa3XDykxX1MeG70nKFlSz/UsFy/2jH1zU8E/2WLQDGPu6kZtjuxD1xihyJ5bPTHWfn5IlNHjydMoOt4CnC1xTYB9ObhKqATdVFJMXdRegCpasOV4gLfdFGIneU9YhSB9WFCISjvE76iUJbwsitPtRcDfIqsTFnrwDWbeZhEtlmHp0W71JSkrmCOP9tbiyfH7ujW/DLHuHRa1rxiZYGDKvI3sfwjqRnHkBOTWvs/h7xIQxDUJWwkX0JyVSIp4YuhfSTxVq+cWmtLHfaisY7nSEECcM4m6U2T5YmnogM2Rw8Vqc</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.szie.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">Szent István Egyetem</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Szent István University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">Szent István Egyetem</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Szent István University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.szie.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.szie.hu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Cseh Vendel</md:SurName>
-      <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Cseh Vendel</md:SurName>
-      <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Cseh Vendel</md:SurName>
-      <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUSscIknb+7vqGVUw6Kl9kxz2bcWAwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLnN6aWUuaHUwHhcNMTAxMTA4MTExOTEzWhcNMzAxMTA4MTExOTEzWjAWMRQwEgYDVQQDEwtpZHAuc3ppZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ3NmFZGZxB5neVKIfq5+RTZO1apk0MNGinQYVD8T9PXXm4g4d8ZkNAdY/eUW8z3IdkStf0I/7imKjnnC4Px5ImUJ4tOblJ1n1DDYmqYf7ivNuM89gpt8yE+ffGa/EZeGizeVLJLDT0X3+k22otLEZt3s/gDgCRBal80VtiE0IPT9y2L9XOyzzawRAWlfnjCxBrQiJb35OlUnctOHGc4004Jp+3O9xCr9lOqO/UaQPKpTUFQvK9NIBaV8VqCA62+SQsiSjWtg8Rc/AcdBjrmVcMrU8mia26VyRwtZ0vZpIlpiUhKnuwmWuFMJvAymXI74OwrmYkudzqGgvbk+N10snMCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLnN6aWUuaHWGImh0dHBzOi8vaWRwLnN6aWUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ/ZbxqsxhPifPOOGn+OHtet0wYvMA0GCSqGSIb3DQEBBQUAA4IBAQBHjf0B9D8VtyZu2zstLmGw9Mw+f/dRxOBhzXLJVMxHa3XDykxX1MeG70nKFlSz/UsFy/2jH1zU8E/2WLQDGPu6kZtjuxD1xihyJ5bPTHWfn5IlNHjydMoOt4CnC1xTYB9ObhKqATdVFJMXdRegCpasOV4gLfdFGIneU9YhSB9WFCISjvE76iUJbwsitPtRcDfIqsTFnrwDWbeZhEtlmHp0W71JSkrmCOP9tbiyfH7ujW/DLHuHRa1rxiZYGDKvI3sfwjqRnHkBOTWvs/h7xIQxDUJWwkX0JyVSIp4YuhfSTxVq+cWmtLHfaisY7nSEECcM4m6U2T5YmnogM2Rw8Vqc</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.szie.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">Szent István Egyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Szent István University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Szent István Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Szent István University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.szie.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.szie.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Cseh Vendel</md:SurName>
+    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Cseh Vendel</md:SurName>
+    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Cseh Vendel</md:SurName>
+    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml
index 9a1036ed..408b97ee 100644
--- a/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tamucc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamucc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Texas A&amp;M University-Corpus Christi</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TAMU-CC Federated Identification Services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.tamucc.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://it.tamucc.edu/informationsecurity/securitypolicies/index.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="446" width="254" xml:lang="en">https://falcon.tamucc.edu/maint/idp/tamucc-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamucc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Texas A&amp;M University-Corpus Christi</mdui:DisplayName>
-          <mdui:Description xml:lang="en">TAMU-CC Federated Identification Services</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.tamucc.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://it.tamucc.edu/informationsecurity/securitypolicies/index.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="446" width="254" xml:lang="en">https://falcon.tamucc.edu/maint/idp/tamucc-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOYKntKjtqsjK3XCDvOROln3UFB7MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC50YW11Y2MuZWR1MB4XDTA5MDIyNjE1MjcwNVoX
 DTI5MDIyNjE1MjcwNVowGTEXMBUGA1UEAxMOaWRwLnRhbXVjYy5lZHUwggEiMA0G
@@ -41,23 +41,23 @@ LMyX/IpxQDw5neIfiBge51m49GRFDQvvRdSurNf4uGF9ubBHwk+rqmwle/ypQWNg
 7LtWxJUTw7xMC8A+g7TQNRYxQVQetW8BeuiTLAD3wVEDTag2Jt4Wb2jEXHYkbnTo
 9pLuQGFhtWiswggmYR7TqvrVdoMuskIxwZmVPFx5EplQOQSW+fHYSw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamucc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamucc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tamucc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tamucc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tamucc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamucc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamucc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamucc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tamucc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tamucc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tamucc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamucc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOYKntKjtqsjK3XCDvOROln3UFB7MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC50YW11Y2MuZWR1MB4XDTA5MDIyNjE1MjcwNVoX
 DTI5MDIyNjE1MjcwNVowGTEXMBUGA1UEAxMOaWRwLnRhbXVjYy5lZHUwggEiMA0G
@@ -76,30 +76,30 @@ LMyX/IpxQDw5neIfiBge51m49GRFDQvvRdSurNf4uGF9ubBHwk+rqmwle/ypQWNg
 7LtWxJUTw7xMC8A+g7TQNRYxQVQetW8BeuiTLAD3wVEDTag2Jt4Wb2jEXHYkbnTo
 9pLuQGFhtWiswggmYR7TqvrVdoMuskIxwZmVPFx5EplQOQSW+fHYSw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamucc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Texas A&amp;M University-Corpus Christi</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Texas A&amp;M University-Corpus Christi</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tamucc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil Hale</md:GivenName>
-      <md:EmailAddress>Phil.Hale@tamucc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Edward Evans</md:GivenName>
-      <md:EmailAddress>Edward.Evans@tamucc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Office of Information Security</md:GivenName>
-      <md:EmailAddress>OIS@tamucc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Help Desk</md:GivenName>
-      <md:EmailAddress>ithelp@tamucc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamucc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Texas A&amp;M University-Corpus Christi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Texas A&amp;M University-Corpus Christi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tamucc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil Hale</md:GivenName>
+    <md:EmailAddress>Phil.Hale@tamucc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Edward Evans</md:GivenName>
+    <md:EmailAddress>Edward.Evans@tamucc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Office of Information Security</md:GivenName>
+    <md:EmailAddress>OIS@tamucc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>ithelp@tamucc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml
index 58b2570c..d8fc9f7f 100644
--- a/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.task.gda.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-22T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-22T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">task.gda.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TASK Gdansk</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">TASK Gdańsk</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Academic Computer Center TASK Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="pl">Dostawca Tożsamości Centrum Informatycznego TASK</mdui:Description>
+        <mdui:Logo height="45" width="109" xml:lang="en">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
+        <mdui:Logo height="45" width="109" xml:lang="pl">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>153.19.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>task.gda.pl</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:54.371860,18.612700</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">task.gda.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">TASK Gdansk</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">TASK Gdańsk</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Academic Computer Center TASK Identity Provider</mdui:Description>
-          <mdui:Description xml:lang="pl">Dostawca Tożsamości Centrum Informatycznego TASK</mdui:Description>
-          <mdui:Logo height="45" width="109" xml:lang="en">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-          <mdui:Logo height="45" width="109" xml:lang="pl">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>153.19.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>task.gda.pl</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:54.371860,18.612700</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIURF5LPwZ/QXjVB9iJ7Kz0mzeHll0wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1OFoX
 DTM1MDQwMzA4Mzk1OFowGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
@@ -50,13 +50,13 @@ XbsFGH7eCthi2IwQls+B93v4EUkWtTM6P/nZlqZi8Y3asX9i5EHrMsdcl2nwzdol
 EY/syGwYwfajAEI1c7RcNujuQty1fraXpRDF/kzhy6oiBCecqpSowKy/QEBlV9wh
 Bp0cQldS1u/LcLeFWQq32HbT9OpVBMoqx7VsL8PEkE+592rLCCTvwDXFng==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVANy+gCUM8Wyxo9utTnW0xq8dzG5ZMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDAeFw0xNTA0MDMwODM5NTZa
 Fw0zNTA0MDMwODM5NTZaMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDCCASIw
@@ -75,13 +75,13 @@ R5rWGWSCMoq/sl687jlylzovRLzQn6opFKoeXlBIBwWdZCG/CNwq3DQeMCWrkgt9
 rUkBt8hYMPOjHcJx2nl+2Ue6vcevZkudqxBpV5tpioX6Q2F/XsQCiCYpGue9aWcQ
 g12oVQa4JuIHhKSmvZfVZIu1QfcMadj27vchQXWqttvarQO7NWRRimE9OII=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUH/PXFUwlqT8+OMaMthWJ3kkOYJ0wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1N1oX
 DTM1MDQwMzA4Mzk1N1owGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
@@ -100,39 +100,39 @@ Dg/6nZ/C6vt40XtJyBMXB8HA4na6IXAFRzr++6QmG4ib8umoPS20cCT2sSUtpz7S
 h1QrFPZQWQRe67fPZlX2aOyu8h5OrEhGoyS95BW/2Hw+nWJFvkn5H12/YYW65qTJ
 /TMpaKEsJ2bRiqVKhW5kntRDcca3KqqIiZ+g4102DKmk44R/y8Yjk9BIxg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.task.gda.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.task.gda.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.task.gda.pl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.task.gda.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.task.gda.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.task.gda.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">task.gda.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">TASK Gdansk</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">TASK Gdańsk</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Academic Computer Center TASK Identity Provider</mdui:Description>
-          <mdui:Description xml:lang="pl">Dostawca Tożsamości Centrum Informatycznego TASK</mdui:Description>
-          <mdui:Logo height="45" width="109" xml:lang="en">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-          <mdui:Logo height="45" width="109" xml:lang="pl">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>153.19.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>task.gda.pl</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:54.371860,18.612700</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.task.gda.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.task.gda.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.task.gda.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.task.gda.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.task.gda.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.task.gda.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">task.gda.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TASK Gdansk</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">TASK Gdańsk</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Academic Computer Center TASK Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="pl">Dostawca Tożsamości Centrum Informatycznego TASK</mdui:Description>
+        <mdui:Logo height="45" width="109" xml:lang="en">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
+        <mdui:Logo height="45" width="109" xml:lang="pl">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>153.19.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>task.gda.pl</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:54.371860,18.612700</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIURF5LPwZ/QXjVB9iJ7Kz0mzeHll0wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1OFoX
 DTM1MDQwMzA4Mzk1OFowGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
@@ -151,13 +151,13 @@ XbsFGH7eCthi2IwQls+B93v4EUkWtTM6P/nZlqZi8Y3asX9i5EHrMsdcl2nwzdol
 EY/syGwYwfajAEI1c7RcNujuQty1fraXpRDF/kzhy6oiBCecqpSowKy/QEBlV9wh
 Bp0cQldS1u/LcLeFWQq32HbT9OpVBMoqx7VsL8PEkE+592rLCCTvwDXFng==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVANy+gCUM8Wyxo9utTnW0xq8dzG5ZMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDAeFw0xNTA0MDMwODM5NTZa
 Fw0zNTA0MDMwODM5NTZaMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDCCASIw
@@ -176,13 +176,13 @@ R5rWGWSCMoq/sl687jlylzovRLzQn6opFKoeXlBIBwWdZCG/CNwq3DQeMCWrkgt9
 rUkBt8hYMPOjHcJx2nl+2Ue6vcevZkudqxBpV5tpioX6Q2F/XsQCiCYpGue9aWcQ
 g12oVQa4JuIHhKSmvZfVZIu1QfcMadj27vchQXWqttvarQO7NWRRimE9OII=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUH/PXFUwlqT8+OMaMthWJ3kkOYJ0wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1N1oX
 DTM1MDQwMzA4Mzk1N1owGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
@@ -201,21 +201,21 @@ Dg/6nZ/C6vt40XtJyBMXB8HA4na6IXAFRzr++6QmG4ib8umoPS20cCT2sSUtpz7S
 h1QrFPZQWQRe67fPZlX2aOyu8h5OrEhGoyS95BW/2Hw+nWJFvkn5H12/YYW65qTJ
 /TMpaKEsJ2bRiqVKhW5kntRDcca3KqqIiZ+g4102DKmk44R/y8Yjk9BIxg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.task.gda.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Academic Computer Center TASK in Gdansk</md:OrganizationName>
-      <md:OrganizationName xml:lang="pl">Centrum Informatyczne TASK w Gdańsku</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Academic Computer Center TASK in Gdansk</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Centrum Informatyczne TASK w Gdańsku</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.task.gda.pl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AAI</md:GivenName>
-      <md:SurName>TASK</md:SurName>
-      <md:EmailAddress>mailto:aai@task.gda.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.task.gda.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Academic Computer Center TASK in Gdansk</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Centrum Informatyczne TASK w Gdańsku</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Academic Computer Center TASK in Gdansk</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Centrum Informatyczne TASK w Gdańsku</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.task.gda.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>TASK</md:SurName>
+    <md:EmailAddress>mailto:aai@task.gda.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml
index f166bb14..e2a29097 100644
--- a/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tavistockandportman.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tavistockandportman.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tavistockandportman.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CCQC25DQCsFybpjANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMTMwMQYDVQQKDCpU
 						YXZpc3RvY2sgYW5kIFBvcnRtYW4gTkhTIEZvdW5kYXRpb24gVHJ1c3QxJjAkBgNV
@@ -32,26 +32,26 @@
 						U3WmqCxuVXB1U2JfCO/egPOZr1R7tq1+3VMlPmpZMb8pMiLwXqJxU+niwzX8L6Gw
 						ZmOU0wEwiWOMxw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tavistockandportman.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tavistockandportman.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tavistockandportman.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tavistockandportman.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CCQC25DQCsFybpjANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMTMwMQYDVQQKDCpU
 						YXZpc3RvY2sgYW5kIFBvcnRtYW4gTkhTIEZvdW5kYXRpb24gVHJ1c3QxJjAkBgNV
@@ -73,26 +73,26 @@
 						U3WmqCxuVXB1U2JfCO/egPOZr1R7tq1+3VMlPmpZMb8pMiLwXqJxU+niwzX8L6Gw
 						ZmOU0wEwiWOMxw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tavistock and Portman NHS Foundation Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tavistock and Portman NHS Foundation Trust</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tavistockandportman.nhs.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:library@tavi-port.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Andre</md:SurName>
-      <md:EmailAddress>mailto:candre@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tavistock and Portman NHS Foundation Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tavistock and Portman NHS Foundation Trust</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tavistockandportman.nhs.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:library@tavi-port.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Andre</md:SurName>
+    <md:EmailAddress>mailto:candre@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml
index d60c4ac5..1d969cd2 100644
--- a/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tcat.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:19:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:19:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgIIWpJECkilqdowDQYJKoZIhvcNAQEFBQAwSzEvMC0GA1UE
 						CgwmVGVsZm9yZCBDb2xsZWdlIG9mIEFydHMgYW5kIFRlY2hub2xvZ3kxGDAWBgNV
 						BAMMD2lkcDIudGNhdC5hYy51azAeFw0xMzA4MjAxMTI0MzBaFw0yMzA4MjAxMTI0
@@ -33,13 +33,13 @@
 						9DANze22JZYifGoRdEMDk7ImP2+5xovLwLFGUsGbphwEPqHUImBaaqRdsFMf/XU/
 						d5E8PskK9e0xXhXv
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgIIWpJECkilqdowDQYJKoZIhvcNAQEFBQAwSzEvMC0GA1UE
 						CgwmVGVsZm9yZCBDb2xsZWdlIG9mIEFydHMgYW5kIFRlY2hub2xvZ3kxGDAWBgNV
 						BAMMD2lkcDIudGNhdC5hYy51azAeFw0xMzA4MjAxMTI0MzBaFw0yMzA4MjAxMTI0
@@ -60,25 +60,25 @@
 						9DANze22JZYifGoRdEMDk7ImP2+5xovLwLFGUsGbphwEPqHUImBaaqRdsFMf/XU/
 						d5E8PskK9e0xXhXv
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.tcat.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.tcat.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Telford College of Arts and Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Telford College of Arts &amp; Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tcat.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Anne</md:GivenName>
-      <md:SurName>Jackson</md:SurName>
-      <md:EmailAddress>mailto:anne.jackson@tcat.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Jebb</md:SurName>
-      <md:EmailAddress>mailto:jon.jebb@tcat.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.tcat.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.tcat.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Telford College of Arts and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Telford College of Arts &amp; Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tcat.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anne</md:GivenName>
+    <md:SurName>Jackson</md:SurName>
+    <md:EmailAddress>mailto:anne.jackson@tcat.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Jebb</md:SurName>
+    <md:EmailAddress>mailto:jon.jebb@tcat.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tcd.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tcd.ie-idp-shibboleth.xml
index 5720d677..a8cd425e 100644
--- a/swamid-interfederations-2.0/idp.tcd.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tcd.ie-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tcd.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-02T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-02T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcd.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Trinity College Dublin</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://isservices.tcd.ie</mdui:InformationURL>
+        <mdui:Logo height="92" width="165">https://edugate.heanet.ie/rr3/logos/tcd.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.345294,-6.257722</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcd.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Trinity College Dublin</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://isservices.tcd.ie</mdui:InformationURL>
-          <mdui:Logo height="92" width="165">https://edugate.heanet.ie/rr3/logos/tcd.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.345294,-6.257722</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAPRPufbduHXCtO3D7xf4VyBenGK1MA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC50Y2QuaWUwHhcNMTEwMjExMTIyMDI3WhcNMzEw
 MjExMTIyMDI3WjAVMRMwEQYDVQQDEwppZHAudGNkLmllMIIBIjANBgkqhkiG9w0B
@@ -37,40 +37,40 @@ fwSAxBZ6Sa3Tu8mUpjpbrpMzMOVzm+eVq2svOziznMC0OH5gBe0m9JA5KOnKLNjV
 TKbh+Z5mRJsjPLO7Nw37TfB4qV4jqG1zsnToPK4g5bVWtDie9VREe7rVdik4ojQC
 Q3LYLrBZf+t0v+PaZ+yBfJCbEk4iRX/l
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tcd.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tcd.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tcd.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Trinity College Dublin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Trinity College Dublin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://isservices.tcd.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="other">
-      <md:GivenName>Katrina</md:GivenName>
-      <md:SurName>McCall</md:SurName>
-      <md:EmailAddress>mailto:katrina.mccall@tcd.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Mills</md:SurName>
-      <md:EmailAddress>mailto:millslh@tcd.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Brookes</md:SurName>
-      <md:EmailAddress>mailto:brooken@tcd.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Brookes</md:SurName>
-      <md:EmailAddress>mailto:brooken@tcd.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tcd.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tcd.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tcd.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Trinity College Dublin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Trinity College Dublin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://isservices.tcd.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="other">
+    <md:GivenName>Katrina</md:GivenName>
+    <md:SurName>McCall</md:SurName>
+    <md:EmailAddress>mailto:katrina.mccall@tcd.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Mills</md:SurName>
+    <md:EmailAddress>mailto:millslh@tcd.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Brookes</md:SurName>
+    <md:EmailAddress>mailto:brooken@tcd.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Brookes</md:SurName>
+    <md:EmailAddress>mailto:brooken@tcd.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml
index 42f7bf96..7efd378b 100644
--- a/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teiath.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">career.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ee.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ga.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gd.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">da.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fo.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ba.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ma.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">te.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hc.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xr.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ot.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ae.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ml.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">he.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nub.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nua.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">na.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mi.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dt.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sw.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gms.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ft.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cw.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tg.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">et.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pcm.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rdtl.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ca.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tk.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">survey.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">library.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">study.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teiath.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Athens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.teiath.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.teiath.gr/</mdui:InformationURL>
+        <mdui:Logo height="111" width="113">https://idp.teiath.gr/logos/mdui_teiath_logo_111_113.png</mdui:Logo>
+        <mdui:Logo height="65" width="66">https://idp.teiath.gr/logos/mdui_teiath_logo_65_66.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>teiath.gr</mdui:DomainHint>
+        <mdui:IPHint>195.130.96.0/20</mdui:IPHint>
+        <mdui:IPHint>2001:648:2330::/48</mdui:IPHint>
+        <mdui:IPHint>83.212.64.0/22</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.004213, 23.676573</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">career.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ee.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ga.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gd.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">da.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fo.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ba.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ma.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">te.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hc.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xr.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ot.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ae.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ml.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">he.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nub.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nua.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">na.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mi.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dt.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sw.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gms.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ft.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cw.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tg.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">et.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pcm.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rdtl.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ca.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tk.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">survey.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">library.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">study.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teiath.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Technological Educational Institute of Athens</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.teiath.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.teiath.gr/</mdui:InformationURL>
-          <mdui:Logo height="111" width="113">https://idp.teiath.gr/logos/mdui_teiath_logo_111_113.png</mdui:Logo>
-          <mdui:Logo height="65" width="66">https://idp.teiath.gr/logos/mdui_teiath_logo_65_66.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>teiath.gr</mdui:DomainHint>
-          <mdui:IPHint>195.130.96.0/20</mdui:IPHint>
-          <mdui:IPHint>2001:648:2330::/48</mdui:IPHint>
-          <mdui:IPHint>83.212.64.0/22</mdui:IPHint>
-          <mdui:GeolocationHint>geo:38.004213, 23.676573</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDIDCCAgigAwIBAgIVANDknRDhjuiWDcvevty921p7NnzwMA0GCSqGSIb3DQEB
                             BQUAMBgxFjAUBgNVBAMTDWlkcC50ZWlhdGguZ3IwHhcNMTEwNjI3MTAxNTQ5WhcN
                             MTQwNjI3MTAxNTQ5WjAYMRYwFAYDVQQDEw1pZHAudGVpYXRoLmdyMIIBIjANBgkq
@@ -91,70 +91,70 @@
                             srQ1qv7RvWlqqd+U8R1yBKmfMwFAlbhkeSWR0bNMMcmrQD27CsfeNpwPvq8dXxj7
                             MPub/eEjjeLkVO3S+81GhuhW+xOnL7iTOO/A6L09KSbpCZMD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teiath.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teiath.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teiath.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teiath.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teiath.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teiath.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">career.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ee.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ga.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gd.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">da.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fo.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ba.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ma.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">te.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hc.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xr.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ot.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ae.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ml.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">he.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nub.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nua.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">na.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mi.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dt.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sw.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gms.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ft.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cw.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tg.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">et.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pcm.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rdtl.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ca.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tk.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">survey.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">library.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">study.teiath.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teiath.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teiath.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teiath.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teiath.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teiath.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teiath.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teiath.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">career.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ee.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ga.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gd.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">da.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fo.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ba.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ma.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">te.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hc.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xr.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ot.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ae.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ml.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">he.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nub.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nua.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">na.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mi.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dt.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sw.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gms.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ft.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cw.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tg.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">et.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pcm.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rdtl.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ca.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tk.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">survey.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">library.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">study.teiath.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teiath.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDIDCCAgigAwIBAgIVANDknRDhjuiWDcvevty921p7NnzwMA0GCSqGSIb3DQEB
                             BQUAMBgxFjAUBgNVBAMTDWlkcC50ZWlhdGguZ3IwHhcNMTEwNjI3MTAxNTQ5WhcN
                             MTQwNjI3MTAxNTQ5WjAYMRYwFAYDVQQDEw1pZHAudGVpYXRoLmdyMIIBIjANBgkq
@@ -173,29 +173,29 @@
                             srQ1qv7RvWlqqd+U8R1yBKmfMwFAlbhkeSWR0bNMMcmrQD27CsfeNpwPvq8dXxj7
                             MPub/eEjjeLkVO3S+81GhuhW+xOnL7iTOO/A6L09KSbpCZMD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teiath.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teiath.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technological Educational Institute of Athens</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Athens</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teiath.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teiath.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Technological Educational Institute of Athens NOC</md:Company>
-      <md:EmailAddress>noc@teiath.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Technological Educational Institute of Athens Helpdesk</md:Company>
-      <md:EmailAddress>helpdesk@teiath.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-210-5385149</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teiath.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teiath.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technological Educational Institute of Athens</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Athens</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teiath.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teiath.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Technological Educational Institute of Athens NOC</md:Company>
+    <md:EmailAddress>noc@teiath.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Technological Educational Institute of Athens Helpdesk</md:Company>
+    <md:EmailAddress>helpdesk@teiath.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-210-5385149</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
index 2598f72a..65ef6b80 100644
--- a/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teicrete.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chania.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmc.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epp.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teicrete.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Crete</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.teicrete.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.teicrete.gr/en</mdui:InformationURL>
+        <mdui:Logo height="350" width="76">https://www.nmc.teicrete.gr/sites/default/files/images/logo-teicrete-350x76.png</mdui:Logo>
+        <mdui:Logo height="80" width="60">https://www.nmc.teicrete.gr/sites/default/files/images/logo-teicrete-80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.nmc.teicrete.gr/sites/default/files/images/logo-teicrete-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>teicrete.gr</mdui:DomainHint>
+        <mdui:DomainHint>teiher.gr</mdui:DomainHint>
+        <mdui:IPHint>147.95.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:648:2c10::/48</mdui:IPHint>
+        <mdui:IPHint>194.177.198.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.48.0/24</mdui:IPHint>
+        <mdui:IPHint>193.92.145.243</mdui:IPHint>
+        <mdui:IPHint>194.219.126.50</mdui:IPHint>
+        <mdui:IPHint>62.1.154.40/29</mdui:IPHint>
+        <mdui:IPHint>213.16.245.205</mdui:IPHint>
+        <mdui:IPHint>194.219.117.209</mdui:IPHint>
+        <mdui:IPHint>62.1.154.200/29</mdui:IPHint>
+        <mdui:IPHint>193.92.77.232</mdui:IPHint>
+        <mdui:IPHint>62.1.195.171</mdui:IPHint>
+        <mdui:IPHint>193.92.28.48/28</mdui:IPHint>
+        <mdui:GeolocationHint>geo:35.318317,25.102108</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chania.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmc.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epp.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teicrete.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Technological Educational Institute of Crete</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.teicrete.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.teicrete.gr/en</mdui:InformationURL>
-          <mdui:Logo height="350" width="76">https://www.nmc.teicrete.gr/sites/default/files/images/logo-teicrete-350x76.png</mdui:Logo>
-          <mdui:Logo height="80" width="60">https://www.nmc.teicrete.gr/sites/default/files/images/logo-teicrete-80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.nmc.teicrete.gr/sites/default/files/images/logo-teicrete-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>teicrete.gr</mdui:DomainHint>
-          <mdui:DomainHint>teiher.gr</mdui:DomainHint>
-          <mdui:IPHint>147.95.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:648:2c10::/48</mdui:IPHint>
-          <mdui:IPHint>194.177.198.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.48.0/24</mdui:IPHint>
-          <mdui:IPHint>193.92.145.243</mdui:IPHint>
-          <mdui:IPHint>194.219.126.50</mdui:IPHint>
-          <mdui:IPHint>62.1.154.40/29</mdui:IPHint>
-          <mdui:IPHint>213.16.245.205</mdui:IPHint>
-          <mdui:IPHint>194.219.117.209</mdui:IPHint>
-          <mdui:IPHint>62.1.154.200/29</mdui:IPHint>
-          <mdui:IPHint>193.92.77.232</mdui:IPHint>
-          <mdui:IPHint>62.1.195.171</mdui:IPHint>
-          <mdui:IPHint>193.92.28.48/28</mdui:IPHint>
-          <mdui:GeolocationHint>geo:35.318317,25.102108</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDHDCCAgSgAwIBAgIJAIL7nMA9vRODMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
                             BAMTD2lkcC50ZWljcmV0ZS5ncjAeFw0xNDA0MTAxNTQ2NDlaFw0xOTEwMDExNTQ2
                             NDlaMBoxGDAWBgNVBAMTD2lkcC50ZWljcmV0ZS5ncjCCASIwDQYJKoZIhvcNAQEB
@@ -65,33 +65,33 @@
                             wWXCU5mHjk5tflcoFeQb6t9U97O62wXqfngJhbLoC8slL5btHwywdds9azTnYir1
                             5cjli40qHZcQIA/zp9rcWC4ZgUJefHCQM62M6DuQpWU=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teicrete.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teicrete.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teicrete.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teicrete.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teicrete.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teicrete.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chania.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmc.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epp.teicrete.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teicrete.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teicrete.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teicrete.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teicrete.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teicrete.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teicrete.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teicrete.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chania.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmc.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epp.teicrete.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teicrete.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDHDCCAgSgAwIBAgIJAIL7nMA9vRODMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
                             BAMTD2lkcC50ZWljcmV0ZS5ncjAeFw0xNDA0MTAxNTQ2NDlaFw0xOTEwMDExNTQ2
                             NDlaMBoxGDAWBgNVBAMTD2lkcC50ZWljcmV0ZS5ncjCCASIwDQYJKoZIhvcNAQEB
@@ -110,25 +110,25 @@
                             wWXCU5mHjk5tflcoFeQb6t9U97O62wXqfngJhbLoC8slL5btHwywdds9azTnYir1
                             5cjli40qHZcQIA/zp9rcWC4ZgUJefHCQM62M6DuQpWU=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teicrete.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teicrete.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technological Educational Institute of Crete</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Crete</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teicrete.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teicrete.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>TEI of Crete Network Management Center</md:SurName>
-      <md:EmailAddress>noc@teicrete.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teicrete.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teicrete.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technological Educational Institute of Crete</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Crete</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teicrete.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teicrete.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>TEI of Crete Network Management Center</md:SurName>
+    <md:EmailAddress>noc@teicrete.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
index 6db4b5ef..4c565f6c 100644
--- a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teikav.edu.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikav.edu.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Eastern Macedonia and Thrace</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.teiemt.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.teiemt.gr/</mdui:InformationURL>
+        <mdui:Logo width="83" height="83">https://idp.teikav.edu.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.130.92.0/23</mdui:IPHint>
+        <mdui:IPHint>195.130.94.0/24</mdui:IPHint>
+        <mdui:IPHint>83.212.92.0/23</mdui:IPHint>
+        <mdui:IPHint>83.212.94.0/24</mdui:IPHint>
+        <mdui:DomainHint>noc.teiemt.gr</mdui:DomainHint>
+        <mdui:DomainHint>teiemt.gr</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:40.9286958,24.3794714,137</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikav.edu.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Technological Educational Institute of Eastern Macedonia and Thrace</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.teiemt.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.teiemt.gr/</mdui:InformationURL>
-          <mdui:Logo width="83" height="83">https://idp.teikav.edu.gr/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>195.130.92.0/23</mdui:IPHint>
-          <mdui:IPHint>195.130.94.0/24</mdui:IPHint>
-          <mdui:IPHint>83.212.92.0/23</mdui:IPHint>
-          <mdui:IPHint>83.212.94.0/24</mdui:IPHint>
-          <mdui:DomainHint>noc.teiemt.gr</mdui:DomainHint>
-          <mdui:DomainHint>teiemt.gr</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:40.9286958,24.3794714,137</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEbzCCA1egAwIBAgIQFNuyHJki9S+B7LCfm+TiGDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYyNjAwMDAwMFoXDTE2MDYyNTIzNTk1OVowPzEhMB8GA1UE
@@ -55,26 +55,26 @@
                             9Gd9S8+S7i0jUNHK6iGX9EvV5VmjpzMY6/vdhoGpc+xuC0bX1Gjsml4HmcIrq25p
                             VkLGD8nhv01wEmNMTmDawlDlIxUq3l/cK/GuJL/8lVGLOjk=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teikav.edu.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikav.edu.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teikav.edu.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikav.edu.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEbzCCA1egAwIBAgIQFNuyHJki9S+B7LCfm+TiGDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYyNjAwMDAwMFoXDTE2MDYyNTIzNTk1OVowPzEhMB8GA1UE
@@ -100,25 +100,25 @@
                             9Gd9S8+S7i0jUNHK6iGX9EvV5VmjpzMY6/vdhoGpc+xuC0bX1Gjsml4HmcIrq25p
                             VkLGD8nhv01wEmNMTmDawlDlIxUq3l/cK/GuJL/8lVGLOjk=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teikav.edu.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teikav.edu.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kalliopi</md:GivenName>
-      <md:SurName>Sotiropoulou</md:SurName>
-      <md:EmailAddress>lsotir@teikav.edu.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teikav.edu.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teikav.edu.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kalliopi</md:GivenName>
+    <md:SurName>Sotiropoulou</md:SurName>
+    <md:EmailAddress>lsotir@teikav.edu.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml
index 3e756345..7612782f 100644
--- a/swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teikoz.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikoz.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikoz.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEvjCCA6agAwIBAgIQSZIpUYIhvsE2nmtnqM1U4zANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEwMDkwNzAwMDAwMFoXDTEzMDkwNjIzNTk1OVowgYoxCzAJBgNV
@@ -46,26 +46,26 @@
                             Jw1tFiMPZxGygx7LwN5NP6z2d85J19w8mB87I0HA4C2dk9NeR02KWkHEQkiX6nQs
                             MxqUW2tYH/WvrKHC2snqJzMW
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikoz.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikoz.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teikoz.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikoz.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikoz.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikoz.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikoz.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikoz.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikoz.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teikoz.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikoz.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikoz.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikoz.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teikoz.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEvjCCA6agAwIBAgIQSZIpUYIhvsE2nmtnqM1U4zANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEwMDkwNzAwMDAwMFoXDTEzMDkwNjIzNTk1OVowgYoxCzAJBgNV
@@ -93,30 +93,30 @@
                             Jw1tFiMPZxGygx7LwN5NP6z2d85J19w8mB87I0HA4C2dk9NeR02KWkHEQkiX6nQs
                             MxqUW2tYH/WvrKHC2snqJzMW
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikoz.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikoz.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technological Educational Institute of Western Macedonia</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Μακεδονίας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Western Macedonia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Μακεδονίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teikoz.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teikoz.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Technological Educational Institute of Western Macedonia</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Technological Educational Institute of Western Macedonia</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikoz.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikoz.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technological Educational Institute of Western Macedonia</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Μακεδονίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Western Macedonia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Μακεδονίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teikoz.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teikoz.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Technological Educational Institute of Western Macedonia</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Technological Educational Institute of Western Macedonia</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
index 3a1adcf4..13ee7cf7 100644
--- a/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teilam.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teilam.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.teiste.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.teiste.gr/</mdui:InformationURL>
+        <mdui:Logo width="83" height="81">https://idp.teilam.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.130.78.0/23</mdui:IPHint>
+        <mdui:IPHint>195.251.56.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:648:2570::/48</mdui:IPHint>
+        <mdui:DomainHint>teiste.gr</mdui:DomainHint>
+        <mdui:DomainHint>teilam.gr</mdui:DomainHint>
+        <mdui:GeolocationHint>38.875331,22.437969</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teilam.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.teiste.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.teiste.gr/</mdui:InformationURL>
-          <mdui:Logo width="83" height="81">https://idp.teilam.gr/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>195.130.78.0/23</mdui:IPHint>
-          <mdui:IPHint>195.251.56.0/23</mdui:IPHint>
-          <mdui:IPHint>2001:648:2570::/48</mdui:IPHint>
-          <mdui:DomainHint>teiste.gr</mdui:DomainHint>
-          <mdui:DomainHint>teilam.gr</mdui:DomainHint>
-          <mdui:GeolocationHint>38.875331,22.437969</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEaDCCA1CgAwIBAgIRAM3kgGW3woyn1JTbV2Kj1uAwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
@@ -54,26 +54,26 @@
                             h2BHO2FTwpCucZsAUoUqGjDZ68PnCCaBghHeF5BfI/gAZI9lXpv7Ge0C8JZc8HSV
                             TviBthB5PYt5hjK8thpyYqZSKFUJF8iCqZqO2g==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teilam.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teilam.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teilam.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teilam.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teilam.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teilam.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teilam.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teilam.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teilam.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teilam.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEaDCCA1CgAwIBAgIRAM3kgGW3woyn1JTbV2Kj1uAwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
@@ -99,31 +99,31 @@
                             h2BHO2FTwpCucZsAUoUqGjDZ68PnCCaBghHeF5BfI/gAZI9lXpv7Ge0C8JZc8HSV
                             TviBthB5PYt5hjK8thpyYqZSKFUJF8iCqZqO2g==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teilam.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teilam.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Achilleas</md:GivenName>
-      <md:SurName>Likotseas</md:SurName>
-      <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Technological Educational Insitute of Lamia</md:Company>
-      <md:GivenName>Achilleas</md:GivenName>
-      <md:SurName>Likotseas</md:SurName>
-      <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teilam.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teilam.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Achilleas</md:GivenName>
+    <md:SurName>Likotseas</md:SurName>
+    <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Technological Educational Insitute of Lamia</md:Company>
+    <md:GivenName>Achilleas</md:GivenName>
+    <md:SurName>Likotseas</md:SurName>
+    <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml
index 493084b8..c19fa861 100644
--- a/swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teimes.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teimes.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teimes.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZzCCA0+gAwIBAgIQVdiu+LQ1e98NKDokhhkKcDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOzEhMB8GA1UE
@@ -44,26 +44,26 @@
                             l2JbcEBafD9Vw3PvU7npUD0zCKoGxXOIS/euILZpRZpPpl0/P4eeGoF0mPn9yAjk
                             oM+F3tyjZKVbapPixpkTOQrfv21F08UOTAVV
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teimes.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teimes.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teimes.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teimes.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teimes.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teimes.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teimes.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teimes.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teimes.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teimes.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teimes.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teimes.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teimes.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teimes.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZzCCA0+gAwIBAgIQVdiu+LQ1e98NKDokhhkKcDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOzEhMB8GA1UE
@@ -89,29 +89,29 @@
                             l2JbcEBafD9Vw3PvU7npUD0zCKoGxXOIS/euILZpRZpPpl0/P4eeGoF0mPn9yAjk
                             oM+F3tyjZKVbapPixpkTOQrfv21F08UOTAVV
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teimes.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teimes.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technological Educational Institute of Western Greece</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Ελλάδας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Western Greece</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Ελλάδας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teimes.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teimes.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Ilaridis</md:SurName>
-      <md:EmailAddress>noc@teimes.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Technological Educational Institute of Messolonghi Helpdesk</md:Company>
-      <md:EmailAddress>helpdesk@teimes.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teimes.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teimes.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technological Educational Institute of Western Greece</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Ελλάδας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Western Greece</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Ελλάδας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teimes.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teimes.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Ilaridis</md:SurName>
+    <md:EmailAddress>noc@teimes.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Technological Educational Institute of Messolonghi Helpdesk</md:Company>
+    <md:EmailAddress>helpdesk@teimes.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml
index 1a80af37..03aba043 100644
--- a/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teipir.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teipir.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Piraeus University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Ανώτατο Εκπαιδευτικό Ίδρυμα Πειραιά Τεχνολογικού Τομέα</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.teipir.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.teipir.gr/</mdui:InformationURL>
+        <mdui:Logo height="83" width="81">https://idp.teipir.gr/idp/images/dummylogo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>noc.teipir.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.64.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.978971,23.674666</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teipir.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Piraeus University of Applied Sciences</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Ανώτατο Εκπαιδευτικό Ίδρυμα Πειραιά Τεχνολογικού Τομέα</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.teipir.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.teipir.gr/</mdui:InformationURL>
-          <mdui:Logo height="83" width="81">https://idp.teipir.gr/idp/images/dummylogo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>noc.teipir.gr</mdui:DomainHint>
-          <mdui:IPHint>195.251.64.0/19</mdui:IPHint>
-          <mdui:GeolocationHint>geo:37.978971,23.674666</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZzCCA0+gAwIBAgIQeIOp00euUnoH7TSY6j9/TDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYwNTAwMDAwMFoXDTE2MDYwNDIzNTk1OVowOzEhMB8GA1UE
@@ -51,26 +51,26 @@
                             VN8zaPiZhqYc5v5inUcXsY66dHRQVmo8WeBf47tWka6FeKnxvdPJA8euG0ZmNEtt
                             o75PCMgbJ2on+1RDqRfAB1iHjM+BSVS2+Hlz
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teipir.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teipir.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teipir.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teipir.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teipir.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teipir.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teipir.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teipir.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teipir.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.teipir.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teipir.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teipir.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teipir.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teipir.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZzCCA0+gAwIBAgIQeIOp00euUnoH7TSY6j9/TDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYwNTAwMDAwMFoXDTE2MDYwNDIzNTk1OVowOzEhMB8GA1UE
@@ -96,29 +96,29 @@
                             VN8zaPiZhqYc5v5inUcXsY66dHRQVmo8WeBf47tWka6FeKnxvdPJA8euG0ZmNEtt
                             o75PCMgbJ2on+1RDqRfAB1iHjM+BSVS2+Hlz
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teipir.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teipir.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technological Educational Institute of Piraeus</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Πειραιά</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Piraeus</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Πειραιά</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teipir.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.teipir.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christina</md:GivenName>
-      <md:SurName>Avgerinou</md:SurName>
-      <md:EmailAddress>xristina@teipir.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Technological Educational Institute of Piraeus Helpdesk</md:Company>
-      <md:EmailAddress>helpdesk@teipir.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teipir.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teipir.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technological Educational Institute of Piraeus</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Πειραιά</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Piraeus</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Πειραιά</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teipir.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.teipir.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christina</md:GivenName>
+    <md:SurName>Avgerinou</md:SurName>
+    <md:EmailAddress>xristina@teipir.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Technological Educational Institute of Piraeus Helpdesk</md:Company>
+    <md:EmailAddress>helpdesk@teipir.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
index b1795d45..686cf3d9 100644
--- a/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.telecom-bretagne.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-10T18:09:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-10T18:09:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-bretagne.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Télécom Bretagne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB2UlEQVQ4y8WSy2qTQRiGn5nMn/+UNAdJTUqhWkUQMW4kKAgWvIPsvRMvIrhz5Q24yUZXBXHl0o20QlB7SENTIglJ/mPmHxcxIDaLduW7mnmH5/m+xQhjTG9/f3/Tsd2UaySMQmtv7/lQdbvdSrvdLhb9IiCuLJhMx3Q6nVSpnMJ3C7iuhxBXFyRpQt6ykcup4lowSwIACbBi10mE+EcuBAixZIRBARizfDOrw1+51P25r2p5rb3X5P8LlNaaKApRSnL5HwjArAWjKCJNU1St1uDZ0xc4roNBo02ClDYSgTEaKXJkJsUIgRAWxiRgJME8ZGd7F6HN0ej7j25VWR62tUW10mI8+UwQnZO3qoTxCb57C4lkMu9Rq7ZY6Iw4GdKo3/mlkvQr/Yu3eO5tHKdOEB9yOniH62+z4T3iqP+arfpLZuExs/kBP8/eUC42GYze88R5hYyzKePpIafnHxhNviClw0LPmM37eN4uBkk+V8HJNyj4d9koPqDo32ehp2AkKssygjhECjBaUyo0KZceE8QDpvNvSDxy0iaKzsjQ3Ci18J0dsoVgoWOENge94fjTpq2s1LVvkrN2yBYDdJbh5msEyTFu/iFan5DogJwU2OoeF+OPVq3cHP4Gre7EahqxpVsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDDH7d3lAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwtrBlWQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.telecom-bretagne.eu/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Télécom Bretagne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-bretagne.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Télécom Bretagne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB2UlEQVQ4y8WSy2qTQRiGn5nMn/+UNAdJTUqhWkUQMW4kKAgWvIPsvRMvIrhz5Q24yUZXBXHl0o20QlB7SENTIglJ/mPmHxcxIDaLduW7mnmH5/m+xQhjTG9/f3/Tsd2UaySMQmtv7/lQdbvdSrvdLhb9IiCuLJhMx3Q6nVSpnMJ3C7iuhxBXFyRpQt6ykcup4lowSwIACbBi10mE+EcuBAixZIRBARizfDOrw1+51P25r2p5rb3X5P8LlNaaKApRSnL5HwjArAWjKCJNU1St1uDZ0xc4roNBo02ClDYSgTEaKXJkJsUIgRAWxiRgJME8ZGd7F6HN0ej7j25VWR62tUW10mI8+UwQnZO3qoTxCb57C4lkMu9Rq7ZY6Iw4GdKo3/mlkvQr/Yu3eO5tHKdOEB9yOniH62+z4T3iqP+arfpLZuExs/kBP8/eUC42GYze88R5hYyzKePpIafnHxhNviClw0LPmM37eN4uBkk+V8HJNyj4d9koPqDo32ehp2AkKssygjhECjBaUyo0KZceE8QDpvNvSDxy0iaKzsjQ3Ci18J0dsoVgoWOENge94fjTpq2s1LVvkrN2yBYDdJbh5msEyTFu/iFan5DogJwU2OoeF+OPVq3cHP4Gre7EahqxpVsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDDH7d3lAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwtrBlWQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.telecom-bretagne.eu/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Télécom Bretagne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
 MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
@@ -38,23 +38,23 @@ BqA6X8hXjbPat/Ry48AOmlkbSSuPKbc8Ij78VcDg9HlAurDJ8lyPKL72VBJdT0JY
 f7EOBt1e8Cf7GwVdtvHq3LW88y9UTshQMpZtNxk9lXr6FMwcMG0wM1aOn5HRlGSs
 bm2IAM4xlcyiwzG22vG6NmR4y7NYNG9q6YyiOw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-bretagne.eu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-bretagne.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-bretagne.eu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-bretagne.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
 MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
@@ -74,19 +74,19 @@ BqA6X8hXjbPat/Ry48AOmlkbSSuPKbc8Ij78VcDg9HlAurDJ8lyPKL72VBJdT0JY
 f7EOBt1e8Cf7GwVdtvHq3LW88y9UTshQMpZtNxk9lXr6FMwcMG0wM1aOn5HRlGSs
 bm2IAM4xlcyiwzG22vG6NmR4y7NYNG9q6YyiOw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Télécom Bretagne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Télécom Bretagne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.telecom-bretagne.eu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>idp-contact@telecom-bretagne.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Télécom Bretagne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Télécom Bretagne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.telecom-bretagne.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idp-contact@telecom-bretagne.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
index 4cec22f0..79725acf 100644
--- a/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.telecom-lille1.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-04T10:53:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-04T10:53:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille1.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Telecom Lille1</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABFklEQVQ4y82Su0oDYRCFv/k3m0WJMRcDATWQRovghViIjdpaWlhZmpfwJWziEwg2PoIvIDZiZZpgkVJkgxEWdS9jscHddLJr4cA0c5gPZs4B0Az9AfQBCmQrBzgDPmVKzFpeXkBociwD8HeA/TrsVgWAxQKcdwynrYS/XhL6XcNl19CeSwA/LpysWrwHyv1Y2asJvU3Dy6tyPQLbgosNw1FLEGDZEY7vwllA0Yq9AajYsKDC11TtlISVsuD74IXQLEPNBtdPAQYTxQtiQ54mysM4YuTG2uObcvUc0VszgHIzjHD95AwFdMlBq8UkbTsV0fb8bAIPG6IHDUnPgv+RAy8PwALqwBZgZ9hXC7gFmsB2+qm/7OAb/y9ptHSlOm8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDArMDI6MDBQcszMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQwKzAyOjAwIS90cAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.telecom-lille.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Telecom Lille1</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille1.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Telecom Lille1</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABFklEQVQ4y82Su0oDYRCFv/k3m0WJMRcDATWQRovghViIjdpaWlhZmpfwJWziEwg2PoIvIDZiZZpgkVJkgxEWdS9jscHddLJr4cA0c5gPZs4B0Az9AfQBCmQrBzgDPmVKzFpeXkBociwD8HeA/TrsVgWAxQKcdwynrYS/XhL6XcNl19CeSwA/LpysWrwHyv1Y2asJvU3Dy6tyPQLbgosNw1FLEGDZEY7vwllA0Yq9AajYsKDC11TtlISVsuD74IXQLEPNBtdPAQYTxQtiQ54mysM4YuTG2uObcvUc0VszgHIzjHD95AwFdMlBq8UkbTsV0fb8bAIPG6IHDUnPgv+RAy8PwALqwBZgZ9hXC7gFmsB2+qm/7OAb/y9ptHSlOm8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDArMDI6MDBQcszMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQwKzAyOjAwIS90cAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.telecom-lille.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Telecom Lille1</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
 NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
@@ -38,23 +38,23 @@ SoP9I+z1FYAuXjOeKazq+UY3jbiSx/UDBAA0g7FHkzJRaFiws0BZiiOkqPMHLGlB
 cjxHOjLM8xkrkI3+w28uv1nrNWH82728WeyMt5PWqVTyKg8SjPViZWusJF0KUkS/
 /jKovrhBMghl87+BWkzQTRzSyw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-lille1.eu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille1.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-lille1.eu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille1.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
 NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
@@ -74,24 +74,24 @@ SoP9I+z1FYAuXjOeKazq+UY3jbiSx/UDBAA0g7FHkzJRaFiws0BZiiOkqPMHLGlB
 cjxHOjLM8xkrkI3+w28uv1nrNWH82728WeyMt5PWqVTyKg8SjPViZWusJF0KUkS/
 /jKovrhBMghl87+BWkzQTRzSyw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-lille1.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Telecom Lille1</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Telecom Lille1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.telecom-lille.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Landru</md:SurName>
-      <md:EmailAddress>jacques.landru@telecom-lille1.eu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sion</md:SurName>
-      <md:EmailAddress>martine.sion@telecom-lille1.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-lille1.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Telecom Lille1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Telecom Lille1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.telecom-lille.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Landru</md:SurName>
+    <md:EmailAddress>jacques.landru@telecom-lille1.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sion</md:SurName>
+    <md:EmailAddress>martine.sion@telecom-lille1.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
index fc80cba5..ce1910fc 100644
--- a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.telecom-paristech.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-06T11:36:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-06T11:36:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Télécom ParisTech</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAClUlEQVQoz4XLXU9SYRwA8P/zclBAQJ04DUMXIlijCdnWXZlZF3Zh6ypqtfVyWZfd1mprq5u+Qptld7VydVWtGjNz6UxJRbQxjxxOAqLAgXM4z3mePoK/+x/aSG/M/ZyjlMJBmMVisRhNJpPxa3EXuA8MFShPvZqihFI7ODv9nQcG2AJKKAWAOmh6TQcEhBKEEMbY0A0qSZZlEYLNhkkpJYRUoAwAlFvW9as3PB63YRjFQlHTaoqiTFyeWF9L9fb1ybIcOR5Jp9ZzOTU6PMQ5pwDAOaeSNBAKffn0+cRwrPK1Eg6HmyTb6uqa3+9f+LVw687NYnHXbm9mjJH4lfiH6Y+GYXR3dwmAXr+/2d7c3t6eyymhcNg0zWgsmslkJl9M6oY+EBqgCOPEbMLn9RXyhUB///t30/md/PLv5UbD7PDKwWAw8T2hqurYhbFsNgsAFADs4JAkye1xb8tyoD/g6+kpl/cD/YG90h5GaGR0RKtWS6W90XOj3OJUCF4HjTG2mlw1TTO7nWWMMWYtLS5xi2OCKaWcc0mSqpXqs+dPaYvLNTZ+0elwCM65YSIbRRgD54hSbjJEMMLY0g3AuF6vu9takZFRtfkUooS0OFxno7WZFXO/InW1acm/rkiw8W+3Jitdl0YbalFwwQQjd8+My49f1lOKvpHTt1T54WtTqwlLrN9+YOv1F6a+7b6dzT56U1OU9L0nzacGsQCur+X2fyxVl9KkvaWxWSjP/3Ec7SPQ0uTroD1tredjtkiH8+QABiciBHOTNeoZs7RjKVXnsSOd98ebOrzaWgaBTXBh5PLCEp7TQ56RIQGGYAxpm/L+wgoimNod9t5DdVklmNoOe6vJTU90UMsqQmtgm+Qc7CvNLLoiwf/9YlMHLNeSiwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMMft3eUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDC2sGVZAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.telecom-paristech.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Télécom ParisTech</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Télécom ParisTech</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAClUlEQVQoz4XLXU9SYRwA8P/zclBAQJ04DUMXIlijCdnWXZlZF3Zh6ypqtfVyWZfd1mprq5u+Qptld7VydVWtGjNz6UxJRbQxjxxOAqLAgXM4z3mePoK/+x/aSG/M/ZyjlMJBmMVisRhNJpPxa3EXuA8MFShPvZqihFI7ODv9nQcG2AJKKAWAOmh6TQcEhBKEEMbY0A0qSZZlEYLNhkkpJYRUoAwAlFvW9as3PB63YRjFQlHTaoqiTFyeWF9L9fb1ybIcOR5Jp9ZzOTU6PMQ5pwDAOaeSNBAKffn0+cRwrPK1Eg6HmyTb6uqa3+9f+LVw687NYnHXbm9mjJH4lfiH6Y+GYXR3dwmAXr+/2d7c3t6eyymhcNg0zWgsmslkJl9M6oY+EBqgCOPEbMLn9RXyhUB///t30/md/PLv5UbD7PDKwWAw8T2hqurYhbFsNgsAFADs4JAkye1xb8tyoD/g6+kpl/cD/YG90h5GaGR0RKtWS6W90XOj3OJUCF4HjTG2mlw1TTO7nWWMMWYtLS5xi2OCKaWcc0mSqpXqs+dPaYvLNTZ+0elwCM65YSIbRRgD54hSbjJEMMLY0g3AuF6vu9takZFRtfkUooS0OFxno7WZFXO/InW1acm/rkiw8W+3Jitdl0YbalFwwQQjd8+My49f1lOKvpHTt1T54WtTqwlLrN9+YOv1F6a+7b6dzT56U1OU9L0nzacGsQCur+X2fyxVl9KkvaWxWSjP/3Ec7SPQ0uTroD1tredjtkiH8+QABiciBHOTNeoZs7RjKVXnsSOd98ebOrzaWgaBTXBh5PLCEp7TQ56RIQGGYAxpm/L+wgoimNod9t5DdVklmNoOe6vJTU90UMsqQmtgm+Qc7CvNLLoiwf/9YlMHLNeSiwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMMft3eUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDC2sGVZAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.telecom-paristech.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Télécom ParisTech</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
 ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
@@ -39,24 +39,24 @@ hx8qX90cpGu6iYMPfbu+Dl+dFRxJkNY5SGbNGHvv9ZH3FF7f5cN7R8BtWVgo0rTR
 DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
 4QsS7+VwhxDRJdfBoQvr3mrm+hxwrCDEGlU3qCaenA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-paristech.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-paristech.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
 ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
@@ -76,19 +76,19 @@ hx8qX90cpGu6iYMPfbu+Dl+dFRxJkNY5SGbNGHvv9ZH3FF7f5cN7R8BtWVgo0rTR
 DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
 4QsS7+VwhxDRJdfBoQvr3mrm+hxwrCDEGlU3qCaenA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-paristech.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Télécom ParisTech</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Télécom ParisTech</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.telecom-paristech.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@enst.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-paristech.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Télécom ParisTech</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Télécom ParisTech</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.telecom-paristech.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@enst.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml b/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml
index 1715c5f3..6c227bb1 100644
--- a/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml
+++ b/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.test.semantico.net/shibboleth2">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">semantico.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">semantico.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAIyYxXXjcwpmMCFZpfaDBhgqPRVKMA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFmlkcC50ZXN0LnNlbWFudGljby5uZXQwHhcNMTIxMjE3
 						MTIxMzA0WhcNMzIxMjE3MTIxMzA0WjAhMR8wHQYDVQQDExZpZHAudGVzdC5zZW1h
@@ -35,26 +35,26 @@
 						Vs90fU3mVYcbKg96GRsKinrEORtN8bFhXVTTV385hPcoU+HA7FrAz+EnEWVSTISm
 						jZeiXwxR2EOo28vKTTG7Ytp8H4ueb9NI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.semantico.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.semantico.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.test.semantico.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.semantico.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.semantico.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.semantico.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">semantico.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.semantico.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.semantico.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.test.semantico.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.semantico.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.semantico.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.semantico.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">semantico.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAIyYxXXjcwpmMCFZpfaDBhgqPRVKMA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFmlkcC50ZXN0LnNlbWFudGljby5uZXQwHhcNMTIxMjE3
 						MTIxMzA0WhcNMzIxMjE3MTIxMzA0WjAhMR8wHQYDVQQDExZpZHAudGVzdC5zZW1h
@@ -74,25 +74,25 @@
 						Vs90fU3mVYcbKg96GRsKinrEORtN8bFhXVTTV385hPcoU+HA7FrAz+EnEWVSTISm
 						jZeiXwxR2EOo28vKTTG7Ytp8H4ueb9NI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.semantico.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.semantico.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Federation Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:test-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:test-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.semantico.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.semantico.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Federation Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:test-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:test-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
index 563abae7..482d7a69 100644
--- a/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ths.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description>
+        <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description>
-          <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
 MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -38,13 +38,13 @@ wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
 r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
 GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
 MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -63,13 +63,13 @@ WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
 0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
 58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
 MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -88,25 +88,25 @@ UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
 SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
 xAdB19mh1plahNrAaEfu6Ldetyz9iulY
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
 MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -125,13 +125,13 @@ wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
 r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
 GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
 MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -150,13 +150,13 @@ WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
 0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
 58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
 MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -175,26 +175,26 @@ UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
 SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
 xAdB19mh1plahNrAaEfu6Ldetyz9iulY
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">THS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Teologiska högskolan Stockholm</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Stockholm School of Theology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ths.se/english</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.ths.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Owe</md:GivenName>
-      <md:SurName>Kennerberg</md:SurName>
-      <md:EmailAddress>mailto:owe.kennerberg@ths.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Säll</md:SurName>
-      <md:EmailAddress>mailto:peter@jhsupport.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">THS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Teologiska högskolan Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Theology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ths.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ths.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Owe</md:GivenName>
+    <md:SurName>Kennerberg</md:SurName>
+    <md:EmailAddress>mailto:owe.kennerberg@ths.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Säll</md:SurName>
+    <md:EmailAddress>mailto:peter@jhsupport.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml
index 7fe72ebc..824c11be 100644
--- a/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.totton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-07-04T18:55:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-07-04T18:55:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">totton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">totton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFbTCCBFWgAwIBAgIQcYa5PMnn8T0HjxfLbT0gKjANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMDQyNDAwMDAwMFoXDTE2MDQyMzIzNTk1OVowPjEhMB8GA1UE
@@ -44,27 +44,27 @@
 						P5YGhDQ7w1d5X4AaI29sdjFGDis3V47zw5rWuqHMR3CkD+J4OWLXmSmuXtnQj4TX
 						xw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.totton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.totton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.totton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.totton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">totton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.totton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.totton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.totton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.totton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">totton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFbTCCBFWgAwIBAgIQcYa5PMnn8T0HjxfLbT0gKjANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMDQyNDAwMDAwMFoXDTE2MDQyMzIzNTk1OVowPjEhMB8GA1UE
@@ -96,28 +96,28 @@
 						P5YGhDQ7w1d5X4AaI29sdjFGDis3V47zw5rWuqHMR3CkD+J4OWLXmSmuXtnQj4TX
 						xw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Totton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Totton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.totton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Dawson</md:SurName>
-      <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Dawson</md:SurName>
-      <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Totton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Totton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.totton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Dawson</md:SurName>
+    <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Dawson</md:SurName>
+    <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tower.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.tower.ac.uk-openathens.xml
index b9d5fc3e..7177d736 100644
--- a/swamid-interfederations-2.0/idp.tower.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.tower.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tower.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tower.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tower.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/tower.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/tower.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tower Hamlets College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tower.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/tower.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/tower.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tower Hamlets College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tower.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml
index e81fcab6..4bea07bc 100644
--- a/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.treloar.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T12:44:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T12:44:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">treloar.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">treloar.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjACCQCcvr4PTH7CrzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
 						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
 						VHJlbG9hciBUcnVzdDEbMBkGA1UEAwwSaWRwLnRyZWxvYXIub3JnLnVrMB4XDTEz
@@ -32,26 +32,26 @@
 						UqFi0xw+GHyhgvqkcJ+dCRyi3BBD12URWsVCL4Yeyl6BeD7prS6Lh+nVzWX812yY
 						0zSsNXVMidAIgjgaNV0kJgK3D9QF2IVjRA0Atw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.treloar.org.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.treloar.org.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.treloar.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.treloar.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">treloar.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.treloar.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.treloar.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.treloar.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.treloar.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">treloar.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjACCQCcvr4PTH7CrzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
 						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
 						VHJlbG9hciBUcnVzdDEbMBkGA1UEAwwSaWRwLnRyZWxvYXIub3JnLnVrMB4XDTEz
@@ -71,25 +71,25 @@
 						UqFi0xw+GHyhgvqkcJ+dCRyi3BBD12URWsVCL4Yeyl6BeD7prS6Lh+nVzWX812yY
 						0zSsNXVMidAIgjgaNV0kJgK3D9QF2IVjRA0Atw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Treloar Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Treloar's</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.treloar.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Overt Software</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Treloar Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Treloar's</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.treloar.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Overt Software</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml
index 9e72abda..a7ab81bb 100644
--- a/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tresham.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-22T08:15:19Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-22T08:15:19Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tresham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tresham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDojCCAooCCQC38OS+e7lEUzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
 						R0IxGTAXBgNVBAgMEE5vcnRoYW1wdG9uc2hpcmUxEjAQBgNVBAcMCUtldHRlcmlu
 						ZzE4MDYGA1UECgwvVHJlc2hhbSBDb2xsZWdlIG9mIEZ1cnRoZXIgYW5kIEhpZ2hl
@@ -32,29 +32,29 @@
 						6T7XDYHlahNcl1lrv1oMxKfQDO8ISaLr/BREEmKQBKOpZpxfrJ0ISW5f60ndYkRr
 						Zta8/DXmlXmxEaTCt9czo3528Y0HQQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tresham.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tresham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tresham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tresham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDojCCAooCCQC38OS+e7lEUzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
 						R0IxGTAXBgNVBAgMEE5vcnRoYW1wdG9uc2hpcmUxEjAQBgNVBAcMCUtldHRlcmlu
 						ZzE4MDYGA1UECgwvVHJlc2hhbSBDb2xsZWdlIG9mIEZ1cnRoZXIgYW5kIEhpZ2hl
@@ -76,27 +76,27 @@
 						6T7XDYHlahNcl1lrv1oMxKfQDO8ISaLr/BREEmKQBKOpZpxfrJ0ISW5f60ndYkRr
 						Zta8/DXmlXmxEaTCt9czo3528Y0HQQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tresham College of Further and Higher Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tresham College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tresham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stuart</md:GivenName>
-      <md:SurName>Mewes</md:SurName>
-      <md:EmailAddress>mailto:smewes@tresham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Foster</md:SurName>
-      <md:EmailAddress>mailto:mfoster@tresham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tresham College of Further and Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tresham College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tresham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stuart</md:GivenName>
+    <md:SurName>Mewes</md:SurName>
+    <md:EmailAddress>mailto:smewes@tresham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Foster</md:SurName>
+    <md:EmailAddress>mailto:mfoster@tresham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.trinity-cm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.trinity-cm.ac.uk-shibboleth.xml
index 988a3496..344a3e80 100644
--- a/swamid-interfederations-2.0/idp.trinity-cm.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.trinity-cm.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.trinity-cm.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsd.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsd.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/tsd.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/tsd.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wales Trinity Saint David: Carmarthen / Lampeter</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.trinitysaintdavid.ac.uk/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/tsd.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/tsd.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wales Trinity Saint David: Carmarthen / Lampeter</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.trinitysaintdavid.ac.uk/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml
index 132c08f0..6ae7cab6 100644
--- a/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ttk.mta.hu/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+        <saml:AttributeValue>ttkmta</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-test</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-          <saml:AttributeValue>ttkmta</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Természettudományi Kutatóközpont</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MTA Research Centre for  Natural Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA Természettudományi Kutatóközpont</mdui:Description>
+        <mdui:Description xml:lang="en">MTA Research Centre for  Natural Sciences</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">http://www.ttk.mta.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://www.ttk.mta.hu/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="71" width="64">http://www.ttk.mta.hu/wp-content/themes/mtattk/images/mta-ttk-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">MTA Természettudományi Kutatóközpont</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">MTA Research Centre for  Natural Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">MTA Természettudományi Kutatóközpont</mdui:Description>
-          <mdui:Description xml:lang="en">MTA Research Centre for  Natural Sciences</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">http://www.ttk.mta.hu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://www.ttk.mta.hu/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="71" width="64">http://www.ttk.mta.hu/wp-content/themes/mtattk/images/mta-ttk-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoXDTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJHzuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JIl9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaTfxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3zTDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGjYzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsubXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGnSUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBDLCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCAhOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoXDTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJHzuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JIl9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaTfxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3zTDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGjYzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsubXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGnSUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBDLCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCAhOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA Természettudományi Kutatóközpont</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">MTA Research Centre for  Natural Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA Természettudományi Kutatóközpont</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">MTA Research Centre for  Natural Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">www.ttk.mta.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">www.ttk.mta.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>MTA TTK AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@ttk.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>MTA TTK AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@ttk.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>MTA TTK AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@mta.ttk.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoXDTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJHzuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JIl9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaTfxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3zTDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGjYzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsubXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGnSUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBDLCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCAhOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoXDTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJHzuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JIl9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaTfxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3zTDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGjYzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsubXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGnSUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBDLCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCAhOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA Természettudományi Kutatóközpont</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">MTA Research Centre for  Natural Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA Természettudományi Kutatóközpont</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">MTA Research Centre for  Natural Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">www.ttk.mta.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">www.ttk.mta.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>MTA TTK AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@ttk.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>MTA TTK AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@ttk.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>MTA TTK AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@mta.ttk.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml
index 82face8b..06690610 100644
--- a/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-clausthal.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-01-23T11:26:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-01-23T11:26:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Technische Universität Clausthal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Technische Universität Clausthal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider fuer TU Clausthal</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider fuer TU Clausthal</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.tu-clausthal.de/idp/images/tu-clausthal-klein.gif</mdui:Logo>
+        <mdui:Logo height="64" width="344">https://idp.tu-clausthal.de/idp/images/tu-clausthal.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.tu-clausthal.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.tu-clausthal.de/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Technische Universität Clausthal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Technische Universität Clausthal</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider fuer TU Clausthal</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider fuer TU Clausthal</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.tu-clausthal.de/idp/images/tu-clausthal-klein.gif</mdui:Logo>
-          <mdui:Logo height="64" width="344">https://idp.tu-clausthal.de/idp/images/tu-clausthal.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.tu-clausthal.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.tu-clausthal.de/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,L=Clausthal,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGFjCCBP6gAwIBAgIHGYPBFL1P5DANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,L=Clausthal,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGFjCCBP6gAwIBAgIHGYPBFL1P5DANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
 BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
 bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
 IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
@@ -64,32 +64,32 @@ QdDf7Xyhyu/vmDAwaCd2ltaKfk/cxieJPdIFjGowQZfXJ93W62e2yOi/vNthBfTh
 yOLfr414njnVFq83qB9rXvRkyllzFCMiFipjedH8NBlr/H9eLMTxhOrTyVrDUZtA
 +A9Tm6pmSCWUc89MfO/PCoexbG5rxNoaedI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-clausthal.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,L=Clausthal,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGFjCCBP6gAwIBAgIHGYPBFL1P5DANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-clausthal.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,L=Clausthal,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGFjCCBP6gAwIBAgIHGYPBFL1P5DANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
 BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
 bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
 IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
@@ -123,31 +123,31 @@ QdDf7Xyhyu/vmDAwaCd2ltaKfk/cxieJPdIFjGowQZfXJ93W62e2yOi/vNthBfTh
 yOLfr414njnVFq83qB9rXvRkyllzFCMiFipjedH8NBlr/H9eLMTxhOrTyVrDUZtA
 +A9Tm6pmSCWUc89MfO/PCoexbG5rxNoaedI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e291</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e291</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Technische Universität Clausthal</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Technische Universität Clausthal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.tu-clausthal.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.tu-clausthal.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alexander</md:GivenName>
-      <md:SurName>Hasenfuß</md:SurName>
-      <md:EmailAddress>mailto:hasenfuss@rz.tu-clausthal.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alexander</md:GivenName>
-      <md:SurName>Hasenfuß</md:SurName>
-      <md:EmailAddress>mailto:hasenfuss@rz.tu-clausthal.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e291</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e291</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität Clausthal</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Technische Universität Clausthal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.tu-clausthal.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tu-clausthal.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alexander</md:GivenName>
+    <md:SurName>Hasenfuß</md:SurName>
+    <md:EmailAddress>mailto:hasenfuss@rz.tu-clausthal.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alexander</md:GivenName>
+    <md:SurName>Hasenfuß</md:SurName>
+    <md:EmailAddress>mailto:hasenfuss@rz.tu-clausthal.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml
index d0d9dd50..b51fb5cc 100644
--- a/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tuc.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuc.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technical University of Crete</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Πολυτεχνείο Κρήτης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.tuc.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.tuc.gr/</mdui:InformationURL>
+        <mdui:Logo height="100" width="160">https://www.tuc.gr/fileadmin/logo/tuc_logo_100x160.png</mdui:Logo>
+        <mdui:Logo height="50" width="80">https://www.tuc.gr/fileadmin/logo/tuc_logo_50x80.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>tuc.gr</mdui:DomainHint>
+        <mdui:IPHint>147.27.0.0/16</mdui:IPHint>
+        <mdui:GeolocationHint>geo:35.528840,24.068557</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuc.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Technical University of Crete</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Πολυτεχνείο Κρήτης</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.tuc.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.tuc.gr/</mdui:InformationURL>
-          <mdui:Logo height="100" width="160">https://www.tuc.gr/fileadmin/logo/tuc_logo_100x160.png</mdui:Logo>
-          <mdui:Logo height="50" width="80">https://www.tuc.gr/fileadmin/logo/tuc_logo_50x80.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>tuc.gr</mdui:DomainHint>
-          <mdui:IPHint>147.27.0.0/16</mdui:IPHint>
-          <mdui:GeolocationHint>geo:35.528840,24.068557</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEjjCCA3agAwIBAgIQMYf7ZsbgCWkt+2p569I1YTANBgkqhkiG9w0BAQsFADBk
                             MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
                             QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -58,26 +58,26 @@
                             ytOGEeeF3NGmU7xV32pp/sxeXWoTwIxjDKZpjX73cDccJ66JdKWRJ+S5v29171Ai
                             jNeA3T/IKJba0h3PXstHdm6R
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tuc.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tuc.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tuc.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tuc.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tuc.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tuc.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuc.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tuc.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tuc.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tuc.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tuc.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tuc.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tuc.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuc.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEjjCCA3agAwIBAgIQMYf7ZsbgCWkt+2p569I1YTANBgkqhkiG9w0BAQsFADBk
                             MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
                             QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -104,31 +104,31 @@
                             ytOGEeeF3NGmU7xV32pp/sxeXWoTwIxjDKZpjX73cDccJ66JdKWRJ+S5v29171Ai
                             jNeA3T/IKJba0h3PXstHdm6R
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tuc.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tuc.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technical University of Crete</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πολυτεχνείο Κρήτης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technical University of Crete</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πολυτεχνείο Κρήτης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tuc.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.tuc.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vasilis</md:GivenName>
-      <md:SurName>Papadakis</md:SurName>
-      <md:EmailAddress>idpHelp@lists.tuc.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-28210-37512</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Technical University of Crete Support</md:Company>
-      <md:EmailAddress>idpHelp@lists.tuc.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-28210-37512</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tuc.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tuc.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technical University of Crete</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πολυτεχνείο Κρήτης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technical University of Crete</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πολυτεχνείο Κρήτης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tuc.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.tuc.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vasilis</md:GivenName>
+    <md:SurName>Papadakis</md:SurName>
+    <md:EmailAddress>idpHelp@lists.tuc.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-28210-37512</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Technical University of Crete Support</md:Company>
+    <md:EmailAddress>idpHelp@lists.tuc.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-28210-37512</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml
index 30d620cd..970ab9b0 100644
--- a/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tulane.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.tulane.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tulane.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Tulane University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.tulane.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tulane.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Tulane University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOM4RMfBQji0Gpr8ZAah2qVCyrRqMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC50dWxhbmUuZWR1MB4XDTExMDMwNTAyMDgwNFoX
 DTMxMDMwNTAyMDgwNFowGTEXMBUGA1UEAxMOaWRwLnR1bGFuZS5lZHUwggEiMA0G
@@ -37,24 +37,24 @@ qsndPfh/4A4j9Zyj9X3XPRUYTvpcQ2XveBiKyA70ZF6WGbqLALw7/g07NH6wW9js
 0dlMhOhrgRu07YFATFwg4RidRkvfUsbjGXgGJ+BxlZzIbrB9hacSRQdNxddtIWO+
 7m01Z344mGsZ1ZDR8bdPepRQi3B8efL6qJXsw3pzQE/xruoBU+jCJg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tulane.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tulane.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tulane.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tulane.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tulane.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tulane.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tulane.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tulane.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tulane.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tulane.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tulane.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tulane.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tulane.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tulane.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOM4RMfBQji0Gpr8ZAah2qVCyrRqMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC50dWxhbmUuZWR1MB4XDTExMDMwNTAyMDgwNFoX
 DTMxMDMwNTAyMDgwNFowGTEXMBUGA1UEAxMOaWRwLnR1bGFuZS5lZHUwggEiMA0G
@@ -73,27 +73,27 @@ qsndPfh/4A4j9Zyj9X3XPRUYTvpcQ2XveBiKyA70ZF6WGbqLALw7/g07NH6wW9js
 0dlMhOhrgRu07YFATFwg4RidRkvfUsbjGXgGJ+BxlZzIbrB9hacSRQdNxddtIWO+
 7m01Z344mGsZ1ZDR8bdPepRQi3B8efL6qJXsw3pzQE/xruoBU+jCJg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tulane.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tulane.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tulane University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tulane University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tulane.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Leo Tran</md:GivenName>
-      <md:EmailAddress>ldtran@tulane.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Carlos Le</md:GivenName>
-      <md:EmailAddress>cle3@tulane.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim Riley</md:GivenName>
-      <md:EmailAddress>riley@tulane.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tulane.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tulane.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tulane University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tulane University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tulane.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Leo Tran</md:GivenName>
+    <md:EmailAddress>ldtran@tulane.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carlos Le</md:GivenName>
+    <md:EmailAddress>cle3@tulane.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim Riley</md:GivenName>
+    <md:EmailAddress>riley@tulane.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
index 817c07bf..bd317065 100644
--- a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tut.fi/shibboleth2">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
+        <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
+        <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
+        <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.167.88.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
+        <mdui:DomainHint>tut.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
-          <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
-          <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
-          <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
-          <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
-          <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
-          <mdui:IPHint>193.167.88.0/21</mdui:IPHint>
-          <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
-          <mdui:DomainHint>tut.fi</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
@@ -61,22 +61,22 @@ Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
 7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
 DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
 ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
@@ -100,27 +100,27 @@ Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
 7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
 DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
 ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jussi</md:GivenName>
-      <md:SurName>Tirkkonen</md:SurName>
-      <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jussi</md:GivenName>
+    <md:SurName>Tirkkonen</md:SurName>
+    <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
index e075d3ef..2aedd2f9 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux-montaigne.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-07T17:16:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-07T17:16:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux-montaigne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Bordeaux Montaigne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA/ElEQVQoz7WS0ZGDIBCG8QqggUjec6aA2ICmgNOUE6jD6LvYwJkChAKkAbEBaGDvgdyay2QmyUxuhxd+/o9d/iECAPJKfbzkfhPgvX8W8N4fDoUxJmyF4Ot1vN1+dp1cTPBbzrn9PmNsNQwDAEjZMrYKK0k2aFs6CMHxbkKI1vrukBeg77+xr9aKEDLPFk1xzG4BIQRK53N/89A8z/8AXSfn2VJKg2SMUUpl2WLCowvQNDWltKpqVJumLooSfWFI771Silg7YTKcH0MmzjkAGMcxSTYhqDTdpenO2olI2UrZXicbYFROp6osvzg/WjsBQOScux7xYUX//lt/AC2qo0VPVdydAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-bordeaux-montaigne.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Bordeaux Montaigne</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Toute la communauté de l'université Bordeaux Montaigne</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux-montaigne.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Bordeaux Montaigne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA/ElEQVQoz7WS0ZGDIBCG8QqggUjec6aA2ICmgNOUE6jD6LvYwJkChAKkAbEBaGDvgdyay2QmyUxuhxd+/o9d/iECAPJKfbzkfhPgvX8W8N4fDoUxJmyF4Ot1vN1+dp1cTPBbzrn9PmNsNQwDAEjZMrYKK0k2aFs6CMHxbkKI1vrukBeg77+xr9aKEDLPFk1xzG4BIQRK53N/89A8z/8AXSfn2VJKg2SMUUpl2WLCowvQNDWltKpqVJumLooSfWFI771Silg7YTKcH0MmzjkAGMcxSTYhqDTdpenO2olI2UrZXicbYFROp6osvzg/WjsBQOScux7xYUX//lt/AC2qo0VPVdydAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-bordeaux-montaigne.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Bordeaux Montaigne</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Toute la communauté de l'université Bordeaux Montaigne</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVzCCAj+gAwIBAgIUHPBrysVhtt7R/gvuIk4VwxtbXfUwDQYJKoZIhvcNAQEF
 BQAwJjEkMCIGA1UEAxMbaWRwLnUtYm9yZGVhdXgtbW9udGFpZ25lLmZyMB4XDTE0
 MDQwNzE0MzczMVoXDTM0MDQwNzE0MzczMVowJjEkMCIGA1UEAxMbaWRwLnUtYm9y
@@ -39,21 +39,21 @@ xvmptgBpVcFa3iDcheYOKngb9JxI1+b31/RyCqYKqUOXVtmdnybefoRFBSaf13D/
 LlzyjzOOYDvl5zBkEX4V5HaZpY2mEPRM6paKiVrxzExfzZL8X8q5OGbg5G3fbNMv
 rCJ2i9qLyjorUvRNPm7ihuZZGUIn0qiv9WaZ9iEbRCGLWjE6oZrGbOecbw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Bordeaux Montaigne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Bordeaux Montaigne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-bordeaux-montaigne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>reseau@u-bordeaux-montaigne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Bordeaux Montaigne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Bordeaux Montaigne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-bordeaux-montaigne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>reseau@u-bordeaux-montaigne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
index dda22a5b..576a3e2d 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux.fr/idp_ubx/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-10T11:43:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-10T11:43:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Bordeaux</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz2VSS2sTYRQ99/tmJpOZpM1EQSou2tRmCroQdFXxgbhSdKfu/AGCP8Bf4KK+SE0jInQjuNKdEmybRBEUN7Uraxdqi0LTlkb6TKbz3esiSVW8m7u459xz7oPwogEADIiACABEoAl7QQRhEoibylWKFgAIDnoqbWE1EkdRysLiNrcYbTKxAZF4mdxUIV8rKQJAMCKX++zVi73lEX+/owCADdzUwIenpx5d1Sbur5aGpwuxm1ICKEJ9k599jwCeX4/f/4xiAQEg5W6spFa+Dk0+CKvFyA8gUG3P0MSaANUCweqMAoCIFk5cyf6YFVICAkS1nUKrja2tx/duvy6/QsJlZlEWRTv1wZG5C7dEWwAIAuwpKN1sNieelN69rSGRABt4mXz5Tnpt0bhptdtEd23qz/aUCoKs73tgw15mYHosrBUNKQh3u/9LgIgxxgiQtAenCmHlYeRlQF3A/wqAkDCED1UmwurDyMtAQBx3i51sddjCQrqVzDibjSOfRiM/C0CbVuQF4FiZ3c4TdBQEEOGE/+Xczdlrd5cPn7S3fyU2V+tDZ5aOXQoWZtz1JbYciLQVhCDipgfKo/u+fVw+en7m+nj28xsIN4ZP69ZWfvI+SfvP2pd5viZeb26qkK+Ng2j9QDh/9sZa/3EBBYszYXW8pz4XOz4Jd4d/GeUqxbAyFnkBiHS0ozhueQEAZ7shShs7uYcGoHN92XytFCd7SEDCrG22HB23lNk1dlK0/TcawG/PIwVYE5CYvQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMCswMjowMOmjNjwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDCY/o6AAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">https://www.u-bordeaux.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Bordeaux</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Bordeaux</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz2VSS2sTYRQ99/tmJpOZpM1EQSou2tRmCroQdFXxgbhSdKfu/AGCP8Bf4KK+SE0jInQjuNKdEmybRBEUN7Uraxdqi0LTlkb6TKbz3esiSVW8m7u459xz7oPwogEADIiACABEoAl7QQRhEoibylWKFgAIDnoqbWE1EkdRysLiNrcYbTKxAZF4mdxUIV8rKQJAMCKX++zVi73lEX+/owCADdzUwIenpx5d1Sbur5aGpwuxm1ICKEJ9k599jwCeX4/f/4xiAQEg5W6spFa+Dk0+CKvFyA8gUG3P0MSaANUCweqMAoCIFk5cyf6YFVICAkS1nUKrja2tx/duvy6/QsJlZlEWRTv1wZG5C7dEWwAIAuwpKN1sNieelN69rSGRABt4mXz5Tnpt0bhptdtEd23qz/aUCoKs73tgw15mYHosrBUNKQh3u/9LgIgxxgiQtAenCmHlYeRlQF3A/wqAkDCED1UmwurDyMtAQBx3i51sddjCQrqVzDibjSOfRiM/C0CbVuQF4FiZ3c4TdBQEEOGE/+Xczdlrd5cPn7S3fyU2V+tDZ5aOXQoWZtz1JbYciLQVhCDipgfKo/u+fVw+en7m+nj28xsIN4ZP69ZWfvI+SfvP2pd5viZeb26qkK+Ng2j9QDh/9sZa/3EBBYszYXW8pz4XOz4Jd4d/GeUqxbAyFnkBiHS0ozhueQEAZ7shShs7uYcGoHN92XytFCd7SEDCrG22HB23lNk1dlK0/TcawG/PIwVYE5CYvQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMCswMjowMOmjNjwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDCY/o6AAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">https://www.u-bordeaux.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Bordeaux</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIJAPEVvQl9sqJ0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 BAMTGXYtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIwHhcNMTQwNDE0MDc1NjE5WhcN
 MjQwNDExMDc1NjE5WjAkMSIwIAYDVQQDExl2LWlkcDAxLnNydi51LWJvcmRlYXV4
@@ -38,13 +38,13 @@ wuQY8NfjOSmMrG1NsCIia2C4gWqEqKwFwuknaueT95GubIrz4ayqz5WYEe2KTNSy
 1KI84uKzIgymoedQ2eibLzfcTg3aEs24aWfjpKhLYERBgUGeoymuqTT2WPnH21IT
 Rl74R0YddDzKj3NOCjggOxW2tAPCCd5pPprTRQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTzCCAjegAwIBAgIUE1/WgEZpWyPYXsF/fURZlGXutGUwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5mcjAeFw0xMzEy
 MTAwODA5NDFaFw0xNjEyMTAwODA5NDFaMCQxIjAgBgNVBAMTGXYtaWRwMDEuc3J2
@@ -64,21 +64,21 @@ e3NB3eRNWIn9CMUNYgz3BEHSM36bb+I4pZ3iG2yLIFZ9FpnAHbuBkbE2hdPgppYw
 xq57ToMq1Btju+x6evFlV0uqCSszQMxTU/Tleid5iZfL4ae9IgM6xqEvYZ4xr6fr
 VkBzyAKX8s3JZo9lM7GdA2PXiIodtHSyeNvrRmVpGN63REs=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Bordeaux</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.u-bordeaux.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>noc@univ-bordeaux.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Bordeaux</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.u-bordeaux.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>noc@univ-bordeaux.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
index d215a336..83da75ee 100644
--- a/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-cergy.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-27T10:43:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-27T10:43:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-cergy.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Cergy Pontoise</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABAElEQVQ4y2NgwAH+S98t+y99N5WBXLBGaOqmCt6M/3ADJe/KYlPHhMN25TO/L/sKMwncOyS6Yl4Fb8b/+i8TrmFTy4hFs2Hlp+5zENOZfv9j+Mfqym6z2PlNTBxBZ/+XvltxSHTFvP/Sdx0reDP+VfFm/fovfZeXJL//l77LWMGb8b+Pv/o6MeqZsYh9EGUSulv4sUWb5JDfLjx/eQNv/nuSNUKdLl3Bm/H/v/RdRrIMgAaYJqn6mBgYGBj+S96VV2CWPsv4VJmogMMAZ8Q2TiPX6Uz/Je9yXfp9Q4fxqfJ/cgxg+C99N+a/5F1LsjRDDXAjWzMDAwMTwz+Gc5QYAAAS1l+1Qbx69wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMH48JxUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDAPYZ+pAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-cergy.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Cergy Pontoise</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-cergy.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Cergy Pontoise</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABAElEQVQ4y2NgwAH+S98t+y99N5WBXLBGaOqmCt6M/3ADJe/KYlPHhMN25TO/L/sKMwncOyS6Yl4Fb8b/+i8TrmFTy4hFs2Hlp+5zENOZfv9j+Mfqym6z2PlNTBxBZ/+XvltxSHTFvP/Sdx0reDP+VfFm/fovfZeXJL//l77LWMGb8b+Pv/o6MeqZsYh9EGUSulv4sUWb5JDfLjx/eQNv/nuSNUKdLl3Bm/H/v/RdRrIMgAaYJqn6mBgYGBj+S96VV2CWPsv4VJmogMMAZ8Q2TiPX6Uz/Je9yXfp9Q4fxqfJ/cgxg+C99N+a/5F1LsjRDDXAjWzMDAwMTwz+Gc5QYAAAS1l+1Qbx69wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMH48JxUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDAPYZ+pAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-cergy.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Cergy Pontoise</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAL5VX/FyJxE+QaVPYflgTRs+IqDyMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51LWNlcmd5LmZyMB4XDTA5MTEyMDE1MTIyNVoX
 DTI5MTEyMDE1MTIyNVowGTEXMBUGA1UEAxMOaWRwLnUtY2VyZ3kuZnIwggEiMA0G
@@ -37,21 +37,21 @@ zE7fqzssOVC0HYf0fuvZyEV1ix45zxhCVtuSjL/39ttUDNcAe0hbc4J+XdtseBXE
 +aj1Ghr+XBI3dG4FUhea8Ic6pTg3BPgSdEZVq2xumojU8lKa+1LzF4IY6YKATkz8
 o7TC7JeLaEP9IIl444TjCDusYcOd5ESjG4zw6KiQaO9Jpp2jOL/jMg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-cergy.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-cergy.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-cergy.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Cergy Pontoise</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Cergy Pontoise</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-cergy.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>disi-infra-systeme@ml.u-cergy.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-cergy.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-cergy.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-cergy.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Cergy Pontoise</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Cergy Pontoise</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-cergy.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>disi-infra-systeme@ml.u-cergy.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
index a2e2c1e2..75fc949f 100644
--- a/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-clermont1.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:12:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:12:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-clermont1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz1WSzUvUYRDHv/P8Vm19IbXAYitfKssoLCt6I0GSIOmSHioiOnToXF2DDtG1P6BzURAURBDUKQgiqA1DFnuxjMh19ae1tfr8nt/zzEyH3YS+h2FmmDnMdz506dmLN8USAGMiUTFkqhGACAMgMgCIiEPYn1tn8qXYmAj/JCoruTERkSEiIhIVMpQvxRkOgQypKEsgETWGDA2sW9vburqlvk6h5SSdiBcm5hcBsIQMibTX1XuScuIUMMDNwUPHuzfhf90vfLz1Os8sxifJvdGR60f2iw/s/eltPcNdm94WS2cfPJmMFyfjxQuPnk7Gi2d29A5tyLH3hp2rIwIgqYMPw92dP629/Ph5YabIIqo6/n3mypPny96PbOnUNDXiAwAV9UlKPuSaGifn4oXfv00QAMpMPkyX4umFnx0tzSH1GU5czZ80VREA3ntOnAUkcGTIO0ciLNoAcOIy4pyKSPCSOK5jVRWRYBNjCICysE1YRZk1ULBJxtsEAFi8tRHX10xJUwGUWaLIWwuAoggAO2dQWa4krq0xK86rS4mIAnvrMixrmhorlSVvnbcupCkASVITmPNT03u6Np7Ytd0tW1XlwOKSc4f25dpb332ZFufE1e701kbZvoFPP4pjRw+eOjDQ35nbvL6jaVXDsV1954cOz/4qX719t/xnSQIrS/7z1/Gpb7Rm7CKA/u7Oa+dG9/b2tGRXsUh5yb4qfLhx5+FUcdYYEtGVl1PryfNVGAloa2luzjaIyB/rflWWqv3qnGptJ3Okb+vL94VqNTcfzwEAoigDgDkYU+W8hvDg7p1/AYJ6hvrED4yHAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-bpclermont.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-clermont1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz1WSzUvUYRDHv/P8Vm19IbXAYitfKssoLCt6I0GSIOmSHioiOnToXF2DDtG1P6BzURAURBDUKQgiqA1DFnuxjMh19ae1tfr8nt/zzEyH3YS+h2FmmDnMdz506dmLN8USAGMiUTFkqhGACAMgMgCIiEPYn1tn8qXYmAj/JCoruTERkSEiIhIVMpQvxRkOgQypKEsgETWGDA2sW9vburqlvk6h5SSdiBcm5hcBsIQMibTX1XuScuIUMMDNwUPHuzfhf90vfLz1Os8sxifJvdGR60f2iw/s/eltPcNdm94WS2cfPJmMFyfjxQuPnk7Gi2d29A5tyLH3hp2rIwIgqYMPw92dP629/Ph5YabIIqo6/n3mypPny96PbOnUNDXiAwAV9UlKPuSaGifn4oXfv00QAMpMPkyX4umFnx0tzSH1GU5czZ80VREA3ntOnAUkcGTIO0ciLNoAcOIy4pyKSPCSOK5jVRWRYBNjCICysE1YRZk1ULBJxtsEAFi8tRHX10xJUwGUWaLIWwuAoggAO2dQWa4krq0xK86rS4mIAnvrMixrmhorlSVvnbcupCkASVITmPNT03u6Np7Ytd0tW1XlwOKSc4f25dpb332ZFufE1e701kbZvoFPP4pjRw+eOjDQ35nbvL6jaVXDsV1954cOz/4qX719t/xnSQIrS/7z1/Gpb7Rm7CKA/u7Oa+dG9/b2tGRXsUh5yb4qfLhx5+FUcdYYEtGVl1PryfNVGAloa2luzjaIyB/rflWWqv3qnGptJ3Okb+vL94VqNTcfzwEAoigDgDkYU+W8hvDg7p1/AYJ6hvrED4yHAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-bpclermont.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
 OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
@@ -38,23 +38,23 @@ FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
 KmDbVb0p+dFwUH3zICKCDJM7OBcUNDM/fcHMBWJ64r17AiGtdZ5Cj0dZQt4ClMC9
 Mcelq5/l9A==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-clermont1.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-clermont1.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-clermont1.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-clermont1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
 OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
@@ -74,19 +74,19 @@ FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
 KmDbVb0p+dFwUH3zICKCDJM7OBcUNDM/fcHMBWJ64r17AiGtdZ5Cj0dZQt4ClMC9
 Mcelq5/l9A==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-clermont1.fr/idp/AA"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-bpclermont.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>Fed-Admin@u-clermont1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-clermont1.fr/idp/AA"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-bpclermont.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>Fed-Admin@u-clermont1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
index 19d3dd97..dcfc58e5 100644
--- a/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-paris2.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-04T13:52:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-04T13:52:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-paris2.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACU0lEQVQoz02NPWtTYRiG7+fk5CQn1pPmw0QDqSa1tbSmQ6fopoOdBPEXuDkrtH9D6R/oJDg5uGhRdFG3ToXSQAzYFJIWqpIoOTnv+7y3Q/261uuCC/wf50hSlc4xSfj8Oe/f55MnHI2oepbA/UXVkRrHjtSdHbu2plFkMxl99NiROp060jkH/YMjbRwrqc+emUrFAgawgC0W9elTnUx0OlXn/h00SVRVX72yi4sW0CCwmYyGofF9ffDAkfbs8LsmrTHOJPbuXQtoJqOAnh0Au7qqmxv67r0zxgdAUpyjMeh05PDQBYEUCgxDKZfl2jW0Wsjl4InM1eH7PgARISlhyM89fjmUJOH586zVcOWKd/myy+W8bBZRRGOk0/EBUBWpFLa2+OYtr857tRqaTeTzks9DVQCUy7h4SYxBNivOOWeMFwRuYYHdrty5I7Oz8DzEE6TTEA/FIlst8X3cuCHLyz4A8TwC0m4jjuX0Kz9+QrOByQSVC3K9xZ8/EUXodqXZRCrlA6AxnohrNOin4KU4HnsPHyIIUCrJvXt4/Vrm5tjvc39f6nUfgIQhAJlMUCji+Fh+jHF0hG/fOBjgwwe8eOGShIOB9/Il1tfFJQm/f0cqhc1N7u7KcIjhkDMzkk4jDNlsSrXKUklWV2V+Hv2+z3Sa29s4dw7TKfb2KIJGA0tLvHXLW1/H8rL4vgC0ltYiCMT1etzY4MmJHBxgPObNm9JuS6PBKBIScQxrkc0iDJEkmJkR3r6NXg+npygUUK+jWMRohFIJKyuoVlGpIAh+K1VE0S8h13XkdmDuVAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-paris2.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-paris2.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACU0lEQVQoz02NPWtTYRiG7+fk5CQn1pPmw0QDqSa1tbSmQ6fopoOdBPEXuDkrtH9D6R/oJDg5uGhRdFG3ToXSQAzYFJIWqpIoOTnv+7y3Q/261uuCC/wf50hSlc4xSfj8Oe/f55MnHI2oepbA/UXVkRrHjtSdHbu2plFkMxl99NiROp060jkH/YMjbRwrqc+emUrFAgawgC0W9elTnUx0OlXn/h00SVRVX72yi4sW0CCwmYyGofF9ffDAkfbs8LsmrTHOJPbuXQtoJqOAnh0Au7qqmxv67r0zxgdAUpyjMeh05PDQBYEUCgxDKZfl2jW0Wsjl4InM1eH7PgARISlhyM89fjmUJOH586zVcOWKd/myy+W8bBZRRGOk0/EBUBWpFLa2+OYtr857tRqaTeTzks9DVQCUy7h4SYxBNivOOWeMFwRuYYHdrty5I7Oz8DzEE6TTEA/FIlst8X3cuCHLyz4A8TwC0m4jjuX0Kz9+QrOByQSVC3K9xZ8/EUXodqXZRCrlA6AxnohrNOin4KU4HnsPHyIIUCrJvXt4/Vrm5tjvc39f6nUfgIQhAJlMUCji+Fh+jHF0hG/fOBjgwwe8eOGShIOB9/Il1tfFJQm/f0cqhc1N7u7KcIjhkDMzkk4jDNlsSrXKUklWV2V+Hv2+z3Sa29s4dw7TKfb2KIJGA0tLvHXLW1/H8rL4vgC0ltYiCMT1etzY4MmJHBxgPObNm9JuS6PBKBIScQxrkc0iDJEkmJkR3r6NXg+npygUUK+jWMRohFIJKyuoVlGpIAh+K1VE0S8h13XkdmDuVAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-paris2.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKDCCAhCgAwIBAgIVAINFA2whEjq7dIPf8YLpG746hePRMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjAeFw0xNDA0MjkwNzQ4MjJa
 Fw0zNDA0MjkwNzQ4MjJaMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjCCASIw
@@ -37,21 +37,21 @@ pwo+ghS3u/1WiZwpZV7rQVaEWkW/fwaZBmELmI6C9clq9+qG0/a86tU1Caqjn34g
 xrX/4JKfdKHNuguH4eowRTHgjvkQKyTDcphzAnOr6CE8islttFut36iPvYYJO7t9
 ZOq3IDpQLAcll+GhtVWTmM1041GbGkbqzThB/ADpE/wl5efhlsP7vQEcOkE=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-paris2.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-paris2.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-paris2.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris 2 - Panthéon Assas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-paris2.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>ssri@u-paris2.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-paris2.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-paris2.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-paris2.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 2 - Panthéon Assas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-paris2.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ssri@u-paris2.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml b/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
index 917d2ae1..b75d4a8e 100644
--- a/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-picardie.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-30T17:34:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-30T17:34:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-picardie.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Picardie Jules Verne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB1UlEQVQoz42QzU8TYRCH53333YW6Bdtm0xaIpi0YG4VQY8CDwRASDtw4Eb2REC5wJeFiot49SPwDNF6MNxM9EL1gPCkkVAOVBMJHs6Wl3bW73b7b7X562FAMMWaf08xknl8mgz7nS3w3W67rfdEQNRzCIJZgUaJ90VCdmolIiCNYlCjHMo7r1VSD7JcbI9ejoqw3dEtv290c8+B2cu1DYXq0f6+kZgeusgQDgNayUvFwRWmhJ2+3CUa26wEAQuB54IMRwhhs57w/h7z/Vhy/Ifw8qV8T+GiYOyhrEZ7TWiYAupOJHZQbn/Kn1LAvBFlrf9+XFGpKDUNrWUJvl6qbrus1DVvW2oblOI6XiocB4LjaBAAiylSUaSegqhqXbsilY/mj350WTw4n/YB/koqH/eALYWOn0hk9fZi7JBxXmwo1/RohCHEMA9nZCM8tzWQziZ7BZM/ErcSX3Yr/q/mpoeWZLADM3U8XJfpy8d7dQYEAgGm7CjVPanR9uzQ2JHTiN3YqNdXYK6lfC2eTw0mVWqtvthDMvoJgPJ8f+yUqOJeORXguiLDyevPRRIb8/bL/wzJ4t6jggNsA8HhudO1jIahwpYvc7O89PNOCCi8Wxp+9+wEAfwAs3cph7PutegAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-picardie.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Picardie Jules Verne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-picardie.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Picardie Jules Verne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB1UlEQVQoz42QzU8TYRCH53333YW6Bdtm0xaIpi0YG4VQY8CDwRASDtw4Eb2REC5wJeFiot49SPwDNF6MNxM9EL1gPCkkVAOVBMJHs6Wl3bW73b7b7X562FAMMWaf08xknl8mgz7nS3w3W67rfdEQNRzCIJZgUaJ90VCdmolIiCNYlCjHMo7r1VSD7JcbI9ejoqw3dEtv290c8+B2cu1DYXq0f6+kZgeusgQDgNayUvFwRWmhJ2+3CUa26wEAQuB54IMRwhhs57w/h7z/Vhy/Ifw8qV8T+GiYOyhrEZ7TWiYAupOJHZQbn/Kn1LAvBFlrf9+XFGpKDUNrWUJvl6qbrus1DVvW2oblOI6XiocB4LjaBAAiylSUaSegqhqXbsilY/mj350WTw4n/YB/koqH/eALYWOn0hk9fZi7JBxXmwo1/RohCHEMA9nZCM8tzWQziZ7BZM/ErcSX3Yr/q/mpoeWZLADM3U8XJfpy8d7dQYEAgGm7CjVPanR9uzQ2JHTiN3YqNdXYK6lfC2eTw0mVWqtvthDMvoJgPJ8f+yUqOJeORXguiLDyevPRRIb8/bL/wzJ4t6jggNsA8HhudO1jIahwpYvc7O89PNOCCi8Wxp+9+wEAfwAs3cph7PutegAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-picardie.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Picardie Jules Verne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUc8NfuYdK4dyRrkHm6/tLQySUqJIwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAwwRaWRwLnUtcGljYXJkaWUuZnIwHhcNMTQxMDE2MDcwNzMz
 WhcNMzQxMDE2MDcwNzMzWjAcMRowGAYDVQQDDBFpZHAudS1waWNhcmRpZS5mcjCC
@@ -38,13 +38,13 @@ U+g/1EeMs9SHCFLDY5mjMXLXXLDCVFhQDN8ek//VqmEx+gTUDUcmMkxy+7rEMrIw
 zKSuEobTpLGYSGzMJJYF0NU6sMHnkurmFxA1S6tfm3DPniPJwR0RlSBpBeuJkqPg
 oubj
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDajCCAlKgAwIBAgIVANKhuMi11QAW10TrFPegvTUOqn3bMA0GCSqGSIb3DQEB
 BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnIw
 HhcNMTEwNjE2MTE0MzAyWhcNMzEwNjE2MTE0MzAyWjAqMSgwJgYDVQQDEx9zaGli
@@ -65,26 +65,26 @@ QGrTBMYBD3Ut9DV1bjYzfCVAB1UkYOJLtLYIk+BxT0WJw5eiAGycuu4IXiGiTWrH
 r+QqS3A3s1MpUhjcsw8FjQI13dTP9JbxHe7m/B44rp2myRaIj5iL9OBrd/Wgmu3d
 6zEip/VxKw2xk8VatR4=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-picardie.fr/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-picardie.fr/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-picardie.fr/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-picardie.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean Charles Delépine</md:SurName>
-      <md:EmailAddress>delepine@u-picardie.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Julien Marignale</md:SurName>
-      <md:EmailAddress>Julien.Marignale@u-picardie.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-picardie.fr/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-picardie.fr/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-picardie.fr/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-picardie.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean Charles Delépine</md:SurName>
+    <md:EmailAddress>delepine@u-picardie.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Julien Marignale</md:SurName>
+    <md:EmailAddress>Julien.Marignale@u-picardie.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml b/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml
index 5f107aec..dffefd08 100644
--- a/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml
+++ b/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-psud.fr/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-17T10:03:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-17T10:03:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-psud.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Paris-Sud University</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7UlEQVQ4y2NkwAGO3J+gvv/OnPw//39yMDAy/WdkYGD4/eczp75UyKIw/Uk7YOoYsWlefDY77MG3LSsZ/rIwMLEyMDAyMDEwMv1n+POF80+t6yVWZG0s2Ay493Z3EhMbK8P/3+xPxTj0El99v/OP8T8js6yg5l10OzEMCC28ocvLkXj/G9NzBtZ/QhdSLZbvRsiewrCMCV3gxa8dbUV2xzJZ/jKf/s/5yrtjr9U8Bob/DESD4rnbbQSDm/4zmM3LOfNfwqv1gNyt5oOK/zv2W07Cph5rIDoWTck88vj9tL+/GP7++8A35f6Bd4uW7Juz7s9fbo5Gt5sSyNoYcTiE4e6X/yL2qS2bnvxhsmT4/YeB4Y5pxMSZdZGfv/96X+NyKRFnGMCAMg/jmyfLa63yXU0NBVn+/WNQP7fiRvPpRBFe6fvEBwgUaMa1XWQIbvqvltzdiy6HEY2WKV3rmBgZJP8zMP5jZmL4//zrb57rX3/rMfxnZDCVFzt/i5ABx99+NmJgZpFnYGRiYGBkYmD495+Bk4mRQUuQc8nSuvglBF3AyMj49z8jE0OisYr1/E3HXk6vTfqb4Wn4AGdoYxgQVHeXIaT5/9v//8WJUY8RC/8ZGJgZGJkYXn1g4CTLAAlW5lNOsiJhmoKMD4gxAACHPK71KifLaQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0OSswMjowMMXqiR8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDkrMDI6MDC0tzGjAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-psud.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">staff, students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université Paris-Sud</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnels, étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-psud.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Paris-Sud University</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7UlEQVQ4y2NkwAGO3J+gvv/OnPw//39yMDAy/WdkYGD4/eczp75UyKIw/Uk7YOoYsWlefDY77MG3LSsZ/rIwMLEyMDAyMDEwMv1n+POF80+t6yVWZG0s2Ay493Z3EhMbK8P/3+xPxTj0El99v/OP8T8js6yg5l10OzEMCC28ocvLkXj/G9NzBtZ/QhdSLZbvRsiewrCMCV3gxa8dbUV2xzJZ/jKf/s/5yrtjr9U8Bob/DESD4rnbbQSDm/4zmM3LOfNfwqv1gNyt5oOK/zv2W07Cph5rIDoWTck88vj9tL+/GP7++8A35f6Bd4uW7Juz7s9fbo5Gt5sSyNoYcTiE4e6X/yL2qS2bnvxhsmT4/YeB4Y5pxMSZdZGfv/96X+NyKRFnGMCAMg/jmyfLa63yXU0NBVn+/WNQP7fiRvPpRBFe6fvEBwgUaMa1XWQIbvqvltzdiy6HEY2WKV3rmBgZJP8zMP5jZmL4//zrb57rX3/rMfxnZDCVFzt/i5ABx99+NmJgZpFnYGRiYGBkYmD495+Bk4mRQUuQc8nSuvglBF3AyMj49z8jE0OisYr1/E3HXk6vTfqb4Wn4AGdoYxgQVHeXIaT5/9v//8WJUY8RC/8ZGJgZGJkYXn1g4CTLAAlW5lNOsiJhmoKMD4gxAACHPK71KifLaQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0OSswMjowMMXqiR8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDkrMDI6MDC0tzGjAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-psud.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">staff, students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université Paris-Sud</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnels, étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUEQSMail62qHLjxXRxQKl6EGDTg0wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAwwNaWRwLnUtcHN1ZC5mcjAeFw0xNDExMjExNDE1MzJaFw0z
 NDExMjExNDE1MzJaMBgxFjAUBgNVBAMMDWlkcC51LXBzdWQuZnIwggEiMA0GCSqG
@@ -39,26 +39,26 @@ zcwlSu5ayTUYGX46+Q+bYM94GtwGmL4mbwQoR95HWBR2t+gSxEpre3CUi5JaLJ0m
 H3d4Ee1uIvDWFLtriFMupxcWmlW4N6KvmjZYadBXK7OgsmslEsQegRn9GvT2Iu2d
 EcAYpY0Ax0DDYuMw4VUWS4MncOQtAhRXEBvT3iWffG5otBc=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-psud.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-psud.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-psud.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Paris-Sud</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Paris-Sud</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-psud.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Laubenberger Stéphane</md:SurName>
-      <md:EmailAddress>stephane.laubenberger@u-psud.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Lambert Dominique</md:SurName>
-      <md:EmailAddress>dominique.lambert@u-psud.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-psud.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-psud.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-psud.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Paris-Sud</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Paris-Sud</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-psud.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Laubenberger Stéphane</md:SurName>
+    <md:EmailAddress>stephane.laubenberger@u-psud.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lambert Dominique</md:SurName>
+    <md:EmailAddress>dominique.lambert@u-psud.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml
index e749f955..cad97fa8 100644
--- a/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ua.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ua.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Alabama, The</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ua.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Alabama, The</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUNKqQ00OfQ884NNxZ/Wqg64utm9owDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnVhLmVkdTAeFw0xMjA3MDIxNTMyMTJaFw0zMjA3
 MDIxNTMyMTJaMBUxEzARBgNVBAMTCmlkcC51YS5lZHUwggEiMA0GCSqGSIb3DQEB
@@ -37,24 +37,24 @@ ettjvwSjTCvHNQWQawfSg8q0w+CnTxZ3hfAGR77zOFwzBbrxIBY9g16VOUSbP464
 6izLFjrXdfUARACZIkv+rigqMZou8Fj7VvBp8Wu1f0pzVQYwkgU+nl8INuYKYELW
 3NhJFAodlwbRHKZc0vyCH8RmluU4KoE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ua.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ua.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ua.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ua.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ua.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ua.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ua.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ua.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ua.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ua.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ua.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ua.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ua.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ua.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUNKqQ00OfQ884NNxZ/Wqg64utm9owDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnVhLmVkdTAeFw0xMjA3MDIxNTMyMTJaFw0zMjA3
 MDIxNTMyMTJaMBUxEzARBgNVBAMTCmlkcC51YS5lZHUwggEiMA0GCSqGSIb3DQEB
@@ -73,27 +73,27 @@ ettjvwSjTCvHNQWQawfSg8q0w+CnTxZ3hfAGR77zOFwzBbrxIBY9g16VOUSbP464
 6izLFjrXdfUARACZIkv+rigqMZou8Fj7VvBp8Wu1f0pzVQYwkgU+nl8INuYKYELW
 3NhJFAodlwbRHKZc0vyCH8RmluU4KoE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ua.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ua.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Alabama, The</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Alabama, The</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ua.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Scott Montgomery</md:GivenName>
-      <md:EmailAddress>smontgomery@ua.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Deborah Crocker</md:GivenName>
-      <md:EmailAddress>deborah.crocker@ua.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>itsd@ua.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ua.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ua.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Alabama, The</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Alabama, The</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ua.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Scott Montgomery</md:GivenName>
+    <md:EmailAddress>smontgomery@ua.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Deborah Crocker</md:GivenName>
+    <md:EmailAddress>deborah.crocker@ua.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>itsd@ua.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml
index cf0c01a1..b2e6f29c 100644
--- a/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uaex.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaex.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Arkansas, Cooperative Extension Service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.uaex.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uaex.edu/privacy.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="523" xml:lang="en">https://idpinfo.uaex.edu/ua-color-left-small.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaex.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Arkansas, Cooperative Extension Service</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.uaex.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uaex.edu/privacy.aspx</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="523" xml:lang="en">https://idpinfo.uaex.edu/ua-color-left-small.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDljCCAn4CCQC8udJteSrF3zANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 VVMxETAPBgNVBAgMCEFya2Fuc2FzMRMwEQYDVQQHDApMaXR0bGVSb2NrMQ0wCwYD
 VQQKDARVQUVYMQswCQYDVQQLDAJJVDEVMBMGA1UEAwwMaWRwLnVhZXguZWR1MSIw
@@ -43,13 +43,13 @@ HLlFXy3Tl8O0A2Z3Q4mv0tMoOlNxQEL+HNdqzdbFCaYR1DoglFC7VS/FczqBJiGC
 6w2Y1QbpgJKwx9UaookWEZvtvJa58pbr+syDJmvqekSW130Hlrjik/Nc6DaTFOrz
 VYI9KJ2BtKlBZA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQCtel/2JmOm9DANBgkqhkiG9w0BAQUFADCBjTEVMBMGA1UEAwwM
 aWRwLnVhZXguZWR1MT4wPAYDVQQKDDVVbml2ZXJzaXR5IG9mIEFya2Fuc2FzIENv
 b3BlcmF0aXZlIEV4dGVuc2lvbiBTZXJ2aWNlczELMAkGA1UEBhMCVVMxETAPBgNV
@@ -71,24 +71,24 @@ H5ogY8LVOjvv1c6hEO8khIxKTXUFJ7gKjnT1RxyG0kvqS4P55ZPjTbwkDWDBBNYk
 tqAERtGoSohbErFyMATqZBPqTyb8oKeqIfmzNLfMBVE5aOc7Babyde8hTFShQ5GB
 YL3Kl6VCSUFqg93Q
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uaex.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uaex.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uaex.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uaex.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uaex.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uaex.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaex.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uaex.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uaex.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uaex.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uaex.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uaex.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uaex.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaex.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDljCCAn4CCQC8udJteSrF3zANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 VVMxETAPBgNVBAgMCEFya2Fuc2FzMRMwEQYDVQQHDApMaXR0bGVSb2NrMQ0wCwYD
 VQQKDARVQUVYMQswCQYDVQQLDAJJVDEVMBMGA1UEAwwMaWRwLnVhZXguZWR1MSIw
@@ -110,13 +110,13 @@ HLlFXy3Tl8O0A2Z3Q4mv0tMoOlNxQEL+HNdqzdbFCaYR1DoglFC7VS/FczqBJiGC
 6w2Y1QbpgJKwx9UaookWEZvtvJa58pbr+syDJmvqekSW130Hlrjik/Nc6DaTFOrz
 VYI9KJ2BtKlBZA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQCtel/2JmOm9DANBgkqhkiG9w0BAQUFADCBjTEVMBMGA1UEAwwM
 aWRwLnVhZXguZWR1MT4wPAYDVQQKDDVVbml2ZXJzaXR5IG9mIEFya2Fuc2FzIENv
 b3BlcmF0aXZlIEV4dGVuc2lvbiBTZXJ2aWNlczELMAkGA1UEBhMCVVMxETAPBgNV
@@ -138,27 +138,27 @@ H5ogY8LVOjvv1c6hEO8khIxKTXUFJ7gKjnT1RxyG0kvqS4P55ZPjTbwkDWDBBNYk
 tqAERtGoSohbErFyMATqZBPqTyb8oKeqIfmzNLfMBVE5aOc7Babyde8hTFShQ5GB
 YL3Kl6VCSUFqg93Q
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uaex.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uaex.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Arkansas, Cooperative Extension Service</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Arkansas, Cooperative Extension Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uaex.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sam Boyster</md:GivenName>
-      <md:EmailAddress>sboyster@uaex.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Diana Morian</md:GivenName>
-      <md:EmailAddress>dmorian@uaex.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Russell Wilson</md:GivenName>
-      <md:EmailAddress>crwilson@uaex.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uaex.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uaex.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Arkansas, Cooperative Extension Service</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Arkansas, Cooperative Extension Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uaex.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sam Boyster</md:GivenName>
+    <md:EmailAddress>sboyster@uaex.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Diana Morian</md:GivenName>
+    <md:EmailAddress>dmorian@uaex.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Russell Wilson</md:GivenName>
+    <md:EmailAddress>crwilson@uaex.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml
index f4027540..7f83ef5e 100644
--- a/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uark.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.uark.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uark.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Arkansas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Arkansas, Fayetteville</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uark.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://its.uark.edu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="72" width="300" xml:lang="en">https://its.uark.edu/personal/uark-central-login/ualogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.uark.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uark.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Arkansas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Arkansas, Fayetteville</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uark.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://its.uark.edu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="72" width="300" xml:lang="en">https://its.uark.edu/personal/uark-central-login/ualogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAPt1Tv1bYP4+r/4oWy1Mih/6SWp3MA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTAeFw0xMTEwMTQyMDU3NTJaFw0z
 MTEwMTQyMDU3NTJaMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTCCASIwDQYJKoZI
@@ -44,23 +44,23 @@ Drl/RShq++Sd9n5AQT3X66WvXuoaeLsA0Et4gh+fUtY4vu2/hRO10yiCCaiyMSEE
 VWXbuzfaz3iJqNG1rs/lOMzysDqAxzZHZKYYtnwvQYyhfSkpBKlTCRjr2vDG1k4M
 JkNZiOnZ+OBZcqrcpzW0N93Twh4aoOHdO7qTCafVe0M=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uark.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uark.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uark.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uark.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uark.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uark.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uark.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uark.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uark.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uark.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uark.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uark.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAPt1Tv1bYP4+r/4oWy1Mih/6SWp3MA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTAeFw0xMTEwMTQyMDU3NTJaFw0z
 MTEwMTQyMDU3NTJaMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTCCASIwDQYJKoZI
@@ -79,22 +79,22 @@ Drl/RShq++Sd9n5AQT3X66WvXuoaeLsA0Et4gh+fUtY4vu2/hRO10yiCCaiyMSEE
 VWXbuzfaz3iJqNG1rs/lOMzysDqAxzZHZKYYtnwvQYyhfSkpBKlTCRjr2vDG1k4M
 JkNZiOnZ+OBZcqrcpzW0N93Twh4aoOHdO7qTCafVe0M=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uark.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Arkansas Main Campus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Arkansas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uark.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>System Administrator</md:GivenName>
-      <md:EmailAddress>root@uark.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Security</md:GivenName>
-      <md:EmailAddress>security@uark.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uark.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Arkansas Main Campus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Arkansas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uark.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>System Administrator</md:GivenName>
+    <md:EmailAddress>root@uark.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Security</md:GivenName>
+    <md:EmailAddress>security@uark.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml
index 6a9eaa90..d390b026 100644
--- a/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ubalt.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubalt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Baltimore</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ubalt.edu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubalt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Baltimore</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ubalt.edu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVALNBED/cJIrxyBgo57wvukY6HoaMMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51YmFsdC5lZHUwHhcNMTAwNDE0MTQxMDE0WhcN
 MzAwNDE0MTQxMDE0WjAYMRYwFAYDVQQDEw1pZHAudWJhbHQuZWR1MIIBIjANBgkq
@@ -38,23 +38,23 @@ TnYa0K8gnnk14AGIqfVd0VaCfXLa7RE7+uVngWgHqkZrwkwGlesvAysdDG9RrXM4
 UW70RjR8T0DfLVxDaVoxG38lSnjyhJvNsFoapErardKKtSfjgAPEB9VJ01s73u3w
 8jympr7hYBlzGEVpM1EYCsSsULuEXTgFVg4RZnbigygJHpKA
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ubalt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ubalt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ubalt.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ubalt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ubalt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubalt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ubalt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ubalt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ubalt.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ubalt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ubalt.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubalt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVALNBED/cJIrxyBgo57wvukY6HoaMMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51YmFsdC5lZHUwHhcNMTAwNDE0MTQxMDE0WhcN
 MzAwNDE0MTQxMDE0WjAYMRYwFAYDVQQDEw1pZHAudWJhbHQuZWR1MIIBIjANBgkq
@@ -73,26 +73,26 @@ TnYa0K8gnnk14AGIqfVd0VaCfXLa7RE7+uVngWgHqkZrwkwGlesvAysdDG9RrXM4
 UW70RjR8T0DfLVxDaVoxG38lSnjyhJvNsFoapErardKKtSfjgAPEB9VJ01s73u3w
 8jympr7hYBlzGEVpM1EYCsSsULuEXTgFVg4RZnbigygJHpKA
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ubalt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Baltimore</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Baltimore</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ubalt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>George Weitzel</md:GivenName>
-      <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>George Weitzel</md:GivenName>
-      <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>George Weitzel</md:GivenName>
-      <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ubalt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Baltimore</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Baltimore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ubalt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>George Weitzel</md:GivenName>
+    <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>George Weitzel</md:GivenName>
+    <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>George Weitzel</md:GivenName>
+    <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucb.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ucb.ac.uk-shibboleth.xml
index 8693c71e..f016e81a 100644
--- a/swamid-interfederations-2.0/idp.ucb.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ucb.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ucb.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucb.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucb.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ucb.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ucb.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College Birmingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucb.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ucb.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ucb.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College Birmingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucb.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
index 18640306..fa952ba2 100644
--- a/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uclouvain.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Universite Catholique de Louvain</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Catholic University of Louvain</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">L'Universite Catholique de Louvain est une universite pluridisciplinaire au coeur de l'Europe (Belgique).</mdui:Description>
+        <mdui:Description xml:lang="en">The Catholic University of Louvain is an pluridisciplinary university at the heart of Europe (Belgium)</mdui:Description>
+        <mdui:InformationURL xml:lang="fr">https://www.uclouvain.be/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.uclouvain.be/en-index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fr">https://www.uclouvain.be/10547.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16">https://idp.uclouvain.be/favicon.ico</mdui:Logo>
+        <mdui:Logo height="100" width="540">https://idp.uclouvain.be/idp/images/UCL-bandeau.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.104.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6a8:3080::/44</mdui:IPHint>
+        <mdui:DomainHint>uclouvain.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.669920,4.615240</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fr">Universite Catholique de Louvain</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Catholic University of Louvain</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">L'Universite Catholique de Louvain est une universite pluridisciplinaire au coeur de l'Europe (Belgique).</mdui:Description>
-          <mdui:Description xml:lang="en">The Catholic University of Louvain is an pluridisciplinary university at the heart of Europe (Belgium)</mdui:Description>
-          <mdui:InformationURL xml:lang="fr">https://www.uclouvain.be/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.uclouvain.be/en-index.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="fr">https://www.uclouvain.be/10547.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16">https://idp.uclouvain.be/favicon.ico</mdui:Logo>
-          <mdui:Logo height="100" width="540">https://idp.uclouvain.be/idp/images/UCL-bandeau.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>130.104.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:6a8:3080::/44</mdui:IPHint>
-          <mdui:DomainHint>uclouvain.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.669920,4.615240</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIULsoRND5rnR86uR/01PHcK0n+pmkwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDla
 Fw0zNTA2MjMxMjQzNDlaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
@@ -48,13 +48,13 @@ bvZj2W0Sg69XRSAljXiE9iqK5i3+4lV+lYgjT34A5pDmwr22M8C/QUSfPNqc5TJS
 BIyJrdYr392Pi2qT9hndEWKEGsJFyhcTicd3lf0EShcXm2KbpEvNz8k+S4Twn8q4
 goNAmKsfT41JZjV09SqBnNHg/0fYtAHaNH0QOyRhS4kVhUkmdrdnbhuzWwLL+Y4=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUL59ORSvxP+AJwSsPyJpZlpDdWjowDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDda
 Fw0zNTA2MjMxMjQzNDdaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
@@ -73,13 +73,13 @@ oPCTgFYIFRUgpQX//LI3O3Mvri5VTyBEuZi3xNb3nfOgO7Nm1j5WafWkY/Ez7SLc
 +Eq9MovDNNSNM+tHunfAL+gpMXqnNqgoX/rdf1zCh4iFADNcVIlIWm08teLueerC
 zw6rVzahF34aPaCK0oBPRTHGG43EyKpYvq6WVoVGKPO02ZnUC0znXfiQft47ImE=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUW9CW/lDKLYeNR9Qf3Shw0wzP7/8wDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDha
 Fw0zNTA2MjMxMjQzNDhaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
@@ -98,26 +98,26 @@ XDBjy1GOfQe9Y8f918KdHX9ekfVZzVJu4Ukoz66rOWlDenbOZb///Ih1kE20Yh+L
 jB2eA8lGhLRdfBI2Z7gkLxL6eDCa9QzxZnrX8Pd8a5yGlSe51IyfRFeY5B8inl0p
 RQ04bxgiI77gAJH7GDHsFbX71Gmfurj7pJ3R5F25y6KUWELAmhAPm4Kb0WyV0Us=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uclouvain.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uclouvain.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uclouvain.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uclouvain.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIULsoRND5rnR86uR/01PHcK0n+pmkwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDla
 Fw0zNTA2MjMxMjQzNDlaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
@@ -136,13 +136,13 @@ bvZj2W0Sg69XRSAljXiE9iqK5i3+4lV+lYgjT34A5pDmwr22M8C/QUSfPNqc5TJS
 BIyJrdYr392Pi2qT9hndEWKEGsJFyhcTicd3lf0EShcXm2KbpEvNz8k+S4Twn8q4
 goNAmKsfT41JZjV09SqBnNHg/0fYtAHaNH0QOyRhS4kVhUkmdrdnbhuzWwLL+Y4=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUL59ORSvxP+AJwSsPyJpZlpDdWjowDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDda
 Fw0zNTA2MjMxMjQzNDdaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
@@ -161,13 +161,13 @@ oPCTgFYIFRUgpQX//LI3O3Mvri5VTyBEuZi3xNb3nfOgO7Nm1j5WafWkY/Ez7SLc
 +Eq9MovDNNSNM+tHunfAL+gpMXqnNqgoX/rdf1zCh4iFADNcVIlIWm08teLueerC
 zw6rVzahF34aPaCK0oBPRTHGG43EyKpYvq6WVoVGKPO02ZnUC0znXfiQft47ImE=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUW9CW/lDKLYeNR9Qf3Shw0wzP7/8wDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDha
 Fw0zNTA2MjMxMjQzNDhaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
@@ -186,20 +186,20 @@ XDBjy1GOfQe9Y8f918KdHX9ekfVZzVJu4Ukoz66rOWlDenbOZb///Ih1kE20Yh+L
 jB2eA8lGhLRdfBI2Z7gkLxL6eDCa9QzxZnrX8Pd8a5yGlSe51IyfRFeY5B8inl0p
 RQ04bxgiI77gAJH7GDHsFbX71Gmfurj7pJ3R5F25y6KUWELAmhAPm4Kb0WyV0Us=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Universite Catholique de Louvain</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Universite Catholique de Louvain</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uclouvain.be/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Olivier</md:GivenName>
-      <md:SurName>Delcourt</md:SurName>
-      <md:EmailAddress>olivier.delcourt@uclouvain.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universite Catholique de Louvain</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universite Catholique de Louvain</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uclouvain.be/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olivier</md:GivenName>
+    <md:SurName>Delcourt</md:SurName>
+    <md:EmailAddress>olivier.delcourt@uclouvain.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml
index 31d4068b..d8a56413 100644
--- a/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ucreative.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-23T10:43:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-23T10:43:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucreative.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucreative.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYjCCAkqgAwIBAgIIJo1biNwPrSgwDQYJKoZIhvcNAQEFBQAwSDEoMCYGA1UE
 						CgwfVW5pdmVyc2l0eSBvZiB0aGUgQ3JlYXRpdmUgQXJ0czEcMBoGA1UEAwwTaWRw
 						LnVjcmVhdGl2ZS5hYy51azAeFw0xNDA2MTgwOTU4MDRaFw0yNDA2MTgwOTU4MDRa
@@ -38,13 +38,13 @@
 						wzgmWpHQcWolIchFx3IdrXQA5DjbSGerGgvcqpi6aAo1Q8mJNUAAsMT8y2qhYp1z
 						XcWw+FBE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYjCCAkqgAwIBAgIIJo1biNwPrSgwDQYJKoZIhvcNAQEFBQAwSDEoMCYGA1UE
 						CgwfVW5pdmVyc2l0eSBvZiB0aGUgQ3JlYXRpdmUgQXJ0czEcMBoGA1UEAwwTaWRw
 						LnVjcmVhdGl2ZS5hYy51azAeFw0xNDA2MTgwOTU4MDRaFw0yNDA2MTgwOTU4MDRa
@@ -65,25 +65,25 @@
 						wzgmWpHQcWolIchFx3IdrXQA5DjbSGerGgvcqpi6aAo1Q8mJNUAAsMT8y2qhYp1z
 						XcWw+FBE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucreative.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucreative.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University for the Creative Arts</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University for the Creative Arts (Testing)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucreative.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jill</md:GivenName>
-      <md:SurName>Gravestock</md:SurName>
-      <md:EmailAddress>mailto:JGravestock@ucreative.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jill</md:GivenName>
-      <md:SurName>Gravestock</md:SurName>
-      <md:EmailAddress>mailto:JGravestock@ucreative.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucreative.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucreative.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University for the Creative Arts</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University for the Creative Arts (Testing)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucreative.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jill</md:GivenName>
+    <md:SurName>Gravestock</md:SurName>
+    <md:EmailAddress>mailto:JGravestock@ucreative.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jill</md:GivenName>
+    <md:SurName>Gravestock</md:SurName>
+    <md:EmailAddress>mailto:JGravestock@ucreative.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucreative.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ucreative.ac.uk-shibboleth.xml
index 0e74a302..563ae3a6 100644
--- a/swamid-interfederations-2.0/idp.ucreative.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ucreative.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ucreative.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucreative.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucreative.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ucreative.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ucreative.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University for the Creative Arts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucreative.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ucreative.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ucreative.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University for the Creative Arts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucreative.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml
index 13e2999c..dee6eee7 100644
--- a/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ucs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-12T14:33:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-12T14:33:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Campus Suffolk</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Campus Suffolk</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUHNOHSlpAfJGT9rl3zRDmwa3SDhMwDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLnVjcy5hYy51azAeFw0xNDA0MTYxNDI4MDNaFw0z
 						NDA0MTYxNDI4MDNaMBgxFjAUBgNVBAMTDWlkcC51Y3MuYWMudWswggEiMA0GCSqG
@@ -34,26 +34,26 @@
 						xZgo69TfUXl/v3znLYArSkQl1hRgMalzCx0xXy3BCpTQB8/TvYFy+HHCk3sLSLzE
 						oazcpzNwlhXSgUNXMBFi+ghU9o77fKnWXJN8L3mv8lbbf6g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUHNOHSlpAfJGT9rl3zRDmwa3SDhMwDQYJKoZIhvcNAQEF
 						BQAwGDEWMBQGA1UEAxMNaWRwLnVjcy5hYy51azAeFw0xNDA0MTYxNDI4MDNaFw0z
 						NDA0MTYxNDI4MDNaMBgxFjAUBgNVBAMTDWlkcC51Y3MuYWMudWswggEiMA0GCSqG
@@ -72,26 +72,26 @@
 						xZgo69TfUXl/v3znLYArSkQl1hRgMalzCx0xXy3BCpTQB8/TvYFy+HHCk3sLSLzE
 						oazcpzNwlhXSgUNXMBFi+ghU9o77fKnWXJN8L3mv8lbbf6g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University Campus Suffolk</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University Campus Suffolk</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@ucs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>Liebow</md:SurName>
-      <md:EmailAddress>mailto:w.liebow@ucs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University Campus Suffolk</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University Campus Suffolk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@ucs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Liebow</md:SurName>
+    <md:EmailAddress>mailto:w.liebow@ucs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml
index 538f4f0b..6ae034e2 100644
--- a/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.udc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.udc.edu/mail" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of the District of Columbia</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.udc.edu/mail" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of the District of Columbia</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID6DCCAtACCQDW6/6+LgD4VTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
 VVMxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAcTAkRDMTMwMQYDVQQKEypU
 aGUgVW5pdmVyc2l0eSBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExGTAXBgNV
@@ -41,13 +41,13 @@ GWW8uQUlQ5YqWnmKp7stbXL5y4eNIVfNllc9m2zbuoeYqrR8UwWTJnMBlwLZFidf
 /fonk0+iK+kWJq6zMscCDEtTXMv/9wQv181y6TZ57Twy56/chsQPKO+kcMEC78qn
 ZinR7MQoxDrrq20AG0ehnfsFE3m50C4gNCLVtEZkRXi6/XPSPVSm5P9/njs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIjCCAgoCCQCoznUOdQ6C4jANBgkqhkiG9w0BAQUFADBTMRQwEgYDVQQDEwtp
 ZHAudWRjLmVkdTEMMAoGA1UEChMDVURDMQswCQYDVQQGEwJVUzELMAkGA1UECBMC
 REMxEzARBgNVBAcTCldhc2hpbmd0b24wHhcNMTIwNTA0MTIxMTA4WhcNMTMwNTA0
@@ -66,23 +66,23 @@ g1v/KjAwuzl92m6BjAsbekUGy+eKOFomdak5+TKhHYxCQVb5AMYdnJ4S8LQSYMjT
 7BhoxrpEaBs497Rj85x4ZrZnlR1MjzJrmtz8KW4PPJrlgc5TvLzU1092mHztFK02
 HhXBlbm6h347Gmqauqbwh2b+T0USsvsFH3aW1FM3KHxD72BNpI4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udc.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udc.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udc.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udc.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udc.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udc.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID6DCCAtACCQDW6/6+LgD4VTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
 VVMxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAcTAkRDMTMwMQYDVQQKEypU
 aGUgVW5pdmVyc2l0eSBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExGTAXBgNV
@@ -105,19 +105,19 @@ GWW8uQUlQ5YqWnmKp7stbXL5y4eNIVfNllc9m2zbuoeYqrR8UwWTJnMBlwLZFidf
 /fonk0+iK+kWJq6zMscCDEtTXMv/9wQv181y6TZ57Twy56/chsQPKO+kcMEC78qn
 ZinR7MQoxDrrq20AG0ehnfsFE3m50C4gNCLVtEZkRXi6/XPSPVSm5P9/njs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udc.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udc.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the District of Columbia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the District of Columbia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.udc.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hakeem Fahm</md:GivenName>
-      <md:EmailAddress>hfahm@udc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udc.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udc.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the District of Columbia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the District of Columbia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udc.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hakeem Fahm</md:GivenName>
+    <md:EmailAddress>hfahm@udc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
index 31a5330a..698cf182 100644
--- a/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.udu.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.udu.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-08T11:34:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-08T11:34:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IAH AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚDU AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.udu.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.udu.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="121">https://jiftach.cas.cz/loga/logo-udu-44.png</mdui:Logo>
+        <mdui:Logo height="476" width="1309">https://jiftach.cas.cz/loga/logo-udu-476.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IAH AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚDU AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.udu.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.udu.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="121">https://jiftach.cas.cz/loga/logo-udu-44.png</mdui:Logo>
-          <mdui:Logo height="476" width="1309">https://jiftach.cas.cz/loga/logo-udu-476.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
 MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
 yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udu.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.udu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udu.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUDdgXhHF/fFmY4C/uE1WS2GHgpZYwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVkdS5jYXMuY3owHhcNMTYwMzE4MDg0OTMzWhcN
 MzYwMzE4MDg0OTMzWjAZMRcwFQYDVQQDEw5pZHAudWR1LmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ nsbm68pJthBe50fr26BsG6OhTK7cYFxKOdwreEMVhW/Xj6c1rvJdWIIEys9O5N4t
 yinEEzkppNVBsFK3FdtArwxyImljL9bBpKLxq5XkR7lC0e3Dz5q6
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav dějin umění Akademie věd ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.udu.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.udu.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav dějin umění Akademie věd ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Art History of the Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav dějin umění Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udu.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.udu.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
index 5605cd5c..8ff2905c 100644
--- a/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ueb.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-07T09:50:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-07T09:50:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ueb.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Experimental Botany AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider UEB AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UEB AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ueb.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ueb.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ueb-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ueb-137.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ueb.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Experimental Botany AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider UEB AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UEB AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ueb.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ueb.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ueb-44.png</mdui:Logo>
-          <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ueb-137.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
 MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
 dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ueb.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ueb.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ueb.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ueb.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
 MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
 dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Experimental Botany AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav experimentální botaniky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Experimental Botany AS CR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ueb.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ueb.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Experimental Botany AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav experimentální botaniky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Experimental Botany AS CR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ueb.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ueb.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
index c544ae2d..82cfa21f 100644
--- a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uef.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uef.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Eastern Finland students, faculty and employees.</mdui:Description>
+        <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+        <mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uef.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Eastern Finland students, faculty and employees.</mdui:Description>
-          <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
-          <mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
 MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
 biBGaW5sYW5kMRAwDgYDVQQLDAdTaGliIENBMRQwEgYDVQQDDAtVRUYgU2hpYiBD
 QTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckB1ZWYuZmkwHhcNMTQwNDA5MTQx
@@ -40,41 +40,41 @@ XpIjKfMDM9SBSzMFuSUWyVrbvNCrQScwX+qD5PlpsACQzAGC+Q2pF5lqVx9zERef
 fq7jOiSACuaC39ymek0Wok1k6Mes9krUmwJOdP4SjPmgzWCdeh9X/d3xHgUpg2x5
 Sami+WFaMgXxZxJhK+roCmH3hkSh3r8U7xlrnfckSfQ2es9PGYnFI6UlZJqqtrTc
 WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jarno</md:GivenName>
-      <md:SurName>Huuskonen</md:SurName>
-      <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Markus</md:GivenName>
-      <md:SurName>Hagman</md:SurName>
-      <md:EmailAddress>mailto:markus.hagman@uef.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jarno</md:GivenName>
-      <md:SurName>Huuskonen</md:SurName>
-      <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jarno</md:GivenName>
-      <md:SurName>Huuskonen</md:SurName>
-      <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Markus</md:GivenName>
+    <md:SurName>Hagman</md:SurName>
+    <md:EmailAddress>mailto:markus.hagman@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml
index 9243a7cf..e61d12c7 100644
--- a/swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uel.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uel.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uel.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/uel.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/uel.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of East London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uel.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/uel.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/uel.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of East London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uel.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufca.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufca.edu.br-idp-shibboleth.xml
index b156479f..631ef6cd 100644
--- a/swamid-interfederations-2.0/idp.ufca.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufca.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufca.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFCA - Universidade Federal do Cariri</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFCA - Universidade Federal do Cariri</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFCA - Universidade Federal do Cariri</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFCA - Universidade Federal do Cariri</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufca.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufca.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFCA - Universidade Federal do Cariri</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFCA - Universidade Federal do Cariri</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFCA - Universidade Federal do Cariri</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFCA - Universidade Federal do Cariri</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufca.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufca.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEODCCAyACAQAwDQYJKoZIhvcNAQEFBQAwgeExLjAsBgNVBAoTJVVGQ0EgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBDYXJpcmkxMDAuBgNVBAsUJ0RpcmV0b3Jp
 YSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEpMCcGCSqGSIb3DQEJARYa
@@ -47,26 +47,26 @@ FxuQVub4rznGtuKgp38C6SB+oJ+lh8nmr1J4vqBsWDYOu5fSSktig2765zam9Uo0
 Kvm9/BDoEnofL/+mtAEAsGg6q/A6Y0fB23djMo7yA7OKnwkkfjp4XHJNuIigGVvo
 Lsqq9Xg58Wi6F9GoZbNORe1eyvtrXH1yub354w==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufca.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufca.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufca.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufca.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufca.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufca.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufca.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufca.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEODCCAyACAQAwDQYJKoZIhvcNAQEFBQAwgeExLjAsBgNVBAoTJVVGQ0EgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBDYXJpcmkxMDAuBgNVBAsUJ0RpcmV0b3Jp
@@ -93,24 +93,24 @@ Kvm9/BDoEnofL/+mtAEAsGg6q/A6Y0fB23djMo7yA7OKnwkkfjp4XHJNuIigGVvo
 Lsqq9Xg58Wi6F9GoZbNORe1eyvtrXH1yub354w==
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFCA - Universidade Federal do Cariri</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFCA - Universidade Federal do Cariri</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFCA - Universidade Federal do Cariri</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFCA - Universidade Federal do Cariri</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufca.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufca.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Daniel Tavares</md:SurName>
-      <md:EmailAddress>daniel.tavares@ufca.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufca.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFCA - Universidade Federal do Cariri</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFCA - Universidade Federal do Cariri</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFCA - Universidade Federal do Cariri</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFCA - Universidade Federal do Cariri</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufca.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufca.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Daniel Tavares</md:SurName>
+    <md:EmailAddress>daniel.tavares@ufca.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
index 09d0d3bd..4ad91e83 100644
--- a/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufe.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-12T10:58:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-12T10:58:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufe.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider UFE AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFE AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufe.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ufe.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ufe-44.png</mdui:Logo>
+        <mdui:Logo height="216" width="247">https://jiftach.cas.cz/loga/logo-ufe-216.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufe.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider UFE AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFE AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufe.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ufe.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ufe-44.png</mdui:Logo>
-          <mdui:Logo height="216" width="247">https://jiftach.cas.cz/loga/logo-ufe-216.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
 MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
 hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufe.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufe.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufe.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufe.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
 MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
 hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Photonics and Electronics of the AS CR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufe.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ufe.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Photonics and Electronics of the AS CR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufe.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ufe.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
index c7b33cf6..d6035c84 100644
--- a/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufgd.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufgd.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufgd.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufgd.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufgd.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
 BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
@@ -44,26 +44,26 @@ Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
 YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
 NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufgd.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufgd.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
@@ -87,24 +87,24 @@ YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
 NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFGD - Universidade Federal da Grande Dourados</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufgd.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufgd.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Service Desk</md:SurName>
-      <md:EmailAddress>sd@ufgd.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFGD - Universidade Federal da Grande Dourados</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufgd.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufgd.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Service Desk</md:SurName>
+    <md:EmailAddress>sd@ufgd.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
index b4b01b49..76db90f9 100644
--- a/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufmg.br/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufmg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufmg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufmg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufmg.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufmg.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufmg.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
 UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
 ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
@@ -43,26 +43,26 @@ XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
 PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
 1K9RfzyW1h7typu5xg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.ufmg.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.ufmg.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufmg.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.ufmg.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.ufmg.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufmg.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
 UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
@@ -85,24 +85,24 @@ PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
 1K9RfzyW1h7typu5xg==
                  
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufmg.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufmg.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Renato Veneroso</md:SurName>
-      <md:EmailAddress>rveneroso@lcc.ufmg.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufmg.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufmg.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Renato Veneroso</md:SurName>
+    <md:EmailAddress>rveneroso@lcc.ufmg.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
index 9eb45a38..98be4cc8 100644
--- a/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufpr.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufpr.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPR - Universidade Federal do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPR - Universidade Federal do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpr.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpr.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufpr.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFPR - Universidade Federal do Parana</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFPR - Universidade Federal do Parana</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufpr.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufpr.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ0NFMQswCQYD
 VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmcHIuYnIwHhcNMTUwMzEwMTcyMjA5WhcN
 MjAwMzA4MTcyMjA5WjAxMQwwCgYDVQQLEwNDQ0UxCzAJBgNVBAYTAkJSMRQwEgYD
@@ -40,26 +40,26 @@ Wwp77PxzLvmp1vfitkhd+WxJBrjqN07J6e5UC8sfW3vLrZANxj5OLs4dVbV2JK5L
 P/B3aKMyKpyAUfaY9Hqh3tWcQj+4LTlL5TdvPMRPlYu0P4cx92BIXXKqPeE3isNI
 djSyCxyE2TdK8Q==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufpr.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufpr.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ0NFMQswCQYD
 VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmcHIuYnIwHhcNMTUwMzEwMTcyMjA5WhcN
@@ -79,24 +79,24 @@ P/B3aKMyKpyAUfaY9Hqh3tWcQj+4LTlL5TdvPMRPlYu0P4cx92BIXXKqPeE3isNI
 djSyCxyE2TdK8Q==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFPR - Universidade Federal do Parana</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufpr.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Antonio Rodrigues Barros</md:SurName>
-      <md:EmailAddress>antonio@ufpr.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFPR - Universidade Federal do Parana</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufpr.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Antonio Rodrigues Barros</md:SurName>
+    <md:EmailAddress>antonio@ufpr.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml
index 5f96eefe..b3fccac6 100644
--- a/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufrb.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrb.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrb.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufrb.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufrb.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxOjA4BgNVBAoTMVVGUkIgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSZWNvbmNhdm8gZGEgQmFoaWExDjAMBgNV
 BAsTBUNPVEVDMSgwJgYJKoZIhvcNAQkBFhljb3RlY0Bwcm9wbGFuLnVmcmIuZWR1
@@ -46,26 +46,26 @@ NUQS7h3jSQc8/tEZ8ri/ZYvL1H51ifaIF3UgsxkaygobrrjWMMHqd+BpLFI25dhT
 kkWUdTXk30J1kWyts6YUVmzxOd3b40Pvv5sQQw2XX0gkDK/INOQbCbIWCyB3W/QG
 IZlmLPTqQz7twruX1Dqbaf/ocy9s4g==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufrb.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufrb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxOjA4BgNVBAoTMVVGUkIgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSZWNvbmNhdm8gZGEgQmFoaWExDjAMBgNV
@@ -91,24 +91,24 @@ kkWUdTXk30J1kWyts6YUVmzxOd3b40Pvv5sQQw2XX0gkDK/INOQbCbIWCyB3W/QG
 IZlmLPTqQz7twruX1Dqbaf/ocy9s4g==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufrb.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufrb.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Anderson Lago Gomes</md:SurName>
-      <md:EmailAddress>cotec@proplan.ufrb.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufrb.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufrb.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Anderson Lago Gomes</md:SurName>
+    <md:EmailAddress>cotec@proplan.ufrb.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
index 1cd9e37c..0076912d 100644
--- a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufsm.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsm.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufsm.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufsm.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsm.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufsm.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufsm.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ1BEMQswCQYD
 VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwHhcNMTUwOTMwMTc1MzQyWhcN
 MjAwOTI4MTc1MzQyWjAxMQwwCgYDVQQLEwNDUEQxCzAJBgNVBAYTAkJSMRQwEgYD
@@ -40,26 +40,26 @@ LMfKRDHJeh/Um4kwOImAoLLNBVtvnixKcCrXFMTgpTPRtU0sFCEjWpsKOf2C4I2t
 0L2l2kUdC2yEXOjyPeVCCqWJSNfEmDQ/mYH5s1A4aRpfWWop3PTGssj1BEMSAEy8
 9YfkoyeLdgTKHg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufsm.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufsm.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufsm.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufsm.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsm.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufsm.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufsm.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufsm.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufsm.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsm.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ1BEMQswCQYD
 VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwHhcNMTUwOTMwMTc1MzQyWhcN
@@ -79,24 +79,24 @@ LMfKRDHJeh/Um4kwOImAoLLNBVtvnixKcCrXFMTgpTPRtU0sFCEjWpsKOf2C4I2t
 9YfkoyeLdgTKHg==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFSM - Universidade Federal de Santa Maria</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufsm.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufsm.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Fabiano B. Franco</md:SurName>
-      <md:EmailAddress>fabiano@cpd.ufsm.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFSM - Universidade Federal de Santa Maria</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufsm.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufsm.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Fabiano B. Franco</md:SurName>
+    <md:EmailAddress>fabiano@cpd.ufsm.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml
index 85a3734d..bf13dc81 100644
--- a/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uft.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFT - Universidade Federal do Tocantins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFT - Universidade Federal do Tocantins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFT - Universidade Federal do Tocantins</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uft.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uft.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFT - Universidade Federal do Tocantins</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFT - Universidade Federal do Tocantins</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFT - Universidade Federal do Tocantins</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uft.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.uft.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExMDAuBgNVBAoTJ1VGVCAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRvIFRvY2FudGluczEwMC4GA1UECxQnQ29vcmRl
 bmHDp2FvIGRlIEluZnJhZXN0cnV0dXJhIGRlIFJlZGVzMSAwHgYJKoZIhvcNAQkB
@@ -46,26 +46,26 @@ Oo0/gS4n7lLOa/UklWufNGEU/Zd/uhDUfORtQ0WrzZso80vcsTkt91eJ5N0EYA6A
 fIkZ6lzIx0eeLooB34cz+W/WRXj0ksz3NJAvgwpEF0i0UVB3jr3d5rTVvOu0GKAC
 q8DJhtp8LlMPiundMfhCy1Z1B6M65fkdhPKrg1NcjEXSO26OaQ19UywP0h8=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uft.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uft.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uft.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uft.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uft.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uft.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uft.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uft.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uft.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uft.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uft.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uft.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExMDAuBgNVBAoTJ1VGVCAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRvIFRvY2FudGluczEwMC4GA1UECxQnQ29vcmRl
@@ -91,24 +91,24 @@ fIkZ6lzIx0eeLooB34cz+W/WRXj0ksz3NJAvgwpEF0i0UVB3jr3d5rTVvOu0GKAC
 q8DJhtp8LlMPiundMfhCy1Z1B6M65fkdhPKrg1NcjEXSO26OaQ19UywP0h8=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uft.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uft.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFT - Universidade Federal do Tocantins</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFT - Universidade Federal do Tocantins</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uft.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.uft.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Aislan Max Gomes Coelho</md:SurName>
-      <md:EmailAddress>aislan@uft.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uft.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uft.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFT - Universidade Federal do Tocantins</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFT - Universidade Federal do Tocantins</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uft.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uft.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Aislan Max Gomes Coelho</md:SurName>
+    <md:EmailAddress>aislan@uft.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml
index 4f575bf3..8deedcf8 100644
--- a/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ugn.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-01-18T11:28:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-01-18T11:28:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugn.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Geonics of the CAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav geoniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IGN AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚGN AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ugn.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ugn.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ugn-44.png</mdui:Logo>
+        <mdui:Logo height="67" width="113">https://jiftach.cas.cz/loga/logo-ugn-67.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugn.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Geonics of the CAS</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav geoniky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider IGN AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚGN AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ugn.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ugn.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ugn-44.png</mdui:Logo>
-          <mdui:Logo height="67" width="113">https://jiftach.cas.cz/loga/logo-ugn-67.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUanMT4HV96dPVlvHmmJ0S4CVXRlQwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVnbi5jYXMuY3owHhcNMTYwMTEyMTI0ODQ1WhcN
 MzYwMTEyMTI0ODQ1WjAZMRcwFQYDVQQDEw5pZHAudWduLmNhcy5jejCCASIwDQYJ
@@ -51,29 +51,29 @@ e/VSttUAOrFWfuz3n6+oOm7dfjcSxQs1OkA74OpOBoYX77P886WQqsOknyd3mz9Q
 H+4Bj5MUAtb4u4czl/MB7Qe52hUlAke+T+5t70GDjSwLnh691Lcv
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ugn.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugn.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ugn.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ugn.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUanMT4HV96dPVlvHmmJ0S4CVXRlQwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVnbi5jYXMuY3owHhcNMTYwMTEyMTI0ODQ1WhcN
 MzYwMTEyMTI0ODQ1WjAZMRcwFQYDVQQDEw5pZHAudWduLmNhcy5jejCCASIwDQYJ
@@ -93,26 +93,26 @@ e/VSttUAOrFWfuz3n6+oOm7dfjcSxQs1OkA74OpOBoYX77P886WQqsOknyd3mz9Q
 H+4Bj5MUAtb4u4czl/MB7Qe52hUlAke+T+5t70GDjSwLnh691Lcv
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Geonics of the CAS</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav geoniky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Geonics of the CAS, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav geoniky AV ČR, v. v. i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ugn.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ugn.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Geonics of the CAS</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav geoniky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Geonics of the CAS, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav geoniky AV ČR, v. v. i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ugn.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ugn.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
index 277c3226..598f8328 100644
--- a/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uha.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-20T17:01:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-20T17:01:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uha.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Haute Alsace</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABYElEQVQ4y8WSu0oDQRSGv8yOu+tGQXwAwcrKG0QLQRCEVClEsPABRCsbQd9BCJJCxCbkBbQQBFcU7KwtrVNKRNG9zc7uWiQRk3VtPdXMnDn/nPPPB/8dpaJE/fI2669d1+X2vP7rXVlUWFueY1QKAp2yPj8DkAE5ITlcvLWygG3bGEJ0D30fsDg+3McLFUD2U0QMd1B2HEYtk8nxMqdX97TuHjGl0c3ZZm4EMfw6wIgQvH54WNYIAAYZ0pCESnO0t0N19+Dbn4ERkp6ncZri+T7bqxVs2+bk4gYdazZWl/42UekEz/fBcSg7DgDtl85AQajiYoEgigCrZxycXT8AUKvMYpgmSZoWe3CwWS3dPz0TRBGvXkC7846ONTrWICWB0rx9hjSarYGvzHHghQpDCIJIsbY4y8SYjdIpSaKJU53rIEdXH6SF6SmyLAEgilMazRa/gfQnyq7rfu+LUP7/+AIl6JNsXCNDFQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMH48JxUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDAPYZ+pAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.uha.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Haute Alsace</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uha.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Haute Alsace</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABYElEQVQ4y8WSu0oDQRSGv8yOu+tGQXwAwcrKG0QLQRCEVClEsPABRCsbQd9BCJJCxCbkBbQQBFcU7KwtrVNKRNG9zc7uWiQRk3VtPdXMnDn/nPPPB/8dpaJE/fI2669d1+X2vP7rXVlUWFueY1QKAp2yPj8DkAE5ITlcvLWygG3bGEJ0D30fsDg+3McLFUD2U0QMd1B2HEYtk8nxMqdX97TuHjGl0c3ZZm4EMfw6wIgQvH54WNYIAAYZ0pCESnO0t0N19+Dbn4ERkp6ncZri+T7bqxVs2+bk4gYdazZWl/42UekEz/fBcSg7DgDtl85AQajiYoEgigCrZxycXT8AUKvMYpgmSZoWe3CwWS3dPz0TRBGvXkC7846ONTrWICWB0rx9hjSarYGvzHHghQpDCIJIsbY4y8SYjdIpSaKJU53rIEdXH6SF6SmyLAEgilMazRa/gfQnyq7rfu+LUP7/+AIl6JNsXCNDFQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMH48JxUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDAPYZ+pAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.uha.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Haute Alsace</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
 NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
@@ -37,23 +37,23 @@ ls4erY4fZXkYtkB7krSAshiSgkfQ6Uyb3u/tl8SI2y8pBTztgiOtYbipIA0HXXsP
 DtsmCguULyq87Qn+zC65jlHJ+8/uA2lVWkZS+i0eeithnR0KjhojwCJ/0PsdAOt9
 f8gbJ9tz+22mD0+GLYu280WZfj2us+fo
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uha.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uha.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uha.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uha.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uha.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uha.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uha.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uha.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
 NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
@@ -72,19 +72,19 @@ ls4erY4fZXkYtkB7krSAshiSgkfQ6Uyb3u/tl8SI2y8pBTztgiOtYbipIA0HXXsP
 DtsmCguULyq87Qn+zC65jlHJ+8/uA2lVWkZS+i0eeithnR0KjhojwCJ/0PsdAOt9
 f8gbJ9tz+22mD0+GLYu280WZfj2us+fo
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uha.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Haute Alsace</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Haute Alsace</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uha.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>contact.di@uha.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uha.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Haute Alsace</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Haute Alsace</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uha.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>contact.di@uha.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml
index 84b0aa09..03ebd19e 100644
--- a/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uhd.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.uhd.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Houston-Downtown</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.uhd.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Houston-Downtown</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEyzCCA7OgAwIBAgIQclomJbKZ1qKYftgv8fmsVzANBgkqhkiG9w0BAQUFADA8
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 aGF3dGUgU1NMIENBMB4XDTE0MDkyMjAwMDAwMFoXDTE2MDkyMjIzNTk1OVowgZEx
@@ -46,13 +46,13 @@ iKK58ricV65clSdE9mANGaUyVQJPaUJEL3g50XDI7cmEZqT/rmi8SGAKHnPDvtIu
 fGX+jzPtswJArLcGHYp0zP6UCGOiMLr5wOQpIw2iHCZ6gqk8gRRnqG+NmUKsuFSP
 nbykyDpkmQj056Oa1BaHtq82JqXJzdZI2VSs9bwR7Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEzDCCA7SgAwIBAgIQJ/hWn0/Y2YHYTNSVANVt1jANBgkqhkiG9w0BAQsFADBB
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
 aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUxMjIxMDAwMDAwWhcNMTYwOTIyMjM1OTU5
@@ -80,23 +80,23 @@ Iv7b8zSFKkCqtt8waKKmfggiSdw9SJmc6c/3MwlfFO64dPTgtJeqsDQK5E6f3xj4
 FTMCFvuVdtHZRBH6ZrG3RKsJ8QUStlMWAt9lxEJ7z1HGtCEC6yiOuaFByzcCj6Sc
 8OP3TRd4Wc84cSXxkQolQZo8W5zm7nSTDV3Dgkb+M+I=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhd.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhd.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhd.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhd.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhd.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhd.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhd.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhd.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhd.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhd.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhd.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhd.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEyzCCA7OgAwIBAgIQclomJbKZ1qKYftgv8fmsVzANBgkqhkiG9w0BAQUFADA8
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 aGF3dGUgU1NMIENBMB4XDTE0MDkyMjAwMDAwMFoXDTE2MDkyMjIzNTk1OVowgZEx
@@ -124,13 +124,13 @@ iKK58ricV65clSdE9mANGaUyVQJPaUJEL3g50XDI7cmEZqT/rmi8SGAKHnPDvtIu
 fGX+jzPtswJArLcGHYp0zP6UCGOiMLr5wOQpIw2iHCZ6gqk8gRRnqG+NmUKsuFSP
 nbykyDpkmQj056Oa1BaHtq82JqXJzdZI2VSs9bwR7Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEzDCCA7SgAwIBAgIQJ/hWn0/Y2YHYTNSVANVt1jANBgkqhkiG9w0BAQsFADBB
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
 aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUxMjIxMDAwMDAwWhcNMTYwOTIyMjM1OTU5
@@ -158,22 +158,22 @@ Iv7b8zSFKkCqtt8waKKmfggiSdw9SJmc6c/3MwlfFO64dPTgtJeqsDQK5E6f3xj4
 FTMCFvuVdtHZRBH6ZrG3RKsJ8QUStlMWAt9lxEJ7z1HGtCEC6yiOuaFByzcCj6Sc
 8OP3TRd4Wc84cSXxkQolQZo8W5zm7nSTDV3Dgkb+M+I=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhd.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Houston-Downtown</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Houston-Downtown</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uhd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vince Esquivel</md:GivenName>
-      <md:EmailAddress>esquivelv@uhd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Grace Davila</md:GivenName>
-      <md:EmailAddress>davilag@uhd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhd.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Houston-Downtown</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Houston-Downtown</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vince Esquivel</md:GivenName>
+    <md:EmailAddress>esquivelv@uhd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Grace Davila</md:GivenName>
+    <md:EmailAddress>davilag@uhd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
index 703ae0b4..226fd69b 100644
--- a/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uhk.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-03-06T13:11:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-03-06T13:11:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Hradec Kralove</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Hradec Králové</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Hradec Kralove</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Hradec Králové</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uhk.cz/en-GB</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.uhk.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="90">https://idp.uhk.cz/images/logo_40.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhk.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Hradec Kralove</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Univerzita Hradec Králové</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Hradec Kralove</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Hradec Králové</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uhk.cz/en-GB</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.uhk.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="90">https://idp.uhk.cz/images/logo_40.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEqTCCA5GgAwIBAgIRAMhhInHN01xDenxdyI/PyagwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -57,28 +57,28 @@ HjXEbptVJiyOlp9sNkX99RTvSEzyYEjbr7B4W3Z7XZAL954cHrpAVOY5tytBtYMB
 NZy+iTOBfRygx8Y6jkYrmgE4ScCiJC4765lDY0nMOPXHhFCLVktlzCThhi2TbTZU
 RxJkWHrjw5t/tTXPerUVJNoKvG5+w64vJ5gyXjKGdhUxf2kLHdme+x7V/FMN
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhk.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhk.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhk.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhk.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhk.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhk.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhk.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhk.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEqTCCA5GgAwIBAgIRAMhhInHN01xDenxdyI/PyagwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -105,32 +105,32 @@ HjXEbptVJiyOlp9sNkX99RTvSEzyYEjbr7B4W3Z7XZAL954cHrpAVOY5tytBtYMB
 NZy+iTOBfRygx8Y6jkYrmgE4ScCiJC4765lDY0nMOPXHhFCLVktlzCThhi2TbTZU
 RxJkWHrjw5t/tTXPerUVJNoKvG5+w64vJ5gyXjKGdhUxf2kLHdme+x7V/FMN
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Hradec Kralove</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Univerzita Hradec Králové</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Hradec Kralove</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Univerzita Hradec Králové</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uhk.cz/en-GB</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.uhk.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lukas</md:GivenName>
-      <md:SurName>Kummer</md:SurName>
-      <md:EmailAddress>lukas.kummer@uhk.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Flek</md:SurName>
-      <md:EmailAddress>jan.flek@uhk.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Hradec Kralove</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Univerzita Hradec Králové</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Hradec Kralove</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Univerzita Hradec Králové</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhk.cz/en-GB</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.uhk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lukas</md:GivenName>
+    <md:SurName>Kummer</md:SurName>
+    <md:EmailAddress>lukas.kummer@uhk.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Flek</md:SurName>
+    <md:EmailAddress>jan.flek@uhk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml
index b9d4c74a..46e243d8 100644
--- a/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uibk.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-10T14:16:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-10T14:16:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uibk.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Innsbruck</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Innsbruck</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uibk.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Innsbruck</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Innsbruck</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKPXC0xL8CC3lPXuHb8IXl0TkWbIMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51aWJrLmFjLmF0MB4XDTA4MDkwOTA3NDkyN1oX
 DTI4MDkwOTA3NDkyN1owGTEXMBUGA1UEAxMOaWRwLnVpYmsuYWMuYXQwggEiMA0G
@@ -35,26 +35,26 @@ fW9oqrK1fafq6xwjjH34md+tEEGUADopOwtw669f64go3d1vQ1lemF3F5xp6Mwv/
 HpQvY9OrdfUdQ/lYbHMFnZTi4mm6912J3HNd1Cngjj2kvLhbH7Ki74G3sCNhYu2i
 sUbbplFi52tSH+D6jCVIQTMb3X8MG7lAf62Cm0BocKwL/0M6jMQWJQ==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uibk.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uibk.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uibk.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uibk.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uibk.ac.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uibk.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uibk.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uibk.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uibk.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uibk.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKPXC0xL8CC3lPXuHb8IXl0TkWbIMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51aWJrLmFjLmF0MB4XDTA4MDkwOTA3NDkyN1oX
 DTI4MDkwOTA3NDkyN1owGTEXMBUGA1UEAxMOaWRwLnVpYmsuYWMuYXQwggEiMA0G
@@ -73,25 +73,25 @@ fW9oqrK1fafq6xwjjH34md+tEEGUADopOwtw669f64go3d1vQ1lemF3F5xp6Mwv/
 HpQvY9OrdfUdQ/lYbHMFnZTi4mm6912J3HNd1Cngjj2kvLhbH7Ki74G3sCNhYu2i
 sUbbplFi52tSH+D6jCVIQTMb3X8MG7lAf62Cm0BocKwL/0M6jMQWJQ==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Universität Innsbruck</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Innsbruck</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Innsbruck</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Innsbruck</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uibk.ac.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uibk.ac.at/index.html.en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Walter</md:GivenName>
-      <md:SurName>Mueller</md:SurName>
-      <md:EmailAddress>mailto:innet-admin@uibk.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Innsbruck</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Innsbruck</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Innsbruck</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Innsbruck</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uibk.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uibk.ac.at/index.html.en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Walter</md:GivenName>
+    <md:SurName>Mueller</md:SurName>
+    <md:EmailAddress>mailto:innet-admin@uibk.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
index d78b9e0e..d9301019 100644
--- a/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:26:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:26:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for UJEP in Usti nad Labem</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro UJEP v Ústí nad Labem</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ujep.cz</mdui:InformationURL>
+        <mdui:Logo height="40" width="102">https://trilian.ujep.cz/logo_ujep40.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for UJEP in Usti nad Labem</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro UJEP v Ústí nad Labem</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ujep.cz</mdui:InformationURL>
-          <mdui:Logo height="40" width="102">https://trilian.ujep.cz/logo_ujep40.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
 Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
 YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
@@ -55,28 +55,28 @@ ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
 6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
 U19RU7sLdrZ60inUFxdxr+AR
              </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujep.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujep.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujep.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujep.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujep.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujep.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujep.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujep.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
 Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
 YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
@@ -101,26 +101,26 @@ ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
 6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
 U19RU7sLdrZ60inUFxdxr+AR
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ujep.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pavel</md:GivenName>
-      <md:SurName>Polacek</md:SurName>
-      <md:EmailAddress>pavel.polacek@ujep.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ujep.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Polacek</md:SurName>
+    <md:EmailAddress>pavel.polacek@ujep.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
index 3cd3f0fe..6c44b88e 100644
--- a/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujf.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-09T14:17:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-09T14:17:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider NPI ASCR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚJF AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ujf.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ujf.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ujf-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ujf-201.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider NPI ASCR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚJF AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ujf.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ujf.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ujf-44.png</mdui:Logo>
-          <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ujf-201.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
 DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
@@ -51,29 +51,29 @@ qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
 omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujf.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujf.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
 DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
@@ -93,26 +93,26 @@ qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
 omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nuclear Physics Institute of the ASCR</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav jaderné fyziky AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ujf.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ujf.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nuclear Physics Institute of the ASCR</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav jaderné fyziky AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ujf.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ujf.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
index 7354dd55..2cf15c66 100644
--- a/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ul.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-21T23:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-21T23:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ul.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Limerick</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Ollscoil Luimnigh</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ul.ie</mdui:InformationURL>
+        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.67381900899521,-8.566224575042725</mdui:GeolocationHint>
+        <mdui:DomainHint>ul.ie</mdui:DomainHint>
+        <mdui:IPHint>193.1.96.0/20</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ul.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Limerick</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Ollscoil Luimnigh</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ul.ie</mdui:InformationURL>
-          <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.67381900899521,-8.566224575042725</mdui:GeolocationHint>
-          <mdui:DomainHint>ul.ie</mdui:DomainHint>
-          <mdui:IPHint>193.1.96.0/20</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEDCCAfigAwIBAgIVAJxKI/0KxawomkWiBThPEUHGaeWBMA0GCSqGSIb3DQEB
 BQUAMBQxEjAQBgNVBAMTCWlkcC51bC5pZTAeFw0wOTA2MDMxMzQ1MzVaFw0yOTA2
 MDMxMzQ1MzVaMBQxEjAQBgNVBAMTCWlkcC51bC5pZTCCASIwDQYJKoZIhvcNAQEB
@@ -40,33 +40,33 @@ zZoWbnsaUBtZKpWUp98WKRX7XX3fczEa3lENR4/lnlEimPYXT9wKh8qydCyWPCYS
 k65z+Uw92gy6HaID2r+Vu8juYEp8989R/CHRZlnxFrGQXkmKYn6traja5Rvaqh67
 Rzm7HVZoXU6uXX1z5kqraHrS28c=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ul.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ul.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Limerick</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Limerick</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ul.ie</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Brian Sexton</md:SurName>
-      <md:EmailAddress>mailto:brian.sexton@ul.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Eugene Murnane</md:SurName>
-      <md:EmailAddress>mailto:eugene.murnane@ul.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Eugene Murnane</md:SurName>
-      <md:EmailAddress>mailto:eugene.murnane@ul.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ul.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ul.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Limerick</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Limerick</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ul.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Brian Sexton</md:SurName>
+    <md:EmailAddress>mailto:brian.sexton@ul.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Eugene Murnane</md:SurName>
+    <md:EmailAddress>mailto:eugene.murnane@ul.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Eugene Murnane</md:SurName>
+    <md:EmailAddress>mailto:eugene.murnane@ul.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
index 5cb603cd..57a1dfd6 100644
--- a/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ulb.ac.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulb.ac.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ULB - Universite Libre de Bruxelles</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Universite Libre de Bruxelles</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.ulb.ac.be/logo/ulb-small.jpg</mdui:Logo>
+        <mdui:Logo height="110" width="331">https://idp.ulb.ac.be/logo/ulb-large.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>164.15.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:11a0::/64</mdui:IPHint>
+        <mdui:DomainHint>ulb.ac.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.8119483,4.38261690</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulb.ac.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ULB - Universite Libre de Bruxelles</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Universite Libre de Bruxelles</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.ulb.ac.be/logo/ulb-small.jpg</mdui:Logo>
-          <mdui:Logo height="110" width="331">https://idp.ulb.ac.be/logo/ulb-large.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>164.15.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:06a8:11a0::/64</mdui:IPHint>
-          <mdui:DomainHint>ulb.ac.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.8119483,4.38261690</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAI/VDrWwVO0DRbxqyo/DcM/tAz8TMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51bGIuYWMuYmUwHhcNMTMxMjE3MTQzOTM2WhcN
 MzMxMjE3MTQzOTM2WjAYMRYwFAYDVQQDEw1pZHAudWxiLmFjLmJlMIIBIjANBgkq
@@ -44,29 +44,29 @@ L4vi1i4VLJAvnvSp3nMLoqQkeDB1HTX5tG35t4q2Plv8tSMWvxdCMsoiN6gWBVfY
 P67aJTsrDaN9W2NHFiwumJUE4QnedbfiOJaI25iZWnEyDLBK
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ulb.ac.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulb.ac.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ulb.ac.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulb.ac.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAI/VDrWwVO0DRbxqyo/DcM/tAz8TMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51bGIuYWMuYmUwHhcNMTMxMjE3MTQzOTM2WhcN
 MzMxMjE3MTQzOTM2WjAYMRYwFAYDVQQDEw1pZHAudWxiLmFjLmJlMIIBIjANBgkq
@@ -86,28 +86,28 @@ L4vi1i4VLJAvnvSp3nMLoqQkeDB1HTX5tG35t4q2Plv8tSMWvxdCMsoiN6gWBVfY
 P67aJTsrDaN9W2NHFiwumJUE4QnedbfiOJaI25iZWnEyDLBK
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
                 Universite Libre de Bruxelles
         </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
                 ULB - Universite Libre de Bruxelles
         </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
                 http://www.ulb.ac.be
         </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>support@ulb.ac.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>support@ulb.ac.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ulster.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ulster.ac.uk-shibboleth.xml
index 15bd0d38..9ce197c9 100644
--- a/swamid-interfederations-2.0/idp.ulster.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ulster.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ulster.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulster.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ulster.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ulster.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Ulster</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ulster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ulster.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ulster.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Ulster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ulster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml
index c86395db..a58cef45 100644
--- a/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umassd.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umassd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Massachusetts - Dartmouth</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.umassd.edu</mdui:InformationURL>
+        <mdui:Logo height="55" width="350" xml:lang="en">https://idp.umassd.edu/idp/images/umassd.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umassd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Massachusetts - Dartmouth</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.umassd.edu</mdui:InformationURL>
-          <mdui:Logo height="55" width="350" xml:lang="en">https://idp.umassd.edu/idp/images/umassd.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJcM3MOQxZ8si0E5BGYr72Fa/81LMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDmlkcC51bWFzc2QuZWR1MB4XDTE1MTExMDE2MjUzMFoX
 DTM1MTExMDE2MjUzMFowGTEXMBUGA1UEAwwOaWRwLnVtYXNzZC5lZHUwggEiMA0G
@@ -39,19 +39,19 @@ hHAQYEb+nF5icqLWRcM3Dy2O7B+DraQaVAxPl1zLH8hESJCTxUPZw2Ztpgpycz+u
 vd40Lau00JitxcFWd5OainenB/QIhYlcQtsEqBgubyiTXzlBSq+ndxwwsCUucyxW
 jRlpHHp503ULaAZOVJz+t/3mK0Il1DaWIueXOHYeWFC3t5NE+Mzajg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umassd.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umassd.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Massachusetts - Dartmouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Massachusetts - Dartmouth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umassd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Craig R. Oliveira</md:GivenName>
-      <md:EmailAddress>coliveira@umassd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umassd.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umassd.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Massachusetts - Dartmouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Massachusetts - Dartmouth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umassd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Craig R. Oliveira</md:GivenName>
+    <md:EmailAddress>coliveira@umassd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml
index 0b320f52..6926a676 100644
--- a/swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umoncton.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-10-15T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-10-15T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umoncton.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Moncton</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université de Moncton</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Université de Moncton</mdui:Description>
+        <mdui:Description xml:lang="fr">Université de Moncton</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.umoncton.ca/english/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.umoncton.ca/enbref/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umoncton.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Moncton</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">Université de Moncton</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Université de Moncton</mdui:Description>
-          <mdui:Description xml:lang="fr">Université de Moncton</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.umoncton.ca/english/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fr">http://www.umoncton.ca/enbref/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUJw5q6RUUySGVia72uCU3k51FT4YwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMB4XDTE0MTAwNjE3MjYyM1oX
 DTM0MTAwNjE3MjYyM1owGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMIIBIjAN
@@ -39,29 +39,29 @@ Vg2ZEA7l0W+vY0rAUR18/Yz1sAg9mg1eULgaFK5vhz06cGhPACjkOfZYyohfNGEN
 qcZWJ7Ktw690e5FRDhPRkmfRz0/puYKVXn7UquIU0kyTn5XEBGb9BTkMaDx8xck1
 WsKC/lb05YSOThSKdky/5vApohqpmoLkqcwDONPRKbRjguzTlMJ3z+U/4A==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.umoncton.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umoncton.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.umoncton.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umoncton.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umoncton.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.umoncton.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umoncton.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.umoncton.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umoncton.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umoncton.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUJw5q6RUUySGVia72uCU3k51FT4YwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMB4XDTE0MTAwNjE3MjYyM1oX
 DTM0MTAwNjE3MjYyM1owGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMIIBIjAN
@@ -80,24 +80,24 @@ Vg2ZEA7l0W+vY0rAUR18/Yz1sAg9mg1eULgaFK5vhz06cGhPACjkOfZYyohfNGEN
 qcZWJ7Ktw690e5FRDhPRkmfRz0/puYKVXn7UquIU0kyTn5XEBGb9BTkMaDx8xck1
 WsKC/lb05YSOThSKdky/5vApohqpmoLkqcwDONPRKbRjguzTlMJ3z+U/4A==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.umoncton.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fr">Université de Moncton</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Université de Moncton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fr">Université de Moncton</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Moncton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fr">http://www.umoncton.ca/enbref/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.umoncton.ca/english/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Service à la clientèle Université de Moncton</md:SurName>
-      <md:EmailAddress>dgt@umoncton.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.umoncton.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fr">Université de Moncton</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Université de Moncton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fr">Université de Moncton</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Moncton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fr">http://www.umoncton.ca/enbref/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.umoncton.ca/english/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Service à la clientèle Université de Moncton</md:SurName>
+    <md:EmailAddress>dgt@umoncton.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index 87effdfe..95a7ce25 100644
--- a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umu.se/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Umeå universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Umeå University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.umu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.umu.se/english/</mdui:InformationURL>
+        <mdui:Logo height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">umu umea+universitet umea+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">umu umea+universitet umea+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>umu.se</mdui:DomainHint>
+        <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Umeå universitet</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Umeå University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.umu.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.umu.se/english/</mdui:InformationURL>
-          <mdui:Logo height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">umu umea+universitet umea+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">umu umea+universitet umea+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>umu.se</mdui:DomainHint>
-          <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umu.se/saml2/idp/ArtifactResolutionService.php" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Umeå University</md:Company>
-      <md:SurName>ITS datordrift</md:SurName>
-      <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Umeå University</md:Company>
-      <md:SurName>ITS datordrift</md:SurName>
-      <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Umeå University</md:Company>
-      <md:SurName>Servicedesk Umeå universitet</md:SurName>
-      <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umu.se/saml2/idp/ArtifactResolutionService.php" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>ITS datordrift</md:SurName>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Umeå University</md:Company>
+    <md:SurName>Servicedesk Umeå universitet</md:SurName>
+    <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
index a312e046..d7b5267c 100644
--- a/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unb.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-01-23T20:50:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-01-23T20:50:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of New Brunswick</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of New Brunswick</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unb.ca</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of New Brunswick</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of New Brunswick</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unb.ca</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIURLDfhqryV9GxVrS3QEZfziUWRGAwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnVuYi5jYTAeFw0xMTA4MjUxNjM1MjdaFw0zMTA4
 MjUxNjM1MjdaMBUxEzARBgNVBAMTCmlkcC51bmIuY2EwggEiMA0GCSqGSIb3DQEB
@@ -34,29 +34,29 @@ Lf3ZA4GUkzJmNHpkFLemP36ydh5pGX15KGZTcGFG+Nhz+MkIzsX/Pz19vZrwBWTM
 ogRrXrUfW1k3AD9hY0/YNIIZ8JO3rSRyGr1MEnIIeQ0abZEmF5Nrhje/G1n/scq9
 NGM3l0dquBRhq0MP6DY4/L0lLn87h2M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unb.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unb.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unb.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unb.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIURLDfhqryV9GxVrS3QEZfziUWRGAwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLnVuYi5jYTAeFw0xMTA4MjUxNjM1MjdaFw0zMTA4
 MjUxNjM1MjdaMBUxEzARBgNVBAMTCmlkcC51bmIuY2EwggEiMA0GCSqGSIb3DQEB
@@ -75,21 +75,21 @@ Lf3ZA4GUkzJmNHpkFLemP36ydh5pGX15KGZTcGFG+Nhz+MkIzsX/Pz19vZrwBWTM
 ogRrXrUfW1k3AD9hY0/YNIIZ8JO3rSRyGr1MEnIIeQ0abZEmF5Nrhje/G1n/scq9
 NGM3l0dquBRhq0MP6DY4/L0lLn87h2M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of New Brunswick</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of New Brunswick</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unb.ca</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>UNB Information Technology Services Help Desk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@unb.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of New Brunswick</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of New Brunswick</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unb.ca</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>UNB Information Technology Services Help Desk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@unb.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml b/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml
index 30c0e1ab..f564017d 100644
--- a/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml
+++ b/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ung.si/idp/20111102">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-22T11:10:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-22T11:10:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ung.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nova Gorica</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Univerza v Novi Gorici</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Keywords>
+        <mdui:Logo height="261" width="258">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.ung.si</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.ung.si</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ung.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nova Gorica</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Univerza v Novi Gorici</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Keywords>
-          <mdui:Logo height="261" width="258">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.ung.si</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.ung.si</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Univerza v Novi Gorici</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Univerza v Novi Gorici</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ung.si</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.ung.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Danilo</md:GivenName>
-      <md:SurName>Zavrtanik</md:SurName>
-      <md:EmailAddress>mailto:danilo.zavrtanik@ung.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bojan</md:GivenName>
-      <md:SurName>Korečič</md:SurName>
-      <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Univerza v Novi Gorici</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Univerza v Novi Gorici</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ung.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.ung.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Danilo</md:GivenName>
+    <md:SurName>Zavrtanik</md:SurName>
+    <md:EmailAddress>mailto:danilo.zavrtanik@ung.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bojan</md:GivenName>
+    <md:SurName>Korečič</md:SurName>
+    <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml
index e6c527a8..1d6ec2db 100644
--- a/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duesseldorf.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-09-18T07:49:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-09-18T07:49:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duesseldorf.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhu.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Heinrich-Heine-Universität Düsseldorf</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Heinrich Heine University Duesseldorf</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identitätsprovider der Heinrich-Heine-Universität Düsseldorf</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of Heinrich Heine University Duesseldorf</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.uni-duesseldorf.de/idp/images/hhu_small.jpg</mdui:Logo>
+        <mdui:Logo height="85" width="170">https://idp.uni-duesseldorf.de/idp/images/hhu_large.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.zim.hhu.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.zim.hhu.de/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duesseldorf.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhu.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Heinrich-Heine-Universität Düsseldorf</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Heinrich Heine University Duesseldorf</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identitätsprovider der Heinrich-Heine-Universität Düsseldorf</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of Heinrich Heine University Duesseldorf</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.uni-duesseldorf.de/idp/images/hhu_small.jpg</mdui:Logo>
-          <mdui:Logo height="85" width="170">https://idp.uni-duesseldorf.de/idp/images/hhu_large.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.zim.hhu.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.zim.hhu.de/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-duesseldorf.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=idm@uni-duesseldorf.de,CN=idp.uni-duesseldorf.de,OU=ZIM,O=Heinrich-Heine-Universitaet Duesseldorf,L=Duesseldorf,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGeTCCBWGgAwIBAgIHGHBqep37LTANBgkqhkiG9w0BAQsFADCBujELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-duesseldorf.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=idm@uni-duesseldorf.de,CN=idp.uni-duesseldorf.de,OU=ZIM,O=Heinrich-Heine-Universitaet Duesseldorf,L=Duesseldorf,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGeTCCBWGgAwIBAgIHGHBqep37LTANBgkqhkiG9w0BAQsFADCBujELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFDASBgNVBAcTC0R1
 ZXNzZWxkb3JmMTAwLgYDVQQKEydIZWlucmljaC1IZWluZS1Vbml2ZXJzaXRhZXQg
 RHVlc3NlbGRvcmYxHzAdBgNVBAMTFlVuaSBEdWVzc2VsZG9yZiBDQS1HMDExJDAi
@@ -62,32 +62,32 @@ xaFVlONzNoh+96g4OuBcqF6GeucvbEGq4iK2ykrwtbMDGGa3hmdpJHOc4oMDekd6
 t6iqz+gCv/iBNnJ32dJNew2DWXZ103juUzHzg8KQ5TzDjJ5XmgVoV3WN9BXuHE3Q
 N/n/b6C9FbOgHlMhI2gC2I3nmP5ruJ5JTH+SS8o=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duesseldorf.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duesseldorf.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhu.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-duesseldorf.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=idm@uni-duesseldorf.de,CN=idp.uni-duesseldorf.de,OU=ZIM,O=Heinrich-Heine-Universitaet Duesseldorf,L=Duesseldorf,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGeTCCBWGgAwIBAgIHGHBqep37LTANBgkqhkiG9w0BAQsFADCBujELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duesseldorf.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duesseldorf.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhu.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-duesseldorf.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=idm@uni-duesseldorf.de,CN=idp.uni-duesseldorf.de,OU=ZIM,O=Heinrich-Heine-Universitaet Duesseldorf,L=Duesseldorf,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGeTCCBWGgAwIBAgIHGHBqep37LTANBgkqhkiG9w0BAQsFADCBujELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFDASBgNVBAcTC0R1
 ZXNzZWxkb3JmMTAwLgYDVQQKEydIZWlucmljaC1IZWluZS1Vbml2ZXJzaXRhZXQg
 RHVlc3NlbGRvcmYxHzAdBgNVBAMTFlVuaSBEdWVzc2VsZG9yZiBDQS1HMDExJDAi
@@ -123,35 +123,35 @@ xaFVlONzNoh+96g4OuBcqF6GeucvbEGq4iK2ykrwtbMDGGa3hmdpJHOc4oMDekd6
 t6iqz+gCv/iBNnJ32dJNew2DWXZ103juUzHzg8KQ5TzDjJ5XmgVoV3WN9BXuHE3Q
 N/n/b6C9FbOgHlMhI2gC2I3nmP5ruJ5JTH+SS8o=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e399</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e399</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Heinrich-Heine-Universität Düsseldorf</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Heinrich Heine University Duesseldorf</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-duesseldorf.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-duesseldorf.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Heide</md:GivenName>
-      <md:SurName>Unteregge</md:SurName>
-      <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Heide</md:GivenName>
-      <md:SurName>Unteregge</md:SurName>
-      <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Heide</md:GivenName>
-      <md:SurName>Unteregge</md:SurName>
-      <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e399</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e399</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Heinrich-Heine-Universität Düsseldorf</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Heinrich Heine University Duesseldorf</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-duesseldorf.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-duesseldorf.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Heide</md:GivenName>
+    <md:SurName>Unteregge</md:SurName>
+    <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Heide</md:GivenName>
+    <md:SurName>Unteregge</md:SurName>
+    <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Heide</md:GivenName>
+    <md:SurName>Unteregge</md:SurName>
+    <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
index caee9c84..eaabd1d0 100644
--- a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duisburg-essen.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Duisburg-Essen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Duisburg-Essen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.uni-duisburg-essen.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-duisburg-essen.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Duisburg-Essen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Duisburg-Essen</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.uni-duisburg-essen.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-duisburg-essen.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
 BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
 A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
 dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
@@ -59,15 +59,15 @@ kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
 gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
 BkqqyY3eD4M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
 BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
 A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
 dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
@@ -103,28 +103,28 @@ kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
 gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
 BkqqyY3eD4M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
 BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
 A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
 dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
@@ -160,15 +160,15 @@ kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
 gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
 BkqqyY3eD4M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
 BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
 A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
 dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
@@ -204,41 +204,41 @@ kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
 gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
 BkqqyY3eD4M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e105</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e105</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Universität Duisburg-Essen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-duisburg-essen.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Harald</md:GivenName>
-      <md:SurName>Schüler</md:SurName>
-      <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Harald</md:GivenName>
-      <md:SurName>Schüler</md:SurName>
-      <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Burkhard</md:GivenName>
-      <md:SurName>Wald</md:SurName>
-      <md:EmailAddress>mailto:burkhard.wald@uni-duisburg-essen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Burkhard</md:GivenName>
-      <md:SurName>Wald</md:SurName>
-      <md:EmailAddress>mailto:burkhard.wald@uni-due.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e105</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e105</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universität Duisburg-Essen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-duisburg-essen.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Harald</md:GivenName>
+    <md:SurName>Schüler</md:SurName>
+    <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Harald</md:GivenName>
+    <md:SurName>Schüler</md:SurName>
+    <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Burkhard</md:GivenName>
+    <md:SurName>Wald</md:SurName>
+    <md:EmailAddress>mailto:burkhard.wald@uni-duisburg-essen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Burkhard</md:GivenName>
+    <md:SurName>Wald</md:SurName>
+    <md:EmailAddress>mailto:burkhard.wald@uni-due.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml b/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml
index 90e5bf48..6965fcfb 100644
--- a/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml
+++ b/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-lj.si/idp/20100525">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-06T18:11:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-06T18:11:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ctk.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ag.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrft.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aluo.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bf1.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ef1.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fa.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fdv.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fe1.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ff.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffa.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgg.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkkt1.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmf.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpp.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fri1.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fs1.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsd.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsp.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fu.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntf.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pef.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pf.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teof.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vf.uni-lj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zf.uni-lj.si</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Ljubljana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for organization University of Ljubljana</mdui:Description>
+        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani</mdui:Description>
+        <mdui:Keywords xml:lang="en">Identity provider for organization University of Ljubljana</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani</mdui:Keywords>
+        <mdui:Logo height="239" width="240">data:image/png;base64,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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.uni-lj.si/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.uni-lj.si</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-lj.si/en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sl">http://www.uni-lj.si</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ctk.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ag.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrft.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aluo.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bf1.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ef1.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fa.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fdv.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fe1.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ff.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffa.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgg.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkkt1.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmf.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpp.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fri1.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fs1.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsd.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsp.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fu.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntf.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pef.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pf.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teof.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vf.uni-lj.si</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zf.uni-lj.si</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Ljubljana</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for organization University of Ljubljana</mdui:Description>
-          <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani</mdui:Description>
-          <mdui:Keywords xml:lang="en">Identity provider for organization University of Ljubljana</mdui:Keywords>
-          <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani</mdui:Keywords>
-          <mdui:Logo height="239" width="240">data:image/png;base64,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</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.uni-lj.si/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="sl">http://www.uni-lj.si</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-lj.si/en</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="sl">http://www.uni-lj.si</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFjjCCA3agAwIBAgIGElFxoJQNMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEwMDgxMjEyMjRaFw0zNDA2MjUxMjEyMjRaMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALf+bKLghf3EDDJu6LXbgiDcIYH/Tvtv6S6Qh5UJHyWjqXpVtp43CQCndE/Fgbfsp44iCLgHOWg1eQuRwol0ixzPyA+qNFfNQcsCjwff5Obzqt5+//ma2XT8nQrePsMa8XL6v+HIOPqnk9ce6K2YRgBhTJn//5rlaLAm6Gy1V8NK35T20sKXSLGOL6/btXOTc4uHRedHRJlk61swYu80wbxO/jsN89olxaC07A8iyrxfYrBlL/As7TDOe7trBanLrY+f+wNKsdoUH2nArYnR3HSUQRV4u2SkuLixTvfkub24PKO4nLw6o4XkhgURnGbYFLYtVR/6mVvizBS4JFO2IJxp5RESDXzJ7xSCMrsKN5ifU0dnH32NIJ16F1bCdszrZzEwVaVETTyxkc+maNhyRDcwvOJh+gKoOf0lOkHFZOXLPYWeYEo45NlQA86cntVkm8GQYhTFNTV8uUO2zHUogvQN3qJZfeOH0W+UaIunJApOablhpUrof5M+qXkRxAMV14l67hsCNxvlSSbQ2jWl7NThTT0hRr4UxB1WYYiFKzW0B00yty65I1C/coXqXwSr9+a2pqKuALk4gD9/aAr478Ws9ikL1Le5sDRapUhm9VOSudOqu4ZLzvzLtj8HPyJXBLYn6QXdHeqNncUeqt7Ri+PBr+XIHKYCrXKbWJo2c9MnAgMBAAGjUDBOMB0GA1UdDgQWBBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAfBgNVHSMEGDAWgBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCaPqA0g1dOV0EfJgsB8y0eHPqljGjDTBHoi1jGKAoD1R35vWHfCOV9GhW/O8pxJJF8u3p7c/PXURQ4aoonC+TKuY/aY/kvZuk6UPOVM1wbDD94LvAUsqhW9Ih2Vv9gPLmhEvRTC5tJZ182BFs/Y871YocOO6Asd0ZOj10X/pI2F69x1I/bWRMC+uU9uT4YOlaFY5eClGHGONUfXD7BqDuMMvYTv/4M7/KNXxS6pDj+9vSLnmbECuBrPXkrz3jprDz6kvMk/lKKrqCRIJxEvnJ4Zlz1zrr0gCTSK2f2C5J68Yz+y6VgGLrquLFTJlG+Sp816E7ajpSzod5l5t++QUpkzMyvytMM10PglpE5E42dhbVryYOfQkd/J32okay187TgQDOh7yQlaF6mHW/3Y39ucsF7N4DeBdxTLc0YVjCkn5l+JZoViVowwvEKslOMFElSXz/1LRh5xO39ZPcqDjh2WFJzJlxyn6HeR9M7t22PMie/XzZn6Px6874BGx7pFfFMWn0xRWAnMgg8xRK9ugPJSv04sUckiYtazplemYhd5XJi4xWHbn+k+DKKHs7DGwXlJWv9NJnnafw0AB0h5UsXwWI+vrQ1NMM7OMJSGzud+SSdxZXulhZxgZqG4FnR9C2w7REyCoRTgqN5PEd30h/Ieo/G6rYjnHishET4UnOOlQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFjjCCA3agAwIBAgIGElFxoJQNMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEwMDgxMjEyMjRaFw0zNDA2MjUxMjEyMjRaMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALf+bKLghf3EDDJu6LXbgiDcIYH/Tvtv6S6Qh5UJHyWjqXpVtp43CQCndE/Fgbfsp44iCLgHOWg1eQuRwol0ixzPyA+qNFfNQcsCjwff5Obzqt5+//ma2XT8nQrePsMa8XL6v+HIOPqnk9ce6K2YRgBhTJn//5rlaLAm6Gy1V8NK35T20sKXSLGOL6/btXOTc4uHRedHRJlk61swYu80wbxO/jsN89olxaC07A8iyrxfYrBlL/As7TDOe7trBanLrY+f+wNKsdoUH2nArYnR3HSUQRV4u2SkuLixTvfkub24PKO4nLw6o4XkhgURnGbYFLYtVR/6mVvizBS4JFO2IJxp5RESDXzJ7xSCMrsKN5ifU0dnH32NIJ16F1bCdszrZzEwVaVETTyxkc+maNhyRDcwvOJh+gKoOf0lOkHFZOXLPYWeYEo45NlQA86cntVkm8GQYhTFNTV8uUO2zHUogvQN3qJZfeOH0W+UaIunJApOablhpUrof5M+qXkRxAMV14l67hsCNxvlSSbQ2jWl7NThTT0hRr4UxB1WYYiFKzW0B00yty65I1C/coXqXwSr9+a2pqKuALk4gD9/aAr478Ws9ikL1Le5sDRapUhm9VOSudOqu4ZLzvzLtj8HPyJXBLYn6QXdHeqNncUeqt7Ri+PBr+XIHKYCrXKbWJo2c9MnAgMBAAGjUDBOMB0GA1UdDgQWBBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAfBgNVHSMEGDAWgBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCaPqA0g1dOV0EfJgsB8y0eHPqljGjDTBHoi1jGKAoD1R35vWHfCOV9GhW/O8pxJJF8u3p7c/PXURQ4aoonC+TKuY/aY/kvZuk6UPOVM1wbDD94LvAUsqhW9Ih2Vv9gPLmhEvRTC5tJZ182BFs/Y871YocOO6Asd0ZOj10X/pI2F69x1I/bWRMC+uU9uT4YOlaFY5eClGHGONUfXD7BqDuMMvYTv/4M7/KNXxS6pDj+9vSLnmbECuBrPXkrz3jprDz6kvMk/lKKrqCRIJxEvnJ4Zlz1zrr0gCTSK2f2C5J68Yz+y6VgGLrquLFTJlG+Sp816E7ajpSzod5l5t++QUpkzMyvytMM10PglpE5E42dhbVryYOfQkd/J32okay187TgQDOh7yQlaF6mHW/3Y39ucsF7N4DeBdxTLc0YVjCkn5l+JZoViVowwvEKslOMFElSXz/1LRh5xO39ZPcqDjh2WFJzJlxyn6HeR9M7t22PMie/XzZn6Px6874BGx7pFfFMWn0xRWAnMgg8xRK9ugPJSv04sUckiYtazplemYhd5XJi4xWHbn+k+DKKHs7DGwXlJWv9NJnnafw0AB0h5UsXwWI+vrQ1NMM7OMJSGzud+SSdxZXulhZxgZqG4FnR9C2w7REyCoRTgqN5PEd30h/Ieo/G6rYjnHishET4UnOOlQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-lj.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-lj.si/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Ljubljana</md:OrganizationName>
-      <md:OrganizationName xml:lang="sl">Univerza v Ljubljani</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Ljubljana</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uni-lj.si/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sl">http://www.uni-lj.si</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Majda</md:GivenName>
-      <md:SurName>Rebernik</md:SurName>
-      <md:EmailAddress>mailto:majda.rebernik@uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anton</md:GivenName>
-      <md:SurName>Jagodic</md:SurName>
-      <md:EmailAddress>mailto:anton.jagodic@uni-lj.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFjjCCA3agAwIBAgIGElFxoJQNMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEwMDgxMjEyMjRaFw0zNDA2MjUxMjEyMjRaMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALf+bKLghf3EDDJu6LXbgiDcIYH/Tvtv6S6Qh5UJHyWjqXpVtp43CQCndE/Fgbfsp44iCLgHOWg1eQuRwol0ixzPyA+qNFfNQcsCjwff5Obzqt5+//ma2XT8nQrePsMa8XL6v+HIOPqnk9ce6K2YRgBhTJn//5rlaLAm6Gy1V8NK35T20sKXSLGOL6/btXOTc4uHRedHRJlk61swYu80wbxO/jsN89olxaC07A8iyrxfYrBlL/As7TDOe7trBanLrY+f+wNKsdoUH2nArYnR3HSUQRV4u2SkuLixTvfkub24PKO4nLw6o4XkhgURnGbYFLYtVR/6mVvizBS4JFO2IJxp5RESDXzJ7xSCMrsKN5ifU0dnH32NIJ16F1bCdszrZzEwVaVETTyxkc+maNhyRDcwvOJh+gKoOf0lOkHFZOXLPYWeYEo45NlQA86cntVkm8GQYhTFNTV8uUO2zHUogvQN3qJZfeOH0W+UaIunJApOablhpUrof5M+qXkRxAMV14l67hsCNxvlSSbQ2jWl7NThTT0hRr4UxB1WYYiFKzW0B00yty65I1C/coXqXwSr9+a2pqKuALk4gD9/aAr478Ws9ikL1Le5sDRapUhm9VOSudOqu4ZLzvzLtj8HPyJXBLYn6QXdHeqNncUeqt7Ri+PBr+XIHKYCrXKbWJo2c9MnAgMBAAGjUDBOMB0GA1UdDgQWBBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAfBgNVHSMEGDAWgBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCaPqA0g1dOV0EfJgsB8y0eHPqljGjDTBHoi1jGKAoD1R35vWHfCOV9GhW/O8pxJJF8u3p7c/PXURQ4aoonC+TKuY/aY/kvZuk6UPOVM1wbDD94LvAUsqhW9Ih2Vv9gPLmhEvRTC5tJZ182BFs/Y871YocOO6Asd0ZOj10X/pI2F69x1I/bWRMC+uU9uT4YOlaFY5eClGHGONUfXD7BqDuMMvYTv/4M7/KNXxS6pDj+9vSLnmbECuBrPXkrz3jprDz6kvMk/lKKrqCRIJxEvnJ4Zlz1zrr0gCTSK2f2C5J68Yz+y6VgGLrquLFTJlG+Sp816E7ajpSzod5l5t++QUpkzMyvytMM10PglpE5E42dhbVryYOfQkd/J32okay187TgQDOh7yQlaF6mHW/3Y39ucsF7N4DeBdxTLc0YVjCkn5l+JZoViVowwvEKslOMFElSXz/1LRh5xO39ZPcqDjh2WFJzJlxyn6HeR9M7t22PMie/XzZn6Px6874BGx7pFfFMWn0xRWAnMgg8xRK9ugPJSv04sUckiYtazplemYhd5XJi4xWHbn+k+DKKHs7DGwXlJWv9NJnnafw0AB0h5UsXwWI+vrQ1NMM7OMJSGzud+SSdxZXulhZxgZqG4FnR9C2w7REyCoRTgqN5PEd30h/Ieo/G6rYjnHishET4UnOOlQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFjjCCA3agAwIBAgIGElFxoJQNMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEwMDgxMjEyMjRaFw0zNDA2MjUxMjEyMjRaMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALf+bKLghf3EDDJu6LXbgiDcIYH/Tvtv6S6Qh5UJHyWjqXpVtp43CQCndE/Fgbfsp44iCLgHOWg1eQuRwol0ixzPyA+qNFfNQcsCjwff5Obzqt5+//ma2XT8nQrePsMa8XL6v+HIOPqnk9ce6K2YRgBhTJn//5rlaLAm6Gy1V8NK35T20sKXSLGOL6/btXOTc4uHRedHRJlk61swYu80wbxO/jsN89olxaC07A8iyrxfYrBlL/As7TDOe7trBanLrY+f+wNKsdoUH2nArYnR3HSUQRV4u2SkuLixTvfkub24PKO4nLw6o4XkhgURnGbYFLYtVR/6mVvizBS4JFO2IJxp5RESDXzJ7xSCMrsKN5ifU0dnH32NIJ16F1bCdszrZzEwVaVETTyxkc+maNhyRDcwvOJh+gKoOf0lOkHFZOXLPYWeYEo45NlQA86cntVkm8GQYhTFNTV8uUO2zHUogvQN3qJZfeOH0W+UaIunJApOablhpUrof5M+qXkRxAMV14l67hsCNxvlSSbQ2jWl7NThTT0hRr4UxB1WYYiFKzW0B00yty65I1C/coXqXwSr9+a2pqKuALk4gD9/aAr478Ws9ikL1Le5sDRapUhm9VOSudOqu4ZLzvzLtj8HPyJXBLYn6QXdHeqNncUeqt7Ri+PBr+XIHKYCrXKbWJo2c9MnAgMBAAGjUDBOMB0GA1UdDgQWBBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAfBgNVHSMEGDAWgBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCaPqA0g1dOV0EfJgsB8y0eHPqljGjDTBHoi1jGKAoD1R35vWHfCOV9GhW/O8pxJJF8u3p7c/PXURQ4aoonC+TKuY/aY/kvZuk6UPOVM1wbDD94LvAUsqhW9Ih2Vv9gPLmhEvRTC5tJZ182BFs/Y871YocOO6Asd0ZOj10X/pI2F69x1I/bWRMC+uU9uT4YOlaFY5eClGHGONUfXD7BqDuMMvYTv/4M7/KNXxS6pDj+9vSLnmbECuBrPXkrz3jprDz6kvMk/lKKrqCRIJxEvnJ4Zlz1zrr0gCTSK2f2C5J68Yz+y6VgGLrquLFTJlG+Sp816E7ajpSzod5l5t++QUpkzMyvytMM10PglpE5E42dhbVryYOfQkd/J32okay187TgQDOh7yQlaF6mHW/3Y39ucsF7N4DeBdxTLc0YVjCkn5l+JZoViVowwvEKslOMFElSXz/1LRh5xO39ZPcqDjh2WFJzJlxyn6HeR9M7t22PMie/XzZn6Px6874BGx7pFfFMWn0xRWAnMgg8xRK9ugPJSv04sUckiYtazplemYhd5XJi4xWHbn+k+DKKHs7DGwXlJWv9NJnnafw0AB0h5UsXwWI+vrQ1NMM7OMJSGzud+SSdxZXulhZxgZqG4FnR9C2w7REyCoRTgqN5PEd30h/Ieo/G6rYjnHishET4UnOOlQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-lj.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-lj.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Ljubljana</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Ljubljana</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uni-lj.si/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.uni-lj.si</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Majda</md:GivenName>
+    <md:SurName>Rebernik</md:SurName>
+    <md:EmailAddress>mailto:majda.rebernik@uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anton</md:GivenName>
+    <md:SurName>Jagodic</md:SurName>
+    <md:EmailAddress>mailto:anton.jagodic@uni-lj.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml
index 02a543e8..cffed4c7 100644
--- a/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-tuebingen.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Tübingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Tübingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Shibboleth IdP Universität Tübingen</mdui:Description>
+        <mdui:Description xml:lang="en">Shibboleth IdP Universität Tübingen</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.uni-tuebingen.de/ut_small.png</mdui:Logo>
+        <mdui:Logo height="100" width="260">https://idp.uni-tuebingen.de/ut_big.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://idp.uni-tuebingen.de/terms.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Tübingen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Tübingen</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Shibboleth IdP Universität Tübingen</mdui:Description>
-          <mdui:Description xml:lang="en">Shibboleth IdP Universität Tübingen</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.uni-tuebingen.de/ut_small.png</mdui:Logo>
-          <mdui:Logo height="100" width="260">https://idp.uni-tuebingen.de/ut_big.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-tuebingen.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-tuebingen.de/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">https://idp.uni-tuebingen.de/terms.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-tuebingen.de,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHFQ0FpCF5EDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-tuebingen.de,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHFQ0FpCF5EDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
 R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
 aS10dWViaW5nZW4uZGUwHhcNMTMwMTA5MTUwOTA5WhcNMTgwMTA4MTUwOTA5WjB+
@@ -63,26 +63,26 @@ sbUiekroRVs7wpRe/cK5CxxCajdxxC6z0Sa7N+WAqsx5UamlyvSvyk+O5BKAh4jh
 kKrtjD0n2ZbNLvPx3e9xowmTpQ+9R2rvaLM1owJE7ZOKmjy+x3gIxw0hDPVbvdY+
 1kKswAopSj+1y7y8b+Z/StEZJI/c3b8CveLBBOaPXljEfyE/tpAjw867Ga1v
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-tuebingen.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-tuebingen.de,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHFQ0FpCF5EDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-tuebingen.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-tuebingen.de,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHFQ0FpCF5EDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
 R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
 aS10dWViaW5nZW4uZGUwHhcNMTMwMTA5MTUwOTA5WhcNMTgwMTA4MTUwOTA5WjB+
@@ -114,35 +114,35 @@ sbUiekroRVs7wpRe/cK5CxxCajdxxC6z0Sa7N+WAqsx5UamlyvSvyk+O5BKAh4jh
 kKrtjD0n2ZbNLvPx3e9xowmTpQ+9R2rvaLM1owJE7ZOKmjy+x3gIxw0hDPVbvdY+
 1kKswAopSj+1y7y8b+Z/StEZJI/c3b8CveLBBOaPXljEfyE/tpAjw867Ga1v
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e60</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e60</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Tübingen</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Tuebingen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kurt</md:GivenName>
-      <md:SurName>Spanier</md:SurName>
-      <md:EmailAddress>mailto:kurt.spanier@uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>mailto:idp-technical@uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:idp-support@uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e60</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e60</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Tübingen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Tuebingen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kurt</md:GivenName>
+    <md:SurName>Spanier</md:SurName>
+    <md:EmailAddress>mailto:kurt.spanier@uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>mailto:idp-technical@uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:idp-support@uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
index 5db69203..a3d545fe 100644
--- a/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-wuppertal.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-05T14:09:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-05T14:09:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Bergische Universität Wuppertal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Wuppertal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Mitglieder der Bergischen Universität Wuppertal</mdui:Description>
+        <mdui:Description xml:lang="en">Members at University of Wuppertal</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.uni-wuppertal.de/idp/images/buw-mini.png</mdui:Logo>
+        <mdui:Logo height="70" width="200">https://idp.uni-wuppertal.de/idp/images/buw_log.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Bergische Universität Wuppertal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Wuppertal</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Mitglieder der Bergischen Universität Wuppertal</mdui:Description>
-          <mdui:Description xml:lang="en">Members at University of Wuppertal</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.uni-wuppertal.de/idp/images/buw-mini.png</mdui:Logo>
-          <mdui:Logo height="70" width="200">https://idp.uni-wuppertal.de/idp/images/buw_log.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
 cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
 YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
@@ -57,15 +57,15 @@ Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
 /m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
 kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
 cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
 YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
@@ -99,28 +99,28 @@ Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
 /m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
 kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
 cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
 YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
@@ -154,15 +154,15 @@ Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
 /m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
 kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
 cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
 YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
@@ -196,30 +196,30 @@ Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
 /m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
 kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e168</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e168</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Bergische Universität Wuppertal</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wuppertal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-wuppertal.de/en/home.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rene</md:GivenName>
-      <md:SurName>Zeipelt</md:SurName>
-      <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rene</md:GivenName>
-      <md:SurName>Zeipelt</md:SurName>
-      <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e168</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e168</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Bergische Universität Wuppertal</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wuppertal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-wuppertal.de/en/home.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rene</md:GivenName>
+    <md:SurName>Zeipelt</md:SurName>
+    <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rene</md:GivenName>
+    <md:SurName>Zeipelt</md:SurName>
+    <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
index 19eebcba..59da3ac0 100644
--- a/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibg.it/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-11-27T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-11-27T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibg.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Bergamo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Bergamo users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli studi di Bergamo</mdui:Description>
+        <mdui:DisplayName xml:lang="it">Università degli studi di Bergamo</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="it">http://www.unibg.it/idem</mdui:InformationURL>
+        <mdui:Logo height="55" width="153">https://idp.unibg.it/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unibg.it</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:45.69548,9.66664</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibg.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Bergamo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Bergamo users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli studi di Bergamo</mdui:Description>
-          <mdui:DisplayName xml:lang="it">Università degli studi di Bergamo</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="it">http://www.unibg.it/idem</mdui:InformationURL>
-          <mdui:Logo height="55" width="153">https://idp.unibg.it/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>unibg.it</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:45.69548,9.66664</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDZzCCAk+gAwIBAgIJAO63/giuk/ngMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
 BAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQKDAZDSU5FQ0ExFTAT
 BgNVBAMMDGlkcC51bmliZy5pdDAeFw0xNDA0MTQxMzA1MTRaFw0yNDA0MTMxMzA1
@@ -45,13 +45,13 @@ e9/ZJFUYBBD+yvrOxMnVCRSnh98phe5P3ZdJVZ/LEMVZvv/HghnVKsDUQZDQc6MQ
 wEH76GwmZQFrC65dac+I+viPLUSDmj2lnXVcCpeG85C5Utg4ulhGWISYK2RVbG/P
 MNMgaClKqsoAXo8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDZzCCAk+gAwIBAgIJAO63/giuk/ngMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
 BAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQKDAZDSU5FQ0ExFTAT
 BgNVBAMMDGlkcC51bmliZy5pdDAeFw0xNDA0MTQxMzA1MTRaFw0yNDA0MTMxMzA1
@@ -72,26 +72,26 @@ e9/ZJFUYBBD+yvrOxMnVCRSnh98phe5P3ZdJVZ/LEMVZvv/HghnVKsDUQZDQc6MQ
 wEH76GwmZQFrC65dac+I+viPLUSDmj2lnXVcCpeG85C5Utg4ulhGWISYK2RVbG/P
 MNMgaClKqsoAXo8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibg.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibg.it/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibg.it/simplesaml/shib13/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli studi di Bergamo</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Bergamo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Bergamo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bergamo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unibg.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unibg.it/en_index.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDP</md:GivenName>
-      <md:SurName>Administrator</md:SurName>
-      <md:EmailAddress>mailto:postmaster@unibg.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibg.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibg.it/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibg.it/simplesaml/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli studi di Bergamo</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Bergamo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Bergamo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bergamo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unibg.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unibg.it/en_index.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDP</md:GivenName>
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:postmaster@unibg.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
index da1e8f6b..40ae6d95 100644
--- a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibocconi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibocconi.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
 NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
@@ -42,27 +42,27 @@ uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
 uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
 K93oKA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibocconi.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibocconi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
 NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
@@ -82,24 +82,24 @@ uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
 uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
 K93oKA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bocconi University</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Universita' Bocconi</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bocconi University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Universita' Bocconi</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unibocconi.eu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unibocconi.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@unibocconi.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bocconi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Universita' Bocconi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bocconi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' Bocconi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unibocconi.eu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unibocconi.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@unibocconi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
index a5b729a6..105051dc 100644
--- a/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unica.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unica.it</mdui:DomainHint>
+        <mdui:DomainHint>www.unica.it</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:39.2238411,9.1216613</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>unica.it</mdui:DomainHint>
-          <mdui:DomainHint>www.unica.it</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:39.2238411,9.1216613</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
 OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
@@ -46,26 +46,26 @@ bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
 jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
 7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unica.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unica.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
 OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
@@ -84,24 +84,24 @@ bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
 jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
 7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Cagliari</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Cagliari State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Cagliari</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Cagliari State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://idp.unica.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Assistenza Tecnica</md:SurName>
-      <md:EmailAddress>mailto:idem-help@unica.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Cagliari</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Cagliari State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Cagliari</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Cagliari State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://idp.unica.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Assistenza Tecnica</md:SurName>
+    <md:EmailAddress>mailto:idem-help@unica.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
index 17ca2070..69b7be2e 100644
--- a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unicaen.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-20T14:38:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-20T14:38:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicaen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Caen Normandie</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAV0lEQVQY03XPMQrAMAxD0d7/WOFPxkvAS8YsGUIW36BTS2WoxgcW8tVKrh9g7OwfsLPD4AX2RE7ioB1zlFKjwIwKq3R4ugCM7CBLI89ymY6H6XO0pvDkBhHbxZqnkacaAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.unicaen.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Caen Normandie</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicaen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Caen Normandie</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAV0lEQVQY03XPMQrAMAxD0d7/WOFPxkvAS8YsGUIW36BTS2WoxgcW8tVKrh9g7OwfsLPD4AX2RE7ioB1zlFKjwIwKq3R4ugCM7CBLI89ymY6H6XO0pvDkBhHbxZqnkacaAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.unicaen.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Caen Normandie</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVALLJNRifsaDgq9SZsGgf6vqdEpntMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51bmljYWVuLmZyMB4XDTA5MDcyNzEzNDMxMFoX
 DTI5MDcyNzEzNDMxMFowGTEXMBUGA1UEAxMOaWRwLnVuaWNhZW4uZnIwggEiMA0G
@@ -37,26 +37,26 @@ sjYkdQpopHxBW3npgmOSS1/5X7qy1di8ckgLfEs7u3qfOZfw6i+nn1/98CjMKlv7
 TRVhM943X1kgV4l/lvaMWsPxvgTT8RRvaoAYClmyg6XLbdFC5QQUCjVCPldcbeIY
 IsKc8ui7+rEvhoAKrdmvAPrxTSfN8KMFQ3tbQDz2E3YzAELQD+4zWg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Caen Normandie</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Caen Normandie</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unicaen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Nicolas HEURTEL</md:SurName>
-      <md:EmailAddress>nicolas.heurtel@unicaen.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>David SURVILLE</md:SurName>
-      <md:EmailAddress>david.surville@unicaen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Caen Normandie</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Caen Normandie</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unicaen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Nicolas HEURTEL</md:SurName>
+    <md:EmailAddress>nicolas.heurtel@unicaen.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>David SURVILLE</md:SurName>
+    <md:EmailAddress>david.surville@unicaen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
index d35f7179..e55ef8ef 100644
--- a/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unical.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-08-18T09:50:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-08-18T09:50:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unical.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Calabria</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università della Calabria</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Calabria users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università della Calabria</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.unical.it/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://www.unical.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.unical.it/idem/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.unical.it/idem/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>160.97.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>unical.it</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:39.357911,16.225530</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unical.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Calabria</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università della Calabria</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for University of Calabria users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università della Calabria</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.unical.it/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://www.unical.it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.unical.it/idem/privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://www.unical.it/idem/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>160.97.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>unical.it</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:39.357911,16.225530</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAL8L6FVmAKzC+THRIlDhT8LSevXmMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMMDWlkcC51bmljYWwuaXQwHhcNMTQxMjMxMDkwOTMxWhcN
 MzQxMjMxMDkwOTMxWjAYMRYwFAYDVQQDDA1pZHAudW5pY2FsLml0MIIBIjANBgkq
@@ -46,29 +46,29 @@ sMNiDkJhdHp/hgU1PqKBsiw0L4NZYnUweSvkoARzl90LOc7gnTaMF/vF1tcvYFF4
 +BtpYUkJLCO302UkQygIJBPbnPWRdAJWdQmqpi326apWLQl3XgUWkLpeGPrguo9J
 Z1yQ0FMZWZ/qgnNEvOC4oDUkACRrs4AMyPBb64WlSs4w2O7O
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unical.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unical.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unical.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unical.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unical.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unical.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unical.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unical.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unical.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unical.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unical.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unical.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unical.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unical.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unical.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unical.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAL8L6FVmAKzC+THRIlDhT8LSevXmMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMMDWlkcC51bmljYWwuaXQwHhcNMTQxMjMxMDkwOTMxWhcN
 MzQxMjMxMDkwOTMxWjAYMRYwFAYDVQQDDA1pZHAudW5pY2FsLml0MIIBIjANBgkq
@@ -87,30 +87,30 @@ sMNiDkJhdHp/hgU1PqKBsiw0L4NZYnUweSvkoARzl90LOc7gnTaMF/vF1tcvYFF4
 +BtpYUkJLCO302UkQygIJBPbnPWRdAJWdQmqpi326apWLQl3XgUWkLpeGPrguo9J
 Z1yQ0FMZWZ/qgnNEvOC4oDUkACRrs4AMyPBb64WlSs4w2O7O
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unical.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università della Calabria</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Calabria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">UNICAL - Università della Calabria</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">UNICAL - University of Calabria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unical.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unical.it/portale/international/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ferdinando</md:GivenName>
-      <md:SurName>Arcuri</md:SurName>
-      <md:EmailAddress>mailto:idem-support@unical.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Walter</md:GivenName>
-      <md:SurName>Curci</md:SurName>
-      <md:EmailAddress>mailto:idem-support@unical.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unical.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università della Calabria</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Calabria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">UNICAL - Università della Calabria</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">UNICAL - University of Calabria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unical.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unical.it/portale/international/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ferdinando</md:GivenName>
+    <md:SurName>Arcuri</md:SurName>
+    <md:EmailAddress>mailto:idem-support@unical.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Walter</md:GivenName>
+    <md:SurName>Curci</md:SurName>
+    <md:EmailAddress>mailto:idem-support@unical.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml
index 9bdad63f..48f3f215 100644
--- a/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unicon.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicon.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Unicon, Inc.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Login service for Unicon Employees</mdui:Description>
+        <mdui:Logo height="88" width="600" xml:lang="en">https://www.unicon.net/files/Image/unicon_logo_600_high.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicon.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Unicon, Inc.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Login service for Unicon Employees</mdui:Description>
-          <mdui:Logo height="88" width="600" xml:lang="en">https://www.unicon.net/files/Image/unicon_logo_600_high.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUIEHTfbStY0ckKZzxIgqd5p1O2K0wDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVuaWNvbi5uZXQwHhcNMTEwOTEzMDMyMzE2WhcN
 MzEwOTEzMDMyMzE2WjAZMRcwFQYDVQQDEw5pZHAudW5pY29uLm5ldDCCASIwDQYJ
@@ -39,23 +39,23 @@ qIlJCads9Rcx3vAih72I4exUUD4qMuBMeLIdY5XReHy5YHqxbkPjQhDIEORAFlzJ
 jLqO/Ldzn4waEa5snDZyeYjsl6pi+8CVGfXLSDVsDuk5s47B9OD+gOSJ1wEc7O/N
 nU9d/WCcM1V4IGZGL8TXUdfJoVXYZUFF08jUGSL2mj30WS1orIWo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unicon.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unicon.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicon.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unicon.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicon.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicon.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unicon.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unicon.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicon.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unicon.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicon.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicon.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUIEHTfbStY0ckKZzxIgqd5p1O2K0wDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnVuaWNvbi5uZXQwHhcNMTEwOTEzMDMyMzE2WhcN
 MzEwOTEzMDMyMzE2WjAZMRcwFQYDVQQDEw5pZHAudW5pY29uLm5ldDCCASIwDQYJ
@@ -74,23 +74,23 @@ qIlJCads9Rcx3vAih72I4exUUD4qMuBMeLIdY5XReHy5YHqxbkPjQhDIEORAFlzJ
 jLqO/Ldzn4waEa5snDZyeYjsl6pi+8CVGfXLSDVsDuk5s47B9OD+gOSJ1wEc7O/N
 nU9d/WCcM1V4IGZGL8TXUdfJoVXYZUFF08jUGSL2mj30WS1orIWo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unicon.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unicon.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Unicon, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Unicon, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unicon.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Lewis</md:GivenName>
-      <md:EmailAddress>jlewis@unicon.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IdP Administrator</md:GivenName>
-      <md:EmailAddress>idp-admin@unicon.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unicon.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unicon.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Unicon, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Unicon, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unicon.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Lewis</md:GivenName>
+    <md:EmailAddress>jlewis@unicon.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IdP Administrator</md:GivenName>
+    <md:EmailAddress>idp-admin@unicon.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
index 5e815a71..d7435ad9 100644
--- a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unige.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-14T16:16:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.unige.ch/stic/cad.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-03-14T16:16:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Genf</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Geneva</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université de Genève</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Ginevra</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Genf</mdui:Description>
+        <mdui:Description xml:lang="en">University of Geneva</mdui:Description>
+        <mdui:Description xml:lang="fr">Université de Genève</mdui:Description>
+        <mdui:Description xml:lang="it">Università di Ginevra</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAjVJREFUeJx0U+1P8VEY/v3nPrS14YONSAwVCjEvIea1KGWUeUt8aGsz02isGSNd7bpb9jx5ng9nfs4593VfL/dRACi/12KxQK/XQyAQQDKZxPPzM7i3Wq3w++4/i1utFux2OxwOhyy3241Op4Plcvl/gPV6jUajgVQqJd0tFgtisRj8fj9sNpvshUIhAfr8/MRfAES+vLxENBrF8fGxfLPw9PQUXq8XmUwGNzc3ODw8RDqdRi6X28gRgJ/OwWAQ4XAYVqtVGHCv3+/j9vYW2WxWlkajwfn5Odrt9jfAeDxGuVwW3byg0+mk89HREYxGI+bzuXR3Op24vr7G2dkZHh4eBHQ4HEJhIQ+Jyl+9Xr/5f3BwgNlsJoUmk0kkUt7V1RX29/cFSCFl6ry4uBB0Oq5Wq7G7uwuDwSAMisWisKJ+Ft3d3QlgPp+HwrhoSrValdwZGw+5dnZ2MJlMJA0W/xjHu2azWfaVeDwuepvNJkajkaDSTJ/PB5VKJZRp3N7eHh4fHwWADMioVCpBYSH1EI1mEcDj8UgKWq12M0Q8I8OPjw9EIhHxh+kpb29vwoBFdJ1ATINGUh4Z0gMuul6pVOSMnr2+vn5PE12m9lqthpeXF3S73c0sDAYDGSp6UK/XpRGbEHAzSHSaXXmR6Pf390KTU8kZYeacQrJh50KhIFK2HtOPBzSRBS6XS8aYsZ6cnIhUGvnno9p6je/v7zKmpJhIJCRzfj89PWE6nW69xi8AAAD//wMAKn0rRUh0CAQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAvrSURBVHic7JgJcFT1HcdXBAta7UxHR2urYzvWqnVQ69iWdqxabbWOglcbCIIJl4rE1FgghBLRSLiEgAlyhNwksAkkJBASEsi1STbX7r6977f3Zs9k782e6fdlYwghOtOOx3Td32Qy//3ve//3Pv/f9f0vbfx7ZrTv+gW+bUsAx7slgOPdEsDxbgngeLcEcLxbAjjeLQEc75YAjndLAF9t0WjU7x8LhULj0W/nfb5Wi477ZSb1hlI/aZma+ypgoErE0q6unu5uptE4HA6Hv/l3/DoNPpItOaB9rzzk8E5Nzg5sNlsIDrel5XJHe5dMppBIpBcamxldPSKRxOVyfdkDRhvY9ur+2NjNVFiOtUeDYWspw1xwKTIWoiZ75daiTurKevZI7ZCHqzXtawq7/JO3NxK2k31+pWV4b+PwJw3Gj2tdDFnI5Rve3WjYXD2c2+DhaGJXYl6XUaleX+KXmoImp2l/s19jN33WYtrRYN7bNPxJvfnw5YDFZT7Yot9EN+0+by3siEaiswN7PB7WEKe3t0+vN2i1OgajV6FQws+dHYzRUYdAIOrt7ReLpZFI5Fpg5Ut5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</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
+        <mdui:IPHint>192.33.224.0/21</mdui:IPHint>
+        <mdui:IPHint>192.33.217.0/24</mdui:IPHint>
+        <mdui:IPHint>192.33.218.0/23</mdui:IPHint>
+        <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
+        <mdui:IPHint>195.176.0.144/28</mdui:IPHint>
+        <mdui:IPHint>192.33.214.0/23</mdui:IPHint>
+        <mdui:IPHint>192.33.216.0/22</mdui:IPHint>
+        <mdui:IPHint>2001:620:600::/48</mdui:IPHint>
+        <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
+        <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
+        <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
+        <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
+        <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
+        <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
+        <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
+        <mdui:IPHint>192.80.42.0/24</mdui:IPHint>
+        <mdui:IPHint>129.194.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
+        <mdui:IPHint>192.33.212.0/24</mdui:IPHint>
+        <mdui:IPHint>192.33.212.0/22</mdui:IPHint>
+        <mdui:IPHint>192.33.216.0/24</mdui:IPHint>
+        <mdui:DomainHint>unige.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.194936,6.139927</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.unige.ch/stic/cad.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Genf</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Geneva</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">Université de Genève</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Ginevra</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Universität Genf</mdui:Description>
-          <mdui:Description xml:lang="en">University of Geneva</mdui:Description>
-          <mdui:Description xml:lang="fr">Université de Genève</mdui:Description>
-          <mdui:Description xml:lang="it">Università di Ginevra</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAjVJREFUeJx0U+1P8VEY/v3nPrS14YONSAwVCjEvIea1KGWUeUt8aGsz02isGSNd7bpb9jx5ng9nfs4593VfL/dRACi/12KxQK/XQyAQQDKZxPPzM7i3Wq3w++4/i1utFux2OxwOhyy3241Op4Plcvl/gPV6jUajgVQqJd0tFgtisRj8fj9sNpvshUIhAfr8/MRfAES+vLxENBrF8fGxfLPw9PQUXq8XmUwGNzc3ODw8RDqdRi6X28gRgJ/OwWAQ4XAYVqtVGHCv3+/j9vYW2WxWlkajwfn5Odrt9jfAeDxGuVwW3byg0+mk89HREYxGI+bzuXR3Op24vr7G2dkZHh4eBHQ4HEJhIQ+Jyl+9Xr/5f3BwgNlsJoUmk0kkUt7V1RX29/cFSCFl6ry4uBB0Oq5Wq7G7uwuDwSAMisWisKJ+Ft3d3QlgPp+HwrhoSrValdwZGw+5dnZ2MJlMJA0W/xjHu2azWfaVeDwuepvNJkajkaDSTJ/PB5VKJZRp3N7eHh4fHwWADMioVCpBYSH1EI1mEcDj8UgKWq12M0Q8I8OPjw9EIhHxh+kpb29vwoBFdJ1ATINGUh4Z0gMuul6pVOSMnr2+vn5PE12m9lqthpeXF3S73c0sDAYDGSp6UK/XpRGbEHAzSHSaXXmR6Pf390KTU8kZYeacQrJh50KhIFK2HtOPBzSRBS6XS8aYsZ6cnIhUGvnno9p6je/v7zKmpJhIJCRzfj89PWE6nW69xi8AAAD//wMAKn0rRUh0CAQAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAvrSURBVHic7JgJcFT1HcdXBAta7UxHR2urYzvWqnVQ69iWdqxabbWOglcbCIIJl4rE1FgghBLRSLiEgAlyhNwksAkkJBASEsi1STbX7r6977f3Zs9k782e6fdlYwghOtOOx3Td32Qy//3ve//3Pv/f9f0vbfx7ZrTv+gW+bUsAx7slgOPdEsDxbgngeLcEcLxbAjjeLQEc75YAjndLAF9t0WjU7x8LhULj0W/nfb5Wi477ZSb1hlI/aZma+ypgoErE0q6unu5uptE4HA6Hv/l3/DoNPpItOaB9rzzk8E5Nzg5sNlsIDrel5XJHe5dMppBIpBcamxldPSKRxOVyfdkDRhvY9ur+2NjNVFiOtUeDYWspw1xwKTIWoiZ75daiTurKevZI7ZCHqzXtawq7/JO3NxK2k31+pWV4b+PwJw3Gj2tdDFnI5Rve3WjYXD2c2+DhaGJXYl6XUaleX+KXmoImp2l/s19jN33WYtrRYN7bNPxJvfnw5YDFZT7Yot9EN+0+by3siEaiswN7PB7WEKe3t0+vN2i1OgajV6FQws+dHYzRUYdAIOrt7ReLpZFI5Fpg5Ut5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</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="de">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
-          <mdui:IPHint>192.33.224.0/21</mdui:IPHint>
-          <mdui:IPHint>192.33.217.0/24</mdui:IPHint>
-          <mdui:IPHint>192.33.218.0/23</mdui:IPHint>
-          <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
-          <mdui:IPHint>195.176.0.144/28</mdui:IPHint>
-          <mdui:IPHint>192.33.214.0/23</mdui:IPHint>
-          <mdui:IPHint>192.33.216.0/22</mdui:IPHint>
-          <mdui:IPHint>2001:620:600::/48</mdui:IPHint>
-          <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
-          <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
-          <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
-          <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
-          <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
-          <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
-          <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
-          <mdui:IPHint>192.80.42.0/24</mdui:IPHint>
-          <mdui:IPHint>129.194.0.0/16</mdui:IPHint>
-          <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
-          <mdui:IPHint>192.33.212.0/24</mdui:IPHint>
-          <mdui:IPHint>192.33.212.0/22</mdui:IPHint>
-          <mdui:IPHint>192.33.216.0/24</mdui:IPHint>
-          <mdui:DomainHint>unige.ch</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:46.194936,6.139927</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUVhAy88tBsXNTKyLKAgkwFfi0Y9UwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMaWRwLnVuaWdlLmNoMB4XDTE2MDMxMTE1MjY0MloXDTE5
 MDMxMTE1MjY0MlowFzEVMBMGA1UEAwwMaWRwLnVuaWdlLmNoMIIBIjANBgkqhkiG
@@ -79,27 +79,27 @@ rFy2553TKofcB/nS7lV4BNhfj4G8FQdDhRTjoTrAhQccpvw4ZWUshrwUZ6Uik3EA
 DUB2pABDlt2u46yvUKh6k2ycA31D2ajv7DISqiTREokSsnVOg/xxrkrpHDu690oa
 uMzLWCT2Q8T1BmpwOdXMFt7zp/BqGo76H2S7kU9k8w==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/Artifact" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unige.ch/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unige.ch/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unige.ch/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unige.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/Artifact" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unige.ch/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unige.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unige.ch/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unige.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUVhAy88tBsXNTKyLKAgkwFfi0Y9UwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMaWRwLnVuaWdlLmNoMB4XDTE2MDMxMTE1MjY0MloXDTE5
 MDMxMTE1MjY0MlowFzEVMBMGA1UEAwwMaWRwLnVuaWdlLmNoMIIBIjANBgkqhkiG
@@ -118,34 +118,34 @@ rFy2553TKofcB/nS7lV4BNhfj4G8FQdDhRTjoTrAhQccpvw4ZWUshrwUZ6Uik3EA
 DUB2pABDlt2u46yvUKh6k2ycA31D2ajv7DISqiTREokSsnVOg/xxrkrpHDu690oa
 uMzLWCT2Q8T1BmpwOdXMFt7zp/BqGo76H2S7kU9k8w==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/AA"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">unige.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Genf</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Geneva</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Université de Genève</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Ginevra</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.unige.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unige.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.unige.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unige.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help</md:GivenName>
-      <md:SurName>Desk for the University of Geneva</md:SurName>
-      <md:EmailAddress>mailto:cad@unige.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UNIGE</md:GivenName>
-      <md:SurName>IdP Administrators</md:SurName>
-      <md:EmailAddress>mailto:aai@unige.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/AA"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">unige.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Genf</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Geneva</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Université de Genève</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Ginevra</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.unige.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unige.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.unige.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unige.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help</md:GivenName>
+    <md:SurName>Desk for the University of Geneva</md:SurName>
+    <md:EmailAddress>mailto:cad@unige.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UNIGE</md:GivenName>
+    <md:SurName>IdP Administrators</md:SurName>
+    <md:EmailAddress>mailto:aai@unige.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
index ca5c8f9e..7e915d57 100644
--- a/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unijui.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unijui.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unijui.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unijui.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unijui.edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unijui.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unijui.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
 R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
 TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
@@ -47,26 +47,26 @@ vVcB15SPOBycWmx5nSRKHLAYa6uBX7auu2fLuHaNRHh3DbH98K/2hAOr2+vqtN/f
 wqwRw3AtMKzp3fPkmn6s6p1PEFUh3QNfoC+bihfQcu5z9PsjGNOjvax4yOPcjyqO
 TjVbXcyyWhkCfxMbGyMNSlUTFkYiET6YjDs4VoshrG2bTe1P
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unijui.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unijui.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unijui.edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unijui.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unijui.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unijui.edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
 R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
@@ -93,24 +93,24 @@ wqwRw3AtMKzp3fPkmn6s6p1PEFUh3QNfoC+bihfQcu5z9PsjGNOjvax4yOPcjyqO
 TjVbXcyyWhkCfxMbGyMNSlUTFkYiET6YjDs4VoshrG2bTe1P
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unijui.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unijui.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Nucleo de Redes e Banco de Dados</md:SurName>
-      <md:EmailAddress>redes@unijui.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unijui.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unijui.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Nucleo de Redes e Banco de Dados</md:SurName>
+    <md:EmailAddress>redes@unijui.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
index e1e3bc5a..2dad989f 100644
--- a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimc.it/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-04-22T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-04-22T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
                     https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Macerata.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' di Macerata</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Macerata users (Students, Teachers, and Employees)</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' degli Studi di Macerata (Studenti, Docenti, Personale Tecnico)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://login.unimc.it/login/new/guida-garr-idem-en.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://login.unimc.it/login/new/guida-garr-idem.php</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unimc.it/en/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unimc.it/it/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Macerata.</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Universita' di Macerata</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for University of Macerata users (Students, Teachers, and Employees)</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' degli Studi di Macerata (Studenti, Docenti, Personale Tecnico)</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://login.unimc.it/login/new/guida-garr-idem-en.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://login.unimc.it/login/new/guida-garr-idem.php</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unimc.it/en/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unimc.it/it/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
 MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
@@ -47,26 +47,26 @@ H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
 yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
 gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimc.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimc.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimc.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimc.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimc.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimc.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
 MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
@@ -85,30 +85,30 @@ H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
 yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
 gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Macerata</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Macerata</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Macerata</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Macerata</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unimc.it/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unimc.it/it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Massimo</md:GivenName>
-      <md:SurName>Reda</md:SurName>
-      <md:EmailAddress>mailto:csia.sistemi@unimc.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Principi</md:SurName>
-      <md:EmailAddress>mailto:csia.sistemi@unimc.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Macerata</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Macerata</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Macerata</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Macerata</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unimc.it/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unimc.it/it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Massimo</md:GivenName>
+    <md:SurName>Reda</md:SurName>
+    <md:EmailAddress>mailto:csia.sistemi@unimc.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Principi</md:SurName>
+    <md:EmailAddress>mailto:csia.sistemi@unimc.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
index 2987d724..ec032ee7 100644
--- a/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimedizin-mainz.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-09T21:46:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-09T21:46:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimedizin-mainz.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universitätsmedizin der JoGu Mainz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University Medical Center of the JoGu Mainz</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</mdui:Description>
+        <mdui:Description xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.unimedizin-mainz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unimedizin-mainz.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimedizin-mainz.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universitätsmedizin der JoGu Mainz</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University Medical Center of the JoGu Mainz</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</mdui:Description>
-          <mdui:Description xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.unimedizin-mainz.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.unimedizin-mainz.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
 bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
@@ -60,15 +60,15 @@ A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
 8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
 AO8Ifi/pFzKtodcKmmfls3M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
 bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
@@ -105,31 +105,31 @@ A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
 8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
 AO8Ifi/pFzKtodcKmmfls3M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimedizin-mainz.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimedizin-mainz.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimedizin-mainz.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimedizin-mainz.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
 bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
@@ -166,15 +166,15 @@ A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
 8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
 AO8Ifi/pFzKtodcKmmfls3M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
 bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
@@ -211,35 +211,35 @@ A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
 8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
 AO8Ifi/pFzKtodcKmmfls3M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e417</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e417</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz Germany</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.unimedizin-mainz.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unimedizin-mainz.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ataollah</md:GivenName>
-      <md:SurName>Khoddam-Zadeh</md:SurName>
-      <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ataollah</md:GivenName>
-      <md:SurName>Khoddam-Zadeh</md:SurName>
-      <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ataollah</md:GivenName>
-      <md:SurName>Khoddam-Zadeh</md:SurName>
-      <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e417</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e417</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz Germany</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.unimedizin-mainz.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unimedizin-mainz.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ataollah</md:GivenName>
+    <md:SurName>Khoddam-Zadeh</md:SurName>
+    <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ataollah</md:GivenName>
+    <md:SurName>Khoddam-Zadeh</md:SurName>
+    <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ataollah</md:GivenName>
+    <md:SurName>Khoddam-Zadeh</md:SurName>
+    <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
index 716ca224..f821a300 100644
--- a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimib.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimib.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Milano-Bicocca</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Milano-Bicocca</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Milano-Bicocca users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università di Milano-Bicocca</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.si.unimib.it/idem-en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.si.unimib.it/idem/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.si.unimib.it/idem-en/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.si.unimib.it/idem/</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="it">unimib università bicocca milano</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">unimib university bicocca milan</mdui:Keywords>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.unimib.it/unimib_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unimib.it/unimib_16x16.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://idp.unimib.it/unimib_50x50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="it">https://idp.unimib.it/unimib_50x50.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unimib.it/unimib_80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unimib.it/unimib_80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unimib.it</mdui:DomainHint>
+        <mdui:IPHint>149.132.0.0/16</mdui:IPHint>
+        <mdui:GeolocationHint>geo:45.518965,9.214319</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.602745,9.254773</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.160489,9.910843</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.558355,9.214384</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:45.528174,9.243695</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimib.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Milano-Bicocca</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Milano-Bicocca</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Milano-Bicocca users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università di Milano-Bicocca</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.si.unimib.it/idem-en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.si.unimib.it/idem/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.si.unimib.it/idem-en/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.si.unimib.it/idem/</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="it">unimib università bicocca milano</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">unimib university bicocca milan</mdui:Keywords>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.unimib.it/unimib_16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unimib.it/unimib_16x16.png</mdui:Logo>
-          <mdui:Logo height="50" width="50" xml:lang="en">https://idp.unimib.it/unimib_50x50.png</mdui:Logo>
-          <mdui:Logo height="50" width="50" xml:lang="it">https://idp.unimib.it/unimib_50x50.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unimib.it/unimib_80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unimib.it/unimib_80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>unimib.it</mdui:DomainHint>
-          <mdui:IPHint>149.132.0.0/16</mdui:IPHint>
-          <mdui:GeolocationHint>geo:45.518965,9.214319</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.602745,9.254773</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:46.160489,9.910843</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.558355,9.214384</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:45.528174,9.243695</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID8jCCAtoCCQDRtfiml6XVzDANBgkqhkiG9w0BAQUFADCBujELMAkGA1UEBhMC
 SVQxDzANBgNVBAgMBk1pbGFubzEPMA0GA1UEBwwGTWlsYW5vMTQwMgYDVQQKDCtV
 bml2ZXJzaXTDg8KgIGRlZ2xpIFN0dWRpIGRpIE1pbGFuby1CaWNvY2NhMRwwGgYD
@@ -63,23 +63,23 @@ CmLcMEs2lw9ZDHDbMwNHqvXrqiljRNowHzZ5v800zjMvoyVHmsVmRzyfqdbmLCnX
 SI8F0ix2bVu35o8sDuqmPkq/l2DwNvPr26l94ohEE6Fh1ZsnGG8ehJ9MuGbSUwf7
 fjKYky96
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimib.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimib.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimib.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Milano-Bicocca</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università di Milano-Bicocca</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Milano-Bicocca</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Milano-Bicocca</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unimib.it/go/102/Home/English</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unimib.it/go/101/Home/Italiano</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@unimib.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimib.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimib.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimib.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Milano-Bicocca</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università di Milano-Bicocca</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Milano-Bicocca</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Milano-Bicocca</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unimib.it/go/102/Home/English</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unimib.it/go/101/Home/Italiano</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@unimib.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
index a6ea7b70..a462d70e 100644
--- a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimore.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimore.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Modena e Reggio Emilia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Modena e Reggio Emilia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Modena e Reggio Emilia users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Modena e Reggio Emilia</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.unimore.it/idem.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unimore.it/international/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unimore.it/idem.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unimore.it/unimore_80_60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unimore.it/unimore_80_60.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>155.185.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>unimore.it</mdui:DomainHint>
+        <mdui:DomainHint>unimo.it</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimore.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Modena e Reggio Emilia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Modena e Reggio Emilia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Modena e Reggio Emilia users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Modena e Reggio Emilia</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.unimore.it/idem.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.unimore.it/international/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unimore.it/idem.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unimore.it/unimore_80_60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unimore.it/unimore_80_60.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>155.185.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>unimore.it</mdui:DomainHint>
-          <mdui:DomainHint>unimo.it</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJBITnJoX92EsdoWjSdjb3G2d4VwMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51bmltb3JlLml0MB4XDTEwMDEyNjEzMzg0MloX
 DTMwMDEyNjEzMzg0MlowGTEXMBUGA1UEAxMOaWRwLnVuaW1vcmUuaXQwggEiMA0G
@@ -47,26 +47,26 @@ p8TJi7Tjt4LZfVL5h+sDSA+FT/jLLYhLN0uy3YOBhIbdVgsDBESeM3jyOTiHxbxm
 O590yv35UKIENt7Ov87uykF3frwjIjMEBffRGYsgmrbl3HdbA5yUDs+9VQS/CXKg
 ApsMFkXxazWEsSuKY+zrMAimGDVPmAjswYuG9Jl3PICYIciqz2Ll+g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimore.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimore.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimore.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimore.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimore.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimore.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimore.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimore.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimore.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimore.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimore.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimore.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimore.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimore.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJBITnJoX92EsdoWjSdjb3G2d4VwMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51bmltb3JlLml0MB4XDTEwMDEyNjEzMzg0MloX
 DTMwMDEyNjEzMzg0MlowGTEXMBUGA1UEAxMOaWRwLnVuaW1vcmUuaXQwggEiMA0G
@@ -85,23 +85,23 @@ p8TJi7Tjt4LZfVL5h+sDSA+FT/jLLYhLN0uy3YOBhIbdVgsDBESeM3jyOTiHxbxm
 O590yv35UKIENt7Ov87uykF3frwjIjMEBffRGYsgmrbl3HdbA5yUDs+9VQS/CXKg
 ApsMFkXxazWEsSuKY+zrMAimGDVPmAjswYuG9Jl3PICYIciqz2Ll+g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimore.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimore.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unimore.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unimore.it/international/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:supporto.identity@unimore.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimore.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimore.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unimore.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unimore.it/international/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:supporto.identity@unimore.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
index 4726c178..4196746a 100644
--- a/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipa.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-16T12:25:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-16T12:25:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipa.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Palermo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Palermo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the users of University of Palermo</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Palermo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/en/idem/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/idem/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/en/idem/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="78" width="192">https://skin.unipa.it/img/logo_unipa_title.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipa.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Palermo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Palermo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for the users of University of Palermo</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Palermo</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/en/idem/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/idem/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/en/idem/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="78" width="192">https://skin.unipa.it/img/logo_unipa_title.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAJbsMbEZBInRgijJc7/Hgow8W9aSMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDAeFw0xMzA2MDQxMzE5MTVaFw0x
 NjA2MDQxMzE5MTVaMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDCCASIwDQYJKoZI
@@ -41,13 +41,13 @@ bbEIk2a+SXsa+bjEJgFerDbdKVS21Ct5dU13iCObhzdxlXdmCSQiWUrjBvSLZJnb
 ljNhr2Khy1bJz90c4T+i/Bk1mb+zB9ylzn/osseY1+1H0UFr9cH0kNp3CMroJlf9
 IjdH/J9P4kLHeAqbi9fTD2jaLUo+79uMXP3ftfsvj74=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAJbsMbEZBInRgijJc7/Hgow8W9aSMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDAeFw0xMzA2MDQxMzE5MTVaFw0x
 NjA2MDQxMzE5MTVaMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDCCASIwDQYJKoZI
@@ -66,29 +66,29 @@ bbEIk2a+SXsa+bjEJgFerDbdKVS21Ct5dU13iCObhzdxlXdmCSQiWUrjBvSLZJnb
 ljNhr2Khy1bJz90c4T+i/Bk1mb+zB9ylzn/osseY1+1H0UFr9cH0kNp3CMroJlf9
 IjdH/J9P4kLHeAqbi9fTD2jaLUo+79uMXP3ftfsvj74=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipa.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipa.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Palermo</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Palermo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Palermo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Palermo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unipa.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unipa.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Pietro</md:GivenName>
-      <md:SurName>Brignola</md:SurName>
-      <md:EmailAddress>mailto:pietro.brignola@unipa.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem-support@unipa.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipa.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipa.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Palermo</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Palermo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Palermo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Palermo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unipa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unipa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Pietro</md:GivenName>
+    <md:SurName>Brignola</md:SurName>
+    <md:EmailAddress>mailto:pietro.brignola@unipa.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem-support@unipa.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
index 7321db21..382c5338 100644
--- a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniparthenope.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-01-11T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-01-11T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniparthenope.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Università di Napoli Parthenope</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Napoli Parthenope</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniparthenope.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Università di Napoli Parthenope</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Napoli Parthenope</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
 OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
@@ -38,26 +38,26 @@ c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
 NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
 cReeVaTfudJyy/pCjfbP
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniparthenope.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniparthenope.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
 OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
@@ -77,24 +77,24 @@ c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
 NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
 cReeVaTfudJyy/pCjfbP
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Napoli Parthenope</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Università di Napoli Parthenope</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.uniparthenope.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uniparthenope.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>N.Napolitano-A.Cioffi</md:SurName>
-      <md:EmailAddress>mailto:idem@uniparthenope.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Napoli Parthenope</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Università di Napoli Parthenope</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.uniparthenope.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uniparthenope.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>N.Napolitano-A.Cioffi</md:SurName>
+    <md:EmailAddress>mailto:idem@uniparthenope.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
index 091ecc8d..186a730e 100644
--- a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipg.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-09T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-09T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Perugia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli studi di Perugia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for the University of Perugia</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli studi di Perugia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipg.it/en/idem-federation</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipg.it/en/idem-federation/idem-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem/informativa-idem</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipg.it</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Perugia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli studi di Perugia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for the University of Perugia</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli studi di Perugia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unipg.it/en/idem-federation</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unipg.it/en/idem-federation/idem-privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem/informativa-idem</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipg.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
 MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
@@ -41,29 +41,29 @@ i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
 NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
 a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipg.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipg.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipg.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipg.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipg.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipg.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
 MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
@@ -82,24 +82,24 @@ i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
 NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
 a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli studi di Perugia</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Perugia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli studi di Perugia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Perugia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unipg.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unipg.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Supporto IDEM</md:GivenName>
-      <md:EmailAddress>mailto:servizio.idem@unipg.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli studi di Perugia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Perugia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli studi di Perugia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Perugia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unipg.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unipg.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Supporto IDEM</md:GivenName>
+    <md:EmailAddress>mailto:servizio.idem@unipg.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml
index 78cbcbeb..76fb2dd3 100644
--- a/swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZjCCA06gAwIBAgIRAIo9PfLIpcxScL7s/HwtDqYwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDoxITAfBgNV
@@ -44,26 +44,26 @@
                             8gxesMwGkGUu1rajPOV0Q77M09CGb94+/N9KndnCEHPnqi6L2DSi0Al/4zXgrv+Q
                             PbUa3MIF7HIzuiNXpv6/9O0asdXCOmyaUkY=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipi.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipi.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEZjCCA06gAwIBAgIRAIo9PfLIpcxScL7s/HwtDqYwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDoxITAfBgNV
@@ -89,29 +89,29 @@
                             8gxesMwGkGUu1rajPOV0Q77M09CGb94+/N9KndnCEHPnqi6L2DSi0Al/4zXgrv+Q
                             PbUa3MIF7HIzuiNXpv6/9O0asdXCOmyaUkY=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Piraeus</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πειραιά</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Piraeus</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πειραιά</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unipi.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.unipi.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rosa</md:GivenName>
-      <md:SurName>Mavropodi</md:SurName>
-      <md:EmailAddress>rosa@unipi.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Piraeus NOC</md:Company>
-      <md:EmailAddress>noc@unipi.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Piraeus</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πειραιά</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Piraeus</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πειραιά</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unipi.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.unipi.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rosa</md:GivenName>
+    <md:SurName>Mavropodi</md:SurName>
+    <md:EmailAddress>rosa@unipi.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Piraeus NOC</md:Company>
+    <md:EmailAddress>noc@unipi.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
index ce85710a..af4f3e6d 100644
--- a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Pisa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Pisa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Pisa users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli Studi di Pisa</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idp.unipi.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://idp.unipi.it/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp.unipi.it/privacy_it.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp.unipi.it/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="82" width="80">https://idp.unipi.it/logos/cherubino_80x80.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.unipi.it/logos/cherubino_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Pisa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Pisa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Pisa users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli Studi di Pisa</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idp.unipi.it/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://idp.unipi.it/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idp.unipi.it/privacy_it.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp.unipi.it/privacy_en.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="82" width="80">https://idp.unipi.it/logos/cherubino_80x80.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.unipi.it/logos/cherubino_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
 MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
@@ -43,26 +43,26 @@ xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
 VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
 23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipi.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
 MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
@@ -81,34 +81,34 @@ xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
 VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
 23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Pisa</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Pisa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Pisa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Pisa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unipi.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unipi.it/english</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>mailto:idem@unipi.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Samuele</md:GivenName>
-      <md:SurName>Tognini</md:SurName>
-      <md:EmailAddress>mailto:samuele.tognini@unipi.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Davide</md:GivenName>
-      <md:SurName>Vaghetti</md:SurName>
-      <md:EmailAddress>mailto:davide.vaghetti@unipi.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Pisa</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Pisa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Pisa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Pisa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unipi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unipi.it/english</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>mailto:idem@unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Samuele</md:GivenName>
+    <md:SurName>Tognini</md:SurName>
+    <md:EmailAddress>mailto:samuele.tognini@unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Davide</md:GivenName>
+    <md:SurName>Vaghetti</md:SurName>
+    <md:EmailAddress>mailto:davide.vaghetti@unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
index 2b9b2695..b4885580 100644
--- a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipv.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-04-28T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-04-28T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipv.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Pavia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Pavia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider of the University of Pavia</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Pavia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipv.it/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipv.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipv.eu/site/en/home/international-students/study-at-the-university-of-pavia/enroll-at-the-university-of-pavia/articolo4157.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipv.eu/site/home/matricole2013.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.unipv.it/LOGO16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unipv.it/LOGO16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unipv.it/LOGO_80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unipv.it/LOGO_80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipv.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Pavia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Pavia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider of the University of Pavia</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Pavia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unipv.it/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unipv.it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unipv.eu/site/en/home/international-students/study-at-the-university-of-pavia/enroll-at-the-university-of-pavia/articolo4157.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unipv.eu/site/home/matricole2013.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp.unipv.it/LOGO16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unipv.it/LOGO16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unipv.it/LOGO_80.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unipv.it/LOGO_80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDujCCAqICCQCaKog9KThXSjANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMC
 SVQxDjAMBgNVBAgTBUl0YWx5MQ4wDAYDVQQHEwVQYXZpYTEcMBoGA1UEChMTVW5p
 dmVyc2l0YSBkaSBQYXZpYTEcMBoGA1UECxMTVW5pdmVyc2l0YSBkaSBQYXZpYTEV
@@ -48,26 +48,26 @@ U64XAuOKN9iAAb7vHEoU9QzYDb+zwXezx4BW1oR07M8OGdNq7muQ8Hd/7BumXv/u
 RJS/BmtNajeBB01paRuupxt5FhIDrUafxlV9ot3TcOYpC8QrkVSuhaeA/u3So1ZR
 obd7ED/DfZMAWgxHnwslh3ZvI+VT3X3NbKbvZIbLIvbKS1xsKbXLZxSRKJ5Ycg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipv.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipv.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipv.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipv.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipv.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipv.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipv.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipv.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipv.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipv.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipv.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipv.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipv.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipv.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDujCCAqICCQCaKog9KThXSjANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMC
 SVQxDjAMBgNVBAgTBUl0YWx5MQ4wDAYDVQQHEwVQYXZpYTEcMBoGA1UEChMTVW5p
 dmVyc2l0YSBkaSBQYXZpYTEcMBoGA1UECxMTVW5pdmVyc2l0YSBkaSBQYXZpYTEV
@@ -89,23 +89,23 @@ U64XAuOKN9iAAb7vHEoU9QzYDb+zwXezx4BW1oR07M8OGdNq7muQ8Hd/7BumXv/u
 RJS/BmtNajeBB01paRuupxt5FhIDrUafxlV9ot3TcOYpC8QrkVSuhaeA/u3So1ZR
 obd7ED/DfZMAWgxHnwslh3ZvI+VT3X3NbKbvZIbLIvbKS1xsKbXLZxSRKJ5Ycg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipv.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipv.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Pavia</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Pavia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Pavia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Pavia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unipv.eu/site/en/home.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unipv.eu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@unipv.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipv.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipv.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Pavia</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Pavia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Pavia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Pavia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unipv.eu/site/en/home.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unipv.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@unipv.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
index d47870d8..ab128e3c 100644
--- a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniroma3.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma3.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Roma TRE IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Roma Tre IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma3.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Roma TRE IdP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Roma Tre IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFQTCCBCmgAwIBAgIQBTxw+2vP6xm5lPNGi9q8AzANBgkqhkiG9w0BAQ0FADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -51,26 +51,26 @@ NDVBxYV/3T+NqEEaACLHePhzY8bUg4WTrToZa/I2/+cKiyXOsbYVr1ZKsOUtcLxL
 VG+4Km92F9fZ4aFwmSvZZKs65ZhSh7Re6fwiExrnQRFAgN8aZx9k++IFyC6cK0/g
 5iHa3Cc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniroma3.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma3.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniroma3.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma3.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFQTCCBCmgAwIBAgIQBTxw+2vP6xm5lPNGi9q8AzANBgkqhkiG9w0BAQ0FADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -101,24 +101,24 @@ NDVBxYV/3T+NqEEaACLHePhzY8bUg4WTrToZa/I2/+cKiyXOsbYVr1ZKsOUtcLxL
 VG+4Km92F9fZ4aFwmSvZZKs65ZhSh7Re6fwiExrnQRFAgN8aZx9k++IFyC6cK0/g
 5iHa3Cc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Roma TRE</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università di Roma TRE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Roma TRE</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Roma TRE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.uniroma3.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>mailto:idem@uniroma3.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Roma TRE</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università di Roma TRE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Roma TRE</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Roma TRE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.uniroma3.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>mailto:idem@uniroma3.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
index a834aaae..1b12723e 100644
--- a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unistra.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-30T02:21:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-30T02:21:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-strasbg.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unistra.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Strasbourg</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y8WRMUsCYRjHfy9UQ2meh4IueiCtIW0NcUcQTZGb0KQfIe4DWB9AImhpytUlLnBqykmafFucTxESAj0QQ224hjslCD2FoGd54Xn//z/P83vgv0uspS67CmAAWUBiCmtjRaMGlJDVwryXzVeAFQLKbo5W7YHpSAFga8dh7/gFqAevUHY1WrUm05FCOGGT0a8xReWnJGgCg+S+JBRz2NwuYgrnF8STo9PCbiji9D7eNYDxZKzkzy6sp+dHIxFP2jE17twf3Ck+OADpvxrgbPSdvtbtddMAakR9UxXVfm02tOFomB5Pxopv0IE2kAbOARh0NKIpuZiBR96jboqrRbJlDLyzhRM2sEZA2dX4+rxBVnMAZPTbZZSFb8oCOQYdnXbDmP9m8xVMUVwWMJsgh6yW5l3v5peYwiKgZgEW6UOdaKoOWJhCBhn/rL4BsgJm3JnI3FEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDcrMDI6MDAsBAiyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA3KzAyOjAwXVmwDgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.unistra.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Strasbourg</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-strasbg.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unistra.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Strasbourg</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y8WRMUsCYRjHfy9UQ2meh4IueiCtIW0NcUcQTZGb0KQfIe4DWB9AImhpytUlLnBqykmafFucTxESAj0QQ224hjslCD2FoGd54Xn//z/P83vgv0uspS67CmAAWUBiCmtjRaMGlJDVwryXzVeAFQLKbo5W7YHpSAFga8dh7/gFqAevUHY1WrUm05FCOGGT0a8xReWnJGgCg+S+JBRz2NwuYgrnF8STo9PCbiji9D7eNYDxZKzkzy6sp+dHIxFP2jE17twf3Ck+OADpvxrgbPSdvtbtddMAakR9UxXVfm02tOFomB5Pxopv0IE2kAbOARh0NKIpuZiBR96jboqrRbJlDLyzhRM2sEZA2dX4+rxBVnMAZPTbZZSFb8oCOQYdnXbDmP9m8xVMUVwWMJsgh6yW5l3v5peYwiKgZgEW6UOdaKoOWJhCBhn/rL4BsgJm3JnI3FEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDcrMDI6MDAsBAiyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA3KzAyOjAwXVmwDgAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.unistra.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Strasbourg</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAJL1uSgdsDY7/9L6gFGKRCNK7RlQMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51bmlzdHJhLmZyMB4XDTEwMTEzMDAxMDc0NFoX
 DTMwMTEzMDAxMDc0NFowGTEXMBUGA1UEAxMOaWRwLnVuaXN0cmEuZnIwggEiMA0G
@@ -38,26 +38,26 @@ Z6Ym1zSD1ELYVcd6rOjyMA4yXW+8EM9K3P83Xy+o3SkIKd9tZzGv0qfy3CPW+v7V
 2Onsdu1A6uvdXVKl8r10oLIRXNp3LzhqFwhyiFzcRmgfOStZPHXzxSM/N9T8d+We
 gN8WbEdGuWT0j11MYdJkWDRArMdtVtI8aHXkmMCvAuttFvJib8Nzog==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unistra.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unistra.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unistra.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Strasbourg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Strasbourg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unistra.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean Benoit</md:SurName>
-      <md:EmailAddress>jean@unistra.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Pascal Geoffroy</md:SurName>
-      <md:EmailAddress>pascal.geoffroy@unistra.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unistra.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unistra.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unistra.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Strasbourg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Strasbourg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unistra.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean Benoit</md:SurName>
+    <md:EmailAddress>jean@unistra.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pascal Geoffroy</md:SurName>
+    <md:EmailAddress>pascal.geoffroy@unistra.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
index 147c5876..f9fd9107 100644
--- a/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitedid.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T11:25:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T11:25:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitedid.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">United ID</mdui:DisplayName>
+        <mdui:Description xml:lang="en">United ID is a secure, public and privacy-respecting identity provider - sign up for free at https://unitedid.org!</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://unitedid.org/</mdui:InformationURL>
+        <mdui:Logo height="75" width="255">https://unitedid.org/wp-content/themes/unitedid/_inc/images/logo_net_globe_255.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitedid.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">United ID</mdui:DisplayName>
-          <mdui:Description xml:lang="en">United ID is a secure, public and privacy-respecting identity provider - sign up for free at https://unitedid.org!</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://unitedid.org/</mdui:InformationURL>
-          <mdui:Logo height="75" width="255">https://unitedid.org/wp-content/themes/unitedid/_inc/images/logo_net_globe_255.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE9zCCAt+gAwIBAgIJAIRpedgPtmouMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlkcC51bml0ZWRpZC5vcmcwHhcNMTQwMzEzMTExNzUzWhcNMjQwMzEwMTEx
 						NzUzWjAbMRkwFwYDVQQDExBpZHAudW5pdGVkaWQub3JnMIICIjANBgkqhkiG9w0B
@@ -52,30 +52,30 @@
 						wZHUAPn5y2BFPiIc2c1v00i5it6uNp6iIY6OMTXw2zFE0rhlMdzRr1MjJWffb15O
 						gxLJbnzfithSY6IfD2mJgSR6iNnUAIdCD0md
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitedid.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitedid.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitedid.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitedid.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitedid.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitedid.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE9zCCAt+gAwIBAgIJAIRpedgPtmouMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlkcC51bml0ZWRpZC5vcmcwHhcNMTQwMzEzMTExNzUzWhcNMjQwMzEwMTEx
 						NzUzWjAbMRkwFwYDVQQDExBpZHAudW5pdGVkaWQub3JnMIICIjANBgkqhkiG9w0B
@@ -104,27 +104,27 @@
 						wZHUAPn5y2BFPiIc2c1v00i5it6uNp6iIY6OMTXw2zFE0rhlMdzRr1MjJWffb15O
 						gxLJbnzfithSY6IfD2mJgSR6iNnUAIdCD0md
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">United ID</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">United ID</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://unitedid.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@unitedid.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Leif</md:GivenName>
-      <md:SurName>Johansson</md:SurName>
-      <md:EmailAddress>mailto:leifj@unitedid.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">United ID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">United ID</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unitedid.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@unitedid.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Leif</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>mailto:leifj@unitedid.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
index 3f78e80f..3999db91 100644
--- a/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitn.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitn.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Trento</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Trento</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Trento users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Trento</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.unitn.it/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unitn.it/en</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitn.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Trento</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Trento</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Trento users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Trento</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.unitn.it/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.unitn.it/en</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIG9TtUKx11xGhvJVWJiQdJGaFAlMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDAeFw0wOTA1MTkxMDM1MDJaFw0y
 OTA1MTkxMDM1MDJaMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDCCASIwDQYJKoZI
@@ -39,26 +39,26 @@ IX86tgYD6FJe9mD1p/1vKQ1tyGcE92D45T2uXa7XEJ54NaZk7vtuIRBB50VRDcbX
 7L4+1kAfwLJIJdzrpqckYW0FCUKCj/4pTfk33N+kKm22AhWMSixW4pjAGWPPPdOz
 PD4N74JoeDBjTnh5SkomQrcf0FeYr/nXWuUh7P1510Y=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitn.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitn.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitn.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitn.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitn.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitn.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitn.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitn.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitn.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitn.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitn.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitn.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitn.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitn.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIG9TtUKx11xGhvJVWJiQdJGaFAlMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDAeFw0wOTA1MTkxMDM1MDJaFw0y
 OTA1MTkxMDM1MDJaMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDCCASIwDQYJKoZI
@@ -77,28 +77,28 @@ IX86tgYD6FJe9mD1p/1vKQ1tyGcE92D45T2uXa7XEJ54NaZk7vtuIRBB50VRDcbX
 7L4+1kAfwLJIJdzrpqckYW0FCUKCj/4pTfk33N+kKm22AhWMSixW4pjAGWPPPdOz
 PD4N74JoeDBjTnh5SkomQrcf0FeYr/nXWuUh7P1510Y=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitn.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitn.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Trento</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Trento</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Trento</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Trento</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unitn.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unitn.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Filippo</md:GivenName>
-      <md:SurName>Moser</md:SurName>
-      <md:EmailAddress>mailto:filippo.moser@unitn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:comunicazioni.aai@unitn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitn.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitn.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Trento</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Trento</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Trento</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Trento</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unitn.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unitn.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Filippo</md:GivenName>
+    <md:SurName>Moser</md:SurName>
+    <md:EmailAddress>mailto:filippo.moser@unitn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:comunicazioni.aai@unitn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
index de17e540..8ddf1327 100644
--- a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniurb.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-02-23T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-02-23T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniurb.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Urbino University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Urbino</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Urbino University users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Urbino</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.uniurb.it/idem/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uniurb.it/it/portale/index.php?mist_id=12000&amp;lang=ENG&amp;tipo=ENG&amp;page=1069</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.uniurb.it/idem/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniurb.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Urbino University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Urbino</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Urbino University users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Urbino</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.uniurb.it/idem/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uniurb.it/it/portale/index.php?mist_id=12000&amp;lang=ENG&amp;tipo=ENG&amp;page=1069</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.uniurb.it/idem/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAPfr8HNJ+ZnHsOZPOHT6/ExkMj/TMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51bml1cmIuaXQwHhcNMDkxMTA0MTIwNjM4WhcN
 MjkxMTA0MTIwNjM4WjAYMRYwFAYDVQQDEw1pZHAudW5pdXJiLml0MIIBIjANBgkq
@@ -40,26 +40,26 @@ Fj/hx4kxR+D2fM+27LoyK3L7jvAq8FcBR7b/vV+6vEF2vI4cKNXQ8GEv0Aem0Ow2
 40cg0YNou/KoAV5DM0cvNRef+K/IjlEILdppfjfmk4jD9Eqom1m6i8dffH7fK2ee
 T68a+KBYk1QOH0KR1wV5hojnDngV3n9JvzTHSBvVpbkOxvDi
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniurb.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniurb.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniurb.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniurb.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniurb.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniurb.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniurb.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniurb.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniurb.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniurb.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniurb.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniurb.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniurb.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniurb.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAPfr8HNJ+ZnHsOZPOHT6/ExkMj/TMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51bml1cmIuaXQwHhcNMDkxMTA0MTIwNjM4WhcN
 MjkxMTA0MTIwNjM4WjAYMRYwFAYDVQQDEw1pZHAudW5pdXJiLml0MIIBIjANBgkq
@@ -78,24 +78,24 @@ Fj/hx4kxR+D2fM+27LoyK3L7jvAq8FcBR7b/vV+6vEF2vI4cKNXQ8GEv0Aem0Ow2
 40cg0YNou/KoAV5DM0cvNRef+K/IjlEILdppfjfmk4jD9Eqom1m6i8dffH7fK2ee
 T68a+KBYk1QOH0KR1wV5hojnDngV3n9JvzTHSBvVpbkOxvDi
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniurb.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniurb.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Urbino</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Urbino University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Urbino</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Urbino University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.uniurb.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uniurb.it/it/portale/index.php?mist_id=12000&amp;lang=ENG&amp;tipo=ENG&amp;page=1069</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>mailto:paolo.cecchini@uniurb.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniurb.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniurb.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Urbino</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Urbino University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Urbino</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Urbino University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.uniurb.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uniurb.it/it/portale/index.php?mist_id=12000&amp;lang=ENG&amp;tipo=ENG&amp;page=1069</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>mailto:paolo.cecchini@uniurb.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
index 2bb21f72..9d147f38 100644
--- a/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-ag.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-25T15:08:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-25T15:08:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ag.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université des Antilles et de la Guyane</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABsklEQVQoz32SP2hTURTGf+fc9/KiDU2oRvTRMUXUgkWhahHpYgeXDk7qICjo5NBBsVDExUFwFgUFp9pFdwVBB3GwRLQ6qNSCVeoftE2aIK/Ju9fhJTXoi3c53HO+75zvOxzhyE0Aq6jlP69h8GIEBfJix8IlGl5XdORfGCnnxAJKJTdz/O6DyUsbgzpICtrqga1frp66fvngc6KMAjY2/CIjDlzqABFYJbIKKAnKdcECjqxaTOujSQoFASepFN/E7X6iJMK79gcnWT9en/ZHUjv868B5yHolIQgGC+lbAjUxBkQQp/jN76ubEIYKtXRhDW+guELMwo88xirB2syLQYST+8tUe/5WJY7qhvE9T2hy63UJr6kY+/DNwPxieHrkXrj5J1EGcS2DOKo9x/bNDW+fu18+TK23tSUKtbEbFxEWps6N9i/xtUAlR6WXb/mzwy+nz1xZXubo7RMUqoC0jm8tszO/8nhioljk/afw7cdBo/FQ6dG2Lbx6V9p9bZIgRl0HAbBKJXt+dHZ879Owb96K+fB5x51nh6Znd9FXa+vsJCQWo4B6gAMnGEeujh93XsBv/7OZ53mGvVkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-ag.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université des Antilles et de la Guyane</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ag.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université des Antilles et de la Guyane</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABsklEQVQoz32SP2hTURTGf+fc9/KiDU2oRvTRMUXUgkWhahHpYgeXDk7qICjo5NBBsVDExUFwFgUFp9pFdwVBB3GwRLQ6qNSCVeoftE2aIK/Ju9fhJTXoi3c53HO+75zvOxzhyE0Aq6jlP69h8GIEBfJix8IlGl5XdORfGCnnxAJKJTdz/O6DyUsbgzpICtrqga1frp66fvngc6KMAjY2/CIjDlzqABFYJbIKKAnKdcECjqxaTOujSQoFASepFN/E7X6iJMK79gcnWT9en/ZHUjv868B5yHolIQgGC+lbAjUxBkQQp/jN76ubEIYKtXRhDW+guELMwo88xirB2syLQYST+8tUe/5WJY7qhvE9T2hy63UJr6kY+/DNwPxieHrkXrj5J1EGcS2DOKo9x/bNDW+fu18+TK23tSUKtbEbFxEWps6N9i/xtUAlR6WXb/mzwy+nz1xZXubo7RMUqoC0jm8tszO/8nhioljk/afw7cdBo/FQ6dG2Lbx6V9p9bZIgRl0HAbBKJXt+dHZ879Owb96K+fB5x51nh6Znd9FXa+vsJCQWo4B6gAMnGEeujh93XsBv/7OZ53mGvVkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-ag.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université des Antilles et de la Guyane</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAPFkF2BmO6RVikcivryW27wULvteMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51bml2LWFnLmZyMB4XDTEyMTAyMzE3MzIxMFoX
 DTMyMTAyMzE3MzIxMFowGTEXMBUGA1UEAxMOaWRwLnVuaXYtYWcuZnIwggEiMA0G
@@ -37,26 +37,26 @@ EzGjS76Zk6gvDgTTtG15vQvaq31e1eHB7nCYe7zHuFObyujLpKHJHMrIW4Q8o18y
 NCDZWNuuZJO1dzUQrzyUXufytEqv1w1SGYWedTxxXIm+sQ3HaR4d3TDCmTw27pnr
 TZeKHGCI5BfQ0oQ0Mao+E/hZqbDzdp6KBUrALSf/R3JSDtmdnL+gvQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-ag.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ag.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ag.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université des Antilles et de la Guyane</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université des Antilles et de la Guyane</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-ag.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Robert BOLIN</md:SurName>
-      <md:EmailAddress>robert.bolin@martinique.univ-ag.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Patrick PLACIDE</md:SurName>
-      <md:EmailAddress>patrick.placide@martinique.univ-ag.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-ag.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ag.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ag.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université des Antilles et de la Guyane</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université des Antilles et de la Guyane</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-ag.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Robert BOLIN</md:SurName>
+    <md:EmailAddress>robert.bolin@martinique.univ-ag.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Patrick PLACIDE</md:SurName>
+    <md:EmailAddress>patrick.placide@martinique.univ-ag.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
index 35bed1fc..698e78ac 100644
--- a/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-amu.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-16T08:27:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-16T08:27:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-amu.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université d'Aix-Marseille</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABfklEQVQ4y71Sv0tCYRQ9n+8pBqI9l0Tph0TQFiVvycAhpCGCtrbW/oLamoKG3AJdgob+ApfGhEALkYYGMagwy+cQor4Qn/h87zZkhX0funXG8517v3PPvcAIWHqJLL1EozTyqEf7PYNxcIxV/HsDu6OR3dO5ue2eTnZH43gug/5TEtTMoq+liTraF6elybzdAlPWOAdMZKuvpcl6OBzipMUjyKFtTi/MwKGoYEoMZNZAZg1MicGhqMIMuI7mywXZzwkwJQbI3oGlD1DzGo75fTjndodquAyY0wt5+RySX2XmY5IAwLlwzKxGgcjQOAdcA9GcACD5VSGPVLZKLcMUnuuoU24ZJqWyVWIbp3fUaHYRjwSwszKFpaBH/NMA97U2nd1oyBfr8CtusJZh0snVKy5zX/O53BKmgx6oYd9QYaGs463WRq9rAQA2oyEcrM/8bqHS6FIiU0G+WP8R/YXLLSEeCWBvNYRZv5sJ1/htUzf6yJVbAIBoeBK+CVk43ic1Y6EX/xTzkAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMAlAiYEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NTkrMDI6MDB4HTE9AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-amu.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université d'Aix-Marseille</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-amu.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université d'Aix-Marseille</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABfklEQVQ4y71Sv0tCYRQ9n+8pBqI9l0Tph0TQFiVvycAhpCGCtrbW/oLamoKG3AJdgob+ApfGhEALkYYGMagwy+cQor4Qn/h87zZkhX0funXG8517v3PPvcAIWHqJLL1EozTyqEf7PYNxcIxV/HsDu6OR3dO5ue2eTnZH43gug/5TEtTMoq+liTraF6elybzdAlPWOAdMZKuvpcl6OBzipMUjyKFtTi/MwKGoYEoMZNZAZg1MicGhqMIMuI7mywXZzwkwJQbI3oGlD1DzGo75fTjndodquAyY0wt5+RySX2XmY5IAwLlwzKxGgcjQOAdcA9GcACD5VSGPVLZKLcMUnuuoU24ZJqWyVWIbp3fUaHYRjwSwszKFpaBH/NMA97U2nd1oyBfr8CtusJZh0snVKy5zX/O53BKmgx6oYd9QYaGs463WRq9rAQA2oyEcrM/8bqHS6FIiU0G+WP8R/YXLLSEeCWBvNYRZv5sJ1/htUzf6yJVbAIBoeBK+CVk43ic1Y6EX/xTzkAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMAlAiYEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NTkrMDI6MDB4HTE9AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-amu.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université d'Aix-Marseille</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIULCzb5nQYuu/jKvNfhCenMAkGKm8wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMB4XDTEyMDQxMzE1MTIzM1oX
 DTMyMDQxMzE1MTIzM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMIIBIjAN
@@ -37,26 +37,26 @@ m3A/gjFibKMSIIXDFvLncxiHYHLrhsrMFeG5HlWXx+pVCunuvo2nNk2uL1ZBWW0Z
 JRO79CP7W1ndIuM+8v1G7C1gjYqkO6rdEKdJArm7hqEMzjUdL60okDqsVX+IYFUX
 VmCmZvTACtUurXS0zocVZTUfQcTaSXkKLSKLU6TQQy4Wf/c9CfNalbv6Sw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-amu.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-amu.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-amu.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université d'Aix-Marseille</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université d'Aix-Marseille</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-amu.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>LALOT Dominique</md:SurName>
-      <md:EmailAddress>dominique.lalot@univ-amu.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>AIMAR Michel</md:SurName>
-      <md:EmailAddress>michel.aimar@univ-amu.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-amu.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-amu.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-amu.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université d'Aix-Marseille</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université d'Aix-Marseille</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-amu.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LALOT Dominique</md:SurName>
+    <md:EmailAddress>dominique.lalot@univ-amu.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>AIMAR Michel</md:SurName>
+    <md:EmailAddress>michel.aimar@univ-amu.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
index f5798930..30682c70 100644
--- a/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-artois.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-07T15:41:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-07T15:41:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-artois.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université d'Artois</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACQ0lEQVQoz32SS0hUcRTGv//c6yttvGMJ42OaxhkSJY0UwYWUlUQStsmFQmWrwARz16IgsoWzKXqAPUBFXAy06UFENOWiCBPJV2nNqOg4kzqmd7TxOo/7OC2uDBLo2X3n4zsczvkxIsKuJcmb48HxAf/gCVv1UfMR0A4VldWHvW7Xu2EianzVxD/OxrMsIuIBqIHhNWd5UlGNscWtT40pmuNMe8ATIv8DAIWCQ1jaU5BhBcAD4PLLSIUy/yGxxo17LwJDS909F3X53PdSJuVK4eWtgDw7AIJhX4lur0vxu3fc4HD6WCkAj+idDHvBWIWlYiugzI2DkFJ5TQ+43gwgK+lkTWHe/r0A3NMfBS7Tkp5bmn0YgAFA9PMtaEgtO6sHmjveIiTfbqnVZfdUH8cMjbbzuuS1NZ8SCPJ5JpZhBtA/6MWYeOF6VVWZHcDE6s+R9R9gVGurm/NvBMUNXvZ9Z0DKcac+4FRbb3lDUZ+zSZefZr5k8UIql2yS7UZBO2gx8+riDAA+7xCAsbFfrzsa6qpLZEXz/f6rRJNvjrZz4NqKr1qtyVsXjE+6ly9hpRXRfieRGotrE1OrntlQJKLOh+fQmYbOTI/oTTwURKSKMyQFNxSamA4trUgJr+tbj/AkP6fLsZ0AHoBqLPD/iRjTYsV2YTtFX5eHGFi95Vyis6lEDGFJlqSY1Zxmykz5DzuecQxMjIkANNKejnaFY+Ed4SOikcVR3AceodJV3fy+VYyEiIjtjveCtDC/FjggWHLTc/TOP6xlTK4bHFRuAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjU5KzAyOjAwCUCJgQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMHgdMT0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-artois.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université d'Artois</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-artois.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université d'Artois</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACQ0lEQVQoz32SS0hUcRTGv//c6yttvGMJ42OaxhkSJY0UwYWUlUQStsmFQmWrwARz16IgsoWzKXqAPUBFXAy06UFENOWiCBPJV2nNqOg4kzqmd7TxOo/7OC2uDBLo2X3n4zsczvkxIsKuJcmb48HxAf/gCVv1UfMR0A4VldWHvW7Xu2EianzVxD/OxrMsIuIBqIHhNWd5UlGNscWtT40pmuNMe8ATIv8DAIWCQ1jaU5BhBcAD4PLLSIUy/yGxxo17LwJDS909F3X53PdSJuVK4eWtgDw7AIJhX4lur0vxu3fc4HD6WCkAj+idDHvBWIWlYiugzI2DkFJ5TQ+43gwgK+lkTWHe/r0A3NMfBS7Tkp5bmn0YgAFA9PMtaEgtO6sHmjveIiTfbqnVZfdUH8cMjbbzuuS1NZ8SCPJ5JpZhBtA/6MWYeOF6VVWZHcDE6s+R9R9gVGurm/NvBMUNXvZ9Z0DKcac+4FRbb3lDUZ+zSZefZr5k8UIql2yS7UZBO2gx8+riDAA+7xCAsbFfrzsa6qpLZEXz/f6rRJNvjrZz4NqKr1qtyVsXjE+6ly9hpRXRfieRGotrE1OrntlQJKLOh+fQmYbOTI/oTTwURKSKMyQFNxSamA4trUgJr+tbj/AkP6fLsZ0AHoBqLPD/iRjTYsV2YTtFX5eHGFi95Vyis6lEDGFJlqSY1Zxmykz5DzuecQxMjIkANNKejnaFY+Ed4SOikcVR3AceodJV3fy+VYyEiIjtjveCtDC/FjggWHLTc/TOP6xlTK4bHFRuAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjU5KzAyOjAwCUCJgQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMHgdMT0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-artois.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université d'Artois</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
 N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
@@ -38,13 +38,13 @@ s/eysRlm/+0o7pMPzFac9m9GmHWuyjifyoRWzNFaqCTEl2xG8eKp2h6lAAuPgu6w
 D/wjE0tsBNLEpO/XVtlNXVk2QQHpypl2XvrEpUpfOCjjb80yv4BD/1hONqUqp0GD
 tfGARKYulw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
 M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
@@ -64,23 +64,23 @@ Blby6pfzo7TZbF6FWkTbOfZtvsxW2XDFKvUYqXzpjJulQXljlKuh5Bjm+VBiFJLn
 jm/fe9sgzhgCC7ONajuWtSG6VLszFulq60E8BV8TQiv3/ZwAnCDvQKxot/Hwd8jl
 yurjS9vfAQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-artois.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-artois.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-artois.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-artois.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-artois.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-artois.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-artois.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-artois.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
 N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
@@ -100,13 +100,13 @@ s/eysRlm/+0o7pMPzFac9m9GmHWuyjifyoRWzNFaqCTEl2xG8eKp2h6lAAuPgu6w
 D/wjE0tsBNLEpO/XVtlNXVk2QQHpypl2XvrEpUpfOCjjb80yv4BD/1hONqUqp0GD
 tfGARKYulw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
 M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
@@ -126,19 +126,19 @@ Blby6pfzo7TZbF6FWkTbOfZtvsxW2XDFKvUYqXzpjJulQXljlKuh5Bjm+VBiFJLn
 jm/fe9sgzhgCC7ONajuWtSG6VLszFulq60E8BV8TQiv3/ZwAnCDvQKxot/Hwd8jl
 yurjS9vfAQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-artois.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université d'Artois</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université d'Artois</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-artois.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-artois.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-artois.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université d'Artois</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université d'Artois</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-artois.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-artois.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
index 9d1e4c66..c05b6c56 100644
--- a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-avignon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-22T12:28:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-22T12:28:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-avignon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADF0lEQVQ4ywXBuY/UZRzA4c/3vX7HzM6xF7AGSRZBZCWYoImJ2kirf4CNlbWS2NBbGVtjqZWdCYWtjVoYEytN1LCAuyDsgrszw87O/K738Hnk9lc/j7+b1h/HqGqa6uTmi+PBbwezc5Ng64X3Rjuz6FuTldZOhDRMonasktjX/PrTrbc+l+uf/fBeVfS+b0LkNEQyJTgF7ugBvmvRksjPX6OnFZlW5CKIwHEbKFP8wohV72w4jU+aaeeJwVPe+4XMOUKCYjmlpwLhzCV0f4QSYWw1IsKs7T5SrXbXrAilFjadYTh7hM1KfLlKqJ6TXbgGXUU62iMBGhARtBK0koEJMfSTCCtG0cSEnD5Fxlss9/9g1UL+/DF2uEbwLc3yhHnWxyihC4kQ08K8vTVa/DmpqZSwCBF19JA4OyTMjvgvBFzvBJXuYqxlGnL85kWsUoSUqLq4NFfPDDZ3Zy2Plg1P6o5Btk5Kiawn1KsvMDp5QiYWU2hEGTasQSvBROhb0arp4vXzPYdRinOFY3M0ZmQNWX9IUQxY6ILjbMDeqacTQ6EgpUQQmLbx1BzO2/trhbv8htZMGs9UKWzu8E0LvkW3NZI8ziq0cyBCroS5j3Sdf2gO5/WksIbSakZJU2lBpUhbT8nHGzRG6LRFKyHGwLz1gEFS4lLftmY7n/4YpMr/XZ5Vj9s4ntXdeTD0emsol7HS7/MsaEay5GnXoKE7brwutPx9aS2/ZT7c+WYv+aPXuugeGO1275wWK4dTP3ppXdMfPuKfsMfB0wU7V7ZY29z//eWL9V+nVX51tbe8//x4cGxeyd7/etl+e6WJ8VWfl/fOlvHd7f6M8cpFylJx4cZ1JpNnjNc2yOTB+pZeXm5GPjTI6yb3O8Y3d26k6f4nLoGb79/MZxWiEtPDXapc0DpxMveUC83qWG2tF/kWCcQWlS5HV1UKw7lfSowddBEOprCsFTYXWi8czSEEAyFRVaBMJFRCrOsiJXdsbNnVOh99GVP9Zm/Y8ekH2UFKso2SMjTsCulu9HEkRp3RLj4mtEbcSpViWHW9uvwf4uN/Mjd4KBEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-avignon.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-avignon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADF0lEQVQ4ywXBuY/UZRzA4c/3vX7HzM6xF7AGSRZBZCWYoImJ2kirf4CNlbWS2NBbGVtjqZWdCYWtjVoYEytN1LCAuyDsgrszw87O/K738Hnk9lc/j7+b1h/HqGqa6uTmi+PBbwezc5Ng64X3Rjuz6FuTldZOhDRMonasktjX/PrTrbc+l+uf/fBeVfS+b0LkNEQyJTgF7ugBvmvRksjPX6OnFZlW5CKIwHEbKFP8wohV72w4jU+aaeeJwVPe+4XMOUKCYjmlpwLhzCV0f4QSYWw1IsKs7T5SrXbXrAilFjadYTh7hM1KfLlKqJ6TXbgGXUU62iMBGhARtBK0koEJMfSTCCtG0cSEnD5Fxlss9/9g1UL+/DF2uEbwLc3yhHnWxyihC4kQ08K8vTVa/DmpqZSwCBF19JA4OyTMjvgvBFzvBJXuYqxlGnL85kWsUoSUqLq4NFfPDDZ3Zy2Plg1P6o5Btk5Kiawn1KsvMDp5QiYWU2hEGTasQSvBROhb0arp4vXzPYdRinOFY3M0ZmQNWX9IUQxY6ILjbMDeqacTQ6EgpUQQmLbx1BzO2/trhbv8htZMGs9UKWzu8E0LvkW3NZI8ziq0cyBCroS5j3Sdf2gO5/WksIbSakZJU2lBpUhbT8nHGzRG6LRFKyHGwLz1gEFS4lLftmY7n/4YpMr/XZ5Vj9s4ntXdeTD0emsol7HS7/MsaEay5GnXoKE7brwutPx9aS2/ZT7c+WYv+aPXuugeGO1275wWK4dTP3ppXdMfPuKfsMfB0wU7V7ZY29z//eWL9V+nVX51tbe8//x4cGxeyd7/etl+e6WJ8VWfl/fOlvHd7f6M8cpFylJx4cZ1JpNnjNc2yOTB+pZeXm5GPjTI6yb3O8Y3d26k6f4nLoGb79/MZxWiEtPDXapc0DpxMveUC83qWG2tF/kWCcQWlS5HV1UKw7lfSowddBEOprCsFTYXWi8czSEEAyFRVaBMJFRCrOsiJXdsbNnVOh99GVP9Zm/Y8ekH2UFKso2SMjTsCulu9HEkRp3RLj4mtEbcSpViWHW9uvwf4uN/Mjd4KBEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-avignon.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNzCCAh+gAwIBAgIUZBH1ZmHI1RRRvGe5/kKYyMcO2w8wDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAwwTaWRwLnVuaXYtYXZpZ25vbi5mcjAeFw0xNTA5MTUxMDA3
 MTNaFw0zNTA5MTUxMDA3MTNaMB4xHDAaBgNVBAMME2lkcC51bml2LWF2aWdub24u
@@ -38,13 +38,13 @@ I411E5B9MpME7bkMHsLP+pNFa9LFCS1qodUuhn0Uh/k/khBNXQ9StiVGmXcq/SGK
 e0lkWPNsuL4wxXCVh11OFAUF0fB7pVza2jKTj6t6ydW51tDmiaYSI8nqXyF3X7wy
 27nzwk0AdRYbU40=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAKFKpfPrDnkBOhfhK+OqWshuX1PZMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWF2aWdub24uZnIwHhcNMTIwNzE4MTMx
 NTQxWhcNMTUwNzE4MTMxNTQxWjAeMRwwGgYDVQQDExNpZHAudW5pdi1hdmlnbm9u
@@ -64,21 +64,21 @@ Rin03XAzDZCVlli7U35vcUIT1vY/UPffkdhVpfWBjQOTRziUA5pV2EU0gv7EaRAl
 IloyUs/s87ZcfKL++xAYi2q27l5854JcOhKPPKzdjUnoHMUwvOdMr8WMs5RsnwIw
 y2gqec2p7TcIRKIM
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-avignon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-avignon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>idpmaster@univ-avignon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-avignon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-avignon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idpmaster@univ-avignon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
index c49e4fcb..2816e2dd 100644
--- a/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-bpclermont.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:16:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:16:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bpclermont.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACb0lEQVQozzXBvYtdZRAH4PnNzHvOveds1j1Zswm4LhG9iBHBlGonISIINgp2FmKlhdb2/gXBxsJUqRSxCWIRSERRwQ8SUSTZfOySJeh+JDeXPV/zzqTyeXDzzlaVtIs0Ji7dIljJTFOEg4I8IthZQmmCwR72qrV8e4sub+5ZoZmLJL1BIztHTwyEg51b8dy+OmteO1Fwa+nyzfvd0eWoFIBqOGvTH5Q2iAEomZPVyR5vrtw4WOSCYSySyrGt5pmzRxQx8uunjq+v5JJaRiah8nAoYo5STIUxmglFsFdUaBCG9cJemj32xnpDi9ZzSJdtCrY0hlTWc526w7QsmbzTaHN5P86ePLKiODVbe3YtNZgruw7IIwdLiKt5cWRYhNnbLx47fTw19UQpPHxK9OGZ5/rc7x/mb64/+PPufidLTsxDZZdu7H3541/vnvv63sOs3HskIcoQjahUt3cX1/6ZD7QKnhTo8fut7dMffEbTJUI0R9d++/SdJ5oSJKAwwvkfNi9c2+uqZevt9u2dS++9oEQEMAEBenCw+/e8e7Kp2cyEGPzTL39c+f4qcQIFujHXMyYQURARBcHi5RONk1+8vntnv9WQZ06uigkwgRQOKrqp0v8AWtl4+tedfz/54uLPV7fL6fL7b77y/GzDMUKyMyCR4UrCom45sQzz/+6e+fhziFBR9fnw3FffFZMqypoAHdgIhQVT7nIWRh+cx9yi1kgRmkGJUAytITQ4uxhlGXjUY9PpR2+d3d7ZJOacBYSgICJXJ1C4AxCG9L6x8dTqUo17W1vORZpmG1RlDNIgYuQYFREUDqKuSBOzdgJd9I8A5fBM5ldwG3gAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-bpclermont.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bpclermont.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACb0lEQVQozzXBvYtdZRAH4PnNzHvOveds1j1Zswm4LhG9iBHBlGonISIINgp2FmKlhdb2/gXBxsJUqRSxCWIRSERRwQ8SUSTZfOySJeh+JDeXPV/zzqTyeXDzzlaVtIs0Ji7dIljJTFOEg4I8IthZQmmCwR72qrV8e4sub+5ZoZmLJL1BIztHTwyEg51b8dy+OmteO1Fwa+nyzfvd0eWoFIBqOGvTH5Q2iAEomZPVyR5vrtw4WOSCYSySyrGt5pmzRxQx8uunjq+v5JJaRiah8nAoYo5STIUxmglFsFdUaBCG9cJemj32xnpDi9ZzSJdtCrY0hlTWc526w7QsmbzTaHN5P86ePLKiODVbe3YtNZgruw7IIwdLiKt5cWRYhNnbLx47fTw19UQpPHxK9OGZ5/rc7x/mb64/+PPufidLTsxDZZdu7H3541/vnvv63sOs3HskIcoQjahUt3cX1/6ZD7QKnhTo8fut7dMffEbTJUI0R9d++/SdJ5oSJKAwwvkfNi9c2+uqZevt9u2dS++9oEQEMAEBenCw+/e8e7Kp2cyEGPzTL39c+f4qcQIFujHXMyYQURARBcHi5RONk1+8vntnv9WQZ06uigkwgRQOKrqp0v8AWtl4+tedfz/54uLPV7fL6fL7b77y/GzDMUKyMyCR4UrCom45sQzz/+6e+fhziFBR9fnw3FffFZMqypoAHdgIhQVT7nIWRh+cx9yi1kgRmkGJUAytITQ4uxhlGXjUY9PpR2+d3d7ZJOacBYSgICJXJ1C4AxCG9L6x8dTqUo17W1vORZpmG1RlDNIgYuQYFREUDqKuSBOzdgJd9I8A5fBM5ldwG3gAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-bpclermont.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
 MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
@@ -38,23 +38,23 @@ iqa6wc50EWUt8/EqtC3V45+jo/6mJx1ZPQI2uPP9BK1p+UdljUKZqmQa0ZZJ4IxW
 UP/k2YNC7B4piqvd0HLqVEDHQmmeiwSPLlFsGozwdYZ+FUuXzJoMguhu3KMw8qV4
 P69e+LdcHzrBqln1xmrkY/MMjTqnJ3E=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-bpclermont.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bpclermont.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-bpclermont.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bpclermont.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
 MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
@@ -74,19 +74,19 @@ iqa6wc50EWUt8/EqtC3V45+jo/6mJx1ZPQI2uPP9BK1p+UdljUKZqmQa0ZZJ4IxW
 UP/k2YNC7B4piqvd0HLqVEDHQmmeiwSPLlFsGozwdYZ+FUuXzJoMguhu3KMw8qV4
 P69e+LdcHzrBqln1xmrkY/MMjTqnJ3E=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-bpclermont.fr/idp/AA"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-bpclermont.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>Fed-Admin@univ-bpclermont.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-bpclermont.fr/idp/AA"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-bpclermont.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>Fed-Admin@univ-bpclermont.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
index e6fc7aa7..9d458c92 100644
--- a/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-fcomte.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-15T12:46:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-15T12:46:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-fcomte.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Franche-Comte</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABPklEQVQoz9VSu04CURSc+3JheW2IwQSIGLGhMzTS2Fjb2PoN1iZ+gT9gY2NvLCz9AQsTEhIfhSbEsIobCWJgeezC6r0WC0IUTCg91WTOnXPuTA45L+5gnuIACmsH0WDmrX1XqhwtxfK51C6A12bx3joFwJm+kd0XPOwOGlflQw4gHEjpWiLkJQFowjD0VQAd1/JHUkLj4RyjwhXx4YZaq9Tt15q9MgClpP9OqY8RgFR9BiHlYCi4fT75/iIB+dsDncvxPxEQMgpHjiip1Lj1UyCl5wPOdB8s8AijGoBxrJNlOyagAJKIrS8vbnXcl2xim1EBoO1Upwqequ+X6fgmp4H8yt5ERz3WL6YIAFybx95nN2kUNGH4TNutPlhndfsGAJl1rdFgJhJMCxbqe61mr+wMGkNvs+KzHdN2zN/8FyutcXADWeY6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://univ-fcomte.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Franche-Comté</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-fcomte.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Franche-Comte</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABPklEQVQoz9VSu04CURSc+3JheW2IwQSIGLGhMzTS2Fjb2PoN1iZ+gT9gY2NvLCz9AQsTEhIfhSbEsIobCWJgeezC6r0WC0IUTCg91WTOnXPuTA45L+5gnuIACmsH0WDmrX1XqhwtxfK51C6A12bx3joFwJm+kd0XPOwOGlflQw4gHEjpWiLkJQFowjD0VQAd1/JHUkLj4RyjwhXx4YZaq9Tt15q9MgClpP9OqY8RgFR9BiHlYCi4fT75/iIB+dsDncvxPxEQMgpHjiip1Lj1UyCl5wPOdB8s8AijGoBxrJNlOyagAJKIrS8vbnXcl2xim1EBoO1Upwqequ+X6fgmp4H8yt5ERz3WL6YIAFybx95nN2kUNGH4TNutPlhndfsGAJl1rdFgJhJMCxbqe61mr+wMGkNvs+KzHdN2zN/8FyutcXADWeY6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://univ-fcomte.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Franche-Comté</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIECTCCAvGgAwIBAgIJAMpmbKzqwZS/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD
 VQQGEwJGUjEWMBQGA1UECAwNRlJBTkNIRSBDT01URTERMA8GA1UEBwwIQmVzYW5j
 b24xDDAKBgNVBAoMA1VGQzEMMAoGA1UECwwDQ1JJMRswGQYDVQQDDBJpZHAudW5p
@@ -42,13 +42,13 @@ pFXlNA+vzp+WEEWPO6TV29w1Hz66NFf7PeexEr4DDBg0vnvsEBAdiGA1x1CQbFit
 Iif5onYKtZVZW68sY7wLOim3mCWb/QayOXJIycv0zc5EyziPGy+dIZT2LePsQPU3
 kL3y4I3hH+GeK5iK/w7esz+6VG04gBFYYeamic8=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
 OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
@@ -68,26 +68,26 @@ XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
 nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
 IVPuFCeDJg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-fcomte.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-fcomte.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-fcomte.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-fcomte.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIECTCCAvGgAwIBAgIJAMpmbKzqwZS/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD
 VQQGEwJGUjEWMBQGA1UECAwNRlJBTkNIRSBDT01URTERMA8GA1UEBwwIQmVzYW5j
 b24xDDAKBgNVBAoMA1VGQzEMMAoGA1UECwwDQ1JJMRswGQYDVQQDDBJpZHAudW5p
@@ -111,13 +111,13 @@ pFXlNA+vzp+WEEWPO6TV29w1Hz66NFf7PeexEr4DDBg0vnvsEBAdiGA1x1CQbFit
 Iif5onYKtZVZW68sY7wLOim3mCWb/QayOXJIycv0zc5EyziPGy+dIZT2LePsQPU3
 kL3y4I3hH+GeK5iK/w7esz+6VG04gBFYYeamic8=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
 OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
@@ -137,19 +137,19 @@ XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
 nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
 IVPuFCeDJg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Franche-Comté</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Franche-Comté</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://univ-fcomte.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>bernard.voisin@univ-fcomte.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Franche-Comté</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Franche-Comté</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://univ-fcomte.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>bernard.voisin@univ-fcomte.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
index 5c341c13..0d52cbf0 100644
--- a/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lehavre.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-25T10:50:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-25T10:50:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lehavre.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université du Havre</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAACeSURBVCjPvdGhaoJhFMbx36ffitrF5BXYBgYtM1tssxgMFtd2F3onK7sAk2VpMwgGMZmGimCyyWsQYexVm/7Tw+Hhz+EcHkpJLx5m/uQf1biQaCkIgqy1raJPT3j2fTZsTC0tzHXUBSkYe4ltewM1AQT9uDBMVmZGGr4Eb+cd/tOU8+HVTsVeOfa0TXDQvX2TX++nkF4p1OXv8oxLHAFqfh/MOjimWwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMHw7c+8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDANZstTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lehavre.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université du Havre</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lehavre.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université du Havre</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAACeSURBVCjPvdGhaoJhFMbx36ffitrF5BXYBgYtM1tssxgMFtd2F3onK7sAk2VpMwgGMZmGimCyyWsQYexVm/7Tw+Hhz+EcHkpJLx5m/uQf1biQaCkIgqy1raJPT3j2fTZsTC0tzHXUBSkYe4ltewM1AQT9uDBMVmZGGr4Eb+cd/tOU8+HVTsVeOfa0TXDQvX2TX++nkF4p1OXv8oxLHAFqfh/MOjimWwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMHw7c+8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDANZstTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lehavre.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université du Havre</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
 MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
@@ -38,23 +38,23 @@ bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
 Kh1cWQw98Mp+EFgBRhkOjAzOXC58eYmrzBUXqK6y49R2AyBcZZ/uEigEinRINPi7
 TLwIDMskmL3PeTdF
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lehavre.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lehavre.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lehavre.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lehavre.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
 MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
@@ -74,24 +74,24 @@ bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
 Kh1cWQw98Mp+EFgBRhkOjAzOXC58eYmrzBUXqK6y49R2AyBcZZ/uEigEinRINPi7
 TLwIDMskmL3PeTdF
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lehavre.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université du Havre</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université du Havre</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lehavre.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>LEMAISTRE Eric</md:SurName>
-      <md:EmailAddress>eric.lemaistre@univ-lehavre.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>COIRRE Mickaël</md:SurName>
-      <md:EmailAddress>mickael.coirre@univ-lehavre.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lehavre.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université du Havre</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université du Havre</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lehavre.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LEMAISTRE Eric</md:SurName>
+    <md:EmailAddress>eric.lemaistre@univ-lehavre.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>COIRRE Mickaël</md:SurName>
+    <md:EmailAddress>mickael.coirre@univ-lehavre.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml b/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
index cb9aee95..6f448a9e 100644
--- a/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
+++ b/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lille3.fr/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-01-27T11:52:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-01-27T11:52:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lille 3</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lille3.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lille 3</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille3.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lille 3</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lille3.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lille 3</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUaI3sGoGDqxSkkKP8neZP2ayfQGswDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZyMB4XDTEwMDEyNzA5NDI0
 MloXDTMwMDEyNzA5NDI0MlowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZy
@@ -38,23 +38,23 @@ Ga4ev2RgDwKOZdcApBozTd1OteRkamdHqjsGGUMOjpa5nDbKBHnuLsszJgxhIIxM
 Zo56PsDM63rAF3vZF0uNsoql0sThageHMHnHIFoAUSpONzzEsQ991uG/bjioCY3T
 TVs+0tBLJA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille3.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille3.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille3.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille3.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUaI3sGoGDqxSkkKP8neZP2ayfQGswDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZyMB4XDTEwMDEyNzA5NDI0
 MloXDTMwMDEyNzA5NDI0MlowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZy
@@ -74,19 +74,19 @@ Ga4ev2RgDwKOZdcApBozTd1OteRkamdHqjsGGUMOjpa5nDbKBHnuLsszJgxhIIxM
 Zo56PsDM63rAF3vZF0uNsoql0sThageHMHnHIFoAUSpONzzEsQ991uG/bjioCY3T
 TVs+0tBLJA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lille 3</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lille 3</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lille3.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi.shibboleth@univ-lille3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lille 3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lille 3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lille3.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi.shibboleth@univ-lille3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
index a268ecd9..080fdf24 100644
--- a/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lorraine.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-04T12:06:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-04T12:06:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lorraine.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lorraine</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACaUlEQVQ4y5VTS09TURD+zrl90EJsS++9UNryMIEYQ1JJqIlbdUH0BxgTw4qFO1cu1AUbjTt2JuqOhy/QkCjR4MIaFurCsCImGiDSphAwYHn0cVvu+VxcWiuBhV8yOcnMmW9mznwHOIRkInmmI9Y12d3VU9SDOsMBnb2nelW8reNlf6K/D8chxRRikfY3RsikHjAYDujUgwb1oMHmE2HqAYNGyGQsEp+Z5GQtTwAAmUKbee27ZZV6lFIQENBcGgBAKceEADTHBbfHvbi2nu2GEA5BrDU+UygULmtSgyYlIASssgUhNEgJuIRTyqr8JfH5GmYza5kB9CcSZ42gSQAcHxtnFQAINHP0QYTcj1FtxgjoDAecsYyQyWRf8pzMbeeHFRUAwLbtg7ZVbUbbBrBPVGwCDqtzksiurt6UJM5XLxPH4IgASXi93gGZy+UahBD4XwghsLO945P1ydJ5U7CuZDVM1q2tjkS2tJql6sybv7cAAJrUAHgAbGFnzwYE4G100je3ActyRmgOh/dkoVCcEkLArzVh+tV0jT2TWcbH1BzGJzYAFwEFpBc8+DTrRu9piXIZyO/uTmHo6lCLETKpBw0C4PNnL1iPkZFHnHgI0o6SpSjJGC9daGGjx+Tg4GBUm1+Yz+thw6yUK0m/rxFjT0ax+GMJShHplTR+bWRx/cZ7LH3zgxawvkK8fqeQL/oef/4y97TWcjwSf1vVvoD7QEiOOT6DgE5Apx5qn/3nL1TRGe+8m98r3KaiwOHNEpCaoL+p6f7P9PKdIwmcdX3Fyc4rt/bL5YvFYil6oPusy+X5sJxevHdYM38As6AfdxYzj+0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lorraine.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lorraine</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lorraine.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lorraine</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACaUlEQVQ4y5VTS09TURD+zrl90EJsS++9UNryMIEYQ1JJqIlbdUH0BxgTw4qFO1cu1AUbjTt2JuqOhy/QkCjR4MIaFurCsCImGiDSphAwYHn0cVvu+VxcWiuBhV8yOcnMmW9mznwHOIRkInmmI9Y12d3VU9SDOsMBnb2nelW8reNlf6K/D8chxRRikfY3RsikHjAYDujUgwb1oMHmE2HqAYNGyGQsEp+Z5GQtTwAAmUKbee27ZZV6lFIQENBcGgBAKceEADTHBbfHvbi2nu2GEA5BrDU+UygULmtSgyYlIASssgUhNEgJuIRTyqr8JfH5GmYza5kB9CcSZ42gSQAcHxtnFQAINHP0QYTcj1FtxgjoDAecsYyQyWRf8pzMbeeHFRUAwLbtg7ZVbUbbBrBPVGwCDqtzksiurt6UJM5XLxPH4IgASXi93gGZy+UahBD4XwghsLO945P1ydJ5U7CuZDVM1q2tjkS2tJql6sybv7cAAJrUAHgAbGFnzwYE4G100je3ActyRmgOh/dkoVCcEkLArzVh+tV0jT2TWcbH1BzGJzYAFwEFpBc8+DTrRu9piXIZyO/uTmHo6lCLETKpBw0C4PNnL1iPkZFHnHgI0o6SpSjJGC9daGGjx+Tg4GBUm1+Yz+thw6yUK0m/rxFjT0ax+GMJShHplTR+bWRx/cZ7LH3zgxawvkK8fqeQL/oef/4y97TWcjwSf1vVvoD7QEiOOT6DgE5Apx5qn/3nL1TRGe+8m98r3KaiwOHNEpCaoL+p6f7P9PKdIwmcdX3Fyc4rt/bL5YvFYil6oPusy+X5sJxevHdYM38As6AfdxYzj+0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lorraine.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lorraine</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
 NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
@@ -38,23 +38,23 @@ Y10pxgllpZX4+9nHqH881zqMIGabResycrkapt9qICb68J1W1ya4Nt5JpKK2FOMt
 r7oI1OzwHs7GPXEkw762uQijJnX7areGTveAn73vnATWtLXbwmtJSj9IN2i84FkO
 06gmvAA/GVb9pyUNbP+z
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lorraine.fr/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lorraine.fr/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lorraine.fr/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lorraine.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lorraine.fr/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lorraine.fr/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lorraine.fr/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lorraine.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
 NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
@@ -74,19 +74,19 @@ Y10pxgllpZX4+9nHqH881zqMIGabResycrkapt9qICb68J1W1ya4Nt5JpKK2FOMt
 r7oI1OzwHs7GPXEkw762uQijJnX7areGTveAn73vnATWtLXbwmtJSj9IN2i84FkO
 06gmvAA/GVb9pyUNbP+z
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lorraine.fr:8443/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lorraine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lorraine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lorraine.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth-contact@univ-lorraine.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lorraine.fr:8443/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lorraine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lorraine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lorraine.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth-contact@univ-lorraine.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
index 198f30e3..05de4f5b 100644
--- a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lyon2.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-27T11:39:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-27T11:39:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon2.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lyon 2 - Lumière</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQ4y2NkYGBg+Pnz538GMgA7OzsjI7maYYCJEs1wA158PcSw4DI7VgWPPm1mWHNTjWHBZXaGBZfZGXbcc2V49+Mi8S5gY+ZnMJPsZYjSesUQonGb4dffjwynnpXA5VkIGSDBbYdimBy/H8OFl83kh8GXXw8ZhDj0iXcBMnjx9RDDnfeLGJzk15Dugnc/LjLsexjKoCIYxyDH50uaAe9+XGTYcc+NQY7Pj8FGZjaKHEED8GnGCIMd91xRJD2UdsOjjIdVDiX0VYTiGXhY5SAG8LApMBiI12J1gYpgHMOX3w9xunDg8wIjAwNl2RkAfglTUwuNT8YAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lyon2.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lyon 2 - Lumière</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon2.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lyon 2 - Lumière</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQ4y2NkYGBg+Pnz538GMgA7OzsjI7maYYCJEs1wA158PcSw4DI7VgWPPm1mWHNTjWHBZXaGBZfZGXbcc2V49+Mi8S5gY+ZnMJPsZYjSesUQonGb4dffjwynnpXA5VkIGSDBbYdimBy/H8OFl83kh8GXXw8ZhDj0iXcBMnjx9RDDnfeLGJzk15Dugnc/LjLsexjKoCIYxyDH50uaAe9+XGTYcc+NQY7Pj8FGZjaKHEED8GnGCIMd91xRJD2UdsOjjIdVDiX0VYTiGXhY5SAG8LApMBiI12J1gYpgHMOX3w9xunDg8wIjAwNl2RkAfglTUwuNT8YAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lyon2.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lyon 2 - Lumière</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDfzCCAmegAwIBAgIUEMeIVUaZhvRDqDGddKXxpUkeNa0wDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwLWx5Mi51bml2LWx5b24yLmZyMB4XDTE1MDkxNjEz
 MjE0N1oXDTM1MDkxNjEzMjE0N1owIDEeMBwGA1UEAxMVaWRwLWx5Mi51bml2LWx5
@@ -39,13 +39,13 @@ sIKBKF9mVywrqhWgCZBuD2rdXfrkHdAdF1INv5pB6HWWnsbYkjEezyNUyY2+k5lg
 Xs49dq8zUWOi07M/Fc+NvtTGH4kkGfjmP0s4MXMRqQq5I045YsD6u2pHYDXPq8gC
 gV4nyX84VcokhCvuxaG6tdMYaciJdHsnrbBoprT3cHjJNgk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUBpfnmhLCkTwSlxzmAuiYTFCGCo4wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwMS51bml2LWx5b24yLmZyMB4XDTEyMDkxODA3NDIy
 OVoXDTMyMDkxODA3NDIyOVowHTEbMBkGA1UEAxMSaWRwMS51bml2LWx5b24yLmZy
@@ -65,26 +65,26 @@ ULjeWoNajiut41GjeVsS637G/DwDBxES4VRpbzQORblOKFqd0JM12osIi569QRkq
 v/ETWbTTTBP29pqVXRoqx9uG1JUODCguG3ugS8oqoXtSpPArLwKfW658Iw0dfAc4
 j/QOF0eZVg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon2.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lyon 2 - Lumière</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lyon 2 - Lumière</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lyon2.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Nicolas Berne</md:SurName>
-      <md:EmailAddress>Nicolas.Berne@univ-lyon2.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Daniel Dao-Castellana</md:SurName>
-      <md:EmailAddress>daniel.dao-castellana@univ-lyon2.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon2.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lyon 2 - Lumière</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lyon 2 - Lumière</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lyon2.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Nicolas Berne</md:SurName>
+    <md:EmailAddress>Nicolas.Berne@univ-lyon2.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Daniel Dao-Castellana</md:SurName>
+    <md:EmailAddress>daniel.dao-castellana@univ-lyon2.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
index 2d6128e0..a65f7dce 100644
--- a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lyon3.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T10:43:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T10:43:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABKUlEQVQ4y+2SvUoDYRREZ3aDoKCbuIVYmA2bzQMIlhaWPoTYiqKNCMHK2tLGFJY2NgpG8hKSJzDJmk8liRYuCViYn2+sIiGthSCeboq5XA4D/PNjOJ0L+eDUWnQBfZLOQOzfNBqt5yjMFQFxMMKVMaY5LriT7TAMPQe6BkGSEck9yF31F7x7Odh1yB2HWEtn5qtJ0nsDAGfygMvREcgZSbcW9tjKlkhsyEUFRMlanZFcd+hWCtls+P1BPgg2fT99QnJfUjXV+zistzrNJOlWFjPeK8ktWdQaj6boZzxDclsO5t6T7h0BIApzjyRyksoW/YM4bj9NeonCoElgWItNAYCNwuABwGw9NispAJB0KeplOGLZmHZnSqwAngt2aSyd1IWE5d9ewJ/hC8sKeQc2gDq1AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAw2EssoQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMKkWlB0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lyon3.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon3.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABKUlEQVQ4y+2SvUoDYRREZ3aDoKCbuIVYmA2bzQMIlhaWPoTYiqKNCMHK2tLGFJY2NgpG8hKSJzDJmk8liRYuCViYn2+sIiGthSCeboq5XA4D/PNjOJ0L+eDUWnQBfZLOQOzfNBqt5yjMFQFxMMKVMaY5LriT7TAMPQe6BkGSEck9yF31F7x7Odh1yB2HWEtn5qtJ0nsDAGfygMvREcgZSbcW9tjKlkhsyEUFRMlanZFcd+hWCtls+P1BPgg2fT99QnJfUjXV+zistzrNJOlWFjPeK8ktWdQaj6boZzxDclsO5t6T7h0BIApzjyRyksoW/YM4bj9NeonCoElgWItNAYCNwuABwGw9NispAJB0KeplOGLZmHZnSqwAngt2aSyd1IWE5d9ewJ/hC8sKeQc2gDq1AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAw2EssoQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMKkWlB0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lyon3.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVAJNAAx/pIfn3JBeuoLwC9QIBjkqyMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcC51bml2LWx5b24zLmZyMB4XDTE2MDMyMjEzMzYz
 M1oXDTM2MDMyMjEzMzYzM1owHDEaMBgGA1UEAwwRaWRwLnVuaXYtbHlvbjMuZnIw
@@ -38,13 +38,13 @@ beVYAgW2oOn1NDiGKBarnIA9/Eil38PyILcfbRZ9TSJs+nReh5YpTLe9AsDRF8Pm
 N7wNdIRYdDxrWcRJorbhwW9cZBgLUpUBbDc9ZL1iafHOYbyh7C0kqqHBmXxbgZoQ
 t0Ge9Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVALk8mZ+AAF53uwidDGYBnH0PYWxbMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LWx5b24zLmZyMB4XDTEwMTAxMjEzMzk1
 NVoXDTMwMTAxMjEzMzk1NVowHDEaMBgGA1UEAxMRaWRwLnVuaXYtbHlvbjMuZnIw
@@ -64,21 +64,21 @@ TWXosGddVcZLkq+eFRjPBFUZmin0Y1i6IPWtHveMnegwrIimwh4hc3Hq9x9frai9
 vU4n/dUR4kWq12hY6VObixqfgw9dHPnALDINjOdTHmmXaSJAyv5tQkmIRGZyMOmc
 n4c/iw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon3.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lyon 3 - Jean Moulin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lyon3.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>contact-shibboleth@univ-lyon3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon3.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lyon 3 - Jean Moulin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lyon3.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>contact-shibboleth@univ-lyon3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
index 041c2ee5..bb279e64 100644
--- a/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-orleans.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-18T17:24:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-18T17:24:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-orleans.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université d'Orléans</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABIElEQVQ4y+WSvUoDQRRGz8xONpEl6CNoJeQl1lTpFBESRJFNZeErWEnQJ7CxCNNYJFWsLRILC1/ATgjYWgTyI5vdvWOxikZE7ET86u8cPrgX/nzUj1o2bILeoGwOGM8fQN+CrBDdbH0vsBt7QIuit0rmIBXwNXgantMhuBP1oXxENDh/hc5QboZv1kkExOVgQcMsa4OUcBiglAtstU7ZdJjM7/FNhURyqTjQCpY8mGYNon7380iNrdYJvA7jBJSuEGc5KA6KHogbMkm2ifpdbNjEhleLAuSUWMDoHHpLYCCWBtFgDcUuvZojKLQp+5vY8OldoLgjlUdSd4HR+eTALE5WLDOK95lmh+xcKxytr8/YqzlG8RA4Jhpc/s5n/cO8AOugaYEtH1CQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAw6aM2PAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMCswMjowMJj+joAAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-orleans.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université d'Orléans</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-orleans.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université d'Orléans</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABIElEQVQ4y+WSvUoDQRRGz8xONpEl6CNoJeQl1lTpFBESRJFNZeErWEnQJ7CxCNNYJFWsLRILC1/ATgjYWgTyI5vdvWOxikZE7ET86u8cPrgX/nzUj1o2bILeoGwOGM8fQN+CrBDdbH0vsBt7QIuit0rmIBXwNXgantMhuBP1oXxENDh/hc5QboZv1kkExOVgQcMsa4OUcBiglAtstU7ZdJjM7/FNhURyqTjQCpY8mGYNon7380iNrdYJvA7jBJSuEGc5KA6KHogbMkm2ifpdbNjEhleLAuSUWMDoHHpLYCCWBtFgDcUuvZojKLQp+5vY8OldoLgjlUdSd4HR+eTALE5WLDOK95lmh+xcKxytr8/YqzlG8RA4Jhpc/s5n/cO8AOugaYEtH1CQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAw6aM2PAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMCswMjowMJj+joAAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-orleans.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université d'Orléans</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPDCCAiSgAwIBAgIVANWZeCtKF/UQd4fR6YuwUFezr4HpMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWIudW5pdi1vcmxlYW5zLmZyMB4XDTExMDQxMTEy
 MDgzMFoXDTMxMDQxMTEyMDgzMFowHzEdMBsGA1UEAxMUc2hpYi51bml2LW9ybGVh
@@ -38,21 +38,21 @@ Lk2EiYwXkYbiqz4l8/tVJ3YFYVNmNezvW/PvgeiJaSKaIWwpeHxu/YdB+grKUckN
 IM41Gy3rPU+4VD6wsj+dXYpUCvMUwVKaQahxu1DKWH9hrMMBkYio3dLds0GNs0GJ
 C+qiXdGuUa6kUpYVBFC+Vw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-orleans.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université d'Orléans</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université d'Orléans</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-orleans.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>equipe.reseau@univ-orleans.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-orleans.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université d'Orléans</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université d'Orléans</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-orleans.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>equipe.reseau@univ-orleans.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
index 19bcee4a..56765d91 100644
--- a/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-paris3.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-16T22:34:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-16T22:34:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABfUlEQVQoz2P8//8/AymA6fH9uyRpYJbhY3t8/66MgjIHJycxGhh7a0sgLEMLG0tHN2Rtf18e+Pflwf+vD/6+PMDAwPD/ywNmcQcWuPT5E0euXTjj6myowHnp78sD/14eRDeclZ/NZAJUw7+Pt/99uvPr0511p38qSTK4mDCws6GrZzOZwMgmwOyl9ePngy3/Plz9/+M1w/+/DAwM778w3HrCIC3KwM2BFDji9uwmExgYGJiXZj7/8/fvy3cohv36zXDlPgMfF4OoANQxHE47GNkEGBgYGL8sZmBgYHj9gWHPGYY3H5FCg1uWiVtWS0/DIySWgVWAWcgAKg7RAAFH7shffCLMxKfKxCMLF9QyMPEICkcYBNHAohTPopzALO5w5/qVnetX/vzxA9mFohJSoYkZkBBn/HmxnlWjAOI+CHj1/Omm5Qs/fXiPVQ8j1rT04/v31fNnvH7xDC4io6CkbWiibWjKiCvx/fj+HaJBVEIKOfoZSU6tJKlmYGAAAJBvj53VXvxUAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-paris3.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">All members of the Sorbonne Nouvelle - Paris 3 community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Tous les membres de la communauté Sorbonne Nouvelle - Paris 3 : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissements travaillant dans l'université, invités, prestataires, anciens personnels gardant une activité.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris3.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABfUlEQVQoz2P8//8/AymA6fH9uyRpYJbhY3t8/66MgjIHJycxGhh7a0sgLEMLG0tHN2Rtf18e+Pflwf+vD/6+PMDAwPD/ywNmcQcWuPT5E0euXTjj6myowHnp78sD/14eRDeclZ/NZAJUw7+Pt/99uvPr0511p38qSTK4mDCws6GrZzOZwMgmwOyl9ePngy3/Plz9/+M1w/+/DAwM778w3HrCIC3KwM2BFDji9uwmExgYGJiXZj7/8/fvy3cohv36zXDlPgMfF4OoANQxHE47GNkEGBgYGL8sZmBgYHj9gWHPGYY3H5FCg1uWiVtWS0/DIySWgVWAWcgAKg7RAAFH7shffCLMxKfKxCMLF9QyMPEICkcYBNHAohTPopzALO5w5/qVnetX/vzxA9mFohJSoYkZkBBn/HmxnlWjAOI+CHj1/Omm5Qs/fXiPVQ8j1rT04/v31fNnvH7xDC4io6CkbWiibWjKiCvx/fj+HaJBVEIKOfoZSU6tJKlmYGAAAJBvj53VXvxUAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-paris3.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">All members of the Sorbonne Nouvelle - Paris 3 community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Tous les membres de la communauté Sorbonne Nouvelle - Paris 3 : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissements travaillant dans l'université, invités, prestataires, anciens personnels gardant une activité.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVAMSFD1SXsksxsNe7dgs+bu0/1u4hMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5mcjAeFw0xMTEyMTUxNzE1
 MTZaFw0zMTEyMTUxNzE1MTZaMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5m
@@ -40,21 +40,21 @@ IBbAxUnoEmbTqImHVmF229LIlNphqKpuduDhOtSs+Szd2ZoooyRaSTu9SVMplJ4Y
 bZMYCQGSG0R+xeFXPOJHMRl0brK4iwveaUGTXC2yg8W/wLm9f4MVOKKRKrMTYHGY
 HKtGROgixJI=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris3.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-paris3.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-paris3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris3.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-paris3.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-paris3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
index 02d22830..88be2781 100644
--- a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-paris4.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-15T16:19:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-15T16:19:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Paris IV - Sorbonne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.paris-sorbonne.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Paris IV - Sorbonne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Paris IV - Sorbonne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.paris-sorbonne.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Paris IV - Sorbonne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
@@ -46,24 +46,24 @@ LsZ2ycJNxU+3DFaLplq4s2S7llycn+QoR2FGFQYbRxEIkEExzPEjcoHxO9Z9NWiX
 mWTayZwzt0iJJtgUTa8Lr+vSHx2pY70ZHgzsmbwKd1gEn1+u7ltx/5nUar5lRokB
 bz0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris4.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris4.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
@@ -90,20 +90,20 @@ LsZ2ycJNxU+3DFaLplq4s2S7llycn+QoR2FGFQYbRxEIkEExzPEjcoHxO9Z9NWiX
 mWTayZwzt0iJJtgUTa8Lr+vSHx2pY70ZHgzsmbwKd1gEn1+u7ltx/5nUar5lRokB
 bz0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris4.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris IV - Sorbonne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris IV - Sorbonne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.paris-sorbonne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>MARIR Brahim</md:SurName>
-      <md:EmailAddress>brahim.marir@paris-sorbonne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris4.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris IV - Sorbonne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris IV - Sorbonne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.paris-sorbonne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>MARIR Brahim</md:SurName>
+    <md:EmailAddress>brahim.marir@paris-sorbonne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
index c36525fa..3500a01f 100644
--- a/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-paris8.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-24T11:17:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-24T11:17:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris8.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Paris 8 - Vincennes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXklEQVQ4y6VTTWgTYRB9822yu0mM+kmo4MGfVtJsJYgb0VYrrQcVETwIHjyUomAFUQ/iQRCvepPipRcFD95EQcQf6MFSREFsFQNNa1p6qVAqTbRtsrvZ7DcemoSWVi99x2HmzbzHG2CDoEQiccf3/R6l1EI0Gv06Ozt7hYgaDWzZAKirGFTPaURqs9BeAjxEuVEAgAiCYHupVGrVNG26UCj0GYbBmUymuz7ss5rM++6Qq1TfYjW4mvfd9wo8sUwMkJTyoeM4F13XjTMzpJQffi/86eCDRzUslr87rLZGSNtJuZHaRRmUOJiJCfETig6LuhQAICIUi8VOGAaj7NzKV7x0BFpnfRgAKDeCGLSOfMU7BMEQa0whAjSRm3CcTAAGiJvXOsdWwAwACK3n7BYtrKemxircZj/74bmDbNntINQ0oHui4r5J6eZTKGoQNGxnZsTj8SQE+sFiIKmb37Ke82WTEGUGqKRUpEU3pgH00PhIg4CZGclk8piU8vWSUjN8oGMAZe9J1nP2p83IOzA+QSGKMHaNec75NiMyyfsye0MAAgAxKaUHQA+Hw8MonuiCNXVp3Hd700bkLI2NvlopkS37wrTvlfaEjeeQUvabpslNTU03uWYMAHzc3fqCLXv4XwnkNvtGttlSoqbfnZube7Aqgcv18n9S7DBAq3KwEkeisc/jFfcUW3bLmu2pDApB9V7aMAdDAAQAbZ03uZ/SzdNZz5lky34M8FsQlcA4PlP1rikg2KaFTlIikbjLzGfm5+fb19sEwbeXAnX9V1DdAQCKGS268QjA5fpDbQh/Af+zC6c7Nz0LAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-paris8.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Paris 8 - Vincennes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris8.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Paris 8 - Vincennes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXklEQVQ4y6VTTWgTYRB9822yu0mM+kmo4MGfVtJsJYgb0VYrrQcVETwIHjyUomAFUQ/iQRCvepPipRcFD95EQcQf6MFSREFsFQNNa1p6qVAqTbRtsrvZ7DcemoSWVi99x2HmzbzHG2CDoEQiccf3/R6l1EI0Gv06Ozt7hYgaDWzZAKirGFTPaURqs9BeAjxEuVEAgAiCYHupVGrVNG26UCj0GYbBmUymuz7ss5rM++6Qq1TfYjW4mvfd9wo8sUwMkJTyoeM4F13XjTMzpJQffi/86eCDRzUslr87rLZGSNtJuZHaRRmUOJiJCfETig6LuhQAICIUi8VOGAaj7NzKV7x0BFpnfRgAKDeCGLSOfMU7BMEQa0whAjSRm3CcTAAGiJvXOsdWwAwACK3n7BYtrKemxircZj/74bmDbNntINQ0oHui4r5J6eZTKGoQNGxnZsTj8SQE+sFiIKmb37Ke82WTEGUGqKRUpEU3pgH00PhIg4CZGclk8piU8vWSUjN8oGMAZe9J1nP2p83IOzA+QSGKMHaNec75NiMyyfsye0MAAgAxKaUHQA+Hw8MonuiCNXVp3Hd700bkLI2NvlopkS37wrTvlfaEjeeQUvabpslNTU03uWYMAHzc3fqCLXv4XwnkNvtGttlSoqbfnZube7Aqgcv18n9S7DBAq3KwEkeisc/jFfcUW3bLmu2pDApB9V7aMAdDAAQAbZ03uZ/SzdNZz5lky34M8FsQlcA4PlP1rikg2KaFTlIikbjLzGfm5+fb19sEwbeXAnX9V1DdAQCKGS268QjA5fpDbQh/Af+zC6c7Nz0LAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-paris8.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Paris 8 - Vincennes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcTCCA1mgAwIBAgIQU6fzKCJW2smEB7nD2+nWADANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDYyNzAwMDAwMFoXDTE2MDYyNjIzNTk1OVowQDEhMB8GA1UE
@@ -44,21 +44,21 @@ l/ELbK/eJKOdrq6Zmy628SNr3CqnfmJYzCjWWLCPDGFLqdb+NGrJmv/vW6qjaXR8
 /V8oGmyidoea26kUSWvdh3AKMnMQS4zsJmhmxanamVwRPT39MQMpRBkyZE8vbzNg
 UBmu1bU2YiGLaIjIQDOLGGuoia51PW2bRqBpeOc4GdmkMuUMIw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris8.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris 8 - Vincennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris 8 - Vincennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-paris8.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>reseau@univ-paris8.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris8.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 8 - Vincennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 8 - Vincennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-paris8.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>reseau@univ-paris8.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml
index 5063e255..7e021c1f 100644
--- a/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-psl.fr/idp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-19T10:06:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-19T10:06:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-psl.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PSL Research University</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYwMjJBMjk4MDYzRTExRTY4MDE0ODMzREQ0OTcxOEQ5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYwMjJBMjk5MDYzRTExRTY4MDE0ODMzREQ0OTcxOEQ5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjAyMkEyOTYwNjNFMTFFNjgwMTQ4MzNERDQ5NzE4RDkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjAyMkEyOTcwNjNFMTFFNjgwMTQ4MzNERDQ5NzE4RDkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz62pAezAAABU0lEQVR42qTSvUoDQRDA8d27qCSVhVoIioWFhdj6UQQLUygWKSxEEF9AsbHJA4iFhdgoKbQUFHwHBQNqI4JdiliJEBDFnBBMPP8Dc7A5Llfowo/72J1hZndtfnrXpIw8PFx1W5Ax6WMdff9JUEA2bYGXMjeMEQxh7C8J5pz5mbQWpjCKKtoI8YU1Z10RFfRoUjGOV0nQjz008KkBTcxrsg8soAxfg3MYxLYkeMIpNhJKDTSp7MWi87+qMQ+S4A0HWuKWlh713kho+xzHuI4f4z028a5PoyW74wQl1LudgvR74XwP6B619PssDMM6TCTpGIuxhIFT6XIm45sOsWApeUnfpcxDfGNHd72QzfX6etyJV1kuzwSesY+jqBKqLVlrJtutn1ljzU23BFL+C1Zx5/wvE/zI8zIImiueZyt6Rzr2QN5r0mcsOBq3MudZW3PjfgUYAK1uUlTvrD2xAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-psl.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">The populations covered are students, teachers and staff of the universities</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">PSL - Université de Recherche Paris Sciences &amp; Lettres</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les populations couvertes sont les étudiants, les enseignants et les personnels de l'universités</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-psl.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PSL Research University</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYwMjJBMjk4MDYzRTExRTY4MDE0ODMzREQ0OTcxOEQ5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYwMjJBMjk5MDYzRTExRTY4MDE0ODMzREQ0OTcxOEQ5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjAyMkEyOTYwNjNFMTFFNjgwMTQ4MzNERDQ5NzE4RDkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NjAyMkEyOTcwNjNFMTFFNjgwMTQ4MzNERDQ5NzE4RDkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz62pAezAAABU0lEQVR42qTSvUoDQRDA8d27qCSVhVoIioWFhdj6UQQLUygWKSxEEF9AsbHJA4iFhdgoKbQUFHwHBQNqI4JdiliJEBDFnBBMPP8Dc7A5Llfowo/72J1hZndtfnrXpIw8PFx1W5Ax6WMdff9JUEA2bYGXMjeMEQxh7C8J5pz5mbQWpjCKKtoI8YU1Z10RFfRoUjGOV0nQjz008KkBTcxrsg8soAxfg3MYxLYkeMIpNhJKDTSp7MWi87+qMQ+S4A0HWuKWlh713kho+xzHuI4f4z028a5PoyW74wQl1LudgvR74XwP6B619PssDMM6TCTpGIuxhIFT6XIm45sOsWApeUnfpcxDfGNHd72QzfX6etyJV1kuzwSesY+jqBKqLVlrJtutn1ljzU23BFL+C1Zx5/wvE/zI8zIImiueZyt6Rzr2QN5r0mcsOBq3MudZW3PjfgUYAK1uUlTvrD2xAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-psl.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">The populations covered are students, teachers and staff of the universities</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">PSL - Université de Recherche Paris Sciences &amp; Lettres</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Les populations couvertes sont les étudiants, les enseignants et les personnels de l'universités</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+TCCAeGgAwIBAgIJANcuXKnq7Ew5MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 BAMMCHdob2NhcmVzMB4XDTE1MDMxMTE2NDAxMFoXDTI1MDMwODE2NDAxMFowEzER
 MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -38,21 +38,21 @@ TR+9MZ+wgSmw6FzzmLb/rLPqGDTjJty/3j4A3/dpoYoDsthfzPHF0IVSWZ6AOXq7
 4NVa4plDX3kopSpDWpn0AR9JL6d76t1TZqXPACtoO3JOLvWujgNmZxmOwBdFcMe6
 m4NQPTEkvbbry7PxzsLnEPJZu80pEM8viNvuNNKAnyJZLIH17t8JkEW5Nr/E
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-psl.fr/idp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-psl.fr/idp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-psl.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PSL - Université de Recherche Paris Sciences &amp; Lettres</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PSL - Université de Recherche Paris Sciences &amp; Lettres</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-psl.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support.informatique@univ-psl.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-psl.fr/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-psl.fr/idp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-psl.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PSL - Université de Recherche Paris Sciences &amp; Lettres</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PSL - Université de Recherche Paris Sciences &amp; Lettres</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-psl.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support.informatique@univ-psl.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
index 6e4ecfd3..b33e9212 100644
--- a/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-tours.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-24T18:00:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-24T18:00:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tours.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Tours</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACGElEQVQoz5VRzWpTYRCd7+f+myaNbWpNMYIRC0WzEFxYXXThwr6A4FbfwRfwFXTThWuXii4EF1IXgkUsUqVQpdbYtClpcnPTfPfe729cRANiNp7V4cycOcwMQUT4H9B/JSH1/SfvMmUmGviYxUI+er291Yy7uXr/o3d+9ku1FF6tlZeqRUbpBMOH78cvN/cbtfLy4tztK9XVy2dPMv1qq9VOsltL8+M2Mt4hVSaTOvKctfWdlcUz9Uqhn6oXm00LcO9mfYJhhI3dzt3Hbxu1sufz437WODf9YHWpHHmTDRZxbf2rw+nyhdmfPbHXGd65Vos8DgCISAiBEUNEazEW+bOPzYfPPyltRmJnkL3ZPmzFQki9c5hYaxHxd0KubSsWLqPzpYCOJv3JPOhn/VQulMKpwAEAkqSSEpJp43OWa4uIocu7Ii8GTizUlO9YRAQQUruMtpOMfzsapNIoa7sn8nTBA0QEst8dXr9Yebqxd6M+k2tLgWhj54rB51bMq9NhO0nni0E7ySLPCV02zHXR56HLVi5VFspRPMxDlxNCTvk8M4YLaXpCSY3S2FzbowEC4kzBdznLtd3viSRTBd+pFPzdzhAt8OnQBUAEQAQhTchI4DCHUc5IZcpnlIQu913GKClHLgBwRBwKMzoMAYw853CQ5soog9pitRQc9FNlLAIAQuQxYi3av5+tjJXGokUgwBl1GR3XCYFfkCk3eQ/1whgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-tours.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Univesity's student and staff.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Tours</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et personnes de l'université de Tours</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tours.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Tours</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACGElEQVQoz5VRzWpTYRCd7+f+myaNbWpNMYIRC0WzEFxYXXThwr6A4FbfwRfwFXTThWuXii4EF1IXgkUsUqVQpdbYtClpcnPTfPfe729cRANiNp7V4cycOcwMQUT4H9B/JSH1/SfvMmUmGviYxUI+er291Yy7uXr/o3d+9ku1FF6tlZeqRUbpBMOH78cvN/cbtfLy4tztK9XVy2dPMv1qq9VOsltL8+M2Mt4hVSaTOvKctfWdlcUz9Uqhn6oXm00LcO9mfYJhhI3dzt3Hbxu1sufz437WODf9YHWpHHmTDRZxbf2rw+nyhdmfPbHXGd65Vos8DgCISAiBEUNEazEW+bOPzYfPPyltRmJnkL3ZPmzFQki9c5hYaxHxd0KubSsWLqPzpYCOJv3JPOhn/VQulMKpwAEAkqSSEpJp43OWa4uIocu7Ii8GTizUlO9YRAQQUruMtpOMfzsapNIoa7sn8nTBA0QEst8dXr9Yebqxd6M+k2tLgWhj54rB51bMq9NhO0nni0E7ySLPCV02zHXR56HLVi5VFspRPMxDlxNCTvk8M4YLaXpCSY3S2FzbowEC4kzBdznLtd3viSRTBd+pFPzdzhAt8OnQBUAEQAQhTchI4DCHUc5IZcpnlIQu913GKClHLgBwRBwKMzoMAYw853CQ5soog9pitRQc9FNlLAIAQuQxYi3av5+tjJXGokUgwBl1GR3XCYFfkCk3eQ/1whgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-tours.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Univesity's student and staff.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Tours</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants et personnes de l'université de Tours</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUMTCu8WRUyD8HXVem6DjtEjmt/q8wDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRaWRwLnVuaXYtdG91cnMuZnIwHhcNMTYwNDIyMDkxODM5
 WhcNMzYwNDIyMDkxODM5WjAcMRowGAYDVQQDDBFpZHAudW5pdi10b3Vycy5mcjCC
@@ -40,13 +40,13 @@ TsFGvheDs+e9yAJWmYCn95PG5e1yBZaCzZ7y99ns3q6tFbZ6vxUY06hfeJ4APxM1
 Bw3jwMuYwbtLJ3CHiNnsqLOJfefRW6eJMwLXscLFi29lTVkZaUXISIHQX5Ch0ZB9
 z+Ol
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
 WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
@@ -66,23 +66,23 @@ Nm452WAqt1hsasELZYoMp3q/jUFuLwIqk4HaoyP0ugbGZS5S+uf6vrodMvoVwf84
 Sf1I3HGOP6+0iyh+HO8fJM+1VZRsIxCJy69Z4uWDSacQOJo7cvj6sXSDRdv2Ecm8
 DW4K
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-tours.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-tours.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tours.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-tours.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-tours.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tours.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUMTCu8WRUyD8HXVem6DjtEjmt/q8wDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRaWRwLnVuaXYtdG91cnMuZnIwHhcNMTYwNDIyMDkxODM5
 WhcNMzYwNDIyMDkxODM5WjAcMRowGAYDVQQDDBFpZHAudW5pdi10b3Vycy5mcjCC
@@ -102,13 +102,13 @@ TsFGvheDs+e9yAJWmYCn95PG5e1yBZaCzZ7y99ns3q6tFbZ6vxUY06hfeJ4APxM1
 Bw3jwMuYwbtLJ3CHiNnsqLOJfefRW6eJMwLXscLFi29lTVkZaUXISIHQX5Ch0ZB9
 z+Ol
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
 WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
@@ -128,20 +128,20 @@ Nm452WAqt1hsasELZYoMp3q/jUFuLwIqk4HaoyP0ugbGZS5S+uf6vrodMvoVwf84
 Sf1I3HGOP6+0iyh+HO8fJM+1VZRsIxCJy69Z4uWDSacQOJo7cvj6sXSDRdv2Ecm8
 DW4K
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-tours.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Tours</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Tours</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-tours.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Patrice Garnier</md:SurName>
-      <md:EmailAddress>patrice.garnier@univ-tours.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-tours.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Tours</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Tours</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-tours.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Patrice Garnier</md:SurName>
+    <md:EmailAddress>patrice.garnier@univ-tours.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
index 98f032ac..cfd37311 100644
--- a/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unive.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unive.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ca' Foscari University of Venice</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università Ca Foscari di Venezia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Ca' Foscari University of Venice users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università Ca Foscari di Venezia</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://www.unive.it/nqcontent.cfm?a_id=77958</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unive.it/nqcontent.cfm?a_id=10497</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.unive.it/nqcontent.cfm?a_id=77958</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unive.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ca' Foscari University of Venice</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università Ca Foscari di Venezia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Ca' Foscari University of Venice users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università Ca Foscari di Venezia</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://www.unive.it/nqcontent.cfm?a_id=77958</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.unive.it/nqcontent.cfm?a_id=10497</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://www.unive.it/nqcontent.cfm?a_id=77958</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUYUFQBvFR3QHBbGwgFllRXJ3//CowDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MB4XDTEwMDcwNTA4MzU0NloXDTMw
 MDcwNTA4MzU0NlowFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MIIBIjANBgkqhkiG
@@ -40,29 +40,29 @@ dHRyg+dniGnc4A611sNQAQfQjMH8mG2ddSR3QUy+pHOgKc+bBYlxXARDWG3sRdfW
 kLS5sOnteGUA6cE6QlqrPoLXBzpWMNX/deaHjVGA55ohGiB26Nq8UnXLT60U/Eng
 L7SbcgeJ5rjT1w9MYHAeq0GHQFVsubgSvnzLJhF9HQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unive.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unive.it/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://idp.unive.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unive.it/idp/profile/SAML2/POST/SLO" ResponseLocation="https://idp.unive.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unive.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unive.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unive.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unive.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unive.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unive.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unive.it/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://idp.unive.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unive.it/idp/profile/SAML2/POST/SLO" ResponseLocation="https://idp.unive.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unive.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unive.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unive.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unive.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unive.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUYUFQBvFR3QHBbGwgFllRXJ3//CowDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MB4XDTEwMDcwNTA4MzU0NloXDTMw
 MDcwNTA4MzU0NlowFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MIIBIjANBgkqhkiG
@@ -81,24 +81,24 @@ dHRyg+dniGnc4A611sNQAQfQjMH8mG2ddSR3QUy+pHOgKc+bBYlxXARDWG3sRdfW
 kLS5sOnteGUA6cE6QlqrPoLXBzpWMNX/deaHjVGA55ohGiB26Nq8UnXLT60U/Eng
 L7SbcgeJ5rjT1w9MYHAeq0GHQFVsubgSvnzLJhF9HQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unive.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università Ca Foscari di Venezia</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Ca' Foscari University of Venice</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università Ca Foscari di Venezia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Ca' Foscari University of Venice</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://unive.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unive.it/nqcontent.cfm?a_id=10497</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>giacomini</md:SurName>
-      <md:EmailAddress>mailto:gigiacom@unive.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unive.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università Ca Foscari di Venezia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ca' Foscari University of Venice</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università Ca Foscari di Venezia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ca' Foscari University of Venice</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://unive.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unive.it/nqcontent.cfm?a_id=10497</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>giacomini</md:SurName>
+    <md:EmailAddress>mailto:gigiacom@unive.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
index f97057ce..3a4fd17b 100644
--- a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.universite-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-11T10:47:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-11T10:47:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.universite-lyon.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universite-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABpFBMVEUAAAAACAsACQwAn98An94AHCcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAsACQ0ACg4ACg4ACQ0ACQ0ACg4ACg4ACQwACAwAoN8Ant0AndwAndwAnt0AntwAn94An94AHCgAHCcAGiQAGyYAHCcAGyYAHCcAGiUAGiUAHCcAHSgAAAAAAAAALT8AFBsAAAAAAAAAAAAAHysAJDIAAAAAAAAAAAAAAAAAmtcASmcAAAAAAAAAc6EAgrUAAAAAAAAAAAAAl9MASGUAAAAAAAAAcZ4Af7IAAAAAAAAAl9IAS2gAAAAAAAAAc6EAf7EAAAAAAAAAh70Ae6wAAAAAAQEAkssAZo4AAAAAAAAAAAAALkAAoN8AdqUARGAAhboAndwAExsAAAAAAAAAAAAAMUUAjMQAmtcAhLgAHSgAAAAAAAAAAQEAAAAAAAAAAAAAAAD///+idxDJAAAAinRSTlMAAAAAAAACWNbuXQEKRoaEi+e0Djg8rrYrF2q+vKzfynQslkdJfYU+mBGBiomYlYiPcgQNcomIh4pgAwxtgoGCg4GBg1wDDVdjXltEX15hTgQaf4BvYnVzdwgciIp3aX58fwkbiXdxgnt/EYmAeXuCiHaAA3NzmXhzgJB+Vh2PcYCKe3ginZmedxQXELtrAAAAAWJLR0SL8m9H4AAAAAd0SU1FB+ABFxIvLWJf5LIAAADPSURBVBjTY2CAAjZ2Dk4uCJObjYeXj19AsKtLSBgsICwiKtYFAuIS3BAlklLi0jKycvIKMO2KSsoqSqpq6hpcEBWMmlraOrq6evoGhkZMIAFmYxNTM3NzczMLSysWkACrtY2tnb2Do5OziysrWI+bu4enl7ePr59/AMTQwKDgkFCGsPAI1UiIQFR0TGwcQ3xCIl8SRCA5OiU1jS09I1MNqiIrOydXIC+/oLCoGOqyktKy8orKquoamFNr6+obGpua091gAgwtfK1t7R2dICYAXRwr2hVfoiYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDEtMjNUMTg6NDc6NDUrMDE6MDDZWb36AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAxLTIzVDE4OjQ3OjQ1KzAxOjAwqAQFRgAAAFd6VFh0UmF3IHByb2ZpbGUgdHlwZSBpcHRjAAB4nOPyDAhxVigoyk/LzEnlUgADIwsuYwsTIxNLkxQDEyBEgDTDZAMjs1Qgy9jUyMTMxBzEB8uASKBKLgDqFxF08kI1lQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.universite-lyon.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lyon</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.universite-lyon.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universite-lyon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABpFBMVEUAAAAACAsACQwAn98An94AHCcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAsACQ0ACg4ACg4ACQ0ACQ0ACg4ACg4ACQwACAwAoN8Ant0AndwAndwAnt0AntwAn94An94AHCgAHCcAGiQAGyYAHCcAGyYAHCcAGiUAGiUAHCcAHSgAAAAAAAAALT8AFBsAAAAAAAAAAAAAHysAJDIAAAAAAAAAAAAAAAAAmtcASmcAAAAAAAAAc6EAgrUAAAAAAAAAAAAAl9MASGUAAAAAAAAAcZ4Af7IAAAAAAAAAl9IAS2gAAAAAAAAAc6EAf7EAAAAAAAAAh70Ae6wAAAAAAQEAkssAZo4AAAAAAAAAAAAALkAAoN8AdqUARGAAhboAndwAExsAAAAAAAAAAAAAMUUAjMQAmtcAhLgAHSgAAAAAAAAAAQEAAAAAAAAAAAAAAAD///+idxDJAAAAinRSTlMAAAAAAAACWNbuXQEKRoaEi+e0Djg8rrYrF2q+vKzfynQslkdJfYU+mBGBiomYlYiPcgQNcomIh4pgAwxtgoGCg4GBg1wDDVdjXltEX15hTgQaf4BvYnVzdwgciIp3aX58fwkbiXdxgnt/EYmAeXuCiHaAA3NzmXhzgJB+Vh2PcYCKe3ginZmedxQXELtrAAAAAWJLR0SL8m9H4AAAAAd0SU1FB+ABFxIvLWJf5LIAAADPSURBVBjTY2CAAjZ2Dk4uCJObjYeXj19AsKtLSBgsICwiKtYFAuIS3BAlklLi0jKycvIKMO2KSsoqSqpq6hpcEBWMmlraOrq6evoGhkZMIAFmYxNTM3NzczMLSysWkACrtY2tnb2Do5OziysrWI+bu4enl7ePr59/AMTQwKDgkFCGsPAI1UiIQFR0TGwcQ3xCIl8SRCA5OiU1jS09I1MNqiIrOydXIC+/oLCoGOqyktKy8orKquoamFNr6+obGpua091gAgwtfK1t7R2dICYAXRwr2hVfoiYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTYtMDEtMjNUMTg6NDc6NDUrMDE6MDDZWb36AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE2LTAxLTIzVDE4OjQ3OjQ1KzAxOjAwqAQFRgAAAFd6VFh0UmF3IHByb2ZpbGUgdHlwZSBpcHRjAAB4nOPyDAhxVigoyk/LzEnlUgADIwsuYwsTIxNLkxQDEyBEgDTDZAMjs1Qgy9jUyMTMxBzEB8uASKBKLgDqFxF08kI1lQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.universite-lyon.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lyon</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRDCCAiygAwIBAgIVAP2sGfoeCE9dQRA0FpVdm+UCBHNFMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmlkcC51bml2ZXJzaXRlLWx5b24uZnIwHhcNMTEwMzEw
 MTEyMzIxWhcNMzEwMzEwMTEyMzIxWjAhMR8wHQYDVQQDExZpZHAudW5pdmVyc2l0
@@ -39,21 +39,21 @@ h7F5udv5XokwRaF5dzzn5bSOQqxtaUCGfhFpJx0VcmmyBQ6tOhLC9PVC48hyq7v6
 RFr+XMux5XOoza21wQf9RWV70eN43LuUxR1ZNdjdHgvwqXFmIauGAaCib8j3/ARv
 UZpOUBiMjLpIx7nFKyNwPg5DVhxj2BDR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.universite-lyon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.universite-lyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sysadmin@universite-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.universite-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.universite-lyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sysadmin@universite-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
index c528c3f2..6c99fa94 100644
--- a/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univille.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univille.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.univille.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.univille.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univille.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.univille.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.univille.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxNjA0BgNVBAoULVVOSVZJTExF
 IC0gVW5pdmVyc2lkYWRlIGRhIFJlZ2nDo2RlIEpvaW52aWxsZTEUMBIGA1UECxML
 VEktVW5pdmlsbGUxIjAgBgkqhkiG9w0BCQEWE3Bzc2lsdmFAdW5pdmlsbGUuYnIx
@@ -46,26 +46,26 @@ K9avfqWDLuk4tC6BxBdgFlIMBv1B4maEGmac3NNGIk6OU1Iboq1TDPA8OkfRFYEf
 qp8r8NBaC+0BzpVtqUu3g8AFM6PJD46g35EzlP8K1hMAqrlsqEZ7IlD2n91XW5J7
 nP4wY1kEldpD1CfHvNSzk1HuF/Q2VHTjUN2sDaQr1y/qhqBEkNiEhDd78YmPVA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.univille.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univille.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univille.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univille.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univille.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.univille.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univille.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univille.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univille.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univille.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxNjA0BgNVBAoULVVOSVZJTExF
 IC0gVW5pdmVyc2lkYWRlIGRhIFJlZ2nDo2RlIEpvaW52aWxsZTEUMBIGA1UECxML
@@ -91,24 +91,24 @@ qp8r8NBaC+0BzpVtqUu3g8AFM6PJD46g35EzlP8K1hMAqrlsqEZ7IlD2n91XW5J7
 nP4wY1kEldpD1CfHvNSzk1HuF/Q2VHTjUN2sDaQr1y/qhqBEkNiEhDd78YmPVA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univille.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.univille.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Paulo Sergio da Silva</md:SurName>
-      <md:EmailAddress>pssilva@univille.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univille.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.univille.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Paulo Sergio da Silva</md:SurName>
+    <md:EmailAddress>pssilva@univille.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml
index e86cbfe7..68def3ac 100644
--- a/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unmc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unmc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nebraska Medical Center</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Nebraska Medical Center IdP enables standards-based federation for the UNMC community.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.unmc.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unmc.edu/its/privacystatement.htm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="171" xml:lang="en">https://net.unmc.edu/standards/assets/unmcicon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unmc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nebraska Medical Center</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Nebraska Medical Center IdP enables standards-based federation for the UNMC community.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.unmc.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unmc.edu/its/privacystatement.htm</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="171" xml:lang="en">https://net.unmc.edu/standards/assets/unmcicon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUbN18eVJXDqBOyNPdN7TXDGBcPlQwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MB4XDTEyMTAwNTE2NDIzOVoXDTMy
 MTAwNTE2NDIzOVowFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MIIBIjANBgkqhkiG
@@ -47,24 +47,24 @@ FLc13nOcn8B4oa7KsqlIQabF7wn3jLKCmZV22VSSNTU2TfraOnobKf+dU3WdyArT
 qldJfiveQ3S4tzsv9PykD/AUf2DsYKUolzcS/HEPYp0NrIvlIKMRVZMrNoHmJo4B
 fdpZQ2TIsfzV+ci/L9l5y9IOnEqQTn66a9yUVWxNaQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unmc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unmc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unmc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unmc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unmc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unmc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unmc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unmc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unmc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unmc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unmc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unmc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unmc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUbN18eVJXDqBOyNPdN7TXDGBcPlQwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MB4XDTEyMTAwNTE2NDIzOVoXDTMy
 MTAwNTE2NDIzOVowFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MIIBIjANBgkqhkiG
@@ -83,26 +83,26 @@ FLc13nOcn8B4oa7KsqlIQabF7wn3jLKCmZV22VSSNTU2TfraOnobKf+dU3WdyArT
 qldJfiveQ3S4tzsv9PykD/AUf2DsYKUolzcS/HEPYp0NrIvlIKMRVZMrNoHmJo4B
 fdpZQ2TIsfzV+ci/L9l5y9IOnEqQTn66a9yUVWxNaQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unmc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nebraska Medical Center</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nebraska Medical Center</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unmc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Lee Trant</md:GivenName>
-      <md:EmailAddress>ltrant@unmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt Callaway</md:GivenName>
-      <md:EmailAddress>mscallaway@unmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Geoff Gloeb</md:GivenName>
-      <md:EmailAddress>ggloeb@unmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unmc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nebraska Medical Center</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nebraska Medical Center</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unmc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Lee Trant</md:GivenName>
+    <md:EmailAddress>ltrant@unmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt Callaway</md:GivenName>
+    <md:EmailAddress>mscallaway@unmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoff Gloeb</md:GivenName>
+    <md:EmailAddress>ggloeb@unmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
index 82383985..7d913911 100644
--- a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unoesc.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoesc.lan</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unoesc.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unoesc.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoesc.lan</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unoesc.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unoesc.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxOTA3BgNVBAoTMFVOT0VTQyAt
 IFVuaXZlcnNpZGFkZSBkbyBPZXN0ZSBkZSBTYW50YSBDYXRhcmluYTENMAsGA1UE
 CxMEQ1RJQzEtMCsGCSqGSIb3DQEJARYeZmVybmFuZG8uY2VjY2F0b0B1bm9lc2Mu
@@ -47,26 +47,26 @@ sYL4uwYNKWcNkTmCrHo2Fmbguin5G8/eIz47LNz8rVPG69jdCIJ5Ia4GMwmc87Uj
 9GnuDjQAiKaENGURN1wqr343nhVyd5RteY8piQqqZaXbp+pB2HgvgnUpwbKksuFM
 AKS7wA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unoesc.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoesc.lan</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unoesc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoesc.lan</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxOTA3BgNVBAoTMFVOT0VTQyAt
 IFVuaXZlcnNpZGFkZSBkbyBPZXN0ZSBkZSBTYW50YSBDYXRhcmluYTENMAsGA1UE
@@ -93,24 +93,24 @@ sYL4uwYNKWcNkTmCrHo2Fmbguin5G8/eIz47LNz8rVPG69jdCIJ5Ia4GMwmc87Uj
 AKS7wA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Unoesc - Universidade do Oeste de Santa Catarina</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">Unoesc - Universidade do Oeste de Santa Catarina</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unoesc.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unoesc.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Adalberto Freiberger</md:SurName>
-      <md:EmailAddress>ctic.jba@unoesc.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Unoesc - Universidade do Oeste de Santa Catarina</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">Unoesc - Universidade do Oeste de Santa Catarina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unoesc.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unoesc.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Adalberto Freiberger</md:SurName>
+    <md:EmailAddress>ctic.jba@unoesc.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
index f04f28f6..54e37d41 100644
--- a/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uoa.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoa.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoa.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
                             BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
                             SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
@@ -42,27 +42,27 @@
                             Jo0dRg7bs242O3GkczYeCobJ57vAwmiOPpHWyLq0QNPOQpJteMRRbDyDPEJxmZqL
                             fFv23NJu+qiTMvSS1Z89Vph7AOEvYlV+m/BDv+Md9K41XM8i1g==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uoa.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uoa.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uoa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uoa.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoa.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uoa.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uoa.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uoa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uoa.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoa.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
                             BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
                             SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
@@ -91,29 +91,29 @@
                             Jo0dRg7bs242O3GkczYeCobJ57vAwmiOPpHWyLq0QNPOQpJteMRRbDyDPEJxmZqL
                             fFv23NJu+qiTMvSS1Z89Vph7AOEvYlV+m/BDv+Md9K41XM8i1g==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National and Kapodistrian University of Athens</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National and Kapodistrian University of Athens</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uoa.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.uoa.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>University of Athens Helpdesk</md:SurName>
-      <md:EmailAddress>helpdesk.idp@noc.uoa.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>University of Athens Helpdesk</md:SurName>
-      <md:EmailAddress>helpdesk.idp@noc.uoa.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National and Kapodistrian University of Athens</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National and Kapodistrian University of Athens</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uoa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.uoa.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>University of Athens Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk.idp@noc.uoa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>University of Athens Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk.idp@noc.uoa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml
index 0e610631..24893142 100644
--- a/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uolia.london.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonexternal.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonexternal.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYTCCA0mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBgTELMAkGA1UEBhMCR0Ix
 						DzANBgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24x
 						ITAfBgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRw
@@ -36,26 +36,26 @@
 						cvEAR//kD0TVMXReoDar12mz+r9lCgEcnonTTmzrdEUPR/L0fBPgE/a6FAfbM3Wq
 						+KvBFfLg8j/G26W22Ne/6XFgucDY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uolia.london.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonexternal.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uolia.london.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonexternal.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYTCCA0mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBgTELMAkGA1UEBhMCR0Ix
 						DzANBgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24x
 						ITAfBgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRw
@@ -81,27 +81,27 @@
 						cvEAR//kD0TVMXReoDar12mz+r9lCgEcnonTTmzrdEUPR/L0fBPgE/a6FAfbM3Wq
 						+KvBFfLg8j/G26W22Ne/6XFgucDY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of London: Online Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.londoninternational.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathon</md:GivenName>
-      <md:SurName>Thomas</md:SurName>
-      <md:EmailAddress>mailto:Jonathon.Thomas@london.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonathon</md:GivenName>
-      <md:SurName>Thomas</md:SurName>
-      <md:EmailAddress>mailto:Jonathon.Thomas@london.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of London: Online Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.londoninternational.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathon</md:GivenName>
+    <md:SurName>Thomas</md:SurName>
+    <md:EmailAddress>mailto:Jonathon.Thomas@london.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonathon</md:GivenName>
+    <md:SurName>Thomas</md:SurName>
+    <md:EmailAddress>mailto:Jonathon.Thomas@london.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml
index 608d89c5..99a2f94f 100644
--- a/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uom.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uom.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uom.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYTCCA0mgAwIBAgIQC/tCFL3CTrbZoTlo1VwxfTANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYyNTAwMDAwMFoXDTE2MDYyNDIzNTk1OVowODEhMB8GA1UE
@@ -44,26 +44,26 @@
                             +u6JbdZYW2zUWzUzRyyK1eCgXYNIswNFuTQ7ANWxIf/q8kk8SLv7Vdq/P1i+3PVk
                             sEP9QjFH5i9IJ+q4yVNeiQgEPT2+
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uom.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uom.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uom.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uom.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uom.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uom.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uom.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uom.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uom.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uom.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYTCCA0mgAwIBAgIQC/tCFL3CTrbZoTlo1VwxfTANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDYyNTAwMDAwMFoXDTE2MDYyNDIzNTk1OVowODEhMB8GA1UE
@@ -89,29 +89,29 @@
                             +u6JbdZYW2zUWzUzRyyK1eCgXYNIswNFuTQ7ANWxIf/q8kk8SLv7Vdq/P1i+3PVk
                             sEP9QjFH5i9IJ+q4yVNeiQgEPT2+
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Macedonia</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Macedonia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uom.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.uom.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Aspa</md:GivenName>
-      <md:SurName>Tsakiridou</md:SurName>
-      <md:EmailAddress>aspa@uom.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Macedonia NOC</md:Company>
-      <md:EmailAddress>noc@noc.uom.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Macedonia</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Macedonia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uom.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.uom.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aspa</md:GivenName>
+    <md:SurName>Tsakiridou</md:SurName>
+    <md:EmailAddress>aspa@uom.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Macedonia NOC</md:Company>
+    <md:EmailAddress>noc@noc.uom.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml
index b0cab5ea..c480b2a5 100644
--- a/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uowm.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balkan.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eetf.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eled.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icte.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mech.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nured.uowm.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Western Macedonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.uowm.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.uowm.gr/</mdui:InformationURL>
+        <mdui:Logo height="200" width="195">https://web.uowm.gr/_images/uowm-logo-big.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>noc.uowm.gr</mdui:DomainHint>
+        <mdui:IPHint>83.212.16.0/21</mdui:IPHint>
+        <mdui:IPHint>83.212.24.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:648:2820::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:40.30285563,21.79324174</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balkan.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eetf.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eled.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icte.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mech.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nured.uowm.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Western Macedonia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.uowm.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.uowm.gr/</mdui:InformationURL>
-          <mdui:Logo height="200" width="195">https://web.uowm.gr/_images/uowm-logo-big.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>noc.uowm.gr</mdui:DomainHint>
-          <mdui:IPHint>83.212.16.0/21</mdui:IPHint>
-          <mdui:IPHint>83.212.24.0/23</mdui:IPHint>
-          <mdui:IPHint>2001:648:2820::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:40.30285563,21.79324174</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYzCCA0ugAwIBAgIQf2UcbnRe+pHMY01RLNKQbDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOTEhMB8GA1UE
@@ -59,32 +59,32 @@
                             Iw2czrj7RCv/CseOgIeOs1UWMOgWCJFa1Lbu7graPiaSToYqWxFeQAR4zmqWvNNS
                             4/vOIp8XLxY5EaSUlBOy3jeTEcnCYiA=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uowm.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uowm.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uowm.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uowm.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uowm.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uowm.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balkan.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eetf.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eled.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icte.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mech.uowm.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nured.uowm.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uowm.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uowm.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uowm.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uowm.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uowm.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uowm.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balkan.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eetf.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eled.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icte.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mech.uowm.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nured.uowm.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEYzCCA0ugAwIBAgIQf2UcbnRe+pHMY01RLNKQbDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOTEhMB8GA1UE
@@ -110,29 +110,29 @@
                             Iw2czrj7RCv/CseOgIeOs1UWMOgWCJFa1Lbu7graPiaSToYqWxFeQAR4zmqWvNNS
                             4/vOIp8XLxY5EaSUlBOy3jeTEcnCYiA=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uowm.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uowm.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Western Macedonia</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Western Macedonia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uowm.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.uowm.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Voutskidis</md:SurName>
-      <md:EmailAddress>pvoutskidis@uowm.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Western Macedonia</md:Company>
-      <md:EmailAddress>noc@uowm.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uowm.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uowm.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Western Macedonia</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Western Macedonia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uowm.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.uowm.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Voutskidis</md:SurName>
+    <md:EmailAddress>pvoutskidis@uowm.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Western Macedonia</md:Company>
+    <md:EmailAddress>noc@uowm.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml b/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml
index c81b8e00..6373b8cb 100644
--- a/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml
+++ b/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.upatras.gr/shibboleth-idp/">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upatras.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upatras.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIGUTCCBbqgAwIBAgIDEyAFMA0GCSqGSIb3DQEBBQUAMIIBEjELMAkGA1UEBhMC
                             RVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMSkwJwYD
                             VQQKEyBJUFMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgcy5sLjEuMCwGA1UEChQl
@@ -54,26 +54,26 @@
                             NmnkmRIH/+c0gm0Ya7Ydomx9mEJZImb6rf1OlwZ6lnTw0U/5jPxcN8nA1TFipZGu
                             +8nkhyWprjhjKQ0fRTEAgF8aDolvFrF3wcS10jiaXnBO3JP2TQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upnet.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upnet.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.upnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upnet.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upatras.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upnet.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upnet.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.upnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upnet.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upatras.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIGUTCCBbqgAwIBAgIDEyAFMA0GCSqGSIb3DQEBBQUAMIIBEjELMAkGA1UEBhMC
                             RVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMSkwJwYD
                             VQQKEyBJUFMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgcy5sLjEuMCwGA1UEChQl
@@ -109,28 +109,28 @@
                             NmnkmRIH/+c0gm0Ya7Ydomx9mEJZImb6rf1OlwZ6lnTw0U/5jPxcN8nA1TFipZGu
                             +8nkhyWprjhjKQ0fRTEAgF8aDolvFrF3wcS10jiaXnBO3JP2TQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Patras</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πάτρας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Patras</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πάτρας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upatras.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.upatras.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>University of Patras NOC</md:SurName>
-      <md:EmailAddress>noc@upatras.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>University of Patras Helpdesk</md:SurName>
-      <md:EmailAddress>helpdesk@upatras.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Patras</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πάτρας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Patras</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πάτρας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upatras.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.upatras.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>University of Patras NOC</md:SurName>
+    <md:EmailAddress>noc@upatras.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>University of Patras Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@upatras.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
index aaafdd4f..3ce7e60d 100644
--- a/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.upce.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T11:28:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T11:28:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upce.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Pardubice</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Pardubice</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Pardubice.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Pardubice.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.upce.cz/english/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.upce.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="37">https://idp.upce.cz/images/logo-40.png</mdui:Logo>
+        <mdui:Logo height="487" width="745" xml:lang="en">https://idp.upce.cz/images/logo-487-en.png</mdui:Logo>
+        <mdui:Logo height="487" width="792" xml:lang="cs">https://idp.upce.cz/images/logo-487-cs.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upce.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Pardubice</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Univerzita Pardubice</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Pardubice.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Pardubice.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.upce.cz/english/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.upce.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="37">https://idp.upce.cz/images/logo-40.png</mdui:Logo>
-          <mdui:Logo height="487" width="745" xml:lang="en">https://idp.upce.cz/images/logo-487-en.png</mdui:Logo>
-          <mdui:Logo height="487" width="792" xml:lang="cs">https://idp.upce.cz/images/logo-487-cs.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEfzCCA2egAwIBAgIRANdGQbGBCwgib2T1mhEqCcMwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDkxITAfBgNV
@@ -59,28 +59,28 @@ kobD7FV0OT6tgq+WtZEocauC5RF7ahIaMtvB5116857eV1L+dkwkcmXd6HEXch7r
 G5y8pHiwmqc1pqxprE0T8bp8kn8fTZ6VK6NI7nnWfcjeHCqegZcT48mMO47JpKPs
 wKnA
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upce.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upce.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upce.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upce.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.upce.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upce.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upce.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upce.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upce.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upce.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upce.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.upce.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upce.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upce.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEfzCCA2egAwIBAgIRANdGQbGBCwgib2T1mhEqCcMwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDkxITAfBgNV
@@ -107,37 +107,37 @@ kobD7FV0OT6tgq+WtZEocauC5RF7ahIaMtvB5116857eV1L+dkwkcmXd6HEXch7r
 G5y8pHiwmqc1pqxprE0T8bp8kn8fTZ6VK6NI7nnWfcjeHCqegZcT48mMO47JpKPs
 wKnA
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upce.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upce.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Pardubice</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Univerzita Pardubice</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Pardubice</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Univerzita Pardubice</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upce.cz/english/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.upce.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lukáš</md:GivenName>
-      <md:SurName>Slánský</md:SurName>
-      <md:EmailAddress>lukas.slansky@upce.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josef</md:GivenName>
-      <md:SurName>Krupička</md:SurName>
-      <md:EmailAddress>josef.krupicka@upce.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pavel</md:GivenName>
-      <md:SurName>Přikryl</md:SurName>
-      <md:EmailAddress>pavel.prikryl@upce.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upce.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upce.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Pardubice</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Univerzita Pardubice</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Pardubice</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Univerzita Pardubice</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upce.cz/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.upce.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lukáš</md:GivenName>
+    <md:SurName>Slánský</md:SurName>
+    <md:EmailAddress>lukas.slansky@upce.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josef</md:GivenName>
+    <md:SurName>Krupička</md:SurName>
+    <md:EmailAddress>josef.krupicka@upce.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Přikryl</md:SurName>
+    <md:EmailAddress>pavel.prikryl@upce.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
index 993bf15f..2b8cd93a 100644
--- a/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.upmc.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-30T10:20:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-30T10:20:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmc.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZ0lEQVQoz5XST0iTcRzH8e/P5/k927Jnzv1DnzndM2azaSqp6SEZyUgxJCSIkIIKgg4VQfcO3YOoWx3qEBFhQkQGJpZJYm4Xe/xbc1ubz5xbzxgT5/Z7/nWqQ3Txc/7c3i+kaRoAIIQUWd76sbwemUvHVmVSAQDMGDhvoKW7v6G5jcZY13UAQJqmIYR2C9LHV08yiQ2Xr817rMfp8gBAVkzEhLAYXa7z+E+dv8ZabLquI13XdwvS60d3zTau/+yYw8XLhKiKDAAUjTHD5MT43JsXRSl97uY91mJDMiGTT+8rinrm8m0KM+n4xurXmXwmBQDWOnegd4Dj/apM3j17QNPU8JU71NULo0ufJwcv3Thkrl2cmpgdf1zIbsukQsql/HZqI/JJ08B9pM3pbop8mHA08NRQb+Cwxd4ZHE5FVyNT441Hu4zVZlLeoyja4fY5G5sTKxG7i+d4f+bnZj6zRQ10NLWfHLI46hfevzSxtYNj143VbDq2RtG4OzR6PDiUTkR/iTFPoEvX9bXFmSqZVJwuj6rIUiaJDSaaMWKjSVWIqhBsNNGMERtMUiapKrLT5ZFJhYY/Q4BIeY+U99kaq9vfCQBsjZWU90l5DwH6e6MxY8iKCZ+9zsY15VLx5HfB136iJzQKAGarPfptsbCz5XDzFI2zYgIzhirOG4gJYcwwrX2hUlES5qc3hTBCgBBsCmFhfrpUlFr7QphhYkKY8wbolu7+qecPc2Kc4/0dwZGl2bdfpB3W6gSA3Xy2VJQ6giMc78+JcTG6fPrirf+EW1mYlraTAGCrb2ztC/0T7uA0DozvoLx/A51vYzkXFljhAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.upmc.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmc.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZ0lEQVQoz5XST0iTcRzH8e/P5/k927Jnzv1DnzndM2azaSqp6SEZyUgxJCSIkIIKgg4VQfcO3YOoWx3qEBFhQkQGJpZJYm4Xe/xbc1ubz5xbzxgT5/Z7/nWqQ3Txc/7c3i+kaRoAIIQUWd76sbwemUvHVmVSAQDMGDhvoKW7v6G5jcZY13UAQJqmIYR2C9LHV08yiQ2Xr817rMfp8gBAVkzEhLAYXa7z+E+dv8ZabLquI13XdwvS60d3zTau/+yYw8XLhKiKDAAUjTHD5MT43JsXRSl97uY91mJDMiGTT+8rinrm8m0KM+n4xurXmXwmBQDWOnegd4Dj/apM3j17QNPU8JU71NULo0ufJwcv3Thkrl2cmpgdf1zIbsukQsql/HZqI/JJ08B9pM3pbop8mHA08NRQb+Cwxd4ZHE5FVyNT441Hu4zVZlLeoyja4fY5G5sTKxG7i+d4f+bnZj6zRQ10NLWfHLI46hfevzSxtYNj143VbDq2RtG4OzR6PDiUTkR/iTFPoEvX9bXFmSqZVJwuj6rIUiaJDSaaMWKjSVWIqhBsNNGMERtMUiapKrLT5ZFJhYY/Q4BIeY+U99kaq9vfCQBsjZWU90l5DwH6e6MxY8iKCZ+9zsY15VLx5HfB136iJzQKAGarPfptsbCz5XDzFI2zYgIzhirOG4gJYcwwrX2hUlES5qc3hTBCgBBsCmFhfrpUlFr7QphhYkKY8wbolu7+qecPc2Kc4/0dwZGl2bdfpB3W6gSA3Xy2VJQ6giMc78+JcTG6fPrirf+EW1mYlraTAGCrb2ztC/0T7uA0DozvoLx/A51vYzkXFljhAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.upmc.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
 MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
@@ -37,23 +37,23 @@ ExxnD0z0ECRqrbfgM8lUgAW2hS1C4wgO8sz6FpOIJ1kkXZ54TjI9UE2rmWKkD+iT
 nBrz6NcdhS32ZUARncfqoFZvOY+9rh4Q2SQIRyjKrAG/2TNVxVo6E+xEzx8nN63D
 Gz5/Q64Ts766vZwDA9u1fXIedZRbjJHYD4o6Fw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upmc.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upmc.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upmc.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmc.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upmc.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upmc.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upmc.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmc.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
 MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
@@ -72,19 +72,19 @@ ExxnD0z0ECRqrbfgM8lUgAW2hS1C4wgO8sz6FpOIJ1kkXZ54TjI9UE2rmWKkD+iT
 nBrz6NcdhS32ZUARncfqoFZvOY+9rh4Q2SQIRyjKrAG/2TNVxVo6E+xEzx8nN63D
 Gz5/Q64Ts766vZwDA9u1fXIedZRbjJHYD4o6Fw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upmc.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upmc.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>exploitationdsi@upmc.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upmc.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upmc.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>exploitationdsi@upmc.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
index 9e10cdcc..e10d066c 100644
--- a/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uqam.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-07-22T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-07-22T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uqam.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students, employees and other UQAM account holders</mdui:Description>
+        <mdui:Description xml:lang="fr">Ãtudiants, employés et autres détenteurs d'identifiants UQAM</mdui:Description>
+        <mdui:Description xml:lang="es">Los estudiantes, los empleados y otros titulares de identificadores UQAM</mdui:Description>
+        <mdui:Description xml:lang="pt">Os alunos, funcionários e outros detentores de identificação UQAM</mdui:Description>
+        <mdui:Description xml:lang="it">Gli studenti, i dipendenti e gli altri titolari di identificatori UQAM</mdui:Description>
+        <mdui:Keywords xml:lang="en">uqam.ca uqam montreal quebec university</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">uqam.ca uqam montréal québec université</mdui:Keywords>
+        <mdui:Keywords xml:lang="es">uqam.ca uqam montréal québec universidad</mdui:Keywords>
+        <mdui:Keywords xml:lang="pt">uqam.ca uqam montréal québec universidade</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">uqam.ca uqam montréal québec università</mdui:Keywords>
+        <mdui:Logo height="16" width="48">https://idp.uqam.ca/images/logo_uqam-48x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="182">https://idp.uqam.ca/images/logo_uqam-182x60.png</mdui:Logo>
+        <mdui:Logo height="647" width="1960">https://idp.uqam.ca/images/logo_uqam-1960x647.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.uqam.ca</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fr">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>132.208.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>uqam.ca</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:45.512843,-73.560893</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uqam.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Students, employees and other UQAM account holders</mdui:Description>
-          <mdui:Description xml:lang="fr">Ãtudiants, employés et autres détenteurs d'identifiants UQAM</mdui:Description>
-          <mdui:Description xml:lang="es">Los estudiantes, los empleados y otros titulares de identificadores UQAM</mdui:Description>
-          <mdui:Description xml:lang="pt">Os alunos, funcionários e outros detentores de identificação UQAM</mdui:Description>
-          <mdui:Description xml:lang="it">Gli studenti, i dipendenti e gli altri titolari di identificatori UQAM</mdui:Description>
-          <mdui:Keywords xml:lang="en">uqam.ca uqam montreal quebec university</mdui:Keywords>
-          <mdui:Keywords xml:lang="fr">uqam.ca uqam montréal québec université</mdui:Keywords>
-          <mdui:Keywords xml:lang="es">uqam.ca uqam montréal québec universidad</mdui:Keywords>
-          <mdui:Keywords xml:lang="pt">uqam.ca uqam montréal québec universidade</mdui:Keywords>
-          <mdui:Keywords xml:lang="it">uqam.ca uqam montréal québec università</mdui:Keywords>
-          <mdui:Logo height="16" width="48">https://idp.uqam.ca/images/logo_uqam-48x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="182">https://idp.uqam.ca/images/logo_uqam-182x60.png</mdui:Logo>
-          <mdui:Logo height="647" width="1960">https://idp.uqam.ca/images/logo_uqam-1960x647.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fr">http://www.uqam.ca</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="fr">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>132.208.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>uqam.ca</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:45.512843,-73.560893</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
 NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
@@ -63,33 +63,33 @@ l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
 fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
 
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uqam.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uqam.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt">Université du Québec à Montréal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Université du Québec à Montréal</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uqam.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uqam.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Université du Québec à Montréal</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
 NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
@@ -109,31 +109,31 @@ l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
 fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
 
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université du Québec à Montréal</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Université du Québec à Montréal</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">Université du Québec à Montréal</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt">Université du Québec à Montréal</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Université du Québec à Montréal</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.uqam.ca</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@uqam.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université du Québec à Montréal</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Université du Québec à Montréal</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">Université du Québec à Montréal</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt">Université du Québec à Montréal</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Université du Québec à Montréal</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.uqam.ca</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@uqam.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uran.ua-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uran.ua-idp-shibboleth.xml
index 851b510c..27db3064 100644
--- a/swamid-interfederations-2.0/idp.uran.ua-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uran.ua-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uran.ua/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-02-17T19:48:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-02-17T19:48:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uran.ua</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">URAN Association IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ru">Ассоциация УРАН IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Association URAN</mdui:Description>
+        <mdui:Description xml:lang="ru">Поставщик Удостоверений для Ассоциации УРАН</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp.uran.ua/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="ru">https://idp.uran.ua/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uran.ua</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uran.ua</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">URAN Association IdP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ru">Ассоциация УРАН IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Association URAN</mdui:Description>
-          <mdui:Description xml:lang="ru">Поставщик Удостоверений для Ассоциации УРАН</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idp.uran.ua/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="ru">https://idp.uran.ua/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>uran.ua</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVANtB8T4bbAsN9mAy57P+mGwmZ7uEMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC51cmFuLnVhMB4XDTE0MDMyNzEwMzYwMVoXDTE3
 MDMyNzA5MzYwMVowFjEUMBIGA1UEAxMLaWRwLnVyYW4udWEwggEiMA0GCSqGSIb3
@@ -44,29 +44,29 @@ Tke+RDktDDWFNPDrE9Ci4nCn6MbDQJEQgVGovAfN1q0zFnt/SlpUSMf3Kx60isUS
 CJ98UPGXiE2iiBpJUNpkhoF+z70jkWKqLy13fd94CRSTrHePdchNqjGusfpz5Y6V
 x0gyhw6tCPraBiFB5+EBMY/L7s3AEdlFxvXTkA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uran.ua:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uran.ua/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uran.ua/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uran.ua/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uran.ua/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uran.ua/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uran.ua/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uran.ua</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uran.ua:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uran.ua/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uran.ua/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uran.ua/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uran.ua/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uran.ua/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uran.ua/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uran.ua</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVANtB8T4bbAsN9mAy57P+mGwmZ7uEMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC51cmFuLnVhMB4XDTE0MDMyNzEwMzYwMVoXDTE3
 MDMyNzA5MzYwMVowFjEUMBIGA1UEAxMLaWRwLnVyYW4udWEwggEiMA0GCSqGSIb3
@@ -85,30 +85,30 @@ Tke+RDktDDWFNPDrE9Ci4nCn6MbDQJEQgVGovAfN1q0zFnt/SlpUSMf3Kx60isUS
 CJ98UPGXiE2iiBpJUNpkhoF+z70jkWKqLy13fd94CRSTrHePdchNqjGusfpz5Y6V
 x0gyhw6tCPraBiFB5+EBMY/L7s3AEdlFxvXTkA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uran.ua:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="ru">Ассоциация УРАН</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Association URAN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="ru">УРАН</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">URAN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="ru">http://www.uran.ua</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uran.ua</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mikhail</md:GivenName>
-      <md:SurName>Dombrougov</md:SurName>
-      <md:EmailAddress>mailto:dopomoga@uran.ua</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Yevhenii</md:GivenName>
-      <md:SurName>Preobrazhenskyi</md:SurName>
-      <md:EmailAddress>mailto:dopomoga@uran.ua</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uran.ua:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="ru">Ассоциация УРАН</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Association URAN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="ru">УРАН</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">URAN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="ru">http://www.uran.ua</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uran.ua</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mikhail</md:GivenName>
+    <md:SurName>Dombrougov</md:SurName>
+    <md:EmailAddress>mailto:dopomoga@uran.ua</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yevhenii</md:GivenName>
+    <md:SurName>Preobrazhenskyi</md:SurName>
+    <md:EmailAddress>mailto:dopomoga@uran.ua</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
index e246d446..d6fbea33 100644
--- a/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.urca.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urca.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">URCA - Universidade Regional do Cariri </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:DisplayName>
+        <mdui:Description xml:lang="en">URCA - Universidade Regional do Cariri </mdui:Description>
+        <mdui:Description xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.urca.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.urca.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urca.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">URCA - Universidade Regional do Cariri </mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:DisplayName>
-          <mdui:Description xml:lang="en">URCA - Universidade Regional do Cariri </mdui:Description>
-          <mdui:Description xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.urca.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.urca.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
 A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
 NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
@@ -40,26 +40,26 @@ DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
 nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
 xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.urca.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.urca.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.urca.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.urca.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urca.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.urca.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.urca.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.urca.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.urca.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urca.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
 A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
@@ -79,24 +79,24 @@ nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
 xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">URCA - Universidade Regional do Cariri</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">URCA - Universidade Regional do Cariri</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">URCA - Universidade Regional do Cariri </md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.urca.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.urca.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Herbert Novais</md:SurName>
-      <md:EmailAddress>herbert.novais@urca.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">URCA - Universidade Regional do Cariri</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">URCA - Universidade Regional do Cariri</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">URCA - Universidade Regional do Cariri </md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.urca.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.urca.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Herbert Novais</md:SurName>
+    <md:EmailAddress>herbert.novais@urca.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml
index 3f722589..518c721d 100644
--- a/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.usask.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-08-21T16:46:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-08-21T16:46:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usask.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:InformationURL xml:lang="en">http://www.usask.ca/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usask.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:InformationURL xml:lang="en">http://www.usask.ca/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMXVGogsmqnkwPUYCdxTPbev9l3ZMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTAeFw0xMDEwMjUyMDU2NTBaFw0z
 MDEwMjUyMDU2NTBaMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTCCASIwDQYJKoZI
@@ -32,24 +32,24 @@ D0NZ6TrcXo/7QHXhypSrNOAyXrN+ngQ8j6KJXmtjXj601I71upEVWOGaor172aNo
 4OJ1yrQ6k4U6yjjuwrQEAjDCL3WYhrhGCwuu/l/AVw28RWHK5qKgMovdwIeukJfL
 B9WRkjxzB4gF0SyVYl64MQB5UICwuA6q6WLxlmMyWIY=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.usask.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.usask.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.usask.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.usask.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.usask.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.usask.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usask.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.usask.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.usask.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.usask.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.usask.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.usask.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.usask.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usask.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMXVGogsmqnkwPUYCdxTPbev9l3ZMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTAeFw0xMDEwMjUyMDU2NTBaFw0z
 MDEwMjUyMDU2NTBaMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTCCASIwDQYJKoZI
@@ -68,22 +68,22 @@ D0NZ6TrcXo/7QHXhypSrNOAyXrN+ngQ8j6KJXmtjXj601I71upEVWOGaor172aNo
 4OJ1yrQ6k4U6yjjuwrQEAjDCL3WYhrhGCwuu/l/AVw28RWHK5qKgMovdwIeukJfL
 B9WRkjxzB4gF0SyVYl64MQB5UICwuA6q6WLxlmMyWIY=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.usask.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.usask.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Saskatchewan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Saskatchewan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.usask.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jennifer</md:GivenName>
-      <md:SurName>Hadley</md:SurName>
-      <md:EmailAddress>mailto:edupass_support@usask.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.usask.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.usask.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Saskatchewan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Saskatchewan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.usask.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jennifer</md:GivenName>
+    <md:SurName>Hadley</md:SurName>
+    <md:EmailAddress>mailto:edupass_support@usask.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
index b3c6437d..ff9a388c 100644
--- a/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ut-capitole.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-30T15:33:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-30T15:33:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse1.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut-capitole.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Toulouse 1 Capitole</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz03S62sTWRzG8XN+5zIzJ5mZpE3S1JQ2rddualtWEWFXRWUXREGof4Pv/KuWfbOwvqqIZRcUKtStUKHgZYPai802zcbcJpc5M3PO8UVRfN498Hn5xb9PLaCvM1rrKKJCcN9FGEySyHZXJzHhHGF8bOg3raLI8v389Sve3IwKpU4SoBQYa77abm2/Pr4IIbLiFRBCSsrM2dNTv16njm2UVqMRcE4YM8ZYvju+fD7Y/ZSMRhgAEEJKRt6puenbvyBkgFKWFnHQ71bfJ2GIAcC2ktGofPcWdWyjNSBjWEoUf7rU3Npm6XTY/Lzz5+rwqDG+WNlbfbL/aM3ECQaSDEcnblzVUQxKRmNLFaAsdWKyv3+w83BVlCYrD+67c2UdxcOjxt6jNWLzqNt18jmnmCd3mZf94Sx1bOLYh+sv4qAvJifERL5T/eCfnCXc6u3sWRnPzuUwRkYpOrtyJz09JdudsNkKm01MgAnhlmdUKJ1iwSjV+7jb36+NLS4Ma4eFSxeAZ3wqHO57GGNkEEIIGMtfXHbLM/Xn/9SerstuFxkEBMJmi9o2ufJvjXkuTQngfHBQS4KBKE3KTocKp/b3s+DjLjIme+60U5wQE/n6xiZgQlQojTYYIPfjUiIl993O2yowmpk/QzinQninZmWrraN4WDsk9zLFqBfkFis6ip3cuJXxjUqsbLb95l3UDXQcl25etcayGOGw1W5sbgEGkM1W4+UWc1P7j/+K+4NUqdStvu+8rRqtSzev1ddfNDZe0rSor28AELLiFYDSwUGNcJ6ZP/P/5lbnXXV8qTK2MG9nM9Xf/nAKufyF5YO1p4P6ETCGv9WqpHTL08WfL6tRGA+G3EvrRLGUiHrBf8+ex70AOEcI4e/z1nGCkHEKeWJbCGGjVNzvy1YHOMMAx+YLtBpGsTIWf64AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-tlse1.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Toulouse 1 Capitole</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse1.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut-capitole.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Toulouse 1 Capitole</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz03S62sTWRzG8XN+5zIzJ5mZpE3S1JQ2rddualtWEWFXRWUXREGof4Pv/KuWfbOwvqqIZRcUKtStUKHgZYPai802zcbcJpc5M3PO8UVRfN498Hn5xb9PLaCvM1rrKKJCcN9FGEySyHZXJzHhHGF8bOg3raLI8v389Sve3IwKpU4SoBQYa77abm2/Pr4IIbLiFRBCSsrM2dNTv16njm2UVqMRcE4YM8ZYvju+fD7Y/ZSMRhgAEEJKRt6puenbvyBkgFKWFnHQ71bfJ2GIAcC2ktGofPcWdWyjNSBjWEoUf7rU3Npm6XTY/Lzz5+rwqDG+WNlbfbL/aM3ECQaSDEcnblzVUQxKRmNLFaAsdWKyv3+w83BVlCYrD+67c2UdxcOjxt6jNWLzqNt18jmnmCd3mZf94Sx1bOLYh+sv4qAvJifERL5T/eCfnCXc6u3sWRnPzuUwRkYpOrtyJz09JdudsNkKm01MgAnhlmdUKJ1iwSjV+7jb36+NLS4Ma4eFSxeAZ3wqHO57GGNkEEIIGMtfXHbLM/Xn/9SerstuFxkEBMJmi9o2ufJvjXkuTQngfHBQS4KBKE3KTocKp/b3s+DjLjIme+60U5wQE/n6xiZgQlQojTYYIPfjUiIl993O2yowmpk/QzinQninZmWrraN4WDsk9zLFqBfkFis6ip3cuJXxjUqsbLb95l3UDXQcl25etcayGOGw1W5sbgEGkM1W4+UWc1P7j/+K+4NUqdStvu+8rRqtSzev1ddfNDZe0rSor28AELLiFYDSwUGNcJ6ZP/P/5lbnXXV8qTK2MG9nM9Xf/nAKufyF5YO1p4P6ETCGv9WqpHTL08WfL6tRGA+G3EvrRLGUiHrBf8+ex70AOEcI4e/z1nGCkHEKeWJbCGGjVNzvy1YHOMMAx+YLtBpGsTIWf64AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-tlse1.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Toulouse 1 Capitole</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVALxLFXefFrTC9DNxwQJ5rG/49hVDMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5mcjAeFw0xMjA2MDcxNDUz
 NTBaFw0zMjA2MDcxNDUzNTBaMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5m
@@ -39,21 +39,21 @@ c7C+wWTEXDd31gwpaV3mdXA/Ll8KxqtSw4UFX7mKna86JLkD1RnInHj+47g2KSAa
 icpGH7BFG5C/Y8WID/SDMcDwUBI55XFzBmDdgRkaZ5Sh3Ncfd+op3Rp0KWHeidql
 j9Itfb+dnWQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ut-capitole.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Toulouse 1 Capitole</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Toulouse 1 Capitole</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-tlse1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>systeme@ut-capitole.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ut-capitole.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Toulouse 1 Capitole</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Toulouse 1 Capitole</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-tlse1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>systeme@ut-capitole.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml
index 43495897..c2bac177 100644
--- a/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uta.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.uta.edu/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uta.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas at Arlington</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.uta.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uta.edu/oit/policy/Internet-privacy.php</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.uta.edu/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uta.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas at Arlington</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.uta.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uta.edu/oit/policy/Internet-privacy.php</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUC7oT6rb9pNSoCFZr77ngoXR+YG8wDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV0YS5lZHUwHhcNMTAwMTIwMTYxMTAyWhcNMzAw
 MTIwMTYxMTAyWjAWMRQwEgYDVQQDEwtpZHAudXRhLmVkdTCCASIwDQYJKoZIhvcN
@@ -39,29 +39,29 @@ k7TvCpFqKCBxLTfs7tqZ7UfbliMLALsrHfa2IIuDy0JfFd74TSj9KbtNAL4hyTPB
 ZPCie/YOLYcIFe7kKPlvkHB9DKXTlq2dPomPA3doG4aIjGK+GspD2OTsHs40W+Nj
 DhuK7YWFCjC6UIAyL63IXO/wa3uFVz2naO/3
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uta.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uta.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uta.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uta.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas at Arlington</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas at Arlington</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uta.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UTA Shibboleth Administrators</md:GivenName>
-      <md:EmailAddress>shibboleth-admin@uta.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jason Hardy</md:GivenName>
-      <md:EmailAddress>hardy@uta.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UTA Shibboleth</md:GivenName>
-      <md:EmailAddress>shibboleth-admin@uta.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uta.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uta.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uta.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uta.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas at Arlington</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas at Arlington</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uta.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UTA Shibboleth Administrators</md:GivenName>
+    <md:EmailAddress>shibboleth-admin@uta.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jason Hardy</md:GivenName>
+    <md:EmailAddress>hardy@uta.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UTA Shibboleth</md:GivenName>
+    <md:EmailAddress>shibboleth-admin@uta.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml
index 605d3ea0..40e5614d 100644
--- a/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utdallas.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utdallas.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas at Dallas</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utdallas.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas at Dallas</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAKxr332EVudjRIrBOrqMFIPg2iBHMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC51dGRhbGxhcy5lZHUwHhcNMTAwNjA3MjA1NDQ1
 WhcNMzAwNjA3MjA1NDQ1WjAbMRkwFwYDVQQDExBpZHAudXRkYWxsYXMuZWR1MIIB
@@ -37,24 +37,24 @@ imYF2TFcPInUp7XGaxDf9nxw4z7NNsNVkUZBjl8WmmUwMtPNUDFDaw8HmVn0J2Wc
 BneDgHFOfFS2aYPeytiEEM7pLc6HaAunOLXymg6VBSKYkC+wUZdIl7otJrccXzqE
 RisCn91uRsbkcD1U5ziboM4m9h4sYC/RP7yrFAUt9XM/aAl5JCBD8A+hnx+R50IW
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utdallas.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utdallas.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utdallas.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utdallas.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utdallas.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utdallas.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utdallas.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utdallas.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utdallas.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utdallas.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utdallas.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utdallas.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utdallas.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utdallas.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAKxr332EVudjRIrBOrqMFIPg2iBHMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC51dGRhbGxhcy5lZHUwHhcNMTAwNjA3MjA1NDQ1
 WhcNMzAwNjA3MjA1NDQ1WjAbMRkwFwYDVQQDExBpZHAudXRkYWxsYXMuZWR1MIIB
@@ -73,23 +73,23 @@ imYF2TFcPInUp7XGaxDf9nxw4z7NNsNVkUZBjl8WmmUwMtPNUDFDaw8HmVn0J2Wc
 BneDgHFOfFS2aYPeytiEEM7pLc6HaAunOLXymg6VBSKYkC+wUZdIl7otJrccXzqE
 RisCn91uRsbkcD1U5ziboM4m9h4sYC/RP7yrFAUt9XM/aAl5JCBD8A+hnx+R50IW
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utdallas.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utdallas.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas at Dallas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas at Dallas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utdallas.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UT Dallas Info Security</md:GivenName>
-      <md:EmailAddress>infosecurity@utdallas.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UT Dallas Info Security</md:GivenName>
-      <md:EmailAddress>infosecurity@utdallas.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utdallas.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utdallas.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas at Dallas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas at Dallas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utdallas.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UT Dallas Info Security</md:GivenName>
+    <md:EmailAddress>infosecurity@utdallas.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UT Dallas Info Security</md:GivenName>
+    <md:EmailAddress>infosecurity@utdallas.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utfpr.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utfpr.edu.br-idp-shibboleth.xml
index 19951e35..e433e0f7 100644
--- a/swamid-interfederations-2.0/idp.utfpr.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utfpr.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utfpr.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utfpr.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utfpr.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.utfpr.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utfpr.edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.utfpr.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.utfpr.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID8jCCAtoCAQAwDQYJKoZIhvcNAQEFBQAwgb4xOzA5BgNVBAoTMlVURlBSIC0g
 VW5pdmVyc2lkYWRlIFRlY25vbG9naWNhIEZlZGVyYWwgZG8gUGFyYW5hMQ8wDQYD
 VQQLEwZESVJHVEkxIjAgBgkqhkiG9w0BCQEWE3RoZXJla0B1dGZwci5lZHUuYnIx
@@ -46,26 +46,26 @@ Z5/bAMRe79ubwmSN80dY7o15bAHsGm0AitSvAx2v/0EElnxHwYV7Iqxxl2Gu8ftV
 lZ8xV4+dC0YYRrWlJX2XGnlYyA1lsAqLKmn9xbmXj68mpCs+/dnoTxyrtWnB0BfH
 SPwv0dgX
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utfpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utfpr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utfpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utfpr.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utfpr.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utfpr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utfpr.edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utfpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utfpr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utfpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utfpr.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utfpr.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utfpr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utfpr.edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID8jCCAtoCAQAwDQYJKoZIhvcNAQEFBQAwgb4xOzA5BgNVBAoTMlVURlBSIC0g
 VW5pdmVyc2lkYWRlIFRlY25vbG9naWNhIEZlZGVyYWwgZG8gUGFyYW5hMQ8wDQYD
@@ -91,23 +91,23 @@ lZ8xV4+dC0YYRrWlJX2XGnlYyA1lsAqLKmn9xbmXj68mpCs+/dnoTxyrtWnB0BfH
 SPwv0dgX
                                         
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utfpr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utfpr.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.utfpr.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Thiago A. Herek</md:SurName>
-      <md:EmailAddress>therek@utfpr.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utfpr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UTFPR - Universidade Tecnologica Federal do Parana</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utfpr.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.utfpr.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Thiago A. Herek</md:SurName>
+    <md:EmailAddress>therek@utfpr.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml
index 7b5d33d2..57dab488 100644
--- a/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uth.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Thessaly</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.uth.gr/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.uth.gr/</mdui:InformationURL>
+        <mdui:Logo height="87" width="87">https://aai.uth.gr/idp/images/uth_logo_87x87.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>www.uth.gr</mdui:DomainHint>
+        <mdui:DomainHint>it.uth.gr</mdui:DomainHint>
+        <mdui:IPHint>194.177.200.0/21</mdui:IPHint>
+        <mdui:IPHint>195.251.17.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.18.0/23</mdui:IPHint>
+        <mdui:IPHint>83.212.32.0/24</mdui:IPHint>
+        <mdui:IPHint>83.212.201.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.108.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2480::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:39.357718,22.950722</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:39.360568,22.931205</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:39.388834,22.940703</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:39.614609,22.387859</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:39.637292,22.418366</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:39.525625,21.775881</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:39.372241,21.916267</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:38.912572,22.428045</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Thessaly</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.uth.gr/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.uth.gr/</mdui:InformationURL>
-          <mdui:Logo height="87" width="87">https://aai.uth.gr/idp/images/uth_logo_87x87.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>www.uth.gr</mdui:DomainHint>
-          <mdui:DomainHint>it.uth.gr</mdui:DomainHint>
-          <mdui:IPHint>194.177.200.0/21</mdui:IPHint>
-          <mdui:IPHint>195.251.17.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.18.0/23</mdui:IPHint>
-          <mdui:IPHint>83.212.32.0/24</mdui:IPHint>
-          <mdui:IPHint>83.212.201.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.108.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:648:2480::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:39.357718,22.950722</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:39.360568,22.931205</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:39.388834,22.940703</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:39.614609,22.387859</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:39.637292,22.418366</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:39.525625,21.775881</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:39.372241,21.916267</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:38.912572,22.428045</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDCDCCAfCgAwIBAgIJAPbE4JqrFTBTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
                             BAMTCmFhaS51dGguZ3IwHhcNMTUwMTIwMDkzNTQwWhcNMTgwMTE5MDkzNTQwWjAV
                             MRMwEQYDVQQDEwphYWkudXRoLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -58,26 +58,26 @@
                             0S9jSEGt7/vFOwbLNDFHydht9HP6Vvf9ELgW+wP9r0ebCWow/++ye7/QPqJ0hyel
                             v6N4PY24wsBai7PU
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.uth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.uth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.uth.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.uth.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.uth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.uth.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.uth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.uth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.uth.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.uth.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.uth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.uth.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDCDCCAfCgAwIBAgIJAPbE4JqrFTBTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
                             BAMTCmFhaS51dGguZ3IwHhcNMTUwMTIwMDkzNTQwWhcNMTgwMTE5MDkzNTQwWjAV
                             MRMwEQYDVQQDEwphYWkudXRoLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -96,28 +96,28 @@
                             0S9jSEGt7/vFOwbLNDFHydht9HP6Vvf9ELgW+wP9r0ebCWow/++ye7/QPqJ0hyel
                             v6N4PY24wsBai7PU
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.uth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.uth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Thessaly</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Thessaly</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uth.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.uth.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Thessaly NOC</md:Company>
-      <md:EmailAddress>noc@uth.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Thessaly NOC</md:Company>
-      <md:EmailAddress>noc@uth.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.uth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.uth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Thessaly</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Thessaly</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uth.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.uth.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Thessaly NOC</md:Company>
+    <md:EmailAddress>noc@uth.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Thessaly NOC</md:Company>
+    <md:EmailAddress>noc@uth.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
index 9ec001df..28ca74b7 100644
--- a/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utia.cas.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-07T08:48:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-07T08:48:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utia.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Information Theory and Automation AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider UTIA AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTIA AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utia.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.utia.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://gedeon.cas.cz/loga/logo-utia-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://gedeon.cas.cz/loga/logo-utia-411.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utia.cas.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Information Theory and Automation AS CR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider UTIA AV CR employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTIA AV ČR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.utia.cas.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.utia.cas.cz/</mdui:InformationURL>
-          <mdui:Logo height="44" width="74">https://gedeon.cas.cz/loga/logo-utia-44.png</mdui:Logo>
-          <mdui:Logo height="411" width="960">https://gedeon.cas.cz/loga/logo-utia-411.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUVCoZ7ODsGasBcM+RvG51oUU2emswDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MB4XDTE2MDUxMDA3NDczNFoX
 DTM2MDUxMDA3NDczNFowGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MIIBIjAN
@@ -50,13 +50,13 @@ F7ZWWTl01IH78lNjzMJUZwdfLLW8fYorMkKLtr0enMP1NC7LoB3vC4miKw+ouAw6
 G09GnvfeK6Psq/kTDKuDyyrhbJddnXXra6OHfKl7RFPH4WAxbmsJYGYm5YyxnA53
 HOuVmLiSmuazcRQpzKBs/0vnKUQLsmsI5qywWNGaFhXLqCIPv2pOywwyWQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVANqdmG7MzbTHfpoxa6zUyqvBfqyNMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC51dGlhLmNhcy5jejAeFw0xNjA1MTAwNzQ3MzJa
 Fw0zNjA1MTAwNzQ3MzJaMBoxGDAWBgNVBAMMD2lkcC51dGlhLmNhcy5jejCCASIw
@@ -75,13 +75,13 @@ VwQQbvVfBHCHzuN4ssBB9lt7VrVHTUUBLi16iS4iX5YpxKTT0DleysfHr2GLiQCu
 1GMXMsilxgUT6+sg8C447hQSu4pZX4HhR7w0D/871njGUjtfJz7b9zWu7FNDXJf7
 fcbXMlSxq+WEOxFY5ZBhFsDMi2QH1GfpR02V1g8lDjfZ+VP+PpriqEJsvNY=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUY/hbQh1yZ2je5HRjYl69seoR234wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MB4XDTE2MDUxMDA3NDczM1oX
 DTM2MDUxMDA3NDczM1owGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MIIBIjAN
@@ -100,27 +100,27 @@ k/o+oZPQ0qGarGpuoCkAqN7pU4H+O0Ud6mwKUfa9CZ6Zgo6kS6U1ETMN42kh+W5G
 UAA1gxjj2ty44WzARV3w5IfuX+xC/cNgu7G7wdwvhbsSB4YE1KWLJ8il2TudE9N9
 RhTsHUGwbFmwQ+kjD5opXKF38qnSsB9pdSR+imsqzeAcOeLpe0jBgaGD1w==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utia.cas.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utia.cas.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utia.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utia.cas.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUVCoZ7ODsGasBcM+RvG51oUU2emswDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MB4XDTE2MDUxMDA3NDczNFoX
 DTM2MDUxMDA3NDczNFowGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MIIBIjAN
@@ -139,13 +139,13 @@ F7ZWWTl01IH78lNjzMJUZwdfLLW8fYorMkKLtr0enMP1NC7LoB3vC4miKw+ouAw6
 G09GnvfeK6Psq/kTDKuDyyrhbJddnXXra6OHfKl7RFPH4WAxbmsJYGYm5YyxnA53
 HOuVmLiSmuazcRQpzKBs/0vnKUQLsmsI5qywWNGaFhXLqCIPv2pOywwyWQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVANqdmG7MzbTHfpoxa6zUyqvBfqyNMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC51dGlhLmNhcy5jejAeFw0xNjA1MTAwNzQ3MzJa
 Fw0zNjA1MTAwNzQ3MzJaMBoxGDAWBgNVBAMMD2lkcC51dGlhLmNhcy5jejCCASIw
@@ -164,13 +164,13 @@ VwQQbvVfBHCHzuN4ssBB9lt7VrVHTUUBLi16iS4iX5YpxKTT0DleysfHr2GLiQCu
 1GMXMsilxgUT6+sg8C447hQSu4pZX4HhR7w0D/871njGUjtfJz7b9zWu7FNDXJf7
 fcbXMlSxq+WEOxFY5ZBhFsDMi2QH1GfpR02V1g8lDjfZ+VP+PpriqEJsvNY=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUY/hbQh1yZ2je5HRjYl69seoR234wDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MB4XDTE2MDUxMDA3NDczM1oX
 DTM2MDUxMDA3NDczM1owGjEYMBYGA1UEAwwPaWRwLnV0aWEuY2FzLmN6MIIBIjAN
@@ -189,22 +189,22 @@ k/o+oZPQ0qGarGpuoCkAqN7pU4H+O0Ud6mwKUfa9CZ6Zgo6kS6U1ETMN42kh+W5G
 UAA1gxjj2ty44WzARV3w5IfuX+xC/cNgu7G7wdwvhbsSB4YE1KWLJ8il2TudE9N9
 RhTsHUGwbFmwQ+kjD5opXKF38qnSsB9pdSR+imsqzeAcOeLpe0jBgaGD1w==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Information Theory and Automation</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Information Theory and Automation, Public Research Institution</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR, v.v.i.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utia.cas.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.utia.cas.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Vaníček</md:SurName>
-      <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Information Theory and Automation</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Information Theory and Automation, Public Research Institution</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR, v.v.i.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utia.cas.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.utia.cas.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Vaníček</md:SurName>
+    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml
index c6ed0e59..ff74f487 100644
--- a/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utk.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utk.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tennessee.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthsc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utm.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsi.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Tennessee</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utk.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tennessee.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthsc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utm.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsi.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Tennessee</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUE53nkabtCMcB00ovnd3bBOKR9LIwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV0ay5lZHUwHhcNMTMwNDE4MTIyNDM2WhcNMzMw
 NDE4MTIyNDM2WjAWMRQwEgYDVQQDEwtpZHAudXRrLmVkdTCCASIwDQYJKoZIhvcN
@@ -42,29 +42,29 @@ iRjzxMh8KXVJD/ta5c50xFKBbuk+r8ESt1jgqvvGSpcGksODPkDs7If2nC2PKGbt
 5jY6V06RqUzDhEKICpvEkj5lt5/Ep3Azl8PXLqWhQJOl6xwWqXhgSo1Qh4Dsz+tJ
 Dsn4YYK4EonuqncWQnyCDypPX/rFk/WakCyE
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utk.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utk.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utk.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utk.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utk.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utk.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utk.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tennessee.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthsc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utm.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsi.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utk.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utk.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utk.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utk.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utk.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utk.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utk.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tennessee.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthsc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utm.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsi.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUE53nkabtCMcB00ovnd3bBOKR9LIwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV0ay5lZHUwHhcNMTMwNDE4MTIyNDM2WhcNMzMw
 NDE4MTIyNDM2WjAWMRQwEgYDVQQDEwtpZHAudXRrLmVkdTCCASIwDQYJKoZIhvcN
@@ -83,31 +83,31 @@ iRjzxMh8KXVJD/ta5c50xFKBbuk+r8ESt1jgqvvGSpcGksODPkDs7If2nC2PKGbt
 5jY6V06RqUzDhEKICpvEkj5lt5/Ep3Azl8PXLqWhQJOl6xwWqXhgSo1Qh4Dsz+tJ
 Dsn4YYK4EonuqncWQnyCDypPX/rFk/WakCyE
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utk.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utk.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Tennessee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Tennessee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utk.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Will Richardson</md:GivenName>
-      <md:EmailAddress>wkrich@utk.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Melissa Wauford</md:GivenName>
-      <md:EmailAddress>mwauford@utk.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OIT HelpDesk</md:GivenName>
-      <md:EmailAddress>tcshd@utk.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>OIT UTK Security Office</md:GivenName>
-      <md:EmailAddress>security@utk.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utk.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utk.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Tennessee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Tennessee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utk.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will Richardson</md:GivenName>
+    <md:EmailAddress>wkrich@utk.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Melissa Wauford</md:GivenName>
+    <md:EmailAddress>mwauford@utk.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OIT HelpDesk</md:GivenName>
+    <md:EmailAddress>tcshd@utk.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>OIT UTK Security Office</md:GivenName>
+    <md:EmailAddress>security@utk.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml
index 5661b849..08b2172a 100644
--- a/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utmb.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utmb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas Medical Branch At Galveston</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utmb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas Medical Branch At Galveston</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEgzCCA2ugAwIBAgIJANpT3JDpg2sAMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
 VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxEjAQBgNVBAcTCUdhbHZlc3RvbjENMAsG
 A1UEChMEVVRNQjELMAkGA1UECxMCSVMxFTATBgNVBAMTDGlkcC51dG1iLmVkdTEh
@@ -45,24 +45,24 @@ cTAu7jzTetIhQnFiIw76j0SgkpfWg6+Fl9I1VWWWL9ixp7cGsq/pAFbhPZDjEOS0
 wn0reWGZiHVNBL8acZaN2MDu9gf+HtJDqJzI/lrQ/KurWaxd4u5L07hPrKQI5y/w
 gTP3jZ4g8Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utmb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utmb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utmb.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utmb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utmb.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utmb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utmb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utmb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utmb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utmb.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utmb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utmb.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utmb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utmb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEgzCCA2ugAwIBAgIJANpT3JDpg2sAMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
 VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxEjAQBgNVBAcTCUdhbHZlc3RvbjENMAsG
 A1UEChMEVVRNQjELMAkGA1UECxMCSVMxFTATBgNVBAMTDGlkcC51dG1iLmVkdTEh
@@ -89,19 +89,19 @@ cTAu7jzTetIhQnFiIw76j0SgkpfWg6+Fl9I1VWWWL9ixp7cGsq/pAFbhPZDjEOS0
 wn0reWGZiHVNBL8acZaN2MDu9gf+HtJDqJzI/lrQ/KurWaxd4u5L07hPrKQI5y/w
 gTP3jZ4g8Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utmb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utmb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas Medical Branch At Galveston</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas Medical Branch At Galveston</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utmb.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rich Thomas</md:GivenName>
-      <md:EmailAddress>rcthomas@utmb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utmb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utmb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas Medical Branch At Galveston</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas Medical Branch At Galveston</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utmb.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rich Thomas</md:GivenName>
+    <md:EmailAddress>rcthomas@utmb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
index 8d5312c5..c4ed6f03 100644
--- a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utorauth.utoronto.ca/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor 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>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utoronto.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Toronto</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.utoronto.ca/</mdui:InformationURL>
+        <mdui:Logo height="93" width="255" xml:lang="en-ca">https://sites.utoronto.ca/image/U-of-T-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor 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>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utoronto.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Toronto</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.utoronto.ca/</mdui:InformationURL>
-          <mdui:Logo height="93" width="255" xml:lang="en-ca">https://sites.utoronto.ca/image/U-of-T-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
 MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
@@ -35,27 +35,27 @@ v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
 JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
 x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utoronto.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utoronto.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
 MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
@@ -75,27 +75,27 @@ v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
 JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
 x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Toronto</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Toronto</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utoronto.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Wiseman</md:SurName>
-      <md:EmailAddress>mailto:mike.wiseman@utoronto.ca</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Fardy</md:SurName>
-      <md:EmailAddress>mailto:paul.fardy@utoronto.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Toronto</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Toronto</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utoronto.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Wiseman</md:SurName>
+    <md:EmailAddress>mailto:mike.wiseman@utoronto.ca</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Fardy</md:SurName>
+    <md:EmailAddress>mailto:paul.fardy@utoronto.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml
index 88283d4a..0624ea87 100644
--- a/swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utrgv.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idm.utsystem.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utrgv.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas Rio Grande Valley</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Logon service for The University of Texas Rio Grande Valley</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utrgv.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.utsystem.edu/privacy.htm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="75" width="75" xml:lang="en">https://idm.utsystem.edu/images/UTRGV_Logo_Sm.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idm.utsystem.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utrgv.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas Rio Grande Valley</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Logon service for The University of Texas Rio Grande Valley</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.utrgv.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.utsystem.edu/privacy.htm</mdui:PrivacyStatementURL>
-          <mdui:Logo height="75" width="75" xml:lang="en">https://idm.utsystem.edu/images/UTRGV_Logo_Sm.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUV4KRu3uQlT3F0LReyxy3ECMvQWYwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLnV0cmd2LmVkdTAeFw0xNDA3MTAyMTU5MTZaFw0z
 NDA3MTAyMTU5MTZaMBgxFjAUBgNVBAMTDWlkcC51dHJndi5lZHUwggEiMA0GCSqG
@@ -41,26 +41,26 @@ fHYMEJ4zy83IB6ZTAp6tsETguG89BU2souTVtoft4lRprMqJljbkTmwW7GzACTuQ
 HwyOSUKc+ksNbpf4860E7NQrb4Rhm5GLsJIcrRO/Q0VoWZrsJmevbmoKsBzENjvn
 0BBEHvl2WwlajXWGBvNV45lHVqRi+ugWOxMCrqjvQcijAiI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utrgv.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utrgv.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utrgv.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utrgv.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utrgv.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utrgv.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utrgv.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utrgv.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utrgv.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utrgv.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utrgv.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utrgv.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUV4KRu3uQlT3F0LReyxy3ECMvQWYwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLnV0cmd2LmVkdTAeFw0xNDA3MTAyMTU5MTZaFw0z
 NDA3MTAyMTU5MTZaMBgxFjAUBgNVBAMTDWlkcC51dHJndi5lZHUwggEiMA0GCSqG
@@ -79,27 +79,27 @@ fHYMEJ4zy83IB6ZTAp6tsETguG89BU2souTVtoft4lRprMqJljbkTmwW7GzACTuQ
 HwyOSUKc+ksNbpf4860E7NQrb4Rhm5GLsJIcrRO/Q0VoWZrsJmevbmoKsBzENjvn
 0BBEHvl2WwlajXWGBvNV45lHVqRi+ugWOxMCrqjvQcijAiI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utrgv.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utrgv.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas Rio Grande Valley</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas Rio Grande Valley</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utrgv.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>William Ewing</md:GivenName>
-      <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>William Ewing</md:GivenName>
-      <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>William Ewing</md:GivenName>
-      <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utrgv.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utrgv.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas Rio Grande Valley</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas Rio Grande Valley</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utrgv.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>William Ewing</md:GivenName>
+    <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>William Ewing</md:GivenName>
+    <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>William Ewing</md:GivenName>
+    <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml
index 50207e31..a5d28c7c 100644
--- a/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utsystem.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idm.utsystem.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsystem.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas System</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Logon service for The University of Texas System Administration</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.utsystem.edu/privacy.htm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="75" width="75" xml:lang="en">https://idm.utsystem.edu/images/UTSystemSeal-Small.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idm.utsystem.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsystem.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas System</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Logon service for The University of Texas System Administration</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.utsystem.edu/privacy.htm</mdui:PrivacyStatementURL>
-          <mdui:Logo height="75" width="75" xml:lang="en">https://idm.utsystem.edu/images/UTSystemSeal-Small.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANsuFgw2Z5XryWlzufSAgriNo5pDMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC51dHN5c3RlbS5lZHUwHhcNMDkwNjIwMjEyNzIy
 WhcNMjkwNjIwMjEyNzIyWjAbMRkwFwYDVQQDExBpZHAudXRzeXN0ZW0uZWR1MIIB
@@ -40,24 +40,24 @@ FLOa1rOT3iYnL2rY+Mzqet3mwz/yoPq8M1/0J/HtvEWyhRkt7SBPnoNZbMt0y33H
 DbzkGdzI4NTA/flqEuAXBrjkg64qktKR7YTkFRWvy1pl44MqiVmP5nvZgVZZmRYg
 BaqXA+v1pIIo2tL8IuUiQxH1KsnDCXE/F74PcEu2CDCVKEgaVEB1v6tGFZwYr2V7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utsystem.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utsystem.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utsystem.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utsystem.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utsystem.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utsystem.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsystem.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utsystem.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utsystem.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utsystem.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utsystem.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utsystem.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utsystem.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsystem.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANsuFgw2Z5XryWlzufSAgriNo5pDMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcC51dHN5c3RlbS5lZHUwHhcNMDkwNjIwMjEyNzIy
 WhcNMjkwNjIwMjEyNzIyWjAbMRkwFwYDVQQDExBpZHAudXRzeXN0ZW0uZWR1MIIB
@@ -76,27 +76,27 @@ FLOa1rOT3iYnL2rY+Mzqet3mwz/yoPq8M1/0J/HtvEWyhRkt7SBPnoNZbMt0y33H
 DbzkGdzI4NTA/flqEuAXBrjkg64qktKR7YTkFRWvy1pl44MqiVmP5nvZgVZZmRYg
 BaqXA+v1pIIo2tL8IuUiQxH1KsnDCXE/F74PcEu2CDCVKEgaVEB1v6tGFZwYr2V7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utsystem.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utsystem.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas System</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utsystem.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Network Admin</md:GivenName>
-      <md:EmailAddress>netadmin@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Paul Caskey</md:GivenName>
-      <md:EmailAddress>pcaskey@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>help@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utsystem.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utsystem.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas System</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utsystem.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Network Admin</md:GivenName>
+    <md:EmailAddress>netadmin@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Paul Caskey</md:GivenName>
+    <md:EmailAddress>pcaskey@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>help@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml
index 70bc07f6..704a867f 100644
--- a/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uttyler.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uttyler.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas At Tyler</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Single Signon Service at The University of Texas at Tyler</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uttyler.edu/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="45" width="63" xml:lang="en">https://idp.uttyler.edu/images/utt-logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uttyler.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas At Tyler</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Single Signon Service at The University of Texas at Tyler</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uttyler.edu/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="45" width="63" xml:lang="en">https://idp.uttyler.edu/images/utt-logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAOpfnxqWfUWwtPv2ziaZ442AjjmsMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTAeFw0xMDA0MTUyMDU3NDNa
 Fw0zMDA0MTUyMDU3NDNaMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTCCASIw
@@ -40,24 +40,24 @@ WtF29eqrNieq3HTwM5N+zL4pIeVNR34zPNfo7+C/fYzSgPv5FeYNfu/CGZhOsH+g
 WEZoQCmdWaTQAmqzpHBokozccqLcD2+Hsa94Pa3+nYVeaCBGmXz3MK5ZHZnz8M7s
 RB4HWzgZih8IU3YLXsJ8IC6GU+UbJ3kj4kUG15mhFlI7j8b/VjZnp6akccM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uttyler.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uttyler.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uttyler.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uttyler.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uttyler.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uttyler.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uttyler.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uttyler.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uttyler.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uttyler.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uttyler.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uttyler.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uttyler.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uttyler.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAOpfnxqWfUWwtPv2ziaZ442AjjmsMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTAeFw0xMDA0MTUyMDU3NDNa
 Fw0zMDA0MTUyMDU3NDNaMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTCCASIw
@@ -76,19 +76,19 @@ WtF29eqrNieq3HTwM5N+zL4pIeVNR34zPNfo7+C/fYzSgPv5FeYNfu/CGZhOsH+g
 WEZoQCmdWaTQAmqzpHBokozccqLcD2+Hsa94Pa3+nYVeaCBGmXz3MK5ZHZnz8M7s
 RB4HWzgZih8IU3YLXsJ8IC6GU+UbJ3kj4kUG15mhFlI7j8b/VjZnp6akccM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uttyler.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uttyler.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas At Tyler</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas At Tyler</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uttyler.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UT Tyler IT Support</md:GivenName>
-      <md:EmailAddress>itsupport@uttyler.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uttyler.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uttyler.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas At Tyler</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas At Tyler</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uttyler.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UT Tyler IT Support</md:GivenName>
+    <md:EmailAddress>itsupport@uttyler.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml
index c66e29e7..a6c1d5a4 100644
--- a/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utulsa.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://errror.utulsa.edu/shiberror.php" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utulsa.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Tulsa</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://errror.utulsa.edu/shiberror.php" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utulsa.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Tulsa</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPETSHdVBddiUfH4XU1QHq66RnYFMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51dHVsc2EuZWR1MB4XDTA4MDQyNTE5NDczMFoX
 DTI4MDQyNTE5NDczMFowGTEXMBUGA1UEAxMOaWRwLnV0dWxzYS5lZHUwggEiMA0G
@@ -37,23 +37,23 @@ u1Bbjw70nFF2AT5X6TBSNgfKNPUkI9qoNeSKin8YdAfcVIGLaj2MXHcyUub3nwJh
 UPH7vTDTXUCgoSAnXDXgEw/2ty4gN/l29qwVl4XqZ9idbFdcH4i70LJQjdekC3CY
 hiXKVILgWJYPDUw4K1gedb5r17APna++AIb37J+mtSJ1KesPn3K45g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utulsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utulsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utulsa.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utulsa.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utulsa.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utulsa.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utulsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utulsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utulsa.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utulsa.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utulsa.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utulsa.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAPETSHdVBddiUfH4XU1QHq66RnYFMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC51dHVsc2EuZWR1MB4XDTA4MDQyNTE5NDczMFoX
 DTI4MDQyNTE5NDczMFowGTEXMBUGA1UEAxMOaWRwLnV0dWxzYS5lZHUwggEiMA0G
@@ -72,18 +72,18 @@ u1Bbjw70nFF2AT5X6TBSNgfKNPUkI9qoNeSKin8YdAfcVIGLaj2MXHcyUub3nwJh
 UPH7vTDTXUCgoSAnXDXgEw/2ty4gN/l29qwVl4XqZ9idbFdcH4i70LJQjdekC3CY
 hiXKVILgWJYPDUw4K1gedb5r17APna++AIb37J+mtSJ1KesPn3K45g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utulsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Tulsa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Tulsa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utulsa.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>University of Tulsa Web Services</md:GivenName>
-      <md:EmailAddress>cloud-services@utulsa.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utulsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Tulsa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Tulsa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utulsa.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>University of Tulsa Web Services</md:GivenName>
+    <md:EmailAddress>cloud-services@utulsa.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uvic.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uvic.ca-idp-shibboleth.xml
index b65a878a..e724fc95 100644
--- a/swamid-interfederations-2.0/idp.uvic.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uvic.ca-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uvic.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvic.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Victoria</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The members of the University of Victoria</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uvic.ca</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.uvic.ca/universitysecretary/privacy/policiesandguidelines/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvic.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Victoria</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The members of the University of Victoria</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uvic.ca</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.uvic.ca/universitysecretary/privacy/policiesandguidelines/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUPnOye0H5sv/pSwtMy5Hye83DrhEwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV2aWMuY2EwHhcNMTMwNDA0MDA0MTE1WhcNMzMw
 NDA0MDA0MTE1WjAWMRQwEgYDVQQDEwtpZHAudXZpYy5jYTCCASIwDQYJKoZIhvcN
@@ -35,24 +35,24 @@ z2QaBZdSFnqvyoVxUV5Rbv7WVbdEMN8FmnxbEBlVpQw6+p5A6bhiEMpfrD5xBx0J
 j01E0XrvbvKY5cf3nUcHSKPKdiH2RRI3EsqR9BGvov1Az0b9GwfzcR0vxJKmhhNR
 KJpCWManfrnK+x0pjdu+3Wy5gnuveWZvStEa
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvic.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvic.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uvic.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uvic.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uvic.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uvic.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvic.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvic.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvic.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uvic.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uvic.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uvic.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uvic.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvic.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUPnOye0H5sv/pSwtMy5Hye83DrhEwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV2aWMuY2EwHhcNMTMwNDA0MDA0MTE1WhcNMzMw
 NDA0MDA0MTE1WjAWMRQwEgYDVQQDEwtpZHAudXZpYy5jYTCCASIwDQYJKoZIhvcN
@@ -71,22 +71,22 @@ z2QaBZdSFnqvyoVxUV5Rbv7WVbdEMN8FmnxbEBlVpQw6+p5A6bhiEMpfrD5xBx0J
 j01E0XrvbvKY5cf3nUcHSKPKdiH2RRI3EsqR9BGvov1Az0b9GwfzcR0vxJKmhhNR
 KJpCWManfrnK+x0pjdu+3Wy5gnuveWZvStEa
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvic.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvic.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Victoria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Victoria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uvic.ca</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University Systems</md:GivenName>
-      <md:SurName>Computer Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@uvic.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvic.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvic.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Victoria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Victoria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uvic.ca</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University Systems</md:GivenName>
+    <md:SurName>Computer Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@uvic.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml
index 91894bb3..366dcc3d 100644
--- a/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uvm.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.uvm.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvm.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Vermont</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Vermont Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.uvm.edu/it/account/?Page=sso.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp.uvm.edu/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="31" width="290" xml:lang="en">https://www.uvm.edu/www/images/templates/uvmlogo-words.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.uvm.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvm.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Vermont</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Vermont Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.uvm.edu/it/account/?Page=sso.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idp.uvm.edu/idp/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="31" width="290" xml:lang="en">https://www.uvm.edu/www/images/templates/uvmlogo-words.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFUjCCBDqgAwIBAgIRAJpLcZsSJzmf55NyB+1EceUwDQYJKoZIhvcNAQEFBQAw
 UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
 b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMzExMjUwMDAw
@@ -56,13 +56,13 @@ HxjbXfPhY5K37DkkhMHiK9+jCRTYbj/eADvpVU4ejP3xSYInk0066P9msJ3gRkkH
 kk33CouamgWP4Pee76HO+VGW0xIz/yMZJXiTeKosuKskZCUBvJwToIm1iuIOG2jP
 qjXzgEnZ8+QfHnA0xxrbXh07lwGqag==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEMzCCAxugAwIBAgIJAOuLhHtr2WBAMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 VQQGEwJVUzEQMA4GA1UECAwHVmVybW9udDETMBEGA1UEBwwKQnVybGluZ3RvbjEe
 MBwGA1UECgwVVW5pdmVyc2l0eSBvZiBWZXJtb250MScwJQYDVQQLDB5FbnRlcnBy
@@ -87,24 +87,24 @@ BC/BRuiGNnpU9qPLNakDDngWHtT9n3Vik5yU8hIdjqFr54D/+Cuu7igmZ3Rw+SJ2
 vjh8uRVZP56GSzxu2j+8GR5XnCegIroPqrHp+E57CW5BcJf4EGXoDWX8P6DD8Nys
 D82TCdiNkm20wl1h/lwK1Vs+qR1fbEc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uvm.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uvm.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uvm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uvm.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvm.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uvm.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uvm.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uvm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uvm.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvm.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFUjCCBDqgAwIBAgIRAJpLcZsSJzmf55NyB+1EceUwDQYJKoZIhvcNAQEFBQAw
 UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
 b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMzExMjUwMDAw
@@ -135,13 +135,13 @@ HxjbXfPhY5K37DkkhMHiK9+jCRTYbj/eADvpVU4ejP3xSYInk0066P9msJ3gRkkH
 kk33CouamgWP4Pee76HO+VGW0xIz/yMZJXiTeKosuKskZCUBvJwToIm1iuIOG2jP
 qjXzgEnZ8+QfHnA0xxrbXh07lwGqag==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEMzCCAxugAwIBAgIJAOuLhHtr2WBAMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 VQQGEwJVUzEQMA4GA1UECAwHVmVybW9udDETMBEGA1UEBwwKQnVybGluZ3RvbjEe
 MBwGA1UECgwVVW5pdmVyc2l0eSBvZiBWZXJtb250MScwJQYDVQQLDB5FbnRlcnBy
@@ -166,27 +166,27 @@ BC/BRuiGNnpU9qPLNakDDngWHtT9n3Vik5yU8hIdjqFr54D/+Cuu7igmZ3Rw+SJ2
 vjh8uRVZP56GSzxu2j+8GR5XnCegIroPqrHp+E57CW5BcJf4EGXoDWX8P6DD8Nys
 D82TCdiNkm20wl1h/lwK1Vs+qR1fbEc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Vermont</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Vermont</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uvm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Architecture and Administration</md:GivenName>
-      <md:EmailAddress>saa@uvm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Security Officer</md:GivenName>
-      <md:EmailAddress>security@uvm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpline</md:GivenName>
-      <md:EmailAddress>helpline@uvm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Vermont</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Vermont</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uvm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Architecture and Administration</md:GivenName>
+    <md:EmailAddress>saa@uvm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Security Officer</md:GivenName>
+    <md:EmailAddress>security@uvm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpline</md:GivenName>
+    <md:EmailAddress>helpline@uvm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml b/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml
index 51a13cea..6ec3afa8 100644
--- a/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml
+++ b/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uwex.uwc.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin Colleges and Extension</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://cits.uwex.uwc.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://cits.uwex.uwc.edu/sites/default/files/PDF/incommonpop_agreement.pdf</mdui:PrivacyStatementURL>
+        <mdui:Logo height="159" width="242" xml:lang="en">https://idp.uwex.uwc.edu/idp/images/logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin Colleges and Extension</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://cits.uwex.uwc.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://cits.uwex.uwc.edu/sites/default/files/PDF/incommonpop_agreement.pdf</mdui:PrivacyStatementURL>
-          <mdui:Logo height="159" width="242" xml:lang="en">https://idp.uwex.uwc.edu/idp/images/logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUaSTC1u9MCHlT0+UC6qbFziz5GmwwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQaWRwLnV3ZXgudXdjLmVkdTAeFw0xMzAxMjIxODE4NTVa
 Fw0zMzAxMjIxODE4NTVaMBsxGTAXBgNVBAMTEGlkcC51d2V4LnV3Yy5lZHUwggEi
@@ -40,24 +40,24 @@ iG8Yh/bzG1MBkzctsrpcSoBF5WxMyTSCzWaI05Fmo0Ddx1w0OOQu1dAQHG6si9rV
 rotmP2+77xWdS+MWt3CQZ/br9EsSlQ3kduNN0s9Ltr96ZVnV/PnJ21PV5ZAw4prH
 9eNuPFDEg9TriQI17DLjIceNb0IO12okvNGZ/wjr1nuW75LEX6xE2rOAXn6v3kE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin Colleges and Extension</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin Colleges and Extension</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwex.uwc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeff Matthias</md:GivenName>
-      <md:EmailAddress>Jeff.Matthias@uwex.uwc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeff Harrison</md:GivenName>
-      <md:EmailAddress>Jeff.Harrison@uwex.uwc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin Colleges and Extension</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin Colleges and Extension</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwex.uwc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeff Matthias</md:GivenName>
+    <md:EmailAddress>Jeff.Matthias@uwex.uwc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeff Harrison</md:GivenName>
+    <md:EmailAddress>Jeff.Harrison@uwex.uwc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml
index bb8f5b1c..454a160f 100644
--- a/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uwf.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwf.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of West Florida</mdui:DisplayName>
+        <mdui:PrivacyStatementURL xml:lang="en">http://uwf.edu/offices/general-counsel/uwf-policies-procedures-notices-regulations/privacy-statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="68" width="260" xml:lang="en">https://idp.uwf.edu/idp/images/logo_west_florida.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwf.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of West Florida</mdui:DisplayName>
-          <mdui:PrivacyStatementURL xml:lang="en">http://uwf.edu/offices/general-counsel/uwf-policies-procedures-notices-regulations/privacy-statement</mdui:PrivacyStatementURL>
-          <mdui:Logo height="68" width="260" xml:lang="en">https://idp.uwf.edu/idp/images/logo_west_florida.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPWEoMIc9MgjL3fLMSOKivnmI4soMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2lkcC51d2YuZWR1MB4XDTE1MTAwODEyMzc1OVoXDTM1
 MTAwODEyMzc1OVowFjEUMBIGA1UEAwwLaWRwLnV3Zi5lZHUwggEiMA0GCSqGSIb3
@@ -42,31 +42,31 @@ NkrSXk8BPkxKbOfkPY/03cxGCVAbDDtAFbrpc+Dl7oWzZyWEPGBOPO1+FwOnouhg
 gwO2WaSZ5oSRh89lFWWjxnXcLM0qysDrlr7ZypdE4sa0l49XmWSHIUqmlB4N6v1R
 Qn1Arbqr1KlWplK7ZKwCVb3qIEuvCtarRGT3ow==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwf.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwf.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of West Florida</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of West Florida</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://uwf.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Melanie Haveard</md:GivenName>
-      <md:EmailAddress>mhaveard@uwf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Geissler Golding</md:GivenName>
-      <md:EmailAddress>ggolding@uwf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Justin Andrews</md:GivenName>
-      <md:EmailAddress>jandrews@uwf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UWF ITS Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@uwf.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwf.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwf.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of West Florida</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of West Florida</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uwf.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Melanie Haveard</md:GivenName>
+    <md:EmailAddress>mhaveard@uwf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Geissler Golding</md:GivenName>
+    <md:EmailAddress>ggolding@uwf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Justin Andrews</md:GivenName>
+    <md:EmailAddress>jandrews@uwf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWF ITS Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@uwf.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml
index 1345892d..7af27063 100644
--- a/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uwl.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T11:11:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T11:11:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwl.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJusaLWH0l8DLgcyT2qPjzTl3AF9MA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC51d2wuYWMudWswHhcNMTQwNTE0MDg1MjM1WhcN
 						MzQwNTE0MDg1MjM1WjAYMRYwFAYDVQQDEw1pZHAudXdsLmFjLnVrMIIBIjANBgkq
@@ -31,29 +31,29 @@
 						UCxV0WZTRU0DqR8PUBQhU75iDmYiIYwirhPaS45HpdC2MKwfkSECjL/tpNGMqwBv
 						VVadKoLbwPTFg6BuJaKzgxeQIJtbr6T4l/LWosU4iAY2aPng
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uwl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uwl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJusaLWH0l8DLgcyT2qPjzTl3AF9MA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC51d2wuYWMudWswHhcNMTQwNTE0MDg1MjM1WhcN
 						MzQwNTE0MDg1MjM1WjAYMRYwFAYDVQQDEw1pZHAudXdsLmFjLnVrMIIBIjANBgkq
@@ -72,26 +72,26 @@
 						UCxV0WZTRU0DqR8PUBQhU75iDmYiIYwirhPaS45HpdC2MKwfkSECjL/tpNGMqwBv
 						VVadKoLbwPTFg6BuJaKzgxeQIJtbr6T4l/LWosU4iAY2aPng
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of West London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of West London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwl.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Data and Voice Team</md:GivenName>
-      <md:EmailAddress>mailto:it.convergednetworkteam@uwl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Rumun</md:SurName>
-      <md:EmailAddress>mailto:Richard.rumun@uwl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of West London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of West London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Data and Voice Team</md:GivenName>
+    <md:EmailAddress>mailto:it.convergednetworkteam@uwl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Rumun</md:SurName>
+    <md:EmailAddress>mailto:Richard.rumun@uwl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml
index 7329d479..1c342d9e 100644
--- a/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uwm.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.uwm.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwm.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin-Milwaukee</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Primary Identity Provider for UW-Milwaukee</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://iam.uwm.edu/services/uwm_saml.cfm</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://iam.uwm.edu/guide/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="81" width="276" xml:lang="en">https://wayf.uwm.edu/files/uwm_preferred_logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.uwm.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwm.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin-Milwaukee</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Primary Identity Provider for UW-Milwaukee</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://iam.uwm.edu/services/uwm_saml.cfm</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://iam.uwm.edu/guide/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="81" width="276" xml:lang="en">https://wayf.uwm.edu/files/uwm_preferred_logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUbFErp3WyjGb0Y8Vx0lm64o2ZtiYwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV3bS5lZHUwHhcNMTAxMTAzMjEzMjI5WhcNMzAx
 MTAzMjIzMjI5WjAWMRQwEgYDVQQDEwtpZHAudXdtLmVkdTCCASIwDQYJKoZIhvcN
@@ -44,21 +44,21 @@ YERpQU8pBA4fGhBaGWY9Zp6W8vyS1n7iNlY/SxVkhtgi1pU2ymkWh63VRhZk988b
 CJ76BgmY1M5uR6Dc/sWtr5KtD7ZAFaym1dadFlH09Qo9YjKi23R4lzaJs7iC6ZY6
 dOu3CjcCE/AhGeGCaig/VkiBvstxMe4R5uVW
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uwm.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwm.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwm.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwm.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uwm.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwm.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwm.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwm.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUbFErp3WyjGb0Y8Vx0lm64o2ZtiYwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnV3bS5lZHUwHhcNMTAxMTAzMjEzMjI5WhcNMzAx
 MTAzMjIzMjI5WjAWMRQwEgYDVQQDEwtpZHAudXdtLmVkdTCCASIwDQYJKoZIhvcN
@@ -77,27 +77,27 @@ YERpQU8pBA4fGhBaGWY9Zp6W8vyS1n7iNlY/SxVkhtgi1pU2ymkWh63VRhZk988b
 CJ76BgmY1M5uR6Dc/sWtr5KtD7ZAFaym1dadFlH09Qo9YjKi23R4lzaJs7iC6ZY6
 dOu3CjcCE/AhGeGCaig/VkiBvstxMe4R5uVW
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mat Houser</md:GivenName>
-      <md:EmailAddress>mhouser@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UW-Milwaukee IAM Team</md:GivenName>
-      <md:EmailAddress>iam-support@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chris Spadanuda</md:GivenName>
-      <md:EmailAddress>cspada@uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mat Houser</md:GivenName>
+    <md:EmailAddress>mhouser@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UW-Milwaukee IAM Team</md:GivenName>
+    <md:EmailAddress>iam-support@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Spadanuda</md:GivenName>
+    <md:EmailAddress>cspada@uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
index 169414af..af327a92 100644
--- a/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uws.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-28T12:55:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-28T12:55:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uws.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="16" width="16">https://logos.uws.ac.uk/UWS-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://logos.uws.ac.uk/UWS-logo-80x60.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">University of the West of Scotland (UWS)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uws.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="16" width="16">https://logos.uws.ac.uk/UWS-logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://logos.uws.ac.uk/UWS-logo-80x60.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">University of the West of Scotland (UWS)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgIIYbFoeRooWYAwDQYJKoZIhvcNAQEFBQAwSzExMC8GA1UE
 						CgwoVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBTY290bGFuZCAoVVdTKTEWMBQG
 						A1UEAwwNaWRwLnV3cy5hYy51azAeFw0xMzAyMTUxNDEyNTlaFw0yMzAyMTUxNDEy
@@ -36,13 +36,13 @@
 						NeRvuatSXDhWfBk/lBSAF4VNSL4LfKsFPQP34DxZdtLT7EI95sGSzKno/2S18uXS
 						6swfWRDPUe/Evz3k
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlCgAwIBAgIIYbFoeRooWYAwDQYJKoZIhvcNAQEFBQAwSzExMC8GA1UE
 						CgwoVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBTY290bGFuZCAoVVdTKTEWMBQG
 						A1UEAwwNaWRwLnV3cy5hYy51azAeFw0xMzAyMTUxNDEyNTlaFw0yMzAyMTUxNDEy
@@ -63,25 +63,25 @@
 						NeRvuatSXDhWfBk/lBSAF4VNSL4LfKsFPQP34DxZdtLT7EI95sGSzKno/2S18uXS
 						6swfWRDPUe/Evz3k
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uws.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uws.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the West of Scotland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the West of Scotland (UWS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uws.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sally</md:GivenName>
-      <md:SurName>McIntosh</md:SurName>
-      <md:EmailAddress>mailto:sally.mcintosh@uws.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Julie</md:GivenName>
-      <md:SurName>Sword</md:SurName>
-      <md:EmailAddress>mailto:julie.sword@uws.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uws.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uws.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the West of Scotland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the West of Scotland (UWS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uws.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sally</md:GivenName>
+    <md:SurName>McIntosh</md:SurName>
+    <md:EmailAddress>mailto:sally.mcintosh@uws.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Julie</md:GivenName>
+    <md:SurName>Sword</md:SurName>
+    <md:EmailAddress>mailto:julie.sword@uws.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml
index 9c8688e0..ed8ef90f 100644
--- a/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uxbridge.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-15T15:33:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-15T15:33:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uxbridge.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uxbridge.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUZwOkMlPz3cSvnZG/flZHZc+acwkwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVrMB4XDTE1MDEyNjA5MTYw
 						OVoXDTM1MDEyNjA5MTYwOVowHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVr
@@ -32,26 +32,26 @@
 						aZniFfgK4PHqWDyOTMlF9wG5JNuzVb4CP04ptQZXiKBtMgnfpmlTyfimiGM/Jn2E
 						ldckhs6TCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uxbridge.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uxbridge.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uxbridge.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uxbridge.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUZwOkMlPz3cSvnZG/flZHZc+acwkwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVrMB4XDTE1MDEyNjA5MTYw
 						OVoXDTM1MDEyNjA5MTYwOVowHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVr
@@ -71,26 +71,26 @@
 						aZniFfgK4PHqWDyOTMlF9wG5JNuzVb4CP04ptQZXiKBtMgnfpmlTyfimiGM/Jn2E
 						ldckhs6TCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Uxbridge College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Uxbridge College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uxbridge.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mohammed</md:GivenName>
-      <md:SurName>Abdulaziz</md:SurName>
-      <md:EmailAddress>mailto:MAbdulaz@uxbridgecollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uxbridge College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uxbridge College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uxbridge.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mohammed</md:GivenName>
+    <md:SurName>Abdulaziz</md:SurName>
+    <md:EmailAddress>mailto:MAbdulaz@uxbridgecollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
index 03d68291..1880e13a 100644
--- a/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vet-alfort.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T14:14:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T14:14:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vet-alfort.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Veterinary School of Alfort</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACSUlEQVQ4y32Tz0sUYRzGP7POOu5u7cgou9qqaKl4ULxIhywUvITd+gvsFh0ST+IpvJSniqQQo0MYCIEeNYgl0qCQRQmFFgXXH7jRCKuz7jo7u7NuB5nXUazn9L4P7/s83/f5fl+JC1ieXBgq5O3hQsYKu3mfFtiVvfKbzge3xty85Cy+jc29UOu0jpIk9UoSZQB2ziarp88ZlAeUpJXJbdwZ6e8VAr/eL1VV36yfqW6r6XEfNnZSrE0vcRlqW6+Fb9zv1GWAo6PMWq2/vAbAMkwyeppizj53QVa8KKpPVGSk0itARFqeXBg6TmWfB0JBAALhq2T/HJHV08iKF9sqICtemu+1cyUUJDbxVYiqddoTT+nk5LHjrDZoKEEfAPXdzeKgovqIz66QiMZRGzTBF4vFAdk8NBsBtNYQTX1tGDupU/UGjaJlk4xtYRkmLf0dACRj20Ig89tokp1NqD0iLrpdkrEtbKvAxtzqpWEKAX1tT7g7sNLmOTEH7vaeCazuibQBbKsgKvofZEX1b1rG8XV3YAC2XhCz8C8EwsF1WSqVXgKvHLKprw1ADFD38F2cLpVVyMiKVwyYVOKd3PWod/zHeHTYzuYjlzlm9TSJaFzwoY4IWksInxbYHRyZOJ3EUiZ/G4mEE5yTA0AiGidnmFS1nP6t1LrOweb+8dvpzwOS5Jlxfab5A6Dy4ju7HvaQM8yzBhyaHxenFgOvP3zqkSQqhcD3Z/ONNjT61Yq6E8kz6g4WwFfp2/L4vU/Xf27vT81+GcyYeQD+AhIl+Jg1VavDAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.vet-alfort.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">ENVA Students, Teachers and researchers and employees.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire d'ALFORT</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants, Enseignants-Chercheur, Personnels de l'ENVA</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vet-alfort.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Veterinary School of Alfort</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACSUlEQVQ4y32Tz0sUYRzGP7POOu5u7cgou9qqaKl4ULxIhywUvITd+gvsFh0ST+IpvJSniqQQo0MYCIEeNYgl0qCQRQmFFgXXH7jRCKuz7jo7u7NuB5nXUazn9L4P7/s83/f5fl+JC1ieXBgq5O3hQsYKu3mfFtiVvfKbzge3xty85Cy+jc29UOu0jpIk9UoSZQB2ziarp88ZlAeUpJXJbdwZ6e8VAr/eL1VV36yfqW6r6XEfNnZSrE0vcRlqW6+Fb9zv1GWAo6PMWq2/vAbAMkwyeppizj53QVa8KKpPVGSk0itARFqeXBg6TmWfB0JBAALhq2T/HJHV08iKF9sqICtemu+1cyUUJDbxVYiqddoTT+nk5LHjrDZoKEEfAPXdzeKgovqIz66QiMZRGzTBF4vFAdk8NBsBtNYQTX1tGDupU/UGjaJlk4xtYRkmLf0dACRj20Ig89tokp1NqD0iLrpdkrEtbKvAxtzqpWEKAX1tT7g7sNLmOTEH7vaeCazuibQBbKsgKvofZEX1b1rG8XV3YAC2XhCz8C8EwsF1WSqVXgKvHLKprw1ADFD38F2cLpVVyMiKVwyYVOKd3PWod/zHeHTYzuYjlzlm9TSJaFzwoY4IWksInxbYHRyZOJ3EUiZ/G4mEE5yTA0AiGidnmFS1nP6t1LrOweb+8dvpzwOS5Jlxfab5A6Dy4ju7HvaQM8yzBhyaHxenFgOvP3zqkSQqhcD3Z/ONNjT61Yq6E8kz6g4WwFfp2/L4vU/Xf27vT81+GcyYeQD+AhIl+Jg1VavDAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.vet-alfort.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">ENVA Students, Teachers and researchers and employees.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire d'ALFORT</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants, Enseignants-Chercheur, Personnels de l'ENVA</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVAO3N41irRpARAo+XP9yzoR89gA0sMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC52ZXQtYWxmb3J0LmZyMB4XDTE0MDYwNjA4NDcz
 NVoXDTM0MDYwNjA4NDczNVowHDEaMBgGA1UEAxMRaWRwLnZldC1hbGZvcnQuZnIw
@@ -40,22 +40,22 @@ xQIiyDnuAGh+RL+tU4BzJZkfmyLDtgrN+jP1rlmBIph0JB3uV2zG0FuIboFlIkZP
 8juD6wsMppjhxFHr+jq4B9iUmMNMCgsg6gX60VF7JNvTuoB6iXE77dJ/a1o7SXlh
 95exag==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vet-alfort.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vet-alfort.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Hervé Battaglia</md:SurName>
-      <md:EmailAddress>herve.battaglia@vet-alfort.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vet-alfort.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vet-alfort.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hervé Battaglia</md:SurName>
+    <md:EmailAddress>herve.battaglia@vet-alfort.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
index 783e26ec..34f59338 100644
--- a/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vfu.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-17T11:13:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-17T11:13:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of University of Veterinary and Pharmaceutical Sciences Brno.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Veterinární a farmaceutické univerzity Brno.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vfu.cz/index_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vfu.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://idp.vfu.cz/vfu_logo_40x40.jpg</mdui:Logo>
+        <mdui:Logo height="50" width="50">https://idp.vfu.cz/vfu_logo_50x50.jpg</mdui:Logo>
+        <mdui:Logo height="101" width="100">https://idp.vfu.cz/vfu_logo_100x101.jpg</mdui:Logo>
+        <mdui:Logo height="203" width="200">https://idp.vfu.cz/vfu_logo_200x203.jpg</mdui:Logo>
+        <mdui:Logo height="407" width="400">https://idp.vfu.cz/vfu_logo_400x407.jpg</mdui:Logo>
+        <mdui:Logo height="814" width="800">https://idp.vfu.cz/vfu_logo_800x814.jpg</mdui:Logo>
+        <mdui:Logo height="3238" width="3182">https://idp.vfu.cz/vfu_logo_3182x3238.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students of University of Veterinary and Pharmaceutical Sciences Brno.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Veterinární a farmaceutické univerzity Brno.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vfu.cz/index_en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.vfu.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://idp.vfu.cz/vfu_logo_40x40.jpg</mdui:Logo>
-          <mdui:Logo height="50" width="50">https://idp.vfu.cz/vfu_logo_50x50.jpg</mdui:Logo>
-          <mdui:Logo height="101" width="100">https://idp.vfu.cz/vfu_logo_100x101.jpg</mdui:Logo>
-          <mdui:Logo height="203" width="200">https://idp.vfu.cz/vfu_logo_200x203.jpg</mdui:Logo>
-          <mdui:Logo height="407" width="400">https://idp.vfu.cz/vfu_logo_400x407.jpg</mdui:Logo>
-          <mdui:Logo height="814" width="800">https://idp.vfu.cz/vfu_logo_800x814.jpg</mdui:Logo>
-          <mdui:Logo height="3238" width="3182">https://idp.vfu.cz/vfu_logo_3182x3238.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVANp/jeTWFQlkALd2zvuQM0NNal7QMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
 MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
@@ -55,13 +55,13 @@ SGRzwuLfThykPFAGd/HjzGGvkeYmhY0J3XmtvlXBgMNVgWO3eJun6lVDwFLLX/fT
 4zcd0uNIaHCPalZni/fJJZZ1OnpqGCcojEkbSZuSNj63zJpRIbX8+2Suwit2C8pR
 OCIUB28HPQitwXyHjHKbbja76a/IB8id
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUZ9X/+ig6ipqz5tuTFlWeaseDk1gwDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLnZmdS5jejAeFw0xNTExMTExNDMxMzhaFw0zNTEx
 MTExNDMxMzhaMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owggEiMA0GCSqGSIb3DQEB
@@ -80,13 +80,13 @@ fDtx0zOl6SCJB7cSVQd9BqvzWfT+/hUZiLlvrE88tIWLQatUC+Frjw9c+z9EcZ+B
 4VMcjUyqivNpcfjuHHAgimF0xW5eazK4lB9f76dgJNvhm0r4VcmuluOhzDDc8HV7
 11vR6XmJ2seiNk9k1bKJnEqIqWW7y9Y=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVALawx1psOeuNB/Q2nKO0A/D3JVB/MA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
 MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
@@ -105,30 +105,30 @@ Ms37IJpACqCJ0i8oQ1KTYqoUZFOigzdFv3O3pa7EjcHUI4KBtSlUADvG7x9G+EQS
 QzbFdRvuJ9SzN5kZ8Cv2hZUdLhp8/GsBO7mWqv5AlYT92fk3aSxXI86nzbAYkPNX
 2VD3vAL+nYSRZTKDTCV0dFKXgixuQNQX
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vfu.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vfu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vfu.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vfu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVANp/jeTWFQlkALd2zvuQM0NNal7QMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
 MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
@@ -147,13 +147,13 @@ SGRzwuLfThykPFAGd/HjzGGvkeYmhY0J3XmtvlXBgMNVgWO3eJun6lVDwFLLX/fT
 4zcd0uNIaHCPalZni/fJJZZ1OnpqGCcojEkbSZuSNj63zJpRIbX8+2Suwit2C8pR
 OCIUB28HPQitwXyHjHKbbja76a/IB8id
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUZ9X/+ig6ipqz5tuTFlWeaseDk1gwDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLnZmdS5jejAeFw0xNTExMTExNDMxMzhaFw0zNTEx
 MTExNDMxMzhaMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owggEiMA0GCSqGSIb3DQEB
@@ -172,13 +172,13 @@ fDtx0zOl6SCJB7cSVQd9BqvzWfT+/hUZiLlvrE88tIWLQatUC+Frjw9c+z9EcZ+B
 4VMcjUyqivNpcfjuHHAgimF0xW5eazK4lB9f76dgJNvhm0r4VcmuluOhzDDc8HV7
 11vR6XmJ2seiNk9k1bKJnEqIqWW7y9Y=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVALawx1psOeuNB/Q2nKO0A/D3JVB/MA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
 MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
@@ -197,33 +197,33 @@ Ms37IJpACqCJ0i8oQ1KTYqoUZFOigzdFv3O3pa7EjcHUI4KBtSlUADvG7x9G+EQS
 QzbFdRvuJ9SzN5kZ8Cv2hZUdLhp8/GsBO7mWqv5AlYT92fk3aSxXI86nzbAYkPNX
 2VD3vAL+nYSRZTKDTCV0dFKXgixuQNQX
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vfu.cz/index_en.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.vfu.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ladislav</md:GivenName>
-      <md:SurName>Žůrek</md:SurName>
-      <md:EmailAddress>zurekl@vfu.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Čejka</md:SurName>
-      <md:EmailAddress>cejkap@vfu.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ondřej</md:GivenName>
-      <md:SurName>Doležal</md:SurName>
-      <md:EmailAddress>dolezalo@vfu.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vfu.cz/index_en.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.vfu.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ladislav</md:GivenName>
+    <md:SurName>Žůrek</md:SurName>
+    <md:EmailAddress>zurekl@vfu.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Čejka</md:SurName>
+    <md:EmailAddress>cejkap@vfu.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ondřej</md:GivenName>
+    <md:SurName>Doležal</md:SurName>
+    <md:EmailAddress>dolezalo@vfu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
index 534deb0b..da7afd8c 100644
--- a/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vib.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">VIB</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vlaams Instituut voor Biotechnologie</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/jpg;base64,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AAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+AAAAAAAcAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAgAAAAAABAAAAABAAACQAAAAkAAAAAAOEJJTQQeAAAAAAAEAAAAADhCSU0EGgAAAAADSwAAAAYAAAAAAAAAAAAAABAAAAAQAAAACwBWAEkAQgBfAHIAZwBiAF8AcABvAHMAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAAQAAAAAFJnaHRsb25nAAAAEAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAF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ZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcFJpZ2h0cz0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3JpZ2h0cy8iIHBob3Rvc2hvcDpMZWdhY3lJUFRDRGlnZXN0PSI0NjBDRjI4OTI2Qjg1NkRBQjA5QzAxQTFCMEE3OTA3NyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1MgTWFjaW50b3NoIiB4bXA6Q3JlYXRlRGF0ZT0iMjAwNy0wMi0yOFQxNjozNDoxNyswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcE1NOkRvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUNBNDA5NDg1RERGRTMxMUI5QzdBRTkzN0QxOEM4QzAiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0RUM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgZGM6Zm9ybWF0PSJpbWFnZS9qcGVnIiB4bXBSaWdodHM6TWFya2VkPSJGYWxzZSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOjU4N0M3RTREQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiBzdFJlZjpkb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRDQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIi8+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOkFDQTQwOTQ4NURERkUzMTFCOUM3QUU5MzdEMThDOEMwIiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE1OjU1OjQ4KzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIABAAEAMBEQACEQEDEQH/3QAEAAL/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AD77t2Vvjc2+u0ZI/kr3lLuWl7Z7Kx2Wx+M6U74/glQlHufORT5Xb+b6833vLa1OJsinipcWggMMGlmmUqUPSjZOYt+5Y5e5UteZva7lNrP9z2rJdSbvtlk09YIyjPDfxQvGzoRqXU/fkOynV1xa5s5L5S5w5r553rlf395ytL08x3qPt/7jvrtLYLcyrIEuLC4uFnjR1OlykRKHMSONHRw9q9M9j1Hxi6c312V2f1lV7a6W3F2L2uuU2hsbsLqbtXv3aNRRt11R03e20INy7RzHX3cGy+wcnQTfximyOcpaqvwkCzUvhqZoPeF9pufM3+ubuUHK+5sm67jLJas3iWl+vhvVZIxNHG9tPEqrSOSJVoANDYq3STc+Xvb+f2R2O55t2WK65Z2eGLcIVjF5Y1mioyXCxmZLiCWWQlpYpXdTqYOpwF//0L88X01jOz+2vkDtPfOAz+L7F6Y3v2pvPu3HVu7tyJ1/hetcvjs3vPoDdXXdVTsMdlafu+kqI6iopp5xPgWw+Zo51V4Kc1GNHuZ9032i9xd4/f0Vrf7ducsbG5Z7qfczczvKjmfVfyP9OFTxEjt7dVgVXUBaxo/QN2nlK4spN0G68yXF7bTXbSxIkaWawRuHrAFtWVZKSMsnjvWZylGOmR16AfM7y2bszpD41UuD2DQT7M3V8VumPn9urFbKzOSyHZGQpaj5F9SZndm0K7cyCs3B2Rtvbm7O+azeNQtXR5b+IVeBWlixLSyUgglnk32927lflifkfc9wl3DkuHbks7G0gU7S1kIpUkinS6sJVuGdVQq8epRK7PK0gd26Vb5sG4blttntW1cxvt8CSxmU/TW9348SKC0LJcAqnjSgO0oJdAWQBhg//9k=</mdui:Logo>
+        <mdui:Logo height="128" width="128">data:image/jpg;base64,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////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAA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eGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.191.128.0/24</mdui:IPHint>
+        <mdui:DomainHint>vib.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.018402,3.691419</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">VIB</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Vlaams Instituut voor Biotechnologie</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/jpg;base64,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AAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+AAAAAAAcAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAgAAAAAABAAAAABAAACQAAAAkAAAAAAOEJJTQQeAAAAAAAEAAAAADhCSU0EGgAAAAADSwAAAAYAAAAAAAAAAAAAABAAAAAQAAAACwBWAEkAQgBfAHIAZwBiAF8AcABvAHMAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAAQAAAAAFJnaHRsb25nAAAAEAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAFc2xpY2UAAAASAAAAB3NsaWNlSURsb25nAAAAAAAAAAdncm91cElEbG9uZwAAAAAAAAAGb3JpZ2luZW51bQAAAAxFU2xpY2VPcmlnaW4AAAANYXV0b0dlbmVyYXRlZAAAAABUeXBlZW51bQAAAApFU2xpY2VUeXBlAAAAAEltZyAAAAAGYm91bmRzT2JqYwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAAEAAAAABSZ2h0bG9uZwAAABAAAAADdXJsVEVYVAAAAAEAAAAAAABudWxsVEVYVAAAAAEAAAAAAABNc2dlVEVYVAAAAAEAAAAAAAZhbHRUYWdURVhUAAAAAQAAAAAADmNlbGxUZXh0SXNIVE1MYm9vbAEAAAAIY2VsbFRleHRURVhUAAAAAQAAAAAACWhvcnpBbGlnbmVudW0AAAAPRVNsaWNlSG9yekFsaWduAAAAB2RlZmF1bHQAAAAJdmVydEFsaWduZW51bQAAAA9FU2xpY2VWZXJ0QWxpZ24AAAAHZGVmYXVsdAAAAAtiZ0NvbG9yVHlwZWVudW0AAAARRVNsaWNlQkdDb2xvclR5cGUAAAAATm9uZQAAAAl0b3BPdXRzZXRsb25nAAAAAAAAAApsZWZ0T3V0c2V0bG9uZwAAAAAAAAAMYm90dG9tT3V0c2V0bG9uZwAAAAAAAAALcmlnaHRPdXRzZXRsb25nAAAAAAA4QklNBCgAAAAAAAwAAAACP/AAAAAAAAA4QklNBBEAAAAAAAEBADhCSU0EFAAAAAAABAAAAAE4QklNBAwAAAAAAs8AAAABAAAAEAAAABAAAAAwAAADAAAAArMAGAAB/9j/7QAMQWRvYmVfQ00AAv/uAA5BZG9iZQBkgAAAAAH/2wCEAAwICAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgRDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIABAAEAMBIgACEQEDEQH/3QAEAAH/xAE/AAABBQEBAQEBAQAAAAAAAAADAAECBAUGBwgJCgsBAAEFAQEBAQEBAAAAAAAAAAEAAgMEBQYHCAkKCxAAAQQBAwIEAgUHBggFAwwzAQACEQMEIRIxBUFRYRMicYEyBhSRobFCIyQVUsFiMzRygtFDByWSU/Dh8WNzNRaisoMmRJNUZEXCo3Q2F9JV4mXys4TD03Xj80YnlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3EQACAgECBAQDBAUGBwcGBTUBAAIRAyExEgRBUWFxIhMFMoGRFKGxQiPBUtHwMyRi4XKCkkNTFWNzNPElBhaisoMHJjXC0kSTVKMXZEVVNnRl4vKzhMPTdePzRpSkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2JzdHV2d3h5ent8f/2gAMAwEAAhEDEQA/ANW6i+y+/wDXL/UFtgcBVbGjne5jqX2M/sLQqwsk9Lx7si+o14rn3bmMfVZc3+Z/Wq91bqsiu1zf0m+3+bRWYTcnLy6rmObfjPsfkguOwVkOsxLKf3vtP/gXp3Kq+6mnBwwyoGqzFq6jY2sk2EetU6ysv+ncxlmU7I+jZ/NfzKfLms05CMocMYaxmMgN/ZixZI/89p4eU9sTNAnIKqv2TyTg/wD/2QA4QklNBCEAAAAAAFUAAAABAQAAAA8AQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAAAAATAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwACAAQwBTADYAAAABADhCSU0EBgAAAAAABwAIAAAAAQEA/+EOP2h0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8APD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcFJpZ2h0cz0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3JpZ2h0cy8iIHBob3Rvc2hvcDpMZWdhY3lJUFRDRGlnZXN0PSI0NjBDRjI4OTI2Qjg1NkRBQjA5QzAxQTFCMEE3OTA3NyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1MgTWFjaW50b3NoIiB4bXA6Q3JlYXRlRGF0ZT0iMjAwNy0wMi0yOFQxNjozNDoxNyswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcE1NOkRvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUNBNDA5NDg1RERGRTMxMUI5QzdBRTkzN0QxOEM4QzAiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0RUM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgZGM6Zm9ybWF0PSJpbWFnZS9qcGVnIiB4bXBSaWdodHM6TWFya2VkPSJGYWxzZSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOjU4N0M3RTREQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiBzdFJlZjpkb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRDQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIi8+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOkFDQTQwOTQ4NURERkUzMTFCOUM3QUU5MzdEMThDOEMwIiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE1OjU1OjQ4KzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIABAAEAMBEQACEQEDEQH/3QAEAAL/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AD77t2Vvjc2+u0ZI/kr3lLuWl7Z7Kx2Wx+M6U74/glQlHufORT5Xb+b6833vLa1OJsinipcWggMMGlmmUqUPSjZOYt+5Y5e5UteZva7lNrP9z2rJdSbvtlk09YIyjPDfxQvGzoRqXU/fkOynV1xa5s5L5S5w5r553rlf395ytL08x3qPt/7jvrtLYLcyrIEuLC4uFnjR1OlykRKHMSONHRw9q9M9j1Hxi6c312V2f1lV7a6W3F2L2uuU2hsbsLqbtXv3aNRRt11R03e20INy7RzHX3cGy+wcnQTfximyOcpaqvwkCzUvhqZoPeF9pufM3+ubuUHK+5sm67jLJas3iWl+vhvVZIxNHG9tPEqrSOSJVoANDYq3STc+Xvb+f2R2O55t2WK65Z2eGLcIVjF5Y1mioyXCxmZLiCWWQlpYpXdTqYOpwF//0L88X01jOz+2vkDtPfOAz+L7F6Y3v2pvPu3HVu7tyJ1/hetcvjs3vPoDdXXdVTsMdlafu+kqI6iopp5xPgWw+Zo51V4Kc1GNHuZ9032i9xd4/f0Vrf7ducsbG5Z7qfczczvKjmfVfyP9OFTxEjt7dVgVXUBaxo/QN2nlK4spN0G68yXF7bTXbSxIkaWawRuHrAFtWVZKSMsnjvWZylGOmR16AfM7y2bszpD41UuD2DQT7M3V8VumPn9urFbKzOSyHZGQpaj5F9SZndm0K7cyCs3B2Rtvbm7O+azeNQtXR5b+IVeBWlixLSyUgglnk32927lflifkfc9wl3DkuHbks7G0gU7S1kIpUkinS6sJVuGdVQq8epRK7PK0gd26Vb5sG4blttntW1cxvt8CSxmU/TW9348SKC0LJcAqnjSgO0oJdAWQBhg//9k=</mdui:Logo>
-          <mdui:Logo height="128" width="128">data:image/jpg;base64,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////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAA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eGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.191.128.0/24</mdui:IPHint>
-          <mdui:DomainHint>vib.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.018402,3.691419</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
@@ -44,26 +44,26 @@ SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
 VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vib.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vib.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vib.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vib.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vib.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vib.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vib.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vib.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vib.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vib.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 
 MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
@@ -84,28 +84,28 @@ SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
 VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
 VIB
 </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
 VIB - Vlaams Instituut voor Biotechnologie
 </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
 http://www.vib.be
 </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jasper</md:GivenName>
-      <md:SurName>Minnaert</md:SurName>
-      <md:EmailAddress>jasper.minnaert@vib.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jasper</md:GivenName>
+    <md:SurName>Minnaert</md:SurName>
+    <md:EmailAddress>jasper.minnaert@vib.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml
index bf43c8f2..2396c9f0 100644
--- a/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vle.ase.md/saml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-08-10T06:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://idp.vle.ase.md/index.php/Policy</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-08-10T06:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://idp.vle.ase.md/index.php/Policy</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="81" width="272">https://idp.vle.ase.md/resources/asem-sso-en.png</mdui:Logo>
+        <mdui:Logo height="81" width="272" xml:lang="ro">https://idp.vle.ase.md/resources/asem-sso-ro.png</mdui:Logo>
+        <mdui:Logo height="81" width="272" xml:lang="ru">https://idp.vle.ase.md/resources/asem-sso-ru.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:47.030450,28.836156</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="81" width="272">https://idp.vle.ase.md/resources/asem-sso-en.png</mdui:Logo>
-          <mdui:Logo height="81" width="272" xml:lang="ro">https://idp.vle.ase.md/resources/asem-sso-ro.png</mdui:Logo>
-          <mdui:Logo height="81" width="272" xml:lang="ru">https://idp.vle.ase.md/resources/asem-sso-ru.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:47.030450,28.836156</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEwTCCA6mgAwIBAgIQXIrV2MDtVlfGHog5H/c8ZzANBgkqhkiG9w0BAQsFADBV
 MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNV
 BAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNjAzMjAx
@@ -47,26 +47,26 @@ uhU2YTrRJtZClTnBnh5XrvG7q4Z2K18KionAljJJ9VO3CQgTEe382o6TORncRzVR
 1LnyukS1vz7WbcYhhQ+Q8lWSRWFxU2lD7iG0+O7vkg7MKtTjAiKL5MDfDSzY5p5J
 i7fP1MuhC/fZpJGnruD1B38Hfjom
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="ro">Academia de Studii Economice din Moldova</md:OrganizationName>
-      <md:OrganizationName xml:lang="ru">Молдавская Экономическая Академия</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Academy of Economic Studies of Moldova</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="ro">ASEM</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="ru">МЭА</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">AESM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="ro">http://ase.md</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://ase.md</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Constantin</md:GivenName>
-      <md:SurName>Sclifos</md:SurName>
-      <md:EmailAddress>mailto:sclifcon@vle.ase.md</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="ro">Academia de Studii Economice din Moldova</md:OrganizationName>
+    <md:OrganizationName xml:lang="ru">Молдавская Экономическая Академия</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Academy of Economic Studies of Moldova</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="ro">ASEM</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ru">МЭА</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">AESM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="ro">http://ase.md</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://ase.md</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Constantin</md:GivenName>
+    <md:SurName>Sclifos</md:SurName>
+    <md:EmailAddress>mailto:sclifcon@vle.ase.md</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml
index 32e9b81e..025615a0 100644
--- a/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vsb.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T11:42:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T11:42:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsb.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">VŠB-Technical University of Ostrava</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoká škola báňská - Technická univerzita Ostrava</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the VŠB-Technical University of Ostrava</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty VŠB-TUO</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vsb.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vsb.cz/</mdui:InformationURL>
+        <mdui:Logo height="244" width="207">https://www2.eduid.cz/idp-loga/vsb.jpeg</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsb.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">VŠB-Technical University of Ostrava</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Vysoká škola báňská - Technická univerzita Ostrava</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students of the VŠB-Technical University of Ostrava</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty VŠB-TUO</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vsb.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.vsb.cz/</mdui:InformationURL>
-          <mdui:Logo height="244" width="207">https://www2.eduid.cz/idp-loga/vsb.jpeg</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKuWvd4iPNRnRXukyKOp+sqpReNLMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
 MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
@@ -49,13 +49,13 @@ qENqBYkiuUrkE2sQtYTbqvJi/0aSjgQwD6qVZtRNalavRIInGqPOpG3663t9vSCK
 ZY58F6tPf6hRCqY0YM246W9jj6IZ0QH/gDbMDQxQYiuLhQ03uDHlTwB32/G27Tkb
 CSX2Yqgu+nMLaqtZ5IZORr9jyxd0h0hM
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAMu0ePB4xgh9EIK+qEugr/6czSz9MA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
 MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
@@ -74,13 +74,13 @@ e+84As5I60v+3ywJlBKOZsjZ17Nw+y6fcbpeEIuWXd/YvuyT/qN6fzNqLkjU+F1I
 wBFnh3xvCTPaFTFgT++wDCqDvtq9GMD1w6SEiZiq7xSh1SVoJYxIu6Zq5C3YyOVS
 8aQKeBPJ3f6ZH0CSSD1nGI+/joVQegLg
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAMmUzXW7GcBvS+GdXawthrAEM9CfMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
 MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
@@ -99,13 +99,13 @@ fc8cOb2/uYOBc2W08BOf2Q6nBywhojlq1TBVigHFb5jdakQ6JJ1WbaKBtMbsXzGW
 7d23IK/AF0SEWknFsrqnhapeDFc2Jh7XZkz8Zf0LMg3d/fCQtTVdi6iS4u1pfzRv
 JYH5NKeeBBdGOunN7KfPzfd86tveJ6kn
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEhDCCA2ygAwIBAgIQMsrmzp+34gaErwPAEEHDaTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDEwNzAwMDAwMFoXDTE2MDEwNzIzNTk1OVowZTELMAkGA1UE
@@ -132,26 +132,26 @@ nFXjhATWbi7bRx15x36jP2vR/yxigWhN73cxZNhhAC76zcH/Fj8/qUhTITiV5hyq
 uGEHDQJdr6KAGF8iO78FoR66sQNIvHTSpJCUyS5tRkHn59BfUlapw4Y6eQ6bxJDN
 h15jC+yc8m8=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vsb.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vsb.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vsb.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vsb.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vsb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vsb.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsb.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vsb.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vsb.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vsb.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vsb.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vsb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vsb.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsb.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAKuWvd4iPNRnRXukyKOp+sqpReNLMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
 MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
@@ -170,13 +170,13 @@ qENqBYkiuUrkE2sQtYTbqvJi/0aSjgQwD6qVZtRNalavRIInGqPOpG3663t9vSCK
 ZY58F6tPf6hRCqY0YM246W9jj6IZ0QH/gDbMDQxQYiuLhQ03uDHlTwB32/G27Tkb
 CSX2Yqgu+nMLaqtZ5IZORr9jyxd0h0hM
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAMu0ePB4xgh9EIK+qEugr/6czSz9MA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
 MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
@@ -195,13 +195,13 @@ e+84As5I60v+3ywJlBKOZsjZ17Nw+y6fcbpeEIuWXd/YvuyT/qN6fzNqLkjU+F1I
 wBFnh3xvCTPaFTFgT++wDCqDvtq9GMD1w6SEiZiq7xSh1SVoJYxIu6Zq5C3YyOVS
 8aQKeBPJ3f6ZH0CSSD1nGI+/joVQegLg
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAMmUzXW7GcBvS+GdXawthrAEM9CfMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
 MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
@@ -220,13 +220,13 @@ fc8cOb2/uYOBc2W08BOf2Q6nBywhojlq1TBVigHFb5jdakQ6JJ1WbaKBtMbsXzGW
 7d23IK/AF0SEWknFsrqnhapeDFc2Jh7XZkz8Zf0LMg3d/fCQtTVdi6iS4u1pfzRv
 JYH5NKeeBBdGOunN7KfPzfd86tveJ6kn
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEhDCCA2ygAwIBAgIQMsrmzp+34gaErwPAEEHDaTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDEwNzAwMDAwMFoXDTE2MDEwNzIzNTk1OVowZTELMAkGA1UE
@@ -253,27 +253,27 @@ nFXjhATWbi7bRx15x36jP2vR/yxigWhN73cxZNhhAC76zcH/Fj8/qUhTITiV5hyq
 uGEHDQJdr6KAGF8iO78FoR66sQNIvHTSpJCUyS5tRkHn59BfUlapw4Y6eQ6bxJDN
 h15jC+yc8m8=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vsb.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">VSB - Technical University of Ostrava</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Vysoká škola báňská - Technická univerzita Ostrava</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">VSB - Technical University of Ostrava</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">VŠB - Technická univerzita Ostrava</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vsb.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://en.vsb.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Radomir</md:GivenName>
-      <md:SurName>Orkac</md:SurName>
-      <md:EmailAddress>radomir.orkac@vsb.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Lason</md:SurName>
-      <md:EmailAddress>martin.lason@vsb.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vsb.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">VSB - Technical University of Ostrava</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Vysoká škola báňská - Technická univerzita Ostrava</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">VSB - Technical University of Ostrava</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">VŠB - Technická univerzita Ostrava</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vsb.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://en.vsb.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Radomir</md:GivenName>
+    <md:SurName>Orkac</md:SurName>
+    <md:EmailAddress>radomir.orkac@vsb.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Lason</md:SurName>
+    <md:EmailAddress>martin.lason@vsb.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
index 4d7ee158..3625e334 100644
--- a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vu-wien.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-11-27T16:13:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-11-27T16:13:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vetmeduni.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Veterinärmedizinische Universität Wien</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Veterinary Medicine, Vienna</mdui:DisplayName>
+        <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
+        <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.vetmeduni.ac.at/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vetmeduni.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Veterinärmedizinische Universität Wien</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Veterinary Medicine, Vienna</mdui:DisplayName>
-          <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
-          <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.vetmeduni.ac.at/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUArxd4kLebWsQSo73wqw//qDah+UwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnZ1LXdpZW4uYWMuYXQwHhcNMDgxMTIxMDkyNzQy
 WhcNMjgxMTIxMDkyNzQyWjAcMRowGAYDVQQDExFpZHAudnUtd2llbi5hYy5hdDCC
@@ -48,29 +48,29 @@ tnd5Kz76fXuLhdnT1jjV6e3YnvBKD7F2sKUJdm8KErwfa3IR2XpTiiCnu+5VogJZ
 1QE5FJMTgKAzci109QuYqSDgqMbBs38nU95tsSN7M8B43FtEOw4dnrz9im+Sc4yK
 IfN31Zc1iB2M7lKMIc7i9VqM+5TXp4mrJwTyl0u20ITLhxu1SNgyZyeQXMHLD8Bl
 1Tdv</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vu-wien.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vetmeduni.ac.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vu-wien.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vetmeduni.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUArxd4kLebWsQSo73wqw//qDah+UwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnZ1LXdpZW4uYWMuYXQwHhcNMDgxMTIxMDkyNzQy
 WhcNMjgxMTIxMDkyNzQyWjAcMRowGAYDVQQDExFpZHAudnUtd2llbi5hYy5hdDCC
@@ -89,26 +89,26 @@ tnd5Kz76fXuLhdnT1jjV6e3YnvBKD7F2sKUJdm8KErwfa3IR2XpTiiCnu+5VogJZ
 1QE5FJMTgKAzci109QuYqSDgqMbBs38nU95tsSN7M8B43FtEOw4dnrz9im+Sc4yK
 IfN31Zc1iB2M7lKMIc7i9VqM+5TXp4mrJwTyl0u20ITLhxu1SNgyZyeQXMHLD8Bl
 1Tdv</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Wolfgang</md:GivenName>
-      <md:SurName>Cernohorsky</md:SurName>
-      <md:EmailAddress>mailto:Wolfgang.Cernohorsky@vu-wien.ac.at</md:EmailAddress>
-      <md:TelephoneNumber>+43 1 25077 1602</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wolfgang</md:GivenName>
+    <md:SurName>Cernohorsky</md:SurName>
+    <md:EmailAddress>mailto:Wolfgang.Cernohorsky@vu-wien.ac.at</md:EmailAddress>
+    <md:TelephoneNumber>+43 1 25077 1602</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
index 31f4249e..c7175ccd 100644
--- a/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vub.ac.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">VUB - Vrije Universiteit Brussel</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vrije Universiteit Brussel</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.vub.ac.be/logo/vub-small.jpg</mdui:Logo>
+        <mdui:Logo height="110" width="347">https://idp.vub.ac.be/logo/vub-large.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>134.184.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:1190::/64</mdui:IPHint>
+        <mdui:DomainHint>vub.ac.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.8213690,4.3957100</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">VUB - Vrije Universiteit Brussel</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Vrije Universiteit Brussel</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp.vub.ac.be/logo/vub-small.jpg</mdui:Logo>
-          <mdui:Logo height="110" width="347">https://idp.vub.ac.be/logo/vub-large.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>134.184.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:06a8:1190::/64</mdui:IPHint>
-          <mdui:DomainHint>vub.ac.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.8213690,4.3957100</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
 MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
@@ -44,29 +44,29 @@ ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
 dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vub.ac.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vub.ac.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vub.ac.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
 MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
@@ -86,28 +86,28 @@ ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
 dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
                 Vrije Universiteit Brussel
         </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
                 VUB - Vrije Universiteit Brussel
         </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
                 http://www.vub.ac.be
         </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>support@vub.ac.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>support@vub.ac.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml
index a5c22260..46c6c534 100644
--- a/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.waltham.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">waltham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">waltham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/waltham.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/waltham.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Waltham Forest College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.waltham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/waltham.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/waltham.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Waltham Forest College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.waltham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml
index 8b27bc1e..c68414e7 100644
--- a/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.warkscol.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-27T17:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-27T17:45:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warkscol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warkscol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQD/4wYFNpyojzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEVMBMGA1UECBMMV2Fyd2lja3NoaXJlMRAwDgYDVQQHEwdXYXJ3aWNrMR0wGwYD
 						VQQKExRXYXJ3aWNrc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLndhcmtzY29s
@@ -33,26 +33,26 @@
 						ufX7okaOmCXfK/slbpd8nhkch7kFhWd2BF3RRRsihBB6VKvKYldfNmUZ7QT3sCNv
 						pouvTA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.warkscol.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warkscol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.warkscol.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warkscol.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQD/4wYFNpyojzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEVMBMGA1UECBMMV2Fyd2lja3NoaXJlMRAwDgYDVQQHEwdXYXJ3aWNrMR0wGwYD
 						VQQKExRXYXJ3aWNrc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLndhcmtzY29s
@@ -73,27 +73,27 @@
 						ufX7okaOmCXfK/slbpd8nhkch7kFhWd2BF3RRRsihBB6VKvKYldfNmUZ7QT3sCNv
 						pouvTA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Warwickshire College, Royal Leamington Spa, Rugby and Moreton Morrell</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Warwickshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warkscol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rob</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:rmitchell@warkscol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:rmitchell@warkscol.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Warwickshire College, Royal Leamington Spa, Rugby and Moreton Morrell</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Warwickshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warkscol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:rmitchell@warkscol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:rmitchell@warkscol.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml
index 89148f99..a3529d56 100644
--- a/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.warrington.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-25T15:09:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-25T15:09:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warrington.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warrington.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFFzCCA/+gAwIBAgIQMjinXVJxXZDuVUOslVHWJzANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMTEwNjAwMDAwMFoXDTE2MTEwNTIzNTk1OVowgeMxCzAJBgNV
@@ -42,26 +42,26 @@
 						OBbEtsqTq+EVBcim7XZmEbVslQwu0iH1nM/HWebqfo4Acugy7Isy6oc43HVnD/W7
 						JzDQd9U2/1ntIS0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.warrington.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warrington.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.warrington.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warrington.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFFzCCA/+gAwIBAgIQMjinXVJxXZDuVUOslVHWJzANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMTEwNjAwMDAwMFoXDTE2MTEwNTIzNTk1OVowgeMxCzAJBgNV
@@ -91,26 +91,26 @@
 						OBbEtsqTq+EVBcim7XZmEbVslQwu0iH1nM/HWebqfo4Acugy7Isy6oc43HVnD/W7
 						JzDQd9U2/1ntIS0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Warrington Collegiate Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Warrington Collegiate (via IdP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warrington.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:Helpdesk@Warrington.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:GRobinson@Warrington.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Warrington Collegiate Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Warrington Collegiate (via IdP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warrington.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:Helpdesk@Warrington.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:GRobinson@Warrington.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
index c6f8fd47..61ccff2d 100644
--- a/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.warwick.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-27T20:54:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-27T20:54:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Warwick</mdui:DisplayName>
+        <mdui:Logo height="26" width="90">https://idp.warwick.ac.uk/origin/static/images/idp-logo-90x26.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp.warwick.ac.uk/origin/static/images/idp-logo-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>137.205.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>warwick.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:52.381991,-1.562032</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.286432,-1.551475</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Warwick</mdui:DisplayName>
-          <mdui:Logo height="26" width="90">https://idp.warwick.ac.uk/origin/static/images/idp-logo-90x26.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp.warwick.ac.uk/origin/static/images/idp-logo-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>137.205.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>warwick.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:52.381991,-1.562032</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.286432,-1.551475</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
 						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
@@ -43,26 +43,26 @@
 						+YK5ljnepO58isd09Xn1XGEqM7kySM4H55OhvBKzeIMSaKmNFJY3e8CJJmMl9u+j
 						vOGPdg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
 						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
@@ -82,25 +82,25 @@
 						+YK5ljnepO58isd09Xn1XGEqM7kySM4H55OhvBKzeIMSaKmNFJY3e8CJJmMl9u+j
 						vOGPdg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Warwick</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Warwick</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Howes</md:SurName>
-      <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Howes</md:SurName>
-      <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Warwick</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Warwick</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Howes</md:SurName>
+    <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Howes</md:SurName>
+    <md:EmailAddress>mailto:n.howes@warwick.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml b/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml
index f79edc5b..104df62d 100644
--- a/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.we-learn.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-12T16:34:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-12T16:34:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">we-learn.com</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">we-learn.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEmzCCA4OgAwIBAgIRALIgeKCSmCSkkGB68w8tkDgwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -39,26 +39,26 @@
 						o1cIOol/iyvTszEztbv5fqSUVrFre+EhFqZmstbD6oWJG29X5lnrgnokiRzlH307
 						jFH1UhDrKPT2FKWjapS+ttqC6T3U8f2u0f/tvxC+hQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.we-learn.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.we-learn.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.we-learn.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.we-learn.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.we-learn.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.we-learn.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">we-learn.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.we-learn.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.we-learn.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.we-learn.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.we-learn.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.we-learn.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.we-learn.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">we-learn.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEmzCCA4OgAwIBAgIRALIgeKCSmCSkkGB68w8tkDgwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -85,27 +85,27 @@
 						o1cIOol/iyvTszEztbv5fqSUVrFre+EhFqZmstbD6oWJG29X5lnrgnokiRzlH307
 						jFH1UhDrKPT2FKWjapS+ttqC6T3U8f2u0f/tvxC+hQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.we-learn.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.we-learn.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Warwickshire County Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Warwickshire e-Learning Community</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warwickshire.gov.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Leach</md:SurName>
-      <md:EmailAddress>mailto:leach.s@welearn365.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Leach</md:SurName>
-      <md:EmailAddress>mailto:leach.s@welearn365.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.we-learn.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.we-learn.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Warwickshire County Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Warwickshire e-Learning Community</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warwickshire.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Leach</md:SurName>
+    <md:EmailAddress>mailto:leach.s@welearn365.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Leach</md:SurName>
+    <md:EmailAddress>mailto:leach.s@welearn365.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.weber.edu-idp.xml b/swamid-interfederations-2.0/idp.weber.edu-idp.xml
index fcac4ace..53fdcc27 100644
--- a/swamid-interfederations-2.0/idp.weber.edu-idp.xml
+++ b/swamid-interfederations-2.0/idp.weber.edu-idp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.weber.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weber.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Weber State University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://weber.edu</mdui:InformationURL>
+        <mdui:Logo height="122" width="238" xml:lang="en">https://www.weber.edu/images/WSU_Logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weber.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Weber State University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://weber.edu</mdui:InformationURL>
-          <mdui:Logo height="122" width="238" xml:lang="en">https://www.weber.edu/images/WSU_Logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDyTCCArGgAwIBAgIJAKivSalalUbnMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
 BAYTAlVTMQ0wCwYDVQQIDARVdGFoMQ4wDAYDVQQHDAVPZ2RlbjEfMB0GA1UECgwW
 V2ViZXIgU3RhdGUgVW5pdmVyc2l0eTELMAkGA1UECwwCSVQxHzAdBgNVBAMMFldl
@@ -43,36 +43,36 @@ RTysR81FEkGE/ftL3niiQere3dkZrwTHIBd5wZuLC8dPunxJxGLM6MGytRdThHnD
 S1S10oATr9bZgNj8WEiw7DWG5sHb79+04Sg6gwheKEoHGHupShONIm+JAGHx6sxP
 EeS6iOJIgvPUd0c4sA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.weber.edu/simplesaml/saml2/idp/SingleLogoutService.php?ReturnTo=https%3A%2F%2Fcas.weber.edu%2Flogout"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.weber.edu/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.weber.edu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Weber State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Weber State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.weber.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jonathan Karras</md:GivenName>
-      <md:EmailAddress>jonathankarras@weber.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Admin Services</md:GivenName>
-      <md:EmailAddress>sysadmin@weber.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Information Security Office</md:GivenName>
-      <md:EmailAddress>security@weber.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>csupport@weber.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Nate Henne</md:GivenName>
-      <md:EmailAddress>natehenne@weber.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.weber.edu/simplesaml/saml2/idp/SingleLogoutService.php?ReturnTo=https%3A%2F%2Fcas.weber.edu%2Flogout"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.weber.edu/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.weber.edu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Weber State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Weber State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.weber.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jonathan Karras</md:GivenName>
+    <md:EmailAddress>jonathankarras@weber.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Admin Services</md:GivenName>
+    <md:EmailAddress>sysadmin@weber.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Information Security Office</md:GivenName>
+    <md:EmailAddress>security@weber.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>csupport@weber.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Nate Henne</md:GivenName>
+    <md:EmailAddress>natehenne@weber.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml
index 0c1f25d7..f9c63cc0 100644
--- a/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wellcome.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wellcome.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wellcome.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDjDCCAnQCCQDSxQ0pkFszHTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UEChMS
 						VGhlIFdlbGxjb21lIFRydXN0MRswGQYDVQQLExJTaGliYm9sZXRoIFByb2plY3Qx
@@ -31,26 +31,26 @@
 						l4tAQPXq7W/jhQ2fGiSDIAPDxUnMaCak1DXL5T/3nyA6F9RbC8z9FPvP7sAjgfdE
 						QTLzavN+fHNlz6ykEglkseHbRs19a1x/EP7tNR8juq3QBCnIpLDFzPt7OQE7mrre
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wellcome.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wellcome.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wellcome.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wellcome.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDjDCCAnQCCQDSxQ0pkFszHTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UEChMS
 						VGhlIFdlbGxjb21lIFRydXN0MRswGQYDVQQLExJTaGliYm9sZXRoIFByb2plY3Qx
@@ -71,27 +71,27 @@
 						l4tAQPXq7W/jhQ2fGiSDIAPDxUnMaCak1DXL5T/3nyA6F9RbC8z9FPvP7sAjgfdE
 						QTLzavN+fHNlz6ykEglkseHbRs19a1x/EP7tNR8juq3QBCnIpLDFzPt7OQE7mrre
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wellcome Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wellcome Trust</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wellcome.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Niraj</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:n.mitchell@wellcome.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Niraj</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:n.mitchell@wellcome.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wellcome Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wellcome Trust</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wellcome.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Niraj</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:n.mitchell@wellcome.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Niraj</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:n.mitchell@wellcome.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
index 5b4b486d..c4496eb6 100644
--- a/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.west-lothian.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-lothian.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-lothian.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-lothian.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-lothian.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Lothian College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.west-lothian.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-lothian.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-lothian.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Lothian College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.west-lothian.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.west-thames.ac.uk-metadata.xml b/swamid-interfederations-2.0/idp.west-thames.ac.uk-metadata.xml
index 6ca3ee24..3986248c 100644
--- a/swamid-interfederations-2.0/idp.west-thames.ac.uk-metadata.xml
+++ b/swamid-interfederations-2.0/idp.west-thames.ac.uk-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.west-thames.ac.uk/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-thames.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-thames.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-thames.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-thames.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Thames College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.west-thames.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-thames.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-thames.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Thames College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.west-thames.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml
index 48e3b961..8b67f348 100644
--- a/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.westherts.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-12T16:24:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-12T16:24:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westherts.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westherts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJ9cooaHnMILJdvfcwbpOMFGaY3KMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcDIud2VzdGhlcnRzLmFjLnVrMB4XDTE0MDUwNjE0
 						NTc0MVoXDTM0MDUwNjE0NTc0MVowHzEdMBsGA1UEAxMUaWRwMi53ZXN0aGVydHMu
@@ -32,26 +32,26 @@
 						lYoHgVIrTV4juJFqx+tJsPceOgQyIqU86/CFyH6rymiSCOoUa4x3uUtI6fBdffuR
 						QvZDzAP5C4j6b/8pYlItCA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.westherts.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westherts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.westherts.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westherts.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJ9cooaHnMILJdvfcwbpOMFGaY3KMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcDIud2VzdGhlcnRzLmFjLnVrMB4XDTE0MDUwNjE0
 						NTc0MVoXDTM0MDUwNjE0NTc0MVowHzEdMBsGA1UEAxMUaWRwMi53ZXN0aGVydHMu
@@ -71,26 +71,26 @@
 						lYoHgVIrTV4juJFqx+tJsPceOgQyIqU86/CFyH6rymiSCOoUa4x3uUtI6fBdffuR
 						QvZDzAP5C4j6b/8pYlItCA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Herts College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Herts College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.westherts.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@westherts.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lawrence</md:GivenName>
-      <md:SurName>Cleaver</md:SurName>
-      <md:EmailAddress>mailto:Lawrence.cleaver@westherts.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Herts College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Herts College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.westherts.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@westherts.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lawrence</md:GivenName>
+    <md:SurName>Cleaver</md:SurName>
+    <md:EmailAddress>mailto:Lawrence.cleaver@westherts.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.westkentandashford.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.westkentandashford.ac.uk-idp-shibboleth.xml
index 34b6d5e0..91116452 100644
--- a/swamid-interfederations-2.0/idp.westkentandashford.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.westkentandashford.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.westkentandashford.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-10T12:20:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-10T12:20:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wkc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wkc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVANIgK8VOCEtdY0hTA/E/0hn30aZrMA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHGlkcC53ZXN0a2VudGFuZGFzaGZvcmQuYWMudWswHhcN
 						MTYwNTExMDk1MTI2WhcNMzYwNTExMDk1MTI2WjAnMSUwIwYDVQQDDBxpZHAud2Vz
@@ -32,13 +32,13 @@
 						TfpRppFUrNC3zYEQNVRCMRauFj696Iw3B7JKvsqxz8cbnsOZEFYQYwiWpllNID+p
 						Tb+q0Kw4SH9Hl8vjfzXmNXl7Xv8gDslqCUdIrhMQnpF9Iw9CF41MiLli4brGiAcG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVAKEHttrNq17jN5R87kvBgWXjIfhTMA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHGlkcC53ZXN0a2VudGFuZGFzaGZvcmQuYWMudWswHhcN
 						MTYwNTExMDk1MTI0WhcNMzYwNTExMDk1MTI0WjAnMSUwIwYDVQQDDBxpZHAud2Vz
@@ -58,13 +58,13 @@
 						Gy+REyXoRLdyc4Owfj8gyrrIhkb8dN01RcJafwwKbvxbRy2VK+K2ybVeP9/x1SmT
 						hy3laQOCW34cEters+vfLyj9USqTlaEDnVhfBGBPXMMwE0j0JzDXLrcUcvFLI0SW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVAMCVzeipRI3iVsOdX3XiNyBMOy/SMA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHGlkcC53ZXN0a2VudGFuZGFzaGZvcmQuYWMudWswHhcN
 						MTYwNTExMDk1MTI1WhcNMzYwNTExMDk1MTI1WjAnMSUwIwYDVQQDDBxpZHAud2Vz
@@ -84,26 +84,26 @@
 						XHnhPQXGqDN4gvh5UoJ6/A8wD+MFnfyf305xploywpWckEm7tVXBHqUUbkhxGj4F
 						lFSJ3srSfXS7YJ3h8ni7AybQSgQWBVrME4/kj57oilwfNospZFLj9HLawB0jZtGm
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.westkentandashford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.westkentandashford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.westkentandashford.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.westkentandashford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.westkentandashford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.westkentandashford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wkc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.westkentandashford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.westkentandashford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.westkentandashford.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.westkentandashford.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.westkentandashford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.westkentandashford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wkc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVANIgK8VOCEtdY0hTA/E/0hn30aZrMA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHGlkcC53ZXN0a2VudGFuZGFzaGZvcmQuYWMudWswHhcN
 						MTYwNTExMDk1MTI2WhcNMzYwNTExMDk1MTI2WjAnMSUwIwYDVQQDDBxpZHAud2Vz
@@ -123,13 +123,13 @@
 						TfpRppFUrNC3zYEQNVRCMRauFj696Iw3B7JKvsqxz8cbnsOZEFYQYwiWpllNID+p
 						Tb+q0Kw4SH9Hl8vjfzXmNXl7Xv8gDslqCUdIrhMQnpF9Iw9CF41MiLli4brGiAcG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVAKEHttrNq17jN5R87kvBgWXjIfhTMA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHGlkcC53ZXN0a2VudGFuZGFzaGZvcmQuYWMudWswHhcN
 						MTYwNTExMDk1MTI0WhcNMzYwNTExMDk1MTI0WjAnMSUwIwYDVQQDDBxpZHAud2Vz
@@ -149,13 +149,13 @@
 						Gy+REyXoRLdyc4Owfj8gyrrIhkb8dN01RcJafwwKbvxbRy2VK+K2ybVeP9/x1SmT
 						hy3laQOCW34cEters+vfLyj9USqTlaEDnVhfBGBPXMMwE0j0JzDXLrcUcvFLI0SW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVAMCVzeipRI3iVsOdX3XiNyBMOy/SMA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHGlkcC53ZXN0a2VudGFuZGFzaGZvcmQuYWMudWswHhcN
 						MTYwNTExMDk1MTI1WhcNMzYwNTExMDk1MTI1WjAnMSUwIwYDVQQDDBxpZHAud2Vz
@@ -175,24 +175,24 @@
 						XHnhPQXGqDN4gvh5UoJ6/A8wD+MFnfyf305xploywpWckEm7tVXBHqUUbkhxGj4F
 						lFSJ3srSfXS7YJ3h8ni7AybQSgQWBVrME4/kj57oilwfNospZFLj9HLawB0jZtGm
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.westkentandashford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Kent and Ashford College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Kent and Ashford College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://westkent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michele</md:GivenName>
-      <md:SurName>Balazs</md:SurName>
-      <md:EmailAddress>mailto:Michelebalazs@westkent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:Garethmitchell@westkent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.westkentandashford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Kent and Ashford College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Kent and Ashford College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://westkent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michele</md:GivenName>
+    <md:SurName>Balazs</md:SurName>
+    <md:EmailAddress>mailto:Michelebalazs@westkent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:Garethmitchell@westkent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml
index c01d30f7..6dc67deb 100644
--- a/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.weston.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-30T13:30:39Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-30T13:30:39Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weston.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAPcnzcVGLzEqHB1pMsO1kGPh7IV9MA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC53ZXN0b24uYWMudWswHhcNMTMwMTE2MTcxMzUy
 						WhcNMzMwMTE2MTcxMzUyWjAbMRkwFwYDVQQDExBpZHAud2VzdG9uLmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						VUPiI5aeGWruZIRk4zgGQEuX9xCofV/Wf0k6yKkV1t5si9aXs66rsGgZLcj5PVD8
 						s0O78Bd48FWN4zeRq+RXI1eqpkYlnD07i0S4ICliPBBe0CmFxplfScWzMKVyUip9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.weston.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.weston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.weston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.weston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.weston.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.weston.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.weston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.weston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weston.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAPcnzcVGLzEqHB1pMsO1kGPh7IV9MA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEGlkcC53ZXN0b24uYWMudWswHhcNMTMwMTE2MTcxMzUy
 						WhcNMzMwMTE2MTcxMzUyWjAbMRkwFwYDVQQDExBpZHAud2VzdG9uLmFjLnVrMIIB
@@ -67,26 +67,26 @@
 						VUPiI5aeGWruZIRk4zgGQEuX9xCofV/Wf0k6yKkV1t5si9aXs66rsGgZLcj5PVD8
 						s0O78Bd48FWN4zeRq+RXI1eqpkYlnD07i0S4ICliPBBe0CmFxplfScWzMKVyUip9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Weston College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Weston College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.weston.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>I.T. Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:it.helpdesk@weston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Hofgartner</md:SurName>
-      <md:EmailAddress>mailto:Jon.Hofgartner@weston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Weston College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Weston College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.weston.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>I.T. Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:it.helpdesk@weston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Hofgartner</md:SurName>
+    <md:EmailAddress>mailto:Jon.Hofgartner@weston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml
index e6425c25..d07f86a2 100644
--- a/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.weymouth.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T11:53:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T11:53:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weymouth.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weymouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUZFz+kRz+YW7p9f/N9n5Of8fT2j0wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVrMB4XDTE1MDUxNDE1MDE0
 						OFoXDTM1MDUxNDE1MDE0OFowHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVr
@@ -32,26 +32,26 @@
 						ZhW5ckHO38W5sam0GEuPfinLTDrEk7u+PvLSKtyZHaW8iNegbWtTgKL/Zspe1vBw
 						ijX+yImKyg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.weymouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weymouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.weymouth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">weymouth.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUZFz+kRz+YW7p9f/N9n5Of8fT2j0wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVrMB4XDTE1MDUxNDE1MDE0
 						OFoXDTM1MDUxNDE1MDE0OFowHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVr
@@ -71,27 +71,27 @@
 						ZhW5ckHO38W5sam0GEuPfinLTDrEk7u+PvLSKtyZHaW8iNegbWtTgKL/Zspe1vBw
 						ijX+yImKyg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Weymouth College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Weymouth College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.weymouth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Templeton</md:SurName>
-      <md:EmailAddress>mailto:Phil_Templeton@weymouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Templeton</md:SurName>
-      <md:EmailAddress>mailto:Phil_Templeton@weymouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Weymouth College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Weymouth College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.weymouth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Templeton</md:SurName>
+    <md:EmailAddress>mailto:Phil_Templeton@weymouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Templeton</md:SurName>
+    <md:EmailAddress>mailto:Phil_Templeton@weymouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
index 4f6c53ac..2145bcb4 100644
--- a/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wiltshire.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-05T16:44:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-05T16:44:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wiltshire.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wiltshire.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEoTCCA4mgAwIBAgIRAOiGbysj0iOdFzhBHusteqMwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -39,26 +39,26 @@
 						0ME9TV8PlhWKNsAHrbaqyii4dqlSpsrP6rCad4pqlp5m1bRIZC7Met5RQ6qyIUjC
 						qwqpVTvyqjl0xrmHHCWfxY8GEVajGv7HzlQwukJFT2uSFdJl/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wiltshire.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wiltshire.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wiltshire.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wiltshire.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEoTCCA4mgAwIBAgIRAOiGbysj0iOdFzhBHusteqMwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -85,26 +85,26 @@
 						0ME9TV8PlhWKNsAHrbaqyii4dqlSpsrP6rCad4pqlp5m1bRIZC7Met5RQ6qyIUjC
 						qwqpVTvyqjl0xrmHHCWfxY8GEVajGv7HzlQwukJFT2uSFdJl/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wiltshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wiltshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wiltshire.ac.uk/external/about_us/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@wiltshire.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Grenfell</md:SurName>
-      <md:EmailAddress>mailto:john.grenfell@wiltshire.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wiltshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wiltshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wiltshire.ac.uk/external/about_us/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@wiltshire.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Grenfell</md:SurName>
+    <md:EmailAddress>mailto:john.grenfell@wiltshire.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml
index 9635e2f5..920d339b 100644
--- a/swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.winchester.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.winchester.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-01T17:03:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-01T17:03:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">winchester.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">winchester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -35,13 +35,13 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -64,23 +64,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/winchester.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/winchester.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Winchester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/winchester.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/winchester.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Winchester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml
index e8bf5173..7888397e 100644
--- a/swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-22T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-22T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Waterford Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Port Láirge</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.wit.ie/about_wit</mdui:InformationURL>
+        <mdui:Logo height="101" width="150">https://edugate.heanet.ie/rr3/logos/wit.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.24602,-7.13992</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Waterford Institute of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Port Láirge</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.wit.ie/about_wit</mdui:InformationURL>
-          <mdui:Logo height="101" width="150">https://edugate.heanet.ie/rr3/logos/wit.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.24602,-7.13992</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAP8av6UsfKq9co3H42qLy3deHv3LMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC53aXQuaWUwHhcNMDkxMDE0MTQwMTA1WhcNMjkx
 MDE0MTQwMTA1WjAVMRMwEQYDVQQDEwppZHAud2l0LmllMIIBIjANBgkqhkiG9w0B
@@ -38,38 +38,38 @@ xNsj+b7mIOWYzHeBZaNA4RMlPOb+e6AVp486SM7Un99Q01M0YKKCywrSCfhgxc9l
 ayulS2yPVLivhbaHyblQHkuxzZHevAs/NRztnJDJJ/V+puOejSvO+0WyvA1YUzTJ
 ect1+KwnR20CjNdGxfXwubzEODFApQ2J
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wit.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wit.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wit.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Waterford Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Waterford Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wit.ie/about_wit</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Aidan</md:GivenName>
-      <md:SurName>Mc Grath</md:SurName>
-      <md:EmailAddress>mailto:amcgrath@wit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="other">
-      <md:GivenName>Pat</md:GivenName>
-      <md:SurName>Cluney</md:SurName>
-      <md:EmailAddress>mailto:pcluney@wit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Dowling</md:SurName>
-      <md:EmailAddress>mailto:tdowling@wit.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>WIT Computer Services</md:SurName>
-      <md:EmailAddress>mailto:computerservices@wit.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wit.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wit.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Waterford Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Waterford Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wit.ie/about_wit</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Aidan</md:GivenName>
+    <md:SurName>Mc Grath</md:SurName>
+    <md:EmailAddress>mailto:amcgrath@wit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="other">
+    <md:GivenName>Pat</md:GivenName>
+    <md:SurName>Cluney</md:SurName>
+    <md:EmailAddress>mailto:pcluney@wit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Dowling</md:SurName>
+    <md:EmailAddress>mailto:tdowling@wit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>WIT Computer Services</md:SurName>
+    <md:EmailAddress>mailto:computerservices@wit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wlc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.wlc.ac.uk-shibboleth.xml
index 56193301..44d43dfb 100644
--- a/swamid-interfederations-2.0/idp.wlc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wlc.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wlc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/wlc.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/wlc.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ealing, Hammersmith &amp; West London College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wlc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/wlc.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/wlc.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ealing, Hammersmith &amp; West London College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wlc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
index b3681a94..e6f9e396 100644
--- a/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wlu.ca/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-02-02T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-02-02T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
             http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
          </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlu.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wilfrid Laurier University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wilfrid Laurier University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.wlu.ca</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlu.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Wilfrid Laurier University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Wilfrid Laurier University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.wlu.ca</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
    MIIDFDCCAfygAwIBAgIVAIo8nwS0vH0WHPEf+uRwLXdgoY/+MA0GCSqGSIb3DQEB
    BQUAMBUxEzARBgNVBAMTCmlkcC53bHUuY2EwHhcNMTMxMDA0MTU0MTIyWhcNMzMx
    MDA0MTU0MTIyWjAVMRMwEQYDVQQDEwppZHAud2x1LmNhMIIBIjANBgkqhkiG9w0B
@@ -38,29 +38,29 @@
    AY0HfabbLN/eDvrYsVf/iG2Iq6g8/iNLDh22ObwWqO4nBKm0lDRb5u1t3XFh5+fk
    r/qIQoaq7ukmKoJSwCKlNblw+JK0yy5j
                </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlu.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlu.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlu.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wlu.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlu.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wlu.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlu.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlu.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlu.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlu.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlu.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wlu.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlu.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wlu.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlu.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlu.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
    MIIDFDCCAfygAwIBAgIVAIo8nwS0vH0WHPEf+uRwLXdgoY/+MA0GCSqGSIb3DQEB
    BQUAMBUxEzARBgNVBAMTCmlkcC53bHUuY2EwHhcNMTMxMDA0MTU0MTIyWhcNMzMx
    MDA0MTU0MTIyWjAVMRMwEQYDVQQDEwppZHAud2x1LmNhMIIBIjANBgkqhkiG9w0B
@@ -79,21 +79,21 @@
    AY0HfabbLN/eDvrYsVf/iG2Iq6g8/iNLDh22ObwWqO4nBKm0lDRb5u1t3XFh5+fk
    r/qIQoaq7ukmKoJSwCKlNblw+JK0yy5j
                </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlu.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wilfrid Laurier University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wilfrid Laurier University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wlu.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>IDM</md:SurName>
-      <md:EmailAddress>wizards@wlu.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlu.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wilfrid Laurier University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wilfrid Laurier University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wlu.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>IDM</md:SurName>
+    <md:EmailAddress>wizards@wlu.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml
index e99ccdce..54e03c62 100644
--- a/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wm.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wm.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">College of William and Mary</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wm.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">College of William and Mary</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAMp2BzquGFXmISEolT3i+yenY4MrMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC53bS5lZHUwHhcNMTAwMzMwMTM0MTM5WhcNMzAw
 MzMwMTM0MTM5WjAVMRMwEQYDVQQDEwppZHAud20uZWR1MIIBIjANBgkqhkiG9w0B
@@ -37,23 +37,23 @@ EeZaazkU17D9zucq5RlcsDxCpPCD8nnB+59J8cpyX0GHOdiwWptZQvXx/VQpqlJT
 DX2ljKn2p2dgvW3kdPGTKp09DtjpRc8nLRqbwakIsa/Q9Ufr1emzm1RLun0hKIS8
 306VYkYFpdyAxtQI164I/aiuurKKJQxG
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wm.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wm.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wm.edu/idp/profile/Shibboleth/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wm.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wm.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wm.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wm.edu/idp/profile/Shibboleth/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wm.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAMp2BzquGFXmISEolT3i+yenY4MrMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCmlkcC53bS5lZHUwHhcNMTAwMzMwMTM0MTM5WhcNMzAw
 MzMwMTM0MTM5WjAVMRMwEQYDVQQDEwppZHAud20uZWR1MIIBIjANBgkqhkiG9w0B
@@ -72,23 +72,23 @@ EeZaazkU17D9zucq5RlcsDxCpPCD8nnB+59J8cpyX0GHOdiwWptZQvXx/VQpqlJT
 DX2ljKn2p2dgvW3kdPGTKp09DtjpRc8nLRqbwakIsa/Q9Ufr1emzm1RLun0hKIS8
 306VYkYFpdyAxtQI164I/aiuurKKJQxG
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">College of William and Mary</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">College of William and Mary</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eric Myers</md:GivenName>
-      <md:EmailAddress>emmyer@wm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Peck</md:GivenName>
-      <md:EmailAddress>chris@wm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">College of William and Mary</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">College of William and Mary</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric Myers</md:GivenName>
+    <md:EmailAddress>emmyer@wm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Peck</md:GivenName>
+    <md:EmailAddress>chris@wm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wmcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wmcollege.ac.uk-idp-shibboleth.xml
index d655f421..c6e47132 100644
--- a/swamid-interfederations-2.0/idp.wmcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wmcollege.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wmcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-16T09:51:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-16T09:51:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmcollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Working Men's College, Camden</mdui:DisplayName>
+        <mdui:Logo height="80" width="80">https://idp.wmcollege.ac.uk/idp/images/WMC_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmcollege.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Working Men's College, Camden</mdui:DisplayName>
-          <mdui:Logo height="80" width="80">https://idp.wmcollege.ac.uk/idp/images/WMC_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAPlMk/0EZ+jUnZ6V7micEwal+IFfMA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME2lkcC53bWNvbGxlZ2UuYWMudWswHhcNMTYwNTA5MTAz
 						MzE2WhcNMzYwNTA5MTAzMzE2WjAeMRwwGgYDVQQDDBNpZHAud21jb2xsZWdlLmFj
@@ -41,13 +41,13 @@
 						DFhguElgfS/eptXAofowGe7GVlivuxiTyNaevHXLjSVboBb+zgWnzE6jNJMcYe4j
 						WdFhclxNPp/gSsbu
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVANQhj2uEh6PwmLcNA3sUgzcA8dH9MA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME2lkcC53bWNvbGxlZ2UuYWMudWswHhcNMTYwNTA5MTAz
 						MzE1WhcNMzYwNTA5MTAzMzE1WjAeMRwwGgYDVQQDDBNpZHAud21jb2xsZWdlLmFj
@@ -67,13 +67,13 @@
 						9ECrMnMb8bhVHYF5Q56mQIsqXuL+iKKk+yDvgbB+79y/LZJSOKthQkKuSWsGw6Zf
 						yhLhLfU2Tw9feN1j
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAJ9xKE/j77/WvOpY3G6PPSgdmk1yMA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME2lkcC53bWNvbGxlZ2UuYWMudWswHhcNMTYwNTA5MTAz
 						MzE1WhcNMzYwNTA5MTAzMzE1WjAeMRwwGgYDVQQDDBNpZHAud21jb2xsZWdlLmFj
@@ -93,26 +93,26 @@
 						tlFmOiDN4zYCGRwGrmtGJQbCIlpxbkmSAEbuPZWsa6dlbiVq4qiKg3RIkvU1BcoM
 						sCeXDgEEeFyR02Ar
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wmcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wmcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wmcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wmcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wmcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wmcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wmcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wmcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAPlMk/0EZ+jUnZ6V7micEwal+IFfMA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME2lkcC53bWNvbGxlZ2UuYWMudWswHhcNMTYwNTA5MTAz
 						MzE2WhcNMzYwNTA5MTAzMzE2WjAeMRwwGgYDVQQDDBNpZHAud21jb2xsZWdlLmFj
@@ -132,13 +132,13 @@
 						DFhguElgfS/eptXAofowGe7GVlivuxiTyNaevHXLjSVboBb+zgWnzE6jNJMcYe4j
 						WdFhclxNPp/gSsbu
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVANQhj2uEh6PwmLcNA3sUgzcA8dH9MA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME2lkcC53bWNvbGxlZ2UuYWMudWswHhcNMTYwNTA5MTAz
 						MzE1WhcNMzYwNTA5MTAzMzE1WjAeMRwwGgYDVQQDDBNpZHAud21jb2xsZWdlLmFj
@@ -158,13 +158,13 @@
 						9ECrMnMb8bhVHYF5Q56mQIsqXuL+iKKk+yDvgbB+79y/LZJSOKthQkKuSWsGw6Zf
 						yhLhLfU2Tw9feN1j
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAJ9xKE/j77/WvOpY3G6PPSgdmk1yMA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME2lkcC53bWNvbGxlZ2UuYWMudWswHhcNMTYwNTA5MTAz
 						MzE1WhcNMzYwNTA5MTAzMzE1WjAeMRwwGgYDVQQDDBNpZHAud21jb2xsZWdlLmFj
@@ -184,24 +184,24 @@
 						tlFmOiDN4zYCGRwGrmtGJQbCIlpxbkmSAEbuPZWsa6dlbiVq4qiKg3RIkvU1BcoM
 						sCeXDgEEeFyR02Ar
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Working Men's College Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Working Men's College, Camden</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wmcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Liz</md:GivenName>
-      <md:SurName>Procter</md:SurName>
-      <md:EmailAddress>mailto:lizp@wmcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Barnes</md:SurName>
-      <md:EmailAddress>mailto:davidB@wmcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Working Men's College Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Working Men's College, Camden</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wmcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Liz</md:GivenName>
+    <md:SurName>Procter</md:SurName>
+    <md:EmailAddress>mailto:lizp@wmcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Barnes</md:SurName>
+    <md:EmailAddress>mailto:davidB@wmcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml
index b9f913c8..416af310 100644
--- a/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wmich.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.wmich.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmich.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Western Michigan University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Western Michigan University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.wmich.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.wmich.edu/it/policies/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="172" xml:lang="en">https://idp.wmich.edu/idp/images/w_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.wmich.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmich.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Western Michigan University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Western Michigan University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.wmich.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.wmich.edu/it/policies/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="172" xml:lang="en">https://idp.wmich.edu/idp/images/w_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUa4EI2jTt6ViDq1EIcA/j+LW97W4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLndtaWNoLmVkdTAeFw0xMjA4MDExOTI0NTFaFw0z
 MjA4MDExOTI0NTFaMBgxFjAUBgNVBAMTDWlkcC53bWljaC5lZHUwggEiMA0GCSqG
@@ -44,23 +44,23 @@ RchDpIDX4nMpzZpWXmOuqXNbUjb5nejgUmF8jELzsNIsnouAOqYg8n9+cgYd+2w+
 p57il9Y4UDMnswbxscZKwp32B+e5o6Mc6YrFVeVuR6zWR6+FQaDG8YFesmTDBvTv
 8Pbk+Hx1N2rqKvwenWT850/va3DwTJBeKdJGwCN2d4QNqMM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmich.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmich.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wmich.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wmich.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wmich.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmich.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmich.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmich.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wmich.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wmich.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wmich.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmich.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUa4EI2jTt6ViDq1EIcA/j+LW97W4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwLndtaWNoLmVkdTAeFw0xMjA4MDExOTI0NTFaFw0z
 MjA4MDExOTI0NTFaMBgxFjAUBgNVBAMTDWlkcC53bWljaC5lZHUwggEiMA0GCSqG
@@ -79,26 +79,26 @@ RchDpIDX4nMpzZpWXmOuqXNbUjb5nejgUmF8jELzsNIsnouAOqYg8n9+cgYd+2w+
 p57il9Y4UDMnswbxscZKwp32B+e5o6Mc6YrFVeVuR6zWR6+FQaDG8YFesmTDBvTv
 8Pbk+Hx1N2rqKvwenWT850/va3DwTJBeKdJGwCN2d4QNqMM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmich.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Western Michigan University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Western Michigan University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wmich.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>WMU OIT Shibboleth Authentication Support</md:GivenName>
-      <md:EmailAddress>oit-shibadmin@wmich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>WMU OIT Shibboleth Authentication Support</md:GivenName>
-      <md:EmailAddress>oit-shibadmin@wmich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>WMU Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@wmich.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmich.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Western Michigan University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Western Michigan University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wmich.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WMU OIT Shibboleth Authentication Support</md:GivenName>
+    <md:EmailAddress>oit-shibadmin@wmich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>WMU OIT Shibboleth Authentication Support</md:GivenName>
+    <md:EmailAddress>oit-shibadmin@wmich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>WMU Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@wmich.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml
index 63451d59..667fc791 100644
--- a/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wmin.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-09T15:50:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-09T15:50:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxTCCAq2gAwIBAgIJAKJTZR5Gg4aEMA0GCSqGSIb3DQEBCwUAMHkxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEiMCAGA1UE
 						CgwZVW5pdmVyc2l0eSBvZiBXZXN0bWluc3RlcjELMAkGA1UECwwCSVMxFzAVBgNV
@@ -35,26 +35,26 @@
 						plQT+YQoWyrQDZMfk+B9dJHcBAr7Sb57l799Hilx3PqrmUkb0JI4K+TxLLlwoGh0
 						f1W0FLEz3Y37
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.wmin.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-login.wmin.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmin.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxTCCAq2gAwIBAgIJAKJTZR5Gg4aEMA0GCSqGSIb3DQEBCwUAMHkxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEiMCAGA1UE
 						CgwZVW5pdmVyc2l0eSBvZiBXZXN0bWluc3RlcjELMAkGA1UECwwCSVMxFzAVBgNV
@@ -77,26 +77,26 @@
 						plQT+YQoWyrQDZMfk+B9dJHcBAr7Sb57l799Hilx3PqrmUkb0JI4K+TxLLlwoGh0
 						f1W0FLEz3Y37
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Westminster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Westminster</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wmin.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Cavendish IT Service</md:GivenName>
-      <md:EmailAddress>mailto:cav-its@westminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Marriott</md:SurName>
-      <md:EmailAddress>mailto:d.marriott@westminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Westminster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Westminster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wmin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cavendish IT Service</md:GivenName>
+    <md:EmailAddress>mailto:cav-its@westminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Marriott</md:SurName>
+    <md:EmailAddress>mailto:d.marriott@westminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
index 1cef3614..92619119 100644
--- a/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wnsc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-16T17:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-16T17:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnsc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnsc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAIMpdh+Ow4gohZ3+1Dc6yZ7rSiohMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMMDmlkcC53bnNjLmFjLnVrMB4XDTE0MTIwMzE0NTc0OFoX
 						DTE3MTIwMzE0NTc0OFowGTEXMBUGA1UEAwwOaWRwLnduc2MuYWMudWswggEiMA0G
@@ -31,26 +31,26 @@
 						OC0qxwHUoAnGzeOz9hT6CiCwsUEYRiTh670haNyDqdu9/5yM3a8pP1IGExh5oIB/
 						m8099KSrhD81Eb8wDHAg815UhD2LoUVwNc0zec2/HISnI2fn2osGEw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wnsc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnsc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wnsc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnsc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIVAIMpdh+Ow4gohZ3+1Dc6yZ7rSiohMA0GCSqGSIb3DQEB
 						BQUAMBkxFzAVBgNVBAMMDmlkcC53bnNjLmFjLnVrMB4XDTE0MTIwMzE0NTc0OFoX
 						DTE3MTIwMzE0NTc0OFowGTEXMBUGA1UEAwwOaWRwLnduc2MuYWMudWswggEiMA0G
@@ -69,26 +69,26 @@
 						OC0qxwHUoAnGzeOz9hT6CiCwsUEYRiTh670haNyDqdu9/5yM3a8pP1IGExh5oIB/
 						m8099KSrhD81Eb8wDHAg815UhD2LoUVwNc0zec2/HISnI2fn2osGEw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Walford and North Shropshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Walford and North Shropshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wnsc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ICT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ICTHelpdesk@wnsc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Henry</md:GivenName>
-      <md:SurName>Nurdin</md:SurName>
-      <md:EmailAddress>mailto:h.nurdin@wnsc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Walford and North Shropshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Walford and North Shropshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wnsc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ICTHelpdesk@wnsc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Henry</md:GivenName>
+    <md:SurName>Nurdin</md:SurName>
+    <md:EmailAddress>mailto:h.nurdin@wnsc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml
index 09ec96ad..d7acb561 100644
--- a/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.woking.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-26T13:59:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-26T13:59:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">woking.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">woking.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQjCCAioCCQDzQLFc3l5fVDANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MQ8wDQYDVQQHEwZXb2tpbmcxFzAVBgNVBAoTDldv
 						a2luZyBDb2xsZWdlMRkwFwYDVQQDExBpZHAud29raW5nLmFjLnVrMB4XDTEzMTEw
@@ -32,26 +32,26 @@
 						ibTP5VM86O2mOIf1QfhPQMUqud7HZfa7b7oRPSwt73xFVvbnjvSvsE5uHw2hiNAz
 						Z0EMXT53Z2x+2Euy0Y8Um48NtjrU3w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.woking.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.woking.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.woking.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.woking.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">woking.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.woking.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.woking.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.woking.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.woking.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">woking.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQjCCAioCCQDzQLFc3l5fVDANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MQ8wDQYDVQQHEwZXb2tpbmcxFzAVBgNVBAoTDldv
 						a2luZyBDb2xsZWdlMRkwFwYDVQQDExBpZHAud29raW5nLmFjLnVrMB4XDTEzMTEw
@@ -71,26 +71,26 @@
 						ibTP5VM86O2mOIf1QfhPQMUqud7HZfa7b7oRPSwt73xFVvbnjvSvsE5uHw2hiNAz
 						Z0EMXT53Z2x+2Euy0Y8Um48NtjrU3w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Woking College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Woking College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.woking.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@woking.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mohammed</md:GivenName>
-      <md:SurName>Akram</md:SurName>
-      <md:EmailAddress>mailto:mak@woking.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Woking College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Woking College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.woking.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@woking.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mohammed</md:GivenName>
+    <md:SurName>Akram</md:SurName>
+    <md:EmailAddress>mailto:mak@woking.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml
index a1e89b0b..08006288 100644
--- a/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wooster.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wooster.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The College of Wooster</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wooster.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The College of Wooster</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAI2Lui1vSO8MHNMubyKBhAnnj/14MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTAeFw0xMTExMDMxODM4NTFa
 Fw0zMTExMDMxOTM4NTFaMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTCCASIw
@@ -37,23 +37,23 @@ YQcoJn0XAszpvKzYDVxlEE0T1UrtlKDy0V9jFDnVw9UFw+5w3Ix3vBDT/TZwjyAj
 W5aggtvAOm9Z5a398jL21emZAgI3HBKcByqHpKB6Ci5rUmTQklhZ6szqU1+IM9+a
 ruOBR00Y3KW+OWjgg06N026JaWDbMENv4J8oyrehK5NqlLF/mZKGEk0UwRI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wooster.edu:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wooster.edu:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wooster.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wooster.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wooster.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wooster.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wooster.edu:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wooster.edu:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wooster.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wooster.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wooster.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wooster.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAI2Lui1vSO8MHNMubyKBhAnnj/14MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTAeFw0xMTExMDMxODM4NTFa
 Fw0zMTExMDMxOTM4NTFaMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTCCASIw
@@ -72,26 +72,26 @@ YQcoJn0XAszpvKzYDVxlEE0T1UrtlKDy0V9jFDnVw9UFw+5w3Ix3vBDT/TZwjyAj
 W5aggtvAOm9Z5a398jL21emZAgI3HBKcByqHpKB6Ci5rUmTQklhZ6szqU1+IM9+a
 ruOBR00Y3KW+OWjgg06N026JaWDbMENv4J8oyrehK5NqlLF/mZKGEk0UwRI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wooster.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The College of Wooster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The College of Wooster</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wooster.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vince DiScipio</md:GivenName>
-      <md:EmailAddress>vdiscipio@wooster.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roger Dills</md:GivenName>
-      <md:EmailAddress>rdills@wooster.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael Naylor</md:GivenName>
-      <md:EmailAddress>mnaylor@wooster.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wooster.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The College of Wooster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The College of Wooster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wooster.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vince DiScipio</md:GivenName>
+    <md:EmailAddress>vdiscipio@wooster.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roger Dills</md:GivenName>
+    <md:EmailAddress>rdills@wooster.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael Naylor</md:GivenName>
+    <md:EmailAddress>mnaylor@wooster.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml
index fbbb5140..69f5f3a1 100644
--- a/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.worc.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-14T17:53:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-14T17:53:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">worc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">worc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDlzCCAn+gAwIBAgIJAM9gbhSqyROWMA0GCSqGSIb3DQEBBQUAMDsxIDAeBgNV
 						BAoTF1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5h
 						Yy51azAeFw0xMTA3MDYxMDQ4MTdaFw0yMTA3MDMxMDQ4MTdaMDsxIDAeBgNVBAoT
@@ -34,13 +34,13 @@
 						JPIj5C1aB1XqXb/f875iu38rBNg0ZEsqKP4SnX5e5nlpQk4KCdkj34RGeCctzEGF
 						FqqTiJna2FaWzV0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDlzCCAn+gAwIBAgIJAM9gbhSqyROWMA0GCSqGSIb3DQEBBQUAMDsxIDAeBgNV
 						BAoTF1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5h
 						Yy51azAeFw0xMTA3MDYxMDQ4MTdaFw0yMTA3MDMxMDQ4MTdaMDsxIDAeBgNVBAoT
@@ -62,25 +62,25 @@
 						JPIj5C1aB1XqXb/f875iu38rBNg0ZEsqKP4SnX5e5nlpQk4KCdkj34RGeCctzEGF
 						FqqTiJna2FaWzV0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.worc.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.worc.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Worcester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Worcester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.worcester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Judy</md:GivenName>
-      <md:SurName>Reed</md:SurName>
-      <md:EmailAddress>mailto:j.reed@worc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ged</md:GivenName>
-      <md:SurName>Attwood</md:SurName>
-      <md:EmailAddress>mailto:g.attwood@worc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.worc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.worc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Worcester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Worcester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worcester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Judy</md:GivenName>
+    <md:SurName>Reed</md:SurName>
+    <md:EmailAddress>mailto:j.reed@worc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ged</md:GivenName>
+    <md:SurName>Attwood</md:SurName>
+    <md:EmailAddress>mailto:g.attwood@worc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml
index 67887336..95d36ae2 100644
--- a/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wortech.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T15:44:57Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T15:44:57Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wortech.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wortech.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUVyuETbzgv93czUmf4A085Hv5gp0wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVrMB4XDTEyMDMyMzE0NDU1
 						M1oXDTMyMDMyMzE0NDU1M1owHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVr
@@ -30,26 +30,26 @@
 						vMgWcHDE/JL/TU1/E8l0OtwcrU4pNPVvcm5ibuX3ADUHT+ZO10elrc8pCMJCFuME
 						cu2/4uSuxQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.wortech.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wortech.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.wortech.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wortech.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUVyuETbzgv93czUmf4A085Hv5gp0wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVrMB4XDTEyMDMyMzE0NDU1
 						M1oXDTMyMDMyMzE0NDU1M1owHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVr
@@ -69,25 +69,25 @@
 						vMgWcHDE/JL/TU1/E8l0OtwcrU4pNPVvcm5ibuX3ADUHT+ZO10elrc8pCMJCFuME
 						cu2/4uSuxQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Worcester College of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:itservices@wortech.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:itservices@wortech.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Heart of Worcestershire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Worcester College of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:itservices@wortech.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:itservices@wortech.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml
index 5a53f6d6..0d9efb42 100644
--- a/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wpi.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpi.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Worcester Polytechnic Institute</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.wpi.edu</mdui:InformationURL>
+        <mdui:Logo height="60" width="489" xml:lang="en">https://www.wpi.edu/Images/template/wpilogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpi.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Worcester Polytechnic Institute</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.wpi.edu</mdui:InformationURL>
-          <mdui:Logo height="60" width="489" xml:lang="en">https://www.wpi.edu/Images/template/wpilogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUZcDEUesMNCAxqzW1X3lCXV3BW40wDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLndwaS5lZHUwHhcNMTEwMzA0MTgyOTIwWhcNMzEw
 MzA0MTgyOTIwWjAWMRQwEgYDVQQDEwtpZHAud3BpLmVkdTCCASIwDQYJKoZIhvcN
@@ -39,23 +39,23 @@ WxgWsGCPSXCPTg+lGT7Hd8FID6VpnOWMrKQkdPga8xDre2YUmiIVMS9FEaSZL+Tj
 oE+cFFxg0TXajhapymP2fMY1bGHiM0wThqXsaeB2MctDByiX1Cl3qPwMtBUEEI1w
 JJHUiO7JFs58BFW6Cbx0vbt8hmKGvdpkMBea
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wpi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wpi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wpi.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wpi.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wpi.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpi.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wpi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wpi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wpi.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wpi.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wpi.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpi.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUZcDEUesMNCAxqzW1X3lCXV3BW40wDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLndwaS5lZHUwHhcNMTEwMzA0MTgyOTIwWhcNMzEw
 MzA0MTgyOTIwWjAWMRQwEgYDVQQDEwtpZHAud3BpLmVkdTCCASIwDQYJKoZIhvcN
@@ -74,27 +74,27 @@ WxgWsGCPSXCPTg+lGT7Hd8FID6VpnOWMrKQkdPga8xDre2YUmiIVMS9FEaSZL+Tj
 oE+cFFxg0TXajhapymP2fMY1bGHiM0wThqXsaeB2MctDByiX1Cl3qPwMtBUEEI1w
 JJHUiO7JFs58BFW6Cbx0vbt8hmKGvdpkMBea
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wpi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wpi.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Worcester Polytechnic Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Worcester Polytechnic Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wpi.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jesse Banning</md:GivenName>
-      <md:EmailAddress>jbanning@wpi.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Allan E. Johannesen</md:GivenName>
-      <md:EmailAddress>aej@wpi.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>WPI Computer Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@wpi.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wpi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wpi.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Worcester Polytechnic Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Worcester Polytechnic Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wpi.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jesse Banning</md:GivenName>
+    <md:EmailAddress>jbanning@wpi.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Allan E. Johannesen</md:GivenName>
+    <md:EmailAddress>aej@wpi.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>WPI Computer Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@wpi.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml
index 2ed182a8..a9baa86e 100644
--- a/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wpunj.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpunj.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">William Paterson University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpunj.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">William Paterson University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBTCCAe2gAwIBAgIJAI4YC5Npo9L0MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMMDmlkcDAud3B1bmouZWR1MB4XDTEzMDYxMjEyMzgzNVoXDTMzMDYwNzEyMzgz
 NVowGTEXMBUGA1UEAwwOaWRwMC53cHVuai5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -37,23 +37,23 @@ VW8P1xkXWl3TgwOQtxQ3ek17NFG63fRTeBddS2K3m9fK5tVF+ivD6Juu2Li/Oqx5
 dzSXh+7VKhTHWQ0+Oax0YOEOtSCceQ3A+/cR+2MRKIKaTekRMVq3lOvgdaVlBtg0
 KZbNrgCaX2SV
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp0.wpunj.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp0.wpunj.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp0.wpunj.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpunj.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp0.wpunj.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp0.wpunj.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp0.wpunj.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpunj.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBTCCAe2gAwIBAgIJAI4YC5Npo9L0MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMMDmlkcDAud3B1bmouZWR1MB4XDTEzMDYxMjEyMzgzNVoXDTMzMDYwNzEyMzgz
 NVowGTEXMBUGA1UEAwwOaWRwMC53cHVuai5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -72,26 +72,26 @@ VW8P1xkXWl3TgwOQtxQ3ek17NFG63fRTeBddS2K3m9fK5tVF+ivD6Juu2Li/Oqx5
 dzSXh+7VKhTHWQ0+Oax0YOEOtSCceQ3A+/cR+2MRKIKaTekRMVq3lOvgdaVlBtg0
 KZbNrgCaX2SV
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">William Paterson University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">William Paterson University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wpunj.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Administrative Support</md:GivenName>
-      <md:EmailAddress>shibb_admin@wpunj.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>shibb_tech@wpunj.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>shibb_help@wpunj.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">William Paterson University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">William Paterson University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wpunj.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Administrative Support</md:GivenName>
+    <md:EmailAddress>shibb_admin@wpunj.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>shibb_tech@wpunj.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>shibb_help@wpunj.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.writtle.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.writtle.ac.uk-shibboleth.xml
index 118f67e4..c84f1d6a 100644
--- a/swamid-interfederations-2.0/idp.writtle.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.writtle.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.writtle.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">writtle.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">writtle.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/writtle.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/writtle.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Writtle College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.writtle.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/writtle.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/writtle.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Writtle College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.writtle.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml
index 041d953f..d3656a71 100644
--- a/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wsc.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-03T13:42:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-03T13:42:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIIT/U/+SViUwMwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
 						CgwUV2VzdCBTdWZmb2xrIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC53c2MuYWMudWsw
 						HhcNMTQwNjAzMTA1NzU5WhcNMjQwNjAzMTA1NzU5WjA3MR0wGwYDVQQKDBRXZXN0
@@ -32,13 +32,13 @@
 						CxXg/y0uia+nbOUPSjtUga9eBCtbxYTOqOGEDufxghpzG+C9DdNVEcOq0bN55wNO
 						HCB9qJyYG8vRlb91n4dVL0q3muQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIIT/U/+SViUwMwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
 						CgwUV2VzdCBTdWZmb2xrIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC53c2MuYWMudWsw
 						HhcNMTQwNjAzMTA1NzU5WhcNMjQwNjAzMTA1NzU5WjA3MR0wGwYDVQQKDBRXZXN0
@@ -58,24 +58,24 @@
 						CxXg/y0uia+nbOUPSjtUga9eBCtbxYTOqOGEDufxghpzG+C9DdNVEcOq0bN55wNO
 						HCB9qJyYG8vRlb91n4dVL0q3muQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wsc.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wsc.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Suffolk College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Suffolk College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wsc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:library.helpdesk@wsc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>White</md:SurName>
-      <md:EmailAddress>mailto:softwarereg@wsc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wsc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wsc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Suffolk College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Suffolk College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wsc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:library.helpdesk@wsc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>White</md:SurName>
+    <md:EmailAddress>mailto:softwarereg@wsc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml
index 09ad1fcd..a975877f 100644
--- a/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wvu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://myid.wvu.edu/shibboleth.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wvu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">West Virginia University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">WVU MyID credential system.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://myid.wvu.edu/shibboleth.html</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://myid.wvu.edu/shibboleth.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wvu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">West Virginia University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">WVU MyID credential system.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://myid.wvu.edu/shibboleth.html</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUHaTaH4T8uSERh/L40p5usF6rssEwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnd2dS5lZHUwHhcNMTQwMjI4MTYzODQwWhcNMzQw
 MjI4MTYzODQwWjAWMRQwEgYDVQQDEwtpZHAud3Z1LmVkdTCCASIwDQYJKoZIhvcN
@@ -42,23 +42,23 @@ cqWpsClvZ6FryowP4RB+fHWsjWURCYMZtPDFDxXDWwkyGHc9SfxNa+bwoWF2M1lK
 NylxsKvHGHIUZMFlicTTxWpQCXT1AnyXP/YXQd0/mT0jN+ctYadWX4kz3B1t5/yW
 xBGKb4ax75uO0493e/TJEz4dq2uU4+HXaijS
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wvu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wvu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wvu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wvu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wvu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wvu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wvu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wvu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wvu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wvu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wvu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wvu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUHaTaH4T8uSERh/L40p5usF6rssEwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwLnd2dS5lZHUwHhcNMTQwMjI4MTYzODQwWhcNMzQw
 MjI4MTYzODQwWjAWMRQwEgYDVQQDEwtpZHAud3Z1LmVkdTCCASIwDQYJKoZIhvcN
@@ -77,30 +77,30 @@ cqWpsClvZ6FryowP4RB+fHWsjWURCYMZtPDFDxXDWwkyGHc9SfxNa+bwoWF2M1lK
 NylxsKvHGHIUZMFlicTTxWpQCXT1AnyXP/YXQd0/mT0jN+ctYadWX4kz3B1t5/yW
 xBGKb4ax75uO0493e/TJEz4dq2uU4+HXaijS
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wvu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Virginia University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Virginia University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wvu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christopher Boyer</md:GivenName>
-      <md:EmailAddress>ckboyer@mail.wvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sara Bishop</md:GivenName>
-      <md:EmailAddress>sabishop@mail.wvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christopher Boyer</md:GivenName>
-      <md:EmailAddress>ckboyer@mail.wvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Alex Jalso</md:GivenName>
-      <md:EmailAddress>acjalso@mail.wvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wvu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Virginia University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Virginia University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wvu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher Boyer</md:GivenName>
+    <md:EmailAddress>ckboyer@mail.wvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sara Bishop</md:GivenName>
+    <md:EmailAddress>sabishop@mail.wvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christopher Boyer</md:GivenName>
+    <md:EmailAddress>ckboyer@mail.wvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Alex Jalso</md:GivenName>
+    <md:EmailAddress>acjalso@mail.wvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml
index 8cd55b9c..6d2e76fb 100644
--- a/swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.xaverian.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xaverian.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xaverian.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/xaverian.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/xaverian.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Xaverian College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.xaverian.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/xaverian.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/xaverian.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Xaverian College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.xaverian.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml
index 3f94ba66..309fc2d0 100644
--- a/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.yeovil.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-05T11:25:44Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-05T11:25:44Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yeovil.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yeovil.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUc+MFJHCvsiXTJD9AbAGFOho/nyQwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRaWRwMi55ZW92aWwuYWMudWswHhcNMTIxMDA0MTYxNTQy
 						WhcNMzIxMDA0MTYxNTQyWjAcMRowGAYDVQQDExFpZHAyLnllb3ZpbC5hYy51azCC
@@ -30,26 +30,26 @@
 						SctLza4RkP6ubwWg7hVn8Qy7IEaDcvgpq1vVeRcOdo/TxQeWnASMZGbpVa9ik5Nn
 						KFgn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.yeovil.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yeovil.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.yeovil.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yeovil.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUc+MFJHCvsiXTJD9AbAGFOho/nyQwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRaWRwMi55ZW92aWwuYWMudWswHhcNMTIxMDA0MTYxNTQy
 						WhcNMzIxMDA0MTYxNTQyWjAcMRowGAYDVQQDExFpZHAyLnllb3ZpbC5hYy51azCC
@@ -69,27 +69,27 @@
 						SctLza4RkP6ubwWg7hVn8Qy7IEaDcvgpq1vVeRcOdo/TxQeWnASMZGbpVa9ik5Nn
 						KFgn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Yeovil College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Yeovil College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.yeovil.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Cullen</md:SurName>
-      <md:EmailAddress>mailto:Craig.Cullen@yeovil.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Cullen</md:SurName>
-      <md:EmailAddress>mailto:Craig.Cullen@yeovil.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Yeovil College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Yeovil College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.yeovil.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Cullen</md:SurName>
+    <md:EmailAddress>mailto:Craig.Cullen@yeovil.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Cullen</md:SurName>
+    <md:EmailAddress>mailto:Craig.Cullen@yeovil.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml
index 3b81a0b0..df6fa10f 100644
--- a/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.yorkcollege.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-12T16:32:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-12T16:32:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yorkcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yorkcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANXRdn2uq2aNgUyIN3af5+JhI22qMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVnZS5hYy51azAeFw0xNDA3MjIx
 						MjU3MDVaFw0zNDA3MjIxMjU3MDVaMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVn
@@ -32,29 +32,29 @@
 						U+QmvDADLGZ7a7dJ8UUavfaxPiYA8eOdir52Q+eFdMEdL4CsWxjmQF+ubm0YPKQF
 						PL5wY3K8+WVnAlA7MY/oR6rJJQo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.yorkcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.yorkcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yorkcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.yorkcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.yorkcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yorkcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANXRdn2uq2aNgUyIN3af5+JhI22qMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVnZS5hYy51azAeFw0xNDA3MjIx
 						MjU3MDVaFw0zNDA3MjIxMjU3MDVaMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVn
@@ -74,27 +74,27 @@
 						U+QmvDADLGZ7a7dJ8UUavfaxPiYA8eOdir52Q+eFdMEdL4CsWxjmQF+ubm0YPKQF
 						PL5wY3K8+WVnAlA7MY/oR6rJJQo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">York College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">York College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.yorkcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Azhar</md:GivenName>
-      <md:SurName>Iqbal</md:SurName>
-      <md:EmailAddress>mailto:aiqbal@yorkcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Azhar</md:GivenName>
-      <md:SurName>Iqbal</md:SurName>
-      <md:EmailAddress>mailto:aiqbal@yorkcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">York College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">York College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.yorkcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Azhar</md:GivenName>
+    <md:SurName>Iqbal</md:SurName>
+    <md:EmailAddress>mailto:aiqbal@yorkcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Azhar</md:GivenName>
+    <md:SurName>Iqbal</md:SurName>
+    <md:EmailAddress>mailto:aiqbal@yorkcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml
index 54872bdb..8500214f 100644
--- a/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml
+++ b/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.yorksj.ac.uk/oala">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-16T09:00:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-16T09:00:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yorksj.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yorksj.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIIC/BGdv33SfYwDQYJKoZIhvcNAQEFBQAwPTEgMB4GA1UE
 						CgwXWW9yayBTdCBKb2huIFVuaXZlcnNpdHkxGTAXBgNVBAMMEGlkcC55b3Jrc2ou
 						YWMudWswHhcNMTQwNTA3MTEyMzUyWhcNMjQwNTA3MTEyMzUyWjA9MSAwHgYDVQQK
@@ -32,13 +32,13 @@
 						qFesPgoUZjD0AHqvtwrs2SlC6Etkfz3O/42U4C0rb0NXEP11Hkrlvlk7GVXY/4w3
 						m8Ur8u4zqlfwsQpCaQSXMb3xNMZKyXm5bdoMQZWg5eI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIIC/BGdv33SfYwDQYJKoZIhvcNAQEFBQAwPTEgMB4GA1UE
 						CgwXWW9yayBTdCBKb2huIFVuaXZlcnNpdHkxGTAXBgNVBAMMEGlkcC55b3Jrc2ou
 						YWMudWswHhcNMTQwNTA3MTEyMzUyWhcNMjQwNTA3MTEyMzUyWjA9MSAwHgYDVQQK
@@ -58,25 +58,25 @@
 						qFesPgoUZjD0AHqvtwrs2SlC6Etkfz3O/42U4C0rb0NXEP11Hkrlvlk7GVXY/4w3
 						m8Ur8u4zqlfwsQpCaQSXMb3xNMZKyXm5bdoMQZWg5eI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.yorksj.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.yorksj.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">York St John University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">York St John University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.yorksj.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marcus</md:GivenName>
-      <md:SurName>Green</md:SurName>
-      <md:EmailAddress>mailto:m.green1@yorksj.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Patterson</md:SurName>
-      <md:EmailAddress>mailto:s.patterson@yorksj.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.yorksj.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.yorksj.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">York St John University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">York St John University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.yorksj.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marcus</md:GivenName>
+    <md:SurName>Green</md:SurName>
+    <md:EmailAddress>mailto:m.green1@yorksj.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Patterson</md:SurName>
+    <md:EmailAddress>mailto:s.patterson@yorksj.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
index 21583f15..ede41428 100644
--- a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
+++ b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.zid.tuwien.ac.at/saml2">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuwien.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Technische Universität Wien</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vienna University of Technology</mdui:DisplayName>
+        <mdui:Logo width="95" height="92">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://www.tuwien.ac.at/fileadmin/tuw/main/images/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuwien.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Technische Universität Wien</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Vienna University of Technology</mdui:DisplayName>
-          <mdui:Logo width="95" height="92">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://www.tuwien.ac.at/fileadmin/tuw/main/images/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php" ResponseLocation="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Technische Universität Wien</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Vienna University of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Technische Universität Wien</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Vienna University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.tuwien.ac.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.tuwien.ac.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Georg</md:GivenName>
-      <md:SurName>Gollmann</md:SurName>
-      <md:EmailAddress>mailto:gollmann@zid.tuwien.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php" ResponseLocation="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Technische Universität Wien</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vienna University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität Wien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vienna University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.tuwien.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tuwien.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Georg</md:GivenName>
+    <md:SurName>Gollmann</md:SurName>
+    <md:EmailAddress>mailto:gollmann@zid.tuwien.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml
index 2003f9ef..8df66b92 100644
--- a/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp0.abertay.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-31T11:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-31T11:05:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uad.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Abertay University</mdui:DisplayName>
+        <mdui:Logo height="23" width="80">https://idp1.abertay.ac.uk/icons/colour-abertay-uni-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp1.abertay.ac.uk/icons/small/shield_16x16.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uad.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Abertay University</mdui:DisplayName>
-          <mdui:Logo height="23" width="80">https://idp1.abertay.ac.uk/icons/colour-abertay-uni-logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp1.abertay.ac.uk/icons/small/shield_16x16.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUc7OjIBg0Vhfh00MlmEXTDJVaD5kwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVrMB4XDTE0MDYyNzEwNTQz
 						M1oXDTM0MDYyNzEwNTQzM1owHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVr
@@ -37,29 +37,29 @@
 						DZWQqoz3Cs2kX3tT0BeVdPiHLZ+Vwc8Bi+WWqioz6oGI16NJYTrhWuMCG3rB7lXZ
 						kYaFXYT6DQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.abertay.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uad.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.abertay.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uad.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUc7OjIBg0Vhfh00MlmEXTDJVaD5kwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVrMB4XDTE0MDYyNzEwNTQz
 						M1oXDTM0MDYyNzEwNTQzM1owHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVr
@@ -79,26 +79,26 @@
 						DZWQqoz3Cs2kX3tT0BeVdPiHLZ+Vwc8Bi+WWqioz6oGI16NJYTrhWuMCG3rB7lXZ
 						kYaFXYT6DQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Abertay Dundee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Abertay University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:isservicedesk@abertay.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Christie</md:SurName>
-      <md:EmailAddress>mailto:ISSADTeam@abertay.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Abertay Dundee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Abertay University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:isservicedesk@abertay.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Christie</md:SurName>
+    <md:EmailAddress>mailto:ISSADTeam@abertay.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml
index d2cf3a0b..115a18cf 100644
--- a/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp0.essex.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIJAITsUwOrZ0UiMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
 						VQQGEwJHQjEOMAwGA1UECBMFRXNzZXgxEzARBgNVBAcTCkNvbGNoZXN0ZXIxHDAa
 						BgNVBAoTE1VuaXZlcnNpdHkgb2YgRXNzZXgxJTAjBgNVBAsTHEluZm9ybWF0aW9u
@@ -36,26 +36,26 @@
 						rDfLmgn2f37l6f6mhHyPGIcmzCSsjV0MYBq9awtuqAV746ZN28lWPKx39LkiO74f
 						kwWCZNtxVk+q/aU+Vrpk7mXhvFD3JBQn07Q=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.essex.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.essex.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essex.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIJAITsUwOrZ0UiMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
 						VQQGEwJHQjEOMAwGA1UECBMFRXNzZXgxEzARBgNVBAcTCkNvbGNoZXN0ZXIxHDAa
 						BgNVBAoTE1VuaXZlcnNpdHkgb2YgRXNzZXgxJTAjBgNVBAsTHEluZm9ybWF0aW9u
@@ -81,26 +81,26 @@
 						rDfLmgn2f37l6f6mhHyPGIcmzCSsjV0MYBq9awtuqAV746ZN28lWPKx39LkiO74f
 						kwWCZNtxVk+q/aU+Vrpk7mXhvFD3JBQn07Q=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Essex</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essex.ac.uk/iss/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:shibadmin@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alexis</md:GivenName>
-      <md:SurName>Wolton</md:SurName>
-      <md:EmailAddress>mailto:awolton@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Essex</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essex.ac.uk/iss/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:shibadmin@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alexis</md:GivenName>
+    <md:SurName>Wolton</md:SurName>
+    <md:EmailAddress>mailto:awolton@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
index 72020766..96ac26c0 100644
--- a/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp01.ogs.trieste.it/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-19T18:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-19T18:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
                     https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogs.trieste.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">OGS (Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for National Institute of Oceanography and Experimental Geophysics's users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per utenti dell'Istituto Nazionale di Oceanografia e di Geofisica Sperimentale</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://cesit.inogs.it/node/100</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://cesit.inogs.it/node/98</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp01.ogs.trieste.it/idp/images/logo-32x32.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp01.ogs.trieste.it/idp/images/logo-32x32.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp01.ogs.trieste.it/idp/images/logo-160x120.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp01.ogs.trieste.it/idp/images/logo-160x120.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://cesit.inogs.it/node/99</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://cesit.inogs.it/node/97</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogs.trieste.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">OGS (Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for National Institute of Oceanography and Experimental Geophysics's users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per utenti dell'Istituto Nazionale di Oceanografia e di Geofisica Sperimentale</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://cesit.inogs.it/node/100</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://cesit.inogs.it/node/98</mdui:InformationURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idp01.ogs.trieste.it/idp/images/logo-32x32.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idp01.ogs.trieste.it/idp/images/logo-32x32.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp01.ogs.trieste.it/idp/images/logo-160x120.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://idp01.ogs.trieste.it/idp/images/logo-160x120.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://cesit.inogs.it/node/99</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://cesit.inogs.it/node/97</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUWOUmLa4FhkqSqR1HxQX3JeEdVy4wDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwMDEub2dzLnRyaWVzdGUuaXQwHhcNMTQwNjI0MTE0
 MDA2WhcNMzQwNjI0MTE0MDA2WjAfMR0wGwYDVQQDExRpZHAwMS5vZ3MudHJpZXN0
@@ -48,29 +48,29 @@ dKeDceJjeS5urGQn65bc7Mzsk16rI5W7o0itlt/+Xpka1Dp+7U+eT/FyiLGGWdQ0
 1xesztEexwtTIxCSBsGrIM9Sy0NJ0CcGgQ8osR4cARCu+qVyouKPb0yWeRK6r0Z9
 orEGOduQPPy+HJjILGav
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.ogs.trieste.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogs.trieste.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.ogs.trieste.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogs.trieste.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUWOUmLa4FhkqSqR1HxQX3JeEdVy4wDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUaWRwMDEub2dzLnRyaWVzdGUuaXQwHhcNMTQwNjI0MTE0
 MDA2WhcNMzQwNjI0MTE0MDA2WjAfMR0wGwYDVQQDExRpZHAwMS5vZ3MudHJpZXN0
@@ -90,23 +90,23 @@ dKeDceJjeS5urGQn65bc7Mzsk16rI5W7o0itlt/+Xpka1Dp+7U+eT/FyiLGGWdQ0
 1xesztEexwtTIxCSBsGrIM9Sy0NJ0CcGgQ8osR4cARCu+qVyouKPb0yWeRK6r0Z9
 orEGOduQPPy+HJjILGav
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">OGS (Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">OGS - Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ogs.trieste.it/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.ogs.trieste.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@ogs.trieste.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">OGS (Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">OGS - Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ogs.trieste.it/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ogs.trieste.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@ogs.trieste.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml
index 0f256096..e1754e80 100644
--- a/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp01.sjsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sjsu.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.sjsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">San Jose State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sjsu.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.sjsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">San Jose State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMn9JCLBoBmGCMcPMiQh214qaACSMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcDAxLnNqc3UuZWR1MB4XDTEwMDEyOTIzNTU1OVoX
 DTMwMDEyOTIzNTU1OVowGTEXMBUGA1UEAxMOaWRwMDEuc2pzdS5lZHUwggEiMA0G
@@ -38,25 +38,25 @@ cpFlgJM0Uad00A88037gPo13fDh6kpydA2VwQbiE9JFfGOno3UlrdO9vMBiEgSCc
 hnbUY3LRoqUIGm6wfs3K6qNvpaF7cQ6WcZv3o4OlV2M/Eu8l9/Mv1EGwSOgfB1jG
 4g4nIYbPZdoTb/jPsSNwoNhTR9O/vGMzDFIUaU+zKQpFtlcylov+kA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.sjsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp01.sjsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.sjsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.sjsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sjsu.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.sjsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.sjsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp01.sjsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.sjsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.sjsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sjsu.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.sjsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMn9JCLBoBmGCMcPMiQh214qaACSMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcDAxLnNqc3UuZWR1MB4XDTEwMDEyOTIzNTU1OVoX
 DTMwMDEyOTIzNTU1OVowGTEXMBUGA1UEAxMOaWRwMDEuc2pzdS5lZHUwggEiMA0G
@@ -75,19 +75,19 @@ cpFlgJM0Uad00A88037gPo13fDh6kpydA2VwQbiE9JFfGOno3UlrdO9vMBiEgSCc
 hnbUY3LRoqUIGm6wfs3K6qNvpaF7cQ6WcZv3o4OlV2M/Eu8l9/Mv1EGwSOgfB1jG
 4g4nIYbPZdoTb/jPsSNwoNhTR9O/vGMzDFIUaU+zKQpFtlcylov+kA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">San Jose State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">San Jose State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sjsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Atul Pala</md:GivenName>
-      <md:EmailAddress>atul.pala@sjsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">San Jose State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">San Jose State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sjsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Atul Pala</md:GivenName>
+    <md:EmailAddress>atul.pala@sjsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
index d8a3f2a8..4203cab2 100644
--- a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp01.stfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-07T13:24:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-07T13:24:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
@@ -42,26 +42,26 @@
 						oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
 						ayT9vCad35E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth01.stfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth01.stfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFFDCCA/ygAwIBAgIUfvk+kIvgObeH9FlTOzyxUUtzNfEwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDMzMDEwMjEz
@@ -91,26 +91,26 @@
 						oUdCBAJx12/CTfHNdDOdr7FHk4fwcUsCvAUTL8hSwSv+fu00lpRe/UoMk26E4Xkv
 						ayT9vCad35E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science and Technology Facilities Council</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OBU Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:obuservicedesk@rl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ali</md:GivenName>
-      <md:SurName>Akkas</md:SurName>
-      <md:EmailAddress>mailto:ali.akkas@stfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science and Technology Facilities Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OBU Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:obuservicedesk@rl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ali</md:GivenName>
+    <md:SurName>Akkas</md:SurName>
+    <md:EmailAddress>mailto:ali.akkas@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
index 86b58d6e..e00c33af 100644
--- a/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp02.ifc.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifc.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifc.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFC - Instituto Federal Catarinense</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifc.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifc.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxLDAqBgNVBAoTI0lGQyAtIElu
 c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHjAcBgkq
 hkiG9w0BCQEWD2NpcnRAaWZjLmVkdS5icjERMA8GA1UEBxMIQmx1bWVuYXUxFzAV
@@ -45,26 +45,26 @@ zguX/6l7wtLQBVd/WJghECX7cLt1JzhmiKDLn/ib4/44BRf5TfVGHNmdikee7xYZ
 yywikHxhzaAW7q+tPCGAMCJWIjPX3fGDSGQIsGXSF87WTdg5S8+Eudlsh1Q/NQN3
 MbzxH0b+Clvd+lg7zzt4d6FadoYsR3FYh0A=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxLDAqBgNVBAoTI0lGQyAtIElu
 c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHjAcBgkq
@@ -90,24 +90,24 @@ MbzxH0b+Clvd+lg7zzt4d6FadoYsR3FYh0A=
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifc.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Marcos Malfatti</md:SurName>
-      <md:EmailAddress>cirt@ifc.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifc.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marcos Malfatti</md:SurName>
+    <md:EmailAddress>cirt@ifc.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
index bcc701bf..a6e66ddb 100644
--- a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp02.stfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-16T17:51:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-16T17:51:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
@@ -42,26 +42,26 @@
 						ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
 						IklcmjJ+40A=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth02.stfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth02.stfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFFDCCA/ygAwIBAgIUOysRoBktqggd9zGS+JJEfPcJmKwwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQwNTEyNDUz
@@ -91,26 +91,26 @@
 						ggRFV+FROzADdEtB2psKL+LrWhSGhRewqazW7eYB8Y9JGN1UnsE6NWyVru1LMYte
 						IklcmjJ+40A=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science and Technology Facilities Council (2nd IdP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OBU Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:obuservicedesk@rl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ali</md:GivenName>
-      <md:SurName>Akkas</md:SurName>
-      <md:EmailAddress>mailto:ali.akkas@stfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science and Technology Facilities Council (2nd IdP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OBU Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:obuservicedesk@rl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ali</md:GivenName>
+    <md:SurName>Akkas</md:SurName>
+    <md:EmailAddress>mailto:ali.akkas@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
index 541a5728..d8342b0e 100644
--- a/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.agroparistech.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-05T10:39:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-05T10:39:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agroparistech.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.agroparistech.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agroparistech.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.agroparistech.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUKhgZTCdgvmRXJo0273XOyJSmkg8wDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyMB4XDTEzMDgzMDEz
 NDkyN1oXDTMzMDgzMDEzNDkyN1owIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0
@@ -37,22 +37,22 @@ XJ041jMKaqY/J5wRPX8crb0W++gdjIxq6gt6dba9X/NEqnwaJbuhGyhDlmosm6pT
 d8gnCW33fFVFobyMfM07xTxC+ZHXM8o9NwAAdcrGG+pNrrlrcYaNcqp230IgDWAL
 mVQRneF5HAR91tSglJwptAkPKA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.agroparistech.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.agroparistech.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Hamid Aichoune</md:SurName>
-      <md:EmailAddress>hamid.aichoune@agroparistech.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.agroparistech.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.agroparistech.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hamid Aichoune</md:SurName>
+    <md:EmailAddress>hamid.aichoune@agroparistech.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.bcot.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.bcot.ac.uk-idp-shibboleth.xml
index 88e55901..de2c5e66 100644
--- a/swamid-interfederations-2.0/idp1.bcot.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.bcot.ac.uk-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.bcot.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-13T13:47:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-13T13:47:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcot.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BCoT IDP Test (IDP1)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test Shibboleth IDP Configuration</mdui:Description>
+        <mdui:Logo height="60" width="80">https://applications.bcot.ac.uk/bcotlogo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.bcot.ac.uk/about/privacy-and-cookies/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:51.2636667,-1.0964444444444443</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcot.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">BCoT IDP Test (IDP1)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test Shibboleth IDP Configuration</mdui:Description>
-          <mdui:Logo height="60" width="80">https://applications.bcot.ac.uk/bcotlogo.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.bcot.ac.uk/about/privacy-and-cookies/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:51.2636667,-1.0964444444444443</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUUDML1pjWEByrBFAOjOtsnMCBUDswDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMB4XDTE2MDQwNDEzNTkzNloX
 						DTM2MDQwNDEzNTkzNlowGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMIIBIjAN
@@ -45,13 +45,13 @@
 						tSMdqNL/Zw9EbucCvN5aKDbihTeWDi9VkQP4yH3yphYlDWvFSZE3SbOUle8WndOu
 						Yrbbw5mBo9qVR9/zjATVltvneYPnFLufRWn6jkKsNJPGF4Em3wxsfCBfQQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAJt/OwkZjzZRWh1D7Bfc1X/CzL3QMA0GCSqGSIb3DQEB
 						CwUAMBoxGDAWBgNVBAMMD2lkcDEuYmNvdC5hYy51azAeFw0xNjA0MDQxMzU5MzVa
 						Fw0zNjA0MDQxMzU5MzVaMBoxGDAWBgNVBAMMD2lkcDEuYmNvdC5hYy51azCCASIw
@@ -70,13 +70,13 @@
 						M6W44VPkPbkxeebJKRJI1UWlnY8gaQHW3rQC2qRaj2ChysqqRncmI14a01HEKrNC
 						LqVaOZc9nJY3fPrpL+luK9TBUR2LzeEY/NTd/kcIpOFoCkphkmCSj1tTQwk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUMzd9hi1IPAuHToiQmZM79eFDbx0wDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMB4XDTE2MDQwNDEzNTkzNVoX
 						DTM2MDQwNDEzNTkzNVowGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMIIBIjAN
@@ -95,26 +95,26 @@
 						ZntQdH4zUGOS1My+u2P6ZjTmq1qu4+iGgWsONpCZwneML4CE5TKEjiEBrSECSTNf
 						1sq8RXXpvotowaZtu6geH+J3IZer1XkPp3qC8t4/Sy9UF5LgHdF2V5pKZQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.bcot.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.bcot.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.bcot.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.bcot.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.bcot.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.bcot.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcot.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.bcot.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.bcot.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.bcot.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.bcot.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.bcot.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.bcot.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcot.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUUDML1pjWEByrBFAOjOtsnMCBUDswDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMB4XDTE2MDQwNDEzNTkzNloX
 						DTM2MDQwNDEzNTkzNlowGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMIIBIjAN
@@ -133,13 +133,13 @@
 						tSMdqNL/Zw9EbucCvN5aKDbihTeWDi9VkQP4yH3yphYlDWvFSZE3SbOUle8WndOu
 						Yrbbw5mBo9qVR9/zjATVltvneYPnFLufRWn6jkKsNJPGF4Em3wxsfCBfQQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAJt/OwkZjzZRWh1D7Bfc1X/CzL3QMA0GCSqGSIb3DQEB
 						CwUAMBoxGDAWBgNVBAMMD2lkcDEuYmNvdC5hYy51azAeFw0xNjA0MDQxMzU5MzVa
 						Fw0zNjA0MDQxMzU5MzVaMBoxGDAWBgNVBAMMD2lkcDEuYmNvdC5hYy51azCCASIw
@@ -158,13 +158,13 @@
 						M6W44VPkPbkxeebJKRJI1UWlnY8gaQHW3rQC2qRaj2ChysqqRncmI14a01HEKrNC
 						LqVaOZc9nJY3fPrpL+luK9TBUR2LzeEY/NTd/kcIpOFoCkphkmCSj1tTQwk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUMzd9hi1IPAuHToiQmZM79eFDbx0wDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMB4XDTE2MDQwNDEzNTkzNVoX
 						DTM2MDQwNDEzNTkzNVowGjEYMBYGA1UEAwwPaWRwMS5iY290LmFjLnVrMIIBIjAN
@@ -183,22 +183,22 @@
 						ZntQdH4zUGOS1My+u2P6ZjTmq1qu4+iGgWsONpCZwneML4CE5TKEjiEBrSECSTNf
 						1sq8RXXpvotowaZtu6geH+J3IZer1XkPp3qC8t4/Sy9UF5LgHdF2V5pKZQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.bcot.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Basingstoke College of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">BCoT IDP Test (IDP1)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bcot.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IdP Support</md:GivenName>
-      <md:EmailAddress>mailto:idp.Support@bcot.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IdP Support</md:GivenName>
-      <md:EmailAddress>mailto:idp.Support@bcot.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.bcot.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Basingstoke College of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BCoT IDP Test (IDP1)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bcot.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IdP Support</md:GivenName>
+    <md:EmailAddress>mailto:idp.Support@bcot.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IdP Support</md:GivenName>
+    <md:EmailAddress>mailto:idp.Support@bcot.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
index 766daaa1..38aa3a02 100644
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-aix-marseille.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T13:50:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T13:50:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Aix Marseille</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACKElEQVR42k1STWsUQRCtqp6P3ZlNNCuKCSRuNkeFaNQ9RkxQcE+KqAiCiAavQkTUgwQhguLXvzAegl5EDxH/gejBUzY3D0aISNaZ2dmd7rKmJ5ukDg1V/erVq+6HYIMADEAFYFGFF8k3/eKySR/qKAJAALZFhH5yFt37KqijItgJ6Vxj/UTHn7lXwFABaIA7VHqgAkGkUkLcbmDmksW90MkzkwgXCfoMuoLuAMQWzbtCUtEjV/MqmAZHBtIQYM6NaJgdQRdCJSifI6ljr0T3ghPKkvhahefJR7uiEELOStwVaRpLYSFbigZYAS7pFH+6VWM5C8mCNr2OMzpKA4PdH9+2ePKTDGQamIxAizXzuWiyrho5GFy7QvVhf+Z0uXkuuHzJa5x0TxwtN5t7b92kHMcFN4I2YHpABFpzp+Mdn1LjY/7sKX92unL7hjd5JJy7biXJDEA2Bish+p7Z2PCmjklbttoCw6pey1bX1Miw/rUOtTF8pcIL5BMhdxO/0XAnD3e/fnfGD7EIThI6sN+027JY9O6DYngLbXqs4xbrEqAuto4TZ6LGaYoO6T9/46Xl9NOX6ONK2fNaLi2Q3XYG3TfuYMdoqA65ewZoX5V7GUcRb/7T6781EjGXSV3NNnODFLa7R+V5J4BelnCG+Ttai6Fi1y1x/pkvdfLUWmPHfDLnkRNMoMNbXspfT3wighd1vLJtvt32lvO5/XjXFnsA7016V0emD5D4DxLK/P0UpMMMAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-aix-marseille.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Aix Marseille</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Aix Marseille</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACKElEQVR42k1STWsUQRCtqp6P3ZlNNCuKCSRuNkeFaNQ9RkxQcE+KqAiCiAavQkTUgwQhguLXvzAegl5EDxH/gejBUzY3D0aISNaZ2dmd7rKmJ5ukDg1V/erVq+6HYIMADEAFYFGFF8k3/eKySR/qKAJAALZFhH5yFt37KqijItgJ6Vxj/UTHn7lXwFABaIA7VHqgAkGkUkLcbmDmksW90MkzkwgXCfoMuoLuAMQWzbtCUtEjV/MqmAZHBtIQYM6NaJgdQRdCJSifI6ljr0T3ghPKkvhahefJR7uiEELOStwVaRpLYSFbigZYAS7pFH+6VWM5C8mCNr2OMzpKA4PdH9+2ePKTDGQamIxAizXzuWiyrho5GFy7QvVhf+Z0uXkuuHzJa5x0TxwtN5t7b92kHMcFN4I2YHpABFpzp+Mdn1LjY/7sKX92unL7hjd5JJy7biXJDEA2Bish+p7Z2PCmjklbttoCw6pey1bX1Miw/rUOtTF8pcIL5BMhdxO/0XAnD3e/fnfGD7EIThI6sN+027JY9O6DYngLbXqs4xbrEqAuto4TZ6LGaYoO6T9/46Xl9NOX6ONK2fNaLi2Q3XYG3TfuYMdoqA65ewZoX5V7GUcRb/7T6781EjGXSV3NNnODFLa7R+V5J4BelnCG+Ttai6Fi1y1x/pkvdfLUWmPHfDLnkRNMoMNbXspfT3wighd1vLJtvt32lvO5/XjXFnsA7016V0emD5D4DxLK/P0UpMMMAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-aix-marseille.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Aix Marseille</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDWDCCAkCgAwIBAgIVANHV3Yljs9HRX1MPesiB1HSIAd3wMA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMMG2lkcDEuY3JvdXMtYWl4LW1hcnNlaWxsZS5mcjAeFw0x
 NjAxMTUxMDI3MDlaFw0zNjAxMTUxMDI3MDlaMCYxJDAiBgNVBAMMG2lkcDEuY3Jv
@@ -39,13 +39,13 @@ g8WYulOyRJOhgs9LoMHQUiW1yn4yrOzu6ZDkjQbkUPvT/wkpyp/AOSdt5ROL3rNm
 iwzInVxg/z31WUgChDtRdAbqK/1eslt/HIgzAt2Bxw8wt8pOAD3nzBLtukAHAzGz
 81f3T9u6PZoh7qU++8NWgS7BuwSgpuCh3zAO9dEW011SnMeGu5RS9/OmP2I=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEgTCCA2mgAwIBAgIQMbkj1D0MR48qNrGSMyNhRzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDEyNTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowUTELMAkGA1UE
@@ -72,21 +72,21 @@ gU+UAhYM4fdvRn/vr7ri2Fj0HCjUxN+YUWEW3IBLsU5r8OWZpa1o6N+0yFhU5yXm
 HR1USJF9XaGkC+U/bCUzTt/htxLw7uH7D0p69tkpR22dp64YLM0zAYXZem3+zdbb
 y3EJNDw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-aix-marseille.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Aix Marseille</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Aix Marseille</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-aix-marseille.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi.applis@crous-aix-marseille.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-aix-marseille.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Aix Marseille</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Aix Marseille</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-aix-marseille.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi.applis@crous-aix-marseille.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
index de5798b0..bdee2070 100644
--- a/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-toulouse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-22T14:37:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-22T14:37:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.crous-toulouse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Toulouse - Etudiants</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuElEQVQoz3WST2sTURTFz3kzTVuaZjRpUxOrSNXQoiAIQsG14MqdfgfBD+DSlSh+Eb+Bol0UpJiFuHShklhjm3TSziQZXOTPvONikjrjn7t7l/u759x7H3f36piFAAJmMoydeU4TAIlUmPSDAgTP/7j17gkogcoU/wXAAMRqY6fcfO0Of4qCEpX/AdLioFVuvrUmN84tGQAwRsoCSRdJEG18tf7C2FGndm9qnbJ/zEACoEhaW3v/dLHfjFavNW4+dATBTAdLhWtnqeWTT2Hl1uHm/YXa7cueJyAMg5OwBwL4LcLdvTpEURRgcONCceHNszieLD14rsJax/c/f91Pq7iJ0aTL+co579VjfHiJzTtDv3HYmxx1u6BNj+2m/ZW8M3ZjO9h+1HZKYbcvHHB6OgKQRDIDkPqyfrdzHJJ9CASB2NKc7l5S5g6j8aRSqRoSgggwFsyc45z1vFOdDNA+8gvL+Ssbl2BICTC5Off6Vo2pU2QsBYOoddC+uF4t5PPHQTify62sFAeDKAhD/RMwYnO/1Y+i6lq5VCqOR6Nv33+0Oz5mEpIyACgJQdALgh4gkFLyRQgo2dIvHcfGvrPn81kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-toulouse.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Etudiants</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.crous-toulouse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Toulouse - Etudiants</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuElEQVQoz3WST2sTURTFz3kzTVuaZjRpUxOrSNXQoiAIQsG14MqdfgfBD+DSlSh+Eb+Bol0UpJiFuHShklhjm3TSziQZXOTPvONikjrjn7t7l/u759x7H3f36piFAAJmMoydeU4TAIlUmPSDAgTP/7j17gkogcoU/wXAAMRqY6fcfO0Of4qCEpX/AdLioFVuvrUmN84tGQAwRsoCSRdJEG18tf7C2FGndm9qnbJ/zEACoEhaW3v/dLHfjFavNW4+dATBTAdLhWtnqeWTT2Hl1uHm/YXa7cueJyAMg5OwBwL4LcLdvTpEURRgcONCceHNszieLD14rsJax/c/f91Pq7iJ0aTL+co579VjfHiJzTtDv3HYmxx1u6BNj+2m/ZW8M3ZjO9h+1HZKYbcvHHB6OgKQRDIDkPqyfrdzHJJ9CASB2NKc7l5S5g6j8aRSqRoSgggwFsyc45z1vFOdDNA+8gvL+Ssbl2BICTC5Off6Vo2pU2QsBYOoddC+uF4t5PPHQTify62sFAeDKAhD/RMwYnO/1Y+i6lq5VCqOR6Nv33+0Oz5mEpIyACgJQdALgh4gkFLyRQgo2dIvHcfGvrPn81kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-toulouse.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Etudiants</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLDCCAhSgAwIBAgIVANP/syULUNCGiJ6jMUcqvbTYvZ74MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEFNSVmlEUC5jcm91cy5sYW4wHhcNMTExMDI4MTQwMDAx
 WhcNMzExMDI4MTUwMDAxWjAbMRkwFwYDVQQDExBTUlZpRFAuY3JvdXMubGFuMIIB
@@ -37,13 +37,13 @@ AY5+hwohjB3vH2jNsQgnSLqNG23N0XP+gywXbe4DeQyQeOSXCWF1cmN2AyJcwlX4
 +9yrgYP8FwS+60ev2v26ZY7fERxUSDtlpwvuWqor0ANFpPg8HbTiTxw4UCyOyLdL
 Fm2Z0wb+tZB2P+GVyIVeS5Kk7SBtWd6iOnuhPvXdTZxSMTCnBOPDqwuSKJNzYSQL
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEWzCCA0OgAwIBAgIBBDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJmcjEO
 MAwGA1UECBMFRmFuY2UxETAPBgNVBAcTCFRvdWxvdXNlMQ4wDAYDVQQKEwVDcm91
 czEmMCQGCSqGSIb3DQEJARYXY3JvdXMtc2lAYWMtdG91bG91c2UuZnIxFDASBgNV
@@ -69,21 +69,21 @@ J8VDIxl4TLSZqOQQdl/kMZhp5FtvJW6hB5IvFXiPzUru/eSelrTiCErPWDooGVol
 xaAGmA2uF92HwcV8uKkqzq8HVzznIXjR35te/qaKm6SO31RiK6/PxM2hfPK1UeOT
 efZl8BTyGK4ETamE3ANP
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Toulouse - Etudiants</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Toulouse - Etudiants</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-toulouse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>crous-reseau@crous-toulouse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Toulouse - Etudiants</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Toulouse - Etudiants</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-toulouse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>crous-reseau@crous-toulouse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml
index 07d300e5..aacd84eb 100644
--- a/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.ens-cachan.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-21T16:09:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-21T16:09:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-cachan.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENS Cachan</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAARVBMVEUQMIyMmsbO0+dKZaWtutZzhr2cqtbv7/cxUZz///+Uos5jdbW9x96Elsb39/8YPJR7jr2lstbv8/c5VZycps5jebXGy+cL1jGdAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAXElEQVQY05VOSRKAMAiLrY7ErSrV/z9VaE96qgzbJCED+Am0AMP0BhAyNsIYrOjgS06MCTzg+sIUoY9sHWN1Au5iYVDszYNI5HyVizM4tXjblRAVsVKpqU2f/gUedDgInhEIAG4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ens-cachan.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">All ENSC members.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENS Cachan</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">L'ensemble des membres de l'ENSC</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-cachan.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENS Cachan</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAARVBMVEUQMIyMmsbO0+dKZaWtutZzhr2cqtbv7/cxUZz///+Uos5jdbW9x96Elsb39/8YPJR7jr2lstbv8/c5VZycps5jebXGy+cL1jGdAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAXElEQVQY05VOSRKAMAiLrY7ErSrV/z9VaE96qgzbJCED+Am0AMP0BhAyNsIYrOjgS06MCTzg+sIUoY9sHWN1Au5iYVDszYNI5HyVizM4tXjblRAVsVKpqU2f/gUedDgInhEIAG4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ens-cachan.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">All ENSC members.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENS Cachan</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">L'ensemble des membres de l'ENSC</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEsTCCA5mgAwIBAgIQNTxRAJU4zPU+440yj8e5sjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -48,13 +48,13 @@ Ginp7PrBbTm7WKPnh1yumqksDelkDBmPaAbxYwOYAm5+qRoYLywIpjrAtVUwp9vg
 BIlA71I9k6f+UzAIGZ/QvDamXq3dM4/sMZ94U9GPtnVntVnlrK891QxjwuBKi4HB
 LBtNF88=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEsjCCA5qgAwIBAgIRAMT2IqUsyYtK9vnPpZsCD/MwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -82,21 +82,21 @@ JsLNVMc7uTXkR85Ql/OVIvVIDNp3e2XI2mKralpB6oFqhd3wd3/+zc3UylwDDUKz
 dodlVr72BC7b/f10yHR7+ePzzwpE7+fzvqkZkkzmw5UwrS0/VojxtYao1g89mXmO
 QhLL/wj5
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.ens-cachan.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.ens-cachan.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.ens-cachan.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENS Cachan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENS Cachan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ens-cachan.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>reseau@ens-cachan.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.ens-cachan.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.ens-cachan.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.ens-cachan.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENS Cachan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENS Cachan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ens-cachan.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>reseau@ens-cachan.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml b/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml
index 4ce1eb10..36554b03 100644
--- a/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.glos.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T10:27:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T10:27:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glos.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glos.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUCsJYB48Mz3bcb/dTeJJEcFS9NPQwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMB4XDTE0MDUyNzE1NDkxMVoX
 						DTM0MDUyNzE1NDkxMVowGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMIIBIjAN
@@ -31,26 +31,26 @@
 						FSs+x2SKYUI4dR4wz7nKIybUCxR5aQ0tsryYKVf7hSw6oatKD6TGmFNJYiy0Ifq3
 						kOm6roKl1gcoqKYmFZfJVnU0H1rtoJ7XQMWtxX3rVtYhwHghbhfB03i6FA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.glos.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glos.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.glos.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glos.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUCsJYB48Mz3bcb/dTeJJEcFS9NPQwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMB4XDTE0MDUyNzE1NDkxMVoX
 						DTM0MDUyNzE1NDkxMVowGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMIIBIjAN
@@ -69,27 +69,27 @@
 						FSs+x2SKYUI4dR4wz7nKIybUCxR5aQ0tsryYKVf7hSw6oatKD6TGmFNJYiy0Ifq3
 						kOm6roKl1gcoqKYmFZfJVnU0H1rtoJ7XQMWtxX3rVtYhwHghbhfB03i6FA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Gloucestershire</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Gloucestershire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glos.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Pete</md:GivenName>
-      <md:SurName>Maller</md:SurName>
-      <md:EmailAddress>mailto:pmaller@glos.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pete</md:GivenName>
-      <md:SurName>Maller</md:SurName>
-      <md:EmailAddress>mailto:pmaller@glos.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Gloucestershire</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gloucestershire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glos.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Pete</md:GivenName>
+    <md:SurName>Maller</md:SurName>
+    <md:EmailAddress>mailto:pmaller@glos.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pete</md:GivenName>
+    <md:SurName>Maller</md:SurName>
+    <md:EmailAddress>mailto:pmaller@glos.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml
index 16441ec0..15ad6743 100644
--- a/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.glyndwr.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-06T12:40:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-06T12:40:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUW2tXeH8370JdIqiuEuyPXsvnn1IwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVrMB4XDTE0MTEwMzExNDUy
 						NVoXDTM0MTEwMzExNDUyNVowHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVr
@@ -32,29 +32,29 @@
 						zKbCkLq1ncgsZ9wbFNI20qOQIXZ13Z6bfnslalxhqc+QNsIhnUSwep11XICn+YzV
 						pBqIGwWXLw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.glyndwr.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.glyndwr.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUW2tXeH8370JdIqiuEuyPXsvnn1IwDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVrMB4XDTE0MTEwMzExNDUy
 						NVoXDTM0MTEwMzExNDUyNVowHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVr
@@ -74,27 +74,27 @@
 						zKbCkLq1ncgsZ9wbFNI20qOQIXZ13Z6bfnslalxhqc+QNsIhnUSwep11XICn+YzV
 						pBqIGwWXLw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Glyndwr University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glyndwr University (Test Do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glyndwr.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alwyn</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:a.d.williams@glyndwr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alwyn</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:a.d.williams@glyndwr.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Glyndwr University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glyndwr University (Test Do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glyndwr.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alwyn</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:a.d.williams@glyndwr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alwyn</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:a.d.williams@glyndwr.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
index da20ac7b..4b81a4ad 100644
--- a/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.hogent.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hogent.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hogent</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Hogeschool Gent</mdui:Description>
+        <mdui:Logo height="75" width="153">data:image/png;base64,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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.172.0/26</mdui:IPHint>
+        <mdui:IPHint>2001:6a8:1c60:d000::/64</mdui:IPHint>
+        <mdui:DomainHint>hogent.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.032894, 3.703396</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hogent.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hogent</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Hogeschool Gent</mdui:Description>
-          <mdui:Logo height="75" width="153">data:image/png;base64,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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.172.0/26</mdui:IPHint>
-          <mdui:IPHint>2001:6a8:1c60:d000::/64</mdui:IPHint>
-          <mdui:DomainHint>hogent.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.032894, 3.703396</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
 DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
@@ -42,29 +42,29 @@ PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
 YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
 4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hogent.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hogent.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
 DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
@@ -83,28 +83,28 @@ PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
 YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
 4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">
     Hogeschool Gent
     </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">
+    <md:OrganizationDisplayName xml:lang="en">
     Hogeschool Gent
     </md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">
+    <md:OrganizationURL xml:lang="en">
     http://www.hogent.be
     </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>helpdesk@hogent.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>helpdesk@hogent.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
index adaba957..89d77a77 100644
--- a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.inria.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-10T14:55:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-10T14:55:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inria.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABb0lEQVQoz2N8pKLOQApgIkk1Pg2cRvbSJ0/IXLrAJq9DWAObvI7wgol/Hjx+buXx6+EVZClGTD+wyevwpsb+efzs48yJhJ3EaWQvtnkJp5/7n3sPsVrOgqZaeMFERk6Od1kVX3dvIOBpuOpPPdNxqUZoYOaREOxtYOTk+DJ7KdzpbPI6zDwSELMgDAYGBoZHKuqPVNR/nr30////H4dOQLiPVNR/37zz////n2cv/fv2/f///79v3oGIMzEwMHC7BrAZ6f579+FtXjnEFLF5C1nUlBkYGJh4uP4+fsrAwPDr/BWEDX8eP/v////bzPJHKuovnIMhZv/79v3zrCUfu6dBbH5qYP91xYZHKuosDAwMzDKSDAwMTIICYvMWspnoM3Jy/P/+421C/vdzB2UuXWBgYPj3+YvksR0/9h+Fevrn4ZMMDAx8xRkMDAz/3r7/++Q5RDUDA8P/7z/+f//BLCH2vrjhTX429pjGD0hOrQCfz6gvIcTqJQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMOXQ2KsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDCUjWAXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.inria.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inria.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABb0lEQVQoz2N8pKLOQApgIkk1Pg2cRvbSJ0/IXLrAJq9DWAObvI7wgol/Hjx+buXx6+EVZClGTD+wyevwpsb+efzs48yJhJ3EaWQvtnkJp5/7n3sPsVrOgqZaeMFERk6Od1kVX3dvIOBpuOpPPdNxqUZoYOaREOxtYOTk+DJ7KdzpbPI6zDwSELMgDAYGBoZHKuqPVNR/nr30////H4dOQLiPVNR/37zz////n2cv/fv2/f///79v3oGIMzEwMHC7BrAZ6f579+FtXjnEFLF5C1nUlBkYGJh4uP4+fsrAwPDr/BWEDX8eP/v////bzPJHKuovnIMhZv/79v3zrCUfu6dBbH5qYP91xYZHKuosDAwMzDKSDAwMTIICYvMWspnoM3Jy/P/+421C/vdzB2UuXWBgYPj3+YvksR0/9h+Fevrn4ZMMDAx8xRkMDAz/3r7/++Q5RDUDA8P/7z/+f//BLCH2vrjhTX429pjGD0hOrQCfz6gvIcTqJQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMOXQ2KsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDCUjWAXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.inria.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGzCCAgOgAwIBAgIURV2xPGuF9dQa7PmIF3FCjmDqotcwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMB4XDTEzMDEwMjEyMDgwNVoXDTMz
 MDEwMjEyMDgwNVowFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMIIBIjANBgkqhkiG
@@ -37,13 +37,13 @@ j9jDk04w+X2S0gBPHndkrAFPe4KvbdVKhGQpc9eFr9WfJngSSJmUMrohKaacONH+
 8BJK7Dl2G+yI9IiUkq8OvIiV5JWYjfxv/aA0rLWtKYicBkqhsF+v1iZJloGbsWPW
 WD2nmIT/ciCuzi7ky/ay789gzNOzcBUkOx/suG84gg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIVAMvLhIH/kO4Uk4hR9sz1+w7AbaK+MA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcDEuaW5yaWEuZnIwHhcNMDkwMzI0MTcyNjQ1WhcN
 MjkwMzI0MTcyNjQ1WjAYMRYwFAYDVQQDEw1pZHAxLmlucmlhLmZyMIIBIjANBgkq
@@ -62,22 +62,22 @@ QLPSDCzmgTrwURi7GudGF8+Nmld2ksTa/GK8CAIJkhvq2JuwdPylUHdp264a/HCj
 e6mt4EwMWTyPLImuko5g1OJpv3QptusujWHHtMcNzx+t+hu0N7V5litMJ5lVnttV
 EcLaLwP/Je8J8l5lTIZobkfKNMs4Rj5PbFBXezI5MfIidTIW
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inria.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inria.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inria.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inria.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Denis Joiret</md:SurName>
-      <md:EmailAddress>denis.joiret@inria.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inria.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inria.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inria.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inria.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Denis Joiret</md:SurName>
+    <md:EmailAddress>denis.joiret@inria.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml
index d786d39c..6f5bb184 100644
--- a/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.ioe.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-20T14:43:42Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-20T14:43:42Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioe.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioe.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUMNyG7wrtkwxFGRAstVzy1ROpxGgwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwMi5pb2UuYWMudWswHhcNMTIwMjA4MTUzMjM3WhcN
 						MzIwMjA4MTUzMjM3WjAZMRcwFQYDVQQDEw5pZHAyLmlvZS5hYy51azCCASIwDQYJ
@@ -29,26 +29,26 @@
 						nireWPUNaiihBLtqAQGIGauhQ1iznkN4BAolAnxC6encTbpdeF6zb+v22vm0JXfd
 						w9lCORwIgQvhUPvXxS9oiA3XIwEAkid4j/wOQLE9plZLQx5+z78n
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.ioe.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioe.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.ioe.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioe.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUMNyG7wrtkwxFGRAstVzy1ROpxGgwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOaWRwMi5pb2UuYWMudWswHhcNMTIwMjA4MTUzMjM3WhcN
 						MzIwMjA4MTUzMjM3WjAZMRcwFQYDVQQDEw5pZHAyLmlvZS5hYy51azCCASIwDQYJ
@@ -67,27 +67,27 @@
 						nireWPUNaiihBLtqAQGIGauhQ1iznkN4BAolAnxC6encTbpdeF6zb+v22vm0JXfd
 						w9lCORwIgQvhUPvXxS9oiA3XIwEAkid4j/wOQLE9plZLQx5+z78n
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Education, University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ioe.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Yu-king</md:GivenName>
-      <md:SurName>Lau</md:SurName>
-      <md:EmailAddress>mailto:y.lau@ioe.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Yu-king</md:GivenName>
-      <md:SurName>Lau</md:SurName>
-      <md:EmailAddress>mailto:y.lau@ioe.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Education, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ioe.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Yu-king</md:GivenName>
+    <md:SurName>Lau</md:SurName>
+    <md:EmailAddress>mailto:y.lau@ioe.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yu-king</md:GivenName>
+    <md:SurName>Lau</md:SurName>
+    <md:EmailAddress>mailto:y.lau@ioe.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml
index 3eaec484..15ee57a2 100644
--- a/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.proofidcloud.co.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-29T13:42:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-29T13:42:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ProofID test Shibboleth identity provider</mdui:DisplayName>
+        <mdui:Logo height="60" width="60">https://idp1.proofidcloud.co.uk/images/proofid-60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ProofID test Shibboleth identity provider</mdui:DisplayName>
-          <mdui:Logo height="60" width="60">https://idp1.proofidcloud.co.uk/images/proofid-60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAO42NKVQT3aOFGBFVBQbZ5n2yNhCMA0GCSqGSIb3DQEB
 						BQUAMCIxIDAeBgNVBAMTF2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrMB4XDTE0MDcy
 						OTA5MjU0MVoXDTM0MDcyOTA5MjU0MVowIjEgMB4GA1UEAxMXaWRwMS5wcm9vZmlk
@@ -41,29 +41,29 @@
 						Lrh0v65OPRCnaVWpnkouhVW341rvY1cSGGOrGeG8QoQWAI/UbdZtjYicrIV7Wt3G
 						9C6qgxQNg/yFFt3Z1jhEgxkVlpktnahzL/cKSA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.proofidcloud.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.proofidcloud.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAO42NKVQT3aOFGBFVBQbZ5n2yNhCMA0GCSqGSIb3DQEB
 						BQUAMCIxIDAeBgNVBAMTF2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrMB4XDTE0MDcy
 						OTA5MjU0MVoXDTM0MDcyOTA5MjU0MVowIjEgMB4GA1UEAxMXaWRwMS5wcm9vZmlk
@@ -83,26 +83,26 @@
 						Lrh0v65OPRCnaVWpnkouhVW341rvY1cSGGOrGeG8QoQWAI/UbdZtjYicrIV7Wt3G
 						9C6qgxQNg/yFFt3Z1jhEgxkVlpktnahzL/cKSA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProofID test Shibboleth identity provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Heaney</md:SurName>
-      <md:EmailAddress>mailto:ukfed@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProofID test Shibboleth identity provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Heaney</md:SurName>
+    <md:EmailAddress>mailto:ukfed@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml
index f51e0b39..ca75eed7 100644
--- a/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.smuc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:31:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smuc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smuc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAJqsp1MrlVMLhxJsVG6wDFuqgiFCMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azAeFw0xNTA0MDExMjUxMjJa
 						Fw0zNTA0MDExMjUxMjJaMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azCCASIw
@@ -31,26 +31,26 @@
 						PEAIy1vRsmhe4GhNYWRSsTFZCUlKR4z/1QCdPNjK5Jwgej1Sm9RKT5XCwGc84f5v
 						cwicfDDt9zpSAegFE90VEroJRjtx8LMAW3HZxFXdnMmgIl7aRh9gk0SAaEM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.smuc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smuc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.smuc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smuc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAJqsp1MrlVMLhxJsVG6wDFuqgiFCMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azAeFw0xNTA0MDExMjUxMjJa
 						Fw0zNTA0MDExMjUxMjJaMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azCCASIw
@@ -69,26 +69,26 @@
 						PEAIy1vRsmhe4GhNYWRSsTFZCUlKR4z/1QCdPNjK5Jwgej1Sm9RKT5XCwGc84f5v
 						cwicfDDt9zpSAegFE90VEroJRjtx8LMAW3HZxFXdnMmgIl7aRh9gk0SAaEM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St Mary's University, Twickenham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Mary's University Twickenham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.smuc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT HelpDesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@stmarys.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Johnson</md:SurName>
-      <md:EmailAddress>mailto:chris.johnson@stmarys.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St Mary's University, Twickenham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Mary's University Twickenham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.smuc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT HelpDesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@stmarys.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Johnson</md:SurName>
+    <md:EmailAddress>mailto:chris.johnson@stmarys.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
index d9753c41..1d3608e4 100644
--- a/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.solent.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-22T14:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-22T14:40:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solent.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
 						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
@@ -32,26 +32,26 @@
 						/RF0wtwrM2dWdDlIQtm+f7yQfxrP74fx4fDWA2uetDa1RkQX7U54/Sfxx9d4UpIU
 						dBTl/A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.solent.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.solent.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solent.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
 						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
@@ -71,25 +71,25 @@
 						/RF0wtwrM2dWdDlIQtm+f7yQfxrP74fx4fDWA2uetDa1RkQX7U54/Sfxx9d4UpIU
 						dBTl/A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southampton Solent University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southampton Solent University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.solent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:federation.support@solent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:federation.tech@solent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southampton Solent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southampton Solent University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.solent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:federation.support@solent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:federation.tech@solent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml b/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml
index 4d979b19..e6d1dd14 100644
--- a/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.tees.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-24T16:04:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-24T16:04:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tees.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tees.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQD+KLySSf4wXDANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLVGVlcyBWYWxsZXkxFjAUBgNVBAcTDU1pZGRsZXNicm91Z2gx
 						GzAZBgNVBAoTElRlZXNpZGUgVW5pdmVyc2l0eTEYMBYGA1UEAxMPaWRwMS50ZWVz
@@ -33,26 +33,26 @@
 						xwwl1ip9UaWdWQC461MmnLmrd9bx+DcVHX5q5zbx4YJ3leQpV1P9HHr8fx2Qffll
 						1b2cbw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.tees.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tees.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.tees.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tees.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQD+KLySSf4wXDANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLVGVlcyBWYWxsZXkxFjAUBgNVBAcTDU1pZGRsZXNicm91Z2gx
 						GzAZBgNVBAoTElRlZXNpZGUgVW5pdmVyc2l0eTEYMBYGA1UEAxMPaWRwMS50ZWVz
@@ -73,27 +73,27 @@
 						xwwl1ip9UaWdWQC461MmnLmrd9bx+DcVHX5q5zbx4YJ3leQpV1P9HHr8fx2Qffll
 						1b2cbw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Teesside University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Teesside University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tees.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Hyland</md:SurName>
-      <md:EmailAddress>mailto:T.Hyland@tees.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Maxwell</md:SurName>
-      <md:EmailAddress>mailto:a.maxwell@tees.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Teesside University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Teesside University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tees.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Hyland</md:SurName>
+    <md:EmailAddress>mailto:T.Hyland@tees.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Maxwell</md:SurName>
+    <md:EmailAddress>mailto:a.maxwell@tees.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml
index 70be79c6..8c77a3ad 100644
--- a/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.themanchestercollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-24T14:49:32Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-24T14:49:32Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">themanchestercollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">themanchestercollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVANqzJLQBsPCEFgsQ4b4IALk9qGiiMA0GCSqGSIb3DQEB
 						BQUAMCoxKDAmBgNVBAMTH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWsw
 						HhcNMTMwMTIyMTUzNjE5WhcNMzMwMTIyMTUzNjE5WjAqMSgwJgYDVQQDEx9pZHAx
@@ -31,26 +31,26 @@
 						hawEgZ1qMsy+ujLpe3fDd0HSaUCLhV3df0xhPwuuzgoBLvnTEGkmtolNVokJ/UbL
 						J9Sk+YSY/yW1ywDO6pU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">themanchestercollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">themanchestercollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVANqzJLQBsPCEFgsQ4b4IALk9qGiiMA0GCSqGSIb3DQEB
 						BQUAMCoxKDAmBgNVBAMTH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWsw
 						HhcNMTMwMTIyMTUzNjE5WhcNMzMwMTIyMTUzNjE5WjAqMSgwJgYDVQQDEx9pZHAx
@@ -71,27 +71,27 @@
 						hawEgZ1qMsy+ujLpe3fDd0HSaUCLhV3df0xhPwuuzgoBLvnTEGkmtolNVokJ/UbL
 						J9Sk+YSY/yW1ywDO6pU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Manchester College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Manchester College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://themanchestercollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>McInnes</md:SurName>
-      <md:EmailAddress>mailto:AMcInnes@themanchestercollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Waseem</md:GivenName>
-      <md:SurName>Afzal</md:SurName>
-      <md:EmailAddress>mailto:WAfzal@themanchestercollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Manchester College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Manchester College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://themanchestercollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McInnes</md:SurName>
+    <md:EmailAddress>mailto:AMcInnes@themanchestercollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Waseem</md:GivenName>
+    <md:SurName>Afzal</md:SurName>
+    <md:EmailAddress>mailto:WAfzal@themanchestercollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml
index b06a9a27..5d8d1f75 100644
--- a/swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.turkuamk.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">turkuamk.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Åbo yrkeshögskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Turku University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Turun ammattikorkeakoulu</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.tuas.fi/en/about-us/tuas/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://www.turkuamk.fi/fi/turun-amk/esittely/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">turkuamk.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Åbo yrkeshögskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Turku University of Applied Sciences</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Turun ammattikorkeakoulu</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.tuas.fi/en/about-us/tuas/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fi">http://www.turkuamk.fi/fi/turun-amk/esittely/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEmzCCA4OgAwIBAgIRANZqNXD6/wnELqTUo3xZV5kwDQYJKoZIhvcNAQELBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmzCCA4OgAwIBAgIRANZqNXD6/wnELqTUo3xZV5kwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
 IENBIDIwHhcNMTQxMTA2MDAwMDAwWhcNMTcxMTIxMjM1OTU5WjA+MSEwHwYDVQQL
@@ -44,32 +44,32 @@ Rt/QNZAJyFYDl+CrTnYxBxF/y6IkNHQvIZGb82wuKLSZdiXq1qzqLMAq499UUBwk
 F7Mg1CgcZSQqvGWAdluOtJ+9XoLVotsK/5euhvQcsYo1AO6CWI+d+eexVIRrYkKv
 Rk0r8pW68ywkt5FlYtZ3l5FKymPri7dpJYO0Wq2gcE8IbOl4W/XENLvgS0EPuxpa
 aIV/r1hKpwPEjw86BQw8hLueNYlwlJ5GAmA+Xb8zOg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.turkuamk.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Turun ammattikorkeakoulu</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Turku University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Åbo yrkeshögskola</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Turun ammattikorkeakoulu</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Turku University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Åbo yrkeshögskola</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.turkuamk.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.turkuamk.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.turkuamk.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Miina</md:GivenName>
-      <md:SurName>Vina</md:SurName>
-      <md:EmailAddress>mailto:miina.vina@turkuamk.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help</md:GivenName>
-      <md:SurName>Desk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@turkuamk.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.turkuamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Turun ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Turku University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo yrkeshögskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Turun ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Turku University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo yrkeshögskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.turkuamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.turkuamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.turkuamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Miina</md:GivenName>
+    <md:SurName>Vina</md:SurName>
+    <md:EmailAddress>mailto:miina.vina@turkuamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help</md:GivenName>
+    <md:SurName>Desk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@turkuamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml
index a5e1b713..1c23387f 100644
--- a/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.utpa.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpa.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas-Pan American</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.utpa.edu/dit</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.utpa.edu/policies/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpa.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas-Pan American</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.utpa.edu/dit</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.utpa.edu/policies/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUdKkzW01lvdyal9wyJMIhLH5ZWwQwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwMS51dHBhLmVkdTAeFw0xMDA3MjEyMTI1MTlaFw0z
 MDA3MjEyMTI1MTlaMBgxFjAUBgNVBAMTDWlkcDEudXRwYS5lZHUwggEiMA0GCSqG
@@ -39,24 +39,24 @@ MMxVRpFaUpwJwIpNA3WID0JTeDaJ2YT9OFLgUeS/N0B2lIp5ClPktl71LJkwpv4C
 oie3XK/NlMnqzjcF/dvCwDhsSHE1a6eSOJTHeP8y49js+sV4i4wcl0Inbf+8+EOh
 DzZqtIw6JsdQP1xYSJp98NUDw6qHGVfuUGUNLW1KeKmwsio=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.utpa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.utpa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.utpa.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.utpa.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.utpa.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.utpa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpa.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.utpa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.utpa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.utpa.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.utpa.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.utpa.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.utpa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpa.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUdKkzW01lvdyal9wyJMIhLH5ZWwQwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNaWRwMS51dHBhLmVkdTAeFw0xMDA3MjEyMTI1MTlaFw0z
 MDA3MjEyMTI1MTlaMBgxFjAUBgNVBAMTDWlkcDEudXRwYS5lZHUwggEiMA0GCSqG
@@ -75,27 +75,27 @@ MMxVRpFaUpwJwIpNA3WID0JTeDaJ2YT9OFLgUeS/N0B2lIp5ClPktl71LJkwpv4C
 oie3XK/NlMnqzjcF/dvCwDhsSHE1a6eSOJTHeP8y49js+sV4i4wcl0Inbf+8+EOh
 DzZqtIw6JsdQP1xYSJp98NUDw6qHGVfuUGUNLW1KeKmwsio=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.utpa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.utpa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas-Pan American</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas-Pan American</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utpa.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Frank Zecca</md:GivenName>
-      <md:EmailAddress>zecca@utpa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jaime Nunez</md:GivenName>
-      <md:EmailAddress>jnunez@utpa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@utpa.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.utpa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.utpa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas-Pan American</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas-Pan American</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utpa.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Frank Zecca</md:GivenName>
+    <md:EmailAddress>zecca@utpa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jaime Nunez</md:GivenName>
+    <md:EmailAddress>jnunez@utpa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@utpa.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
index 0e20e0c5..f44197a2 100644
--- a/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.uwaterloo.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-19T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-19T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwaterloo.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwaterloo.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
 WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
@@ -35,34 +35,34 @@ nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
 4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
 YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
 7zvx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.uwaterloo.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwaterloo.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.uwaterloo.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwaterloo.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
 WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
@@ -80,23 +80,23 @@ nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
 4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
 YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
 7zvx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Waterloo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Waterloo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwaterloo.ca</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sean</md:GivenName>
-      <md:SurName>Mason</md:SurName>
-      <md:EmailAddress>watiam@uwaterloo.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Waterloo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Waterloo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwaterloo.ca</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sean</md:GivenName>
+    <md:SurName>Mason</md:SurName>
+    <md:EmailAddress>watiam@uwaterloo.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
index 52c7784c..f9a28057 100644
--- a/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2-1.slu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.slu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>slu.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.slu.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
-          <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>slu.se</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
 BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
 NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
@@ -49,26 +49,26 @@ EI/cBEjV7AeP1NQXVkxyj9zwY0dYzax/h6Wg+t7qvs8ORxOJdEhr1zdsxY1f+7Aa
 GH/yHRavwkRh3ICgDSty9dO7c8k5MXjnX/W+zZR1/IngJMmUKZXIoLmqwdaHPb+S
 lb1DOdXnNxi+WNQXbBjzonEZa0hFPT/ml32QpjCzh11edlGltCnQVzyLJGw/W5KT
 o04ltBnMhQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-1.slu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-1.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-1.slu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-1.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
 BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
 NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
@@ -85,36 +85,36 @@ EI/cBEjV7AeP1NQXVkxyj9zwY0dYzax/h6Wg+t7qvs8ORxOJdEhr1zdsxY1f+7Aa
 GH/yHRavwkRh3ICgDSty9dO7c8k5MXjnX/W+zZR1/IngJMmUKZXIoLmqwdaHPb+S
 lb1DOdXnNxi+WNQXbBjzonEZa0hFPT/ml32QpjCzh11edlGltCnQVzyLJGw/W5KT
 o04ltBnMhQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.slu.se/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Swedish University of Agricultural Science</md:Company>
-      <md:SurName>Bengt Norman</md:SurName>
-      <md:EmailAddress>saml-admins@slu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 90 786 81 22</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Swedish University of Agricultural Science</md:Company>
-      <md:SurName>Ivan Clegg</md:SurName>
-      <md:EmailAddress>saml-admins@slu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 70 2413737</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Swedish University of Agricultural Science</md:Company>
-      <md:SurName>IT-stöd</md:SurName>
-      <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.slu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish University of Agricultural Science</md:Company>
+    <md:SurName>Bengt Norman</md:SurName>
+    <md:EmailAddress>saml-admins@slu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90 786 81 22</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish University of Agricultural Science</md:Company>
+    <md:SurName>Ivan Clegg</md:SurName>
+    <md:EmailAddress>saml-admins@slu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 2413737</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish University of Agricultural Science</md:Company>
+    <md:SurName>IT-stöd</md:SurName>
+    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.bth.se-idp-shibboleth.xml
index de0704ba..e416697b 100644
--- a/swamid-interfederations-2.0/idp2.bth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.bth.se-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.bth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
+        <mdui:Logo height="139" width="114">https://idp2.bth.se/idp/images/logo_bth.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+        <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
+        <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-          <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-          <mdui:Logo height="139" width="114">https://idp2.bth.se/idp/images/logo_bth.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>bth.se</mdui:DomainHint>
-          <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
-          <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUAjSTOLSd0Pch+pYciElnGplug8kwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwHhcNMTYwMjE4MTE1OTI0WhcNMzYw
 MjE4MTE1OTI0WjAWMRQwEgYDVQQDDAtpZHAyLmJ0aC5zZTCCASIwDQYJKoZIhvcN
@@ -49,13 +49,13 @@ TfH2lJmH0df+CSgiQATV5DOdTQlFe7lYvzUIeACjf6vEHEeDcV36U+U9Y1/sd0y6
 1HLIAeSH9AfmfubhTXLHD8xaQG2J1BJaOKZA+HeYL7MgJV9i9x9nyiv95tkxjDgl
 GbWSba9T9esRqtkbCarn3pNZbtkvA/eL7AkD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVALFoKFMrJuieCS8dfq1gtvn345/lMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyMloXDTM2
 MDIxODExNTkyMlowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
@@ -74,13 +74,13 @@ mmDc3+0FkRtRkR2tks2K3563mjFEWoMyd8y+3Aycu53FI/NNCNcawrB8VmE+GLXN
 C6IIfksrX1+HwFx5AyCAEg3wp9xeP3+BEQciX25HSwNEOCy382O6pWQC+mFvTXVA
 NtrCdbz6qKoDHbanW9dGf/6dGg95GwTJAA1ZSA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOSVWhOajvTHRYTBeX4CXM/zZ1l+MA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyNFoXDTM2
 MDIxODExNTkyNFowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
@@ -99,25 +99,25 @@ tpjGabharxvOUuaD1FPQyXtIq49YH1KuaqpZFN+f8mjLVVVYqjvDgB+lpb2FvzoQ
 B9VY8Qllh3EWiRkI3VA8tR5RuMjFd6A8AOtoxbW2BJQM4rn9Ma2Su2nOD23s7w/H
 KWto/xyUQbv82gswLTMa9y869J9X9IcMEYjVxg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.bth.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.bth.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.bth.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.bth.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.bth.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUAjSTOLSd0Pch+pYciElnGplug8kwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwHhcNMTYwMjE4MTE1OTI0WhcNMzYw
 MjE4MTE1OTI0WjAWMRQwEgYDVQQDDAtpZHAyLmJ0aC5zZTCCASIwDQYJKoZIhvcN
@@ -136,13 +136,13 @@ TfH2lJmH0df+CSgiQATV5DOdTQlFe7lYvzUIeACjf6vEHEeDcV36U+U9Y1/sd0y6
 1HLIAeSH9AfmfubhTXLHD8xaQG2J1BJaOKZA+HeYL7MgJV9i9x9nyiv95tkxjDgl
 GbWSba9T9esRqtkbCarn3pNZbtkvA/eL7AkD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVALFoKFMrJuieCS8dfq1gtvn345/lMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyMloXDTM2
 MDIxODExNTkyMlowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
@@ -161,13 +161,13 @@ mmDc3+0FkRtRkR2tks2K3563mjFEWoMyd8y+3Aycu53FI/NNCNcawrB8VmE+GLXN
 C6IIfksrX1+HwFx5AyCAEg3wp9xeP3+BEQciX25HSwNEOCy382O6pWQC+mFvTXVA
 NtrCdbz6qKoDHbanW9dGf/6dGg95GwTJAA1ZSA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOSVWhOajvTHRYTBeX4CXM/zZ1l+MA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2lkcDIuYnRoLnNlMB4XDTE2MDIxODExNTkyNFoXDTM2
 MDIxODExNTkyNFowFjEUMBIGA1UEAwwLaWRwMi5idGguc2UwggEiMA0GCSqGSIb3
@@ -186,33 +186,33 @@ tpjGabharxvOUuaD1FPQyXtIq49YH1KuaqpZFN+f8mjLVVVYqjvDgB+lpb2FvzoQ
 B9VY8Qllh3EWiRkI3VA8tR5RuMjFd6A8AOtoxbW2BJQM4rn9Ma2Su2nOD23s7w/H
 KWto/xyUQbv82gswLTMa9y869J9X9IcMEYjVxg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Blekinge Institute of Technology</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Blekinge Institute of Technology</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Blekinge Institute of Technology</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Blekinge Institute of Technology</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Blekinge Institute of Technology</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Blekinge Institute of Technology</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
index 87d1080d..cae876bb 100644
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.civ.cvut.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:10:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:10:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvut.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CTU in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cvut.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.cvut.cz/cs</mdui:InformationURL>
+        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvut.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for CTU in Prague</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro ČVUT v Praze</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.cvut.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.cvut.cz/cs</mdui:InformationURL>
-          <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFSDCCBDCgAwIBAgIQBXyYdVS7UxZI1dayu2ZXbDANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -61,27 +61,27 @@ V9zEp+fa293vqzGiIWE+Jk982d31nGCZR1WdrPcjGd2s3oEPc09v+pn5TTdHEeo+
 ANYmEJCunBeqEsRfmPxWNVpqZB+YKKqbDRGVQpSJUN8ck7lFolqJBnncLaNXBJP3
 EL3PvAXtdbMpcuHB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.civ.cvut.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvut.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.civ.cvut.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cvut.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFSDCCBDCgAwIBAgIQBXyYdVS7UxZI1dayu2ZXbDANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -112,26 +112,26 @@ V9zEp+fa293vqzGiIWE+Jk982d31nGCZR1WdrPcjGd2s3oEPc09v+pn5TTdHEeo+
 ANYmEJCunBeqEsRfmPxWNVpqZB+YKKqbDRGVQpSJUN8ck7lFolqJBnncLaNXBJP3
 EL3PvAXtdbMpcuHB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">ČVUT</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CTU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.cvut.cz/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Strupl</md:SurName>
-      <md:EmailAddress>strupl@vc.cvut.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">ČVUT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CTU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.cvut.cz/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Strupl</md:SurName>
+    <md:EmailAddress>strupl@vc.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
index 6791a39e..071411d4 100644
--- a/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.crous-toulouse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T14:57:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T14:57:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-toulouse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Toulouse - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuElEQVQoz3WST2sTURTFz3kzTVuaZjRpUxOrSNXQoiAIQsG14MqdfgfBD+DSlSh+Eb+Bol0UpJiFuHShklhjm3TSziQZXOTPvONikjrjn7t7l/u759x7H3f36piFAAJmMoydeU4TAIlUmPSDAgTP/7j17gkogcoU/wXAAMRqY6fcfO0Of4qCEpX/AdLioFVuvrUmN84tGQAwRsoCSRdJEG18tf7C2FGndm9qnbJ/zEACoEhaW3v/dLHfjFavNW4+dATBTAdLhWtnqeWTT2Hl1uHm/YXa7cueJyAMg5OwBwL4LcLdvTpEURRgcONCceHNszieLD14rsJax/c/f91Pq7iJ0aTL+co579VjfHiJzTtDv3HYmxx1u6BNj+2m/ZW8M3ZjO9h+1HZKYbcvHHB6OgKQRDIDkPqyfrdzHJJ9CASB2NKc7l5S5g6j8aRSqRoSgggwFsyc45z1vFOdDNA+8gvL+Ssbl2BICTC5Off6Vo2pU2QsBYOoddC+uF4t5PPHQTify62sFAeDKAhD/RMwYnO/1Y+i6lq5VCqOR6Nv33+0Oz5mEpIyACgJQdALgh4gkFLyRQgo2dIvHcfGvrPn81kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-toulouse.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-toulouse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Toulouse - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuElEQVQoz3WST2sTURTFz3kzTVuaZjRpUxOrSNXQoiAIQsG14MqdfgfBD+DSlSh+Eb+Bol0UpJiFuHShklhjm3TSziQZXOTPvONikjrjn7t7l/u759x7H3f36piFAAJmMoydeU4TAIlUmPSDAgTP/7j17gkogcoU/wXAAMRqY6fcfO0Of4qCEpX/AdLioFVuvrUmN84tGQAwRsoCSRdJEG18tf7C2FGndm9qnbJ/zEACoEhaW3v/dLHfjFavNW4+dATBTAdLhWtnqeWTT2Hl1uHm/YXa7cueJyAMg5OwBwL4LcLdvTpEURRgcONCceHNszieLD14rsJax/c/f91Pq7iJ0aTL+co579VjfHiJzTtDv3HYmxx1u6BNj+2m/ZW8M3ZjO9h+1HZKYbcvHHB6OgKQRDIDkPqyfrdzHJJ9CASB2NKc7l5S5g6j8aRSqRoSgggwFsyc45z1vFOdDNA+8gvL+Ssbl2BICTC5Off6Vo2pU2QsBYOoddC+uF4t5PPHQTify62sFAeDKAhD/RMwYnO/1Y+i6lq5VCqOR6Nv33+0Oz5mEpIyACgJQdALgh4gkFLyRQgo2dIvHcfGvrPn81kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-toulouse.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEjzCCA3egAwIBAgIRAME/UgvFzamIAmhGwIYeY9owDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzAxMTEwMDAwMDBaFw0xNjAxMTEyMzU5NTlaMGMxCzAJBgNV
@@ -45,21 +45,21 @@ aWPP1VSsnP3E5ZvhI4K84WeGDtUaJhXJ1Zpmp9Gs7XEOKoW4qAvkY3/3PqJ3MxId
 rcTdcsN5irAL3UeqWh8XE4uajiy9wlRatpgsq7TfgB7Ggl2mA/NwMMO245O3/uXO
 QjMsG/CW82hVf+vg7QGL9QVnIQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Toulouse - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Toulouse - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-toulouse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>systeme.reseau@crous-toulouse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Toulouse - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Toulouse - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-toulouse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>systeme.reseau@crous-toulouse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml b/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
index a4af42ea..d73c06b7 100644
--- a/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
+++ b/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.dcu.ie/idp/profile/Metadata/SAML">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-06T21:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-06T21:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dcu.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dublin City University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dcu.ie</mdui:InformationURL>
+        <mdui:Logo height="102" width="150">https://edugate.heanet.ie/rr3/logos/dcu.png</mdui:Logo>
+        <mdui:Logo height="102" width="150" xml:lang="en">data:image/png;base64,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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.385325,-6.257143</mdui:GeolocationHint>
+        <mdui:DomainHint>dcu.ie</mdui:DomainHint>
+        <mdui:IPHint>136.206.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.1.192.0/25</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dcu.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dublin City University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.dcu.ie</mdui:InformationURL>
-          <mdui:Logo height="102" width="150">https://edugate.heanet.ie/rr3/logos/dcu.png</mdui:Logo>
-          <mdui:Logo height="102" width="150" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.385325,-6.257143</mdui:GeolocationHint>
-          <mdui:DomainHint>dcu.ie</mdui:DomainHint>
-          <mdui:IPHint>136.206.0.0/16</mdui:IPHint>
-          <mdui:IPHint>193.1.192.0/25</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUOQ3lfJ+Ec4wFEuvh3raF7kmMtUQwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKaWRwLmRjdS5pZTAeFw0wOTA3MTcxMTQwNDZaFw0yOTA3
 MTcxMTQwNDZaMBUxEzARBgNVBAMTCmlkcC5kY3UuaWUwggEiMA0GCSqGSIb3DQEB
@@ -41,35 +41,35 @@ gDMveZoQEcHqkqVGocb2Mu4fKzSzXH9hAbrUC3RPB7EaJtGhAiQ7dNHR50i1B26n
 1Ig0IsXth908GfvXb4d6qmavTSjAQKLHl64ujQTxSF8oz2wbFcGMsgXu9yb/s+KF
 3JP0HYE1idr7BJ2F14eWlzQIorChnzE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dcu.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dcu.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dcu.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dublin City University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dublin City University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dcu.ie/iss/contact.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DCU ISS</md:GivenName>
-      <md:SurName>Systems Group</md:SurName>
-      <md:EmailAddress>mailto:sysops@dcu.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Fergus</md:GivenName>
-      <md:SurName>Donohue</md:SurName>
-      <md:EmailAddress>mailto:fergus.donohue@dcu.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Doyle</md:SurName>
-      <md:EmailAddress>mailto:john.l.doyle@dcu.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dcu.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dcu.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dcu.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dublin City University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dublin City University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dcu.ie/iss/contact.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DCU ISS</md:GivenName>
+    <md:SurName>Systems Group</md:SurName>
+    <md:EmailAddress>mailto:sysops@dcu.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fergus</md:GivenName>
+    <md:SurName>Donohue</md:SurName>
+    <md:EmailAddress>mailto:fergus.donohue@dcu.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Doyle</md:SurName>
+    <md:EmailAddress>mailto:john.l.doyle@dcu.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml
index 9cca05a1..3b0c873a 100644
--- a/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.gru.edu:8443/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gru.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Georgia Regents University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gru.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Georgia Regents University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGpDCCBYygAwIBAgIQDnlMzdtA7AtWaWmu4CUqHzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQG
 EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSUw
 IwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBDQS0zMB4XDTEzMDUxMzAwMDAwMFoXDTE2
@@ -50,13 +50,13 @@ wdF6J1Z4VTQRICXOrBHQjQ2ZrOsT5ZxZzX6lu+MuJwGgB7TphYasMCCN7/DAz/rtfvwUbNM2YphJ
 3BTrEEj8AYx3srpJRPNmfIkDoaGQ/QoLi9dfk2V48JmGgvjYadhqUFIPJ1CSCecwg4G4qpUzaQxN
 q+CoJC6DRoD3IPR6qFsCf1O/G4voSVmiFrxyw38A/vWnmpeo7+GlTqrLjGejplL1AgIw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFKDCCBBCgAwIBAgIkAhwR/6b9LHsJhchf/U62SIos3yjxeaQepg3W+ThWAgIWC6J5MA0GCSqG
 SIb3DQEBBQUAMDQxGjAYBgNVBAsTEU9yZ2FuaXphdGlvbmFsIENBMRYwFAYDVQQKFA1uYW1faWRz
 M190cmVlMB4XDTE0MDcyMDE0NDg1MFoXDTI0MDcyMDE0NDg1MFowQDEVMBMGA1UEAxMMdGVzdC1z
@@ -82,26 +82,26 @@ oJwXy2BWfVrnVxbKi0TwLFy50Dl9yZZiXBwPTS69p3eEFHr+/06bdOce9Udvr7wszrppZ6TKYZ5c
 pDORgv1sOCLPJx9QBBpvZGcqkgCgr7aOmUhDGQKjkY0nZccr/KZKNCsvK365gVXzm1U0rhBXYgfH
 /HVKXx18VMnABE/LWQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gru.edu:8443/nidp/saml2/spsoap" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gru.edu:8443/nidp/saml2/slo"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.gru.edu:8443/nidp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gru.edu:8443/nidp/saml2/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gru.edu:8443/nidp/saml2/soap"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Augusta University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Georgia Regents University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gru.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Doogie Howser</md:GivenName>
-      <md:EmailAddress>dhowser@gru.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Danny Blair</md:GivenName>
-      <md:EmailAddress>dblair@gru.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gru.edu:8443/nidp/saml2/spsoap" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gru.edu:8443/nidp/saml2/slo"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.gru.edu:8443/nidp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gru.edu:8443/nidp/saml2/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gru.edu:8443/nidp/saml2/soap"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Augusta University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Georgia Regents University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gru.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Doogie Howser</md:GivenName>
+    <md:EmailAddress>dhowser@gru.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Danny Blair</md:GivenName>
+    <md:EmailAddress>dblair@gru.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
index 65745ad7..44b1fb14 100644
--- a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hig.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description>
+        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni at the university.</mdui:Description>
+        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description>
-          <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni at the university.</mdui:Description>
-          <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
 MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
@@ -41,26 +41,26 @@ FC8se9RzTAIwV0P7WorYzwt95Xa9K8DDeLxjheJ3inQR07CD2unOV67Sp5YEfM61
 aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hig.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hig.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hig.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hig.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hig.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hig.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
 MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
@@ -80,36 +80,36 @@ FC8se9RzTAIwV0P7WorYzwt95Xa9K8DDeLxjheJ3inQR07CD2unOV67Sp5YEfM61
 aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HIGALUMNI</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Gävle (Alumni)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>University of Gävle (Alumni)</md:Company>
-      <md:SurName>Network Operations</md:SurName>
-      <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Gävle (Alumni)</md:Company>
-      <md:SurName>Network Operations</md:SurName>
-      <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Gävle (Alumni)</md:Company>
-      <md:SurName>IT Support</md:SurName>
-      <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HIGALUMNI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gävle (Alumni)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Gävle (Alumni)</md:Company>
+    <md:SurName>Network Operations</md:SurName>
+    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Gävle (Alumni)</md:Company>
+    <md:SurName>Network Operations</md:SurName>
+    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Gävle (Alumni)</md:Company>
+    <md:SurName>IT Support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
index 41b156aa..2a575de4 100644
--- a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hua.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hua.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Harokopio University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.hua.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.hua.gr/</mdui:InformationURL>
+        <mdui:Logo width="83" height="81">https://idp.hua.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.130.90.0/23</mdui:IPHint>
+        <mdui:IPHint>195.251.30.0/23</mdui:IPHint>
+        <mdui:IPHint>83.212.240.0/23</mdui:IPHint>
+        <mdui:IPHint>83.212.242.0/24</mdui:IPHint>
+        <mdui:DomainHint>hua.gr</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:37.96118327,23.70823603</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hua.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Harokopio University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.hua.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.hua.gr/</mdui:InformationURL>
-          <mdui:Logo width="83" height="81">https://idp.hua.gr/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>195.130.90.0/23</mdui:IPHint>
-          <mdui:IPHint>195.251.30.0/23</mdui:IPHint>
-          <mdui:IPHint>83.212.240.0/23</mdui:IPHint>
-          <mdui:IPHint>83.212.242.0/24</mdui:IPHint>
-          <mdui:DomainHint>hua.gr</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:37.96118327,23.70823603</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEmzCCA4OgAwIBAgIRANQlWe4RJ07BgbSF+F+w/jEwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMG0xCzAJBgNV
@@ -55,26 +55,26 @@
                             mBFTKd3S15BA5RiJ2Z+u1X5fzgGuyyEI5VnAdC7SBqhh7bm90mVoHLoWjTS378xQ
                             Oy3Soy1kO0DpSfaKXP7Ss8TN2ndbGpO1UhaBeVwMTg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hua.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hua.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hua.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hua.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hua.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hua.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hua.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hua.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEmzCCA4OgAwIBAgIRANQlWe4RJ07BgbSF+F+w/jEwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMG0xCzAJBgNV
@@ -101,30 +101,30 @@
                             mBFTKd3S15BA5RiJ2Z+u1X5fzgGuyyEI5VnAdC7SBqhh7bm90mVoHLoWjTS378xQ
                             Oy3Soy1kO0DpSfaKXP7Ss8TN2ndbGpO1UhaBeVwMTg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Harokopio University</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Harokopio University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hua.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.hua.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Konstantinos</md:GivenName>
-      <md:SurName>Piperidis</md:SurName>
-      <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Konstantinos</md:GivenName>
-      <md:SurName>Piperidis</md:SurName>
-      <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Harokopio University</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Harokopio University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hua.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.hua.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Konstantinos</md:GivenName>
+    <md:SurName>Piperidis</md:SurName>
+    <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Konstantinos</md:GivenName>
+    <md:SurName>Piperidis</md:SurName>
+    <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
index 1fc143a8..366c536d 100644
--- a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hv.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hv.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.234.0/23</mdui:IPHint>
+        <mdui:IPHint>193.10.236.0/23</mdui:IPHint>
+        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>hv.se</mdui:DomainHint>
-          <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
-          <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
-          <mdui:IPHint>193.10.234.0/23</mdui:IPHint>
-          <mdui:IPHint>193.10.236.0/23</mdui:IPHint>
-          <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
-          <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
 NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
@@ -54,26 +54,26 @@ dqEra6A3S5DN0BAWsLH3aBkA3fL/f6f3HUQwmd7dG+OUOtP+5DaB1YdeeXYMz5Wj
 aRQKNbVQdPN5ht6TrINjDQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hv.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hv.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hv.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hv.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hv.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hv.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
 NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
@@ -94,38 +94,38 @@ dqEra6A3S5DN0BAWsLH3aBkA3fL/f6f3HUQwmd7dG+OUOtP+5DaB1YdeeXYMz5Wj
 aRQKNbVQdPN5ht6TrINjDQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>University West</md:Company>
-      <md:SurName>Magnus Andersson</md:SurName>
-      <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University West</md:Company>
-      <md:SurName>Christian Jiresjö</md:SurName>
-      <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University West</md:Company>
-      <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@hv.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University West</md:Company>
+    <md:SurName>Magnus Andersson</md:SurName>
+    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University West</md:Company>
+    <md:SurName>Christian Jiresjö</md:SurName>
+    <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University West</md:Company>
+    <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@hv.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
index dd1f2976..05cd7f6c 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ian A. Young</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is the identity provider for the iay.org.uk domain.</mdui:Description>
+        <mdui:Logo height="80" width="80">https://idp2.iay.org.uk/images/heads_80x80.jpg</mdui:Logo>
+        <mdui:Logo height="43" width="100">https://idp2.iay.org.uk/images/heads_100x43.jpg</mdui:Logo>
+        <mdui:Logo height="104" width="240">https://idp2.iay.org.uk/images/heads_240x104.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>217.155.173.104/29</mdui:IPHint>
+        <mdui:DomainHint>iay.org.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.9328,-3.17905</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ian A. Young</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is the identity provider for the iay.org.uk domain.</mdui:Description>
-          <mdui:Logo height="80" width="80">https://idp2.iay.org.uk/images/heads_80x80.jpg</mdui:Logo>
-          <mdui:Logo height="43" width="100">https://idp2.iay.org.uk/images/heads_100x43.jpg</mdui:Logo>
-          <mdui:Logo height="104" width="240">https://idp2.iay.org.uk/images/heads_240x104.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>217.155.173.104/29</mdui:IPHint>
-          <mdui:DomainHint>iay.org.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:55.9328,-3.17905</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
 						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
 						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
@@ -49,26 +49,26 @@
 						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
 						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.iay.org.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.iay.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.iay.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.iay.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
 						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
 						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
@@ -88,27 +88,27 @@
 						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
 						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ian A. Young</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ian A. Young</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://iay.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ian A. Young</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ian A. Young</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://iay.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
index 8b067ba0..cc4ca424 100644
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T14:56:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/group/mefanet</saml:AttributeValue>
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T14:56:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/group/mefanet</saml:AttributeValue>
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for MU</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro MU</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://idp2.ics.muni.cz/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for MU</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro MU</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://idp2.ics.muni.cz/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDuTCCAqGgAwIBAgIJAIcuS9ZS4u6JMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
 BAYTAkNaMRcwFQYDVQQIDA5DemVjaCBSZXB1YmxpYzETMBEGA1UEBwwKQnJuby1z
 dHJlZDEbMBkGA1UECgwSTWFzYXJ5ayBVbml2ZXJzaXR5MRkwFwYDVQQDDBBpZHAy
@@ -53,28 +53,28 @@ UmZpPnApmRS6ar+8RKwCFo5cf/CoaPEoj0sTMtXLMfKLF2ZFdaaeooR2Uy68Sieu
 LulLpiqPzaI83atwCQLaqKgRHyRil4TplDgI47HQNUEp031rB4a+IEPvpqtcPVnW
 dregv7/EXm4k8mSJTVblFjww5QjaLV+D9vMqwslgUzmGhA5yBoBZn5OY/qYv
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.ics.muni.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.ics.muni.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDuTCCAqGgAwIBAgIJAIcuS9ZS4u6JMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
 BAYTAkNaMRcwFQYDVQQIDA5DemVjaCBSZXB1YmxpYzETMBEGA1UEBwwKQnJuby1z
 dHJlZDEbMBkGA1UECgwSTWFzYXJ5ayBVbml2ZXJzaXR5MRkwFwYDVQQDDBBpZHAy
@@ -96,32 +96,32 @@ UmZpPnApmRS6ar+8RKwCFo5cf/CoaPEoj0sTMtXLMfKLF2ZFdaaeooR2Uy68Sieu
 LulLpiqPzaI83atwCQLaqKgRHyRil4TplDgI47HQNUEp031rB4a+IEPvpqtcPVnW
 dregv7/EXm4k8mSJTVblFjww5QjaLV+D9vMqwslgUzmGhA5yBoBZn5OY/qYv
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">Masarykova univerzita</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Masaryk University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">Masarykova univerzita</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Masaryk University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="cs">http://www.muni.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Radim</md:GivenName>
-      <md:SurName>Pesa</md:SurName>
-      <md:EmailAddress>pesa@ics.muni.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tomas</md:GivenName>
-      <md:SurName>Sapak</md:SurName>
-      <md:EmailAddress>sapakt@ics.muni.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">Masarykova univerzita</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Masaryk University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Masarykova univerzita</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Masaryk University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.muni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Radim</md:GivenName>
+    <md:SurName>Pesa</md:SurName>
+    <md:EmailAddress>pesa@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Sapak</md:SurName>
+    <md:EmailAddress>sapakt@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
index b711c2a0..68b9d700 100644
--- a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.kau.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
+        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kau.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
+        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-          <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kau.se</mdui:DomainHint>
-          <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-          <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-          <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-          <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-          <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-          <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
 MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
@@ -59,26 +59,26 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
 7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.kau.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.kau.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
 MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
@@ -98,36 +98,36 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
 7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kau.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Karlstad University</md:Company>
-      <md:SurName>IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Karlstad University</md:Company>
-      <md:SurName>Paul Scott</md:SurName>
-      <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 54 700 2307</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Karlstad University</md:Company>
-      <md:SurName>IT-avdelningen Karlstads universitet</md:SurName>
-      <md:EmailAddress>mailto:datasupport@kau.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kau.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Karlstad University</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karlstad University</md:Company>
+    <md:SurName>Paul Scott</md:SurName>
+    <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 54 700 2307</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Karlstad University</md:Company>
+    <md:SurName>IT-avdelningen Karlstads universitet</md:SurName>
+    <md:EmailAddress>mailto:datasupport@kau.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml
index dd460fa0..9a85f144 100644
--- a/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.kingston.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-19T09:52:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-19T09:52:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kingston University London (Temporary)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University based in Kingston upon Thames, Greater London</mdui:Description>
+        <mdui:Logo height="140" width="140">https://staffnet.kingston.ac.uk/includes/img/static/kulogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kingston University London (Temporary)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University based in Kingston upon Thames, Greater London</mdui:Description>
-          <mdui:Logo height="140" width="140">https://staffnet.kingston.ac.uk/includes/img/static/kulogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAMevtLbVmUP/KFFW/3IcXK9nAywnMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcDIua2luZ3N0b24uYWMudWswHhcNMTMxMDA0MTM0
 						OTM3WhcNMzMxMDA0MTM0OTM3WjAeMRwwGgYDVQQDExNpZHAyLmtpbmdzdG9uLmFj
@@ -42,29 +42,29 @@
 						oHzU4LOVbqHbO9nk6pB/LsLmpWrpgcx4fjUJQZbLGdEqjMk0Y+LuCoFaTBgGbd5o
 						s5LbIFHuwJhAyQv5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kingston.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kingston.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2-login.kingston.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kingston.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kingston.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2-login.kingston.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kingston.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAMevtLbVmUP/KFFW/3IcXK9nAywnMA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2lkcDIua2luZ3N0b24uYWMudWswHhcNMTMxMDA0MTM0
 						OTM3WhcNMzMxMDA0MTM0OTM3WjAeMRwwGgYDVQQDExNpZHAyLmtpbmdzdG9uLmFj
@@ -84,27 +84,27 @@
 						oHzU4LOVbqHbO9nk6pB/LsLmpWrpgcx4fjUJQZbLGdEqjMk0Y+LuCoFaTBgGbd5o
 						s5LbIFHuwJhAyQv5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kingston University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kingston University London (Temporary)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kingston.ac.uk/support/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Grove</md:SurName>
-      <md:EmailAddress>mailto:m.grove@kingston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Murray</md:SurName>
-      <md:EmailAddress>mailto:k.murray@kingston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kingston University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kingston University London (Temporary)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kingston.ac.uk/support/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Grove</md:SurName>
+    <md:EmailAddress>mailto:m.grove@kingston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Murray</md:SurName>
+    <md:EmailAddress>mailto:k.murray@kingston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml
index ed4fc74a..0e378b9b 100644
--- a/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.londonlibrary.co.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London Library TEST</mdui:DisplayName>
+        <mdui:Logo height="122" width="122">https://idp4.londonlibrary.co.uk/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London Library TEST</mdui:DisplayName>
-          <mdui:Logo height="122" width="122">https://idp4.londonlibrary.co.uk/idp/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDyzCCArOgAwIBAgIJAI6fjypmCFKGMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UE
 						CgwSVGhlIExvbmRvbiBMaWJyYXJ5MQswCQYDVQQLDAJJVDEhMB8GA1UEAwwYaWRw
@@ -42,26 +42,26 @@
 						zOqx8FszNU4vcFPbk+rTBKmgWqMmmv+JjC6HRYKslyhaQrUN5BHjYDCJKGGMex7Y
 						s39/czGWTVmmJjeLXzur
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.londonlibrary.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.londonlibrary.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDyzCCArOgAwIBAgIJAI6fjypmCFKGMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UE
 						CgwSVGhlIExvbmRvbiBMaWJyYXJ5MQswCQYDVQQLDAJJVDEhMB8GA1UEAwwYaWRw
@@ -84,27 +84,27 @@
 						zOqx8FszNU4vcFPbk+rTBKmgWqMmmv+JjC6HRYKslyhaQrUN5BHjYDCJKGGMex7Y
 						s39/czGWTVmmJjeLXzur
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London Library</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Library TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.londonlibrary.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>David</md:SurName>
-      <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>David</md:SurName>
-      <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London Library</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Library TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.londonlibrary.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>David</md:SurName>
+    <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>David</md:SurName>
+    <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml b/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml
index ef14b88b..b2b6aa4f 100644
--- a/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.port.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-19T15:19:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-19T15:19:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">port.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">port.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTjCCAjagAwIBAgIIftqCJVvJwqUwDQYJKoZIhvcNAQEFBQAwPjEhMB8GA1UE
 						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
 						LmFjLnVrMB4XDTE0MTAyODExNTcxMloXDTI0MTAyODExNTcxMlowPjEhMB8GA1UE
@@ -32,13 +32,13 @@
 						bEAQDQvzIRLwc0KO1ZzMvic8OtGthOT7Hc42JEscCf0ZYrE0tSfF0EM5LIImyAve
 						rFsygr8Oy/HFI1289KnDVG2bO0e6qtPveZKsOHtKVwbwAA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTjCCAjagAwIBAgIIftqCJVvJwqUwDQYJKoZIhvcNAQEFBQAwPjEhMB8GA1UE
 						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
 						LmFjLnVrMB4XDTE0MTAyODExNTcxMloXDTI0MTAyODExNTcxMlowPjEhMB8GA1UE
@@ -58,24 +58,24 @@
 						bEAQDQvzIRLwc0KO1ZzMvic8OtGthOT7Hc42JEscCf0ZYrE0tSfF0EM5LIImyAve
 						rFsygr8Oy/HFI1289KnDVG2bO0e6qtPveZKsOHtKVwbwAA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.port.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.port.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Portsmouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Portsmouth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.port.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@port.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Burland</md:SurName>
-      <md:EmailAddress>mailto:phil.burland@port.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.port.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.port.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Portsmouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Portsmouth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.port.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@port.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Burland</md:SurName>
+    <md:EmailAddress>mailto:phil.burland@port.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
index 13b71270..d8927164 100644
--- a/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.redclara.net/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
 http://cofre.reuna.cl/index.php/es/reglas-federacion
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">redclara.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA - Latin American Cooperation of Advanced Networks</mdui:Description>
+        <mdui:Description xml:lang="es">RedCLARA - Cooperación Latino Americana de Redes Avanzadas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">redclara.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RedCLARA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">RedCLARA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RedCLARA - Latin American Cooperation of Advanced Networks</mdui:Description>
-          <mdui:Description xml:lang="es">RedCLARA - Cooperación Latino Americana de Redes Avanzadas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
 MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
@@ -50,26 +50,26 @@ MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
 I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
 yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
 s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.redclara.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.redclara.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.redclara.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.redclara.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">redclara.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.redclara.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.redclara.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.redclara.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.redclara.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">redclara.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
 MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
@@ -97,21 +97,21 @@ MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
 I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
 yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
 s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedCLARA - Cooperacion Latino Americana de Redes Avanzadas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">www.redclara.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA - Cooperacion Latino Americana de Redes Avanzadas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">www.redclara.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
index eed36be1..70a7140e 100644
--- a/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.rfh-koeln.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-26T13:51:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-26T13:51:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rfh-koeln.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der RFH Köln</mdui:Description>
+        <mdui:Description xml:lang="en">Rheinische Fachhochschule Köln gGmbH, University of Applied Sciences, Sibboleth-Identity Provider</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp2.rfh-koeln.de/rfh-logo_shib_klein.gif</mdui:Logo>
+        <mdui:Logo height="64" width="350">https://idp2.rfh-koeln.de/logo-64x150px.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.rfh-koeln.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.rfh-koeln.de/index_eng.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.rfh-koeln.de/impressum/index_ger.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.rfh-koeln.de/imprint/index_eng.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rfh-koeln.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der RFH Köln</mdui:Description>
-          <mdui:Description xml:lang="en">Rheinische Fachhochschule Köln gGmbH, University of Applied Sciences, Sibboleth-Identity Provider</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idp2.rfh-koeln.de/rfh-logo_shib_klein.gif</mdui:Logo>
-          <mdui:Logo height="64" width="350">https://idp2.rfh-koeln.de/logo-64x150px.jpg</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.rfh-koeln.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.rfh-koeln.de/index_eng.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.rfh-koeln.de/impressum/index_ger.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.rfh-koeln.de/imprint/index_eng.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcTBUtv
 ZWxuMS4wLAYDVQQKEyVSaGVpbmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdH
 bWJIMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQDEwxSRkggS29lbG4g
@@ -67,31 +67,31 @@ RSyaXcHkY/vFUfPyc77H5RnGnKi+PCoFzTEOMWPqfs5IrSe2qLYXmoY1xgFaZa8u
 WfCA0DKwsEbCD5XXjPzmUaAUSUf1iAEh16iZ8+QNLhyDq4dqjVaLYkFu1JlhKiU3
 mZ/qmmwB8wRz
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.rfh-koeln.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rfh-koeln.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.rfh-koeln.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rfh-koeln.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcTBUtv
 ZWxuMS4wLAYDVQQKEyVSaGVpbmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdH
 bWJIMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQDEwxSRkggS29lbG4g
@@ -131,30 +131,30 @@ RSyaXcHkY/vFUfPyc77H5RnGnKi+PCoFzTEOMWPqfs5IrSe2qLYXmoY1xgFaZa8u
 WfCA0DKwsEbCD5XXjPzmUaAUSUf1iAEh16iZ8+QNLhyDq4dqjVaLYkFu1JlhKiU3
 mZ/qmmwB8wRz
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e336</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e336</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.rfh-koeln.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.rfh-koeln.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Volker</md:GivenName>
-      <md:SurName>Beckhausen</md:SurName>
-      <md:EmailAddress>mailto:beckhausen@rfh-koeln.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>RZSERVICE</md:GivenName>
-      <md:SurName>RZSERVICE</md:SurName>
-      <md:EmailAddress>mailto:rzservice@rfh-koeln.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e336</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e336</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.rfh-koeln.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.rfh-koeln.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Volker</md:GivenName>
+    <md:SurName>Beckhausen</md:SurName>
+    <md:EmailAddress>mailto:beckhausen@rfh-koeln.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>RZSERVICE</md:GivenName>
+    <md:SurName>RZSERVICE</md:SurName>
+    <md:EmailAddress>mailto:rzservice@rfh-koeln.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml
index 547885c2..6f6f58c3 100644
--- a/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.unr.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp2.unr.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unr.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nevada, Reno</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Founded in 1874 as the Silver State's first university, Nevada is a top-caliber, land-grant research university.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unr.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unr.edu/general-information/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="134" width="400" xml:lang="en">https://idp2.unr.edu/idp/images/unr-n-400.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp2.unr.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unr.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nevada, Reno</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Founded in 1874 as the Silver State's first university, Nevada is a top-caliber, land-grant research university.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unr.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unr.edu/general-information/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="134" width="400" xml:lang="en">https://idp2.unr.edu/idp/images/unr-n-400.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUZomFfy8uFN6CwFWctxZCqJsnTOMwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MB4XDTEyMDgwNzIwMjIwMloXDTMy
 MDgwNzIwMjIwMlowFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MIIBIjANBgkqhkiG
@@ -44,24 +44,24 @@ Uzg3mamGpm5ZLIPMryydAMbYJLvwV8XIbP9fZJAn0d0LflznI5FwecrK5Kz3jAbe
 X9jQS0IfHMVsLIV5TQJbluxByKvrBHFQWXAQVuv1r2QsZD6hx4nQo/SFSz5xGhR+
 85F/oeNtrAXqZplexfbC3eBZMWCs2AEhhC9fLI4w3A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.unr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.unr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.unr.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.unr.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.unr.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.unr.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unr.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.unr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.unr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.unr.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.unr.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.unr.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.unr.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unr.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUZomFfy8uFN6CwFWctxZCqJsnTOMwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MB4XDTEyMDgwNzIwMjIwMloXDTMy
 MDgwNzIwMjIwMlowFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MIIBIjANBgkqhkiG
@@ -80,27 +80,27 @@ Uzg3mamGpm5ZLIPMryydAMbYJLvwV8XIbP9fZJAn0d0LflznI5FwecrK5Kz3jAbe
 X9jQS0IfHMVsLIV5TQJbluxByKvrBHFQWXAQVuv1r2QsZD6hx4nQo/SFSz5xGhR+
 85F/oeNtrAXqZplexfbC3eBZMWCs2AEhhC9fLI4w3A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.unr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.unr.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nevada, Reno</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nevada, Reno</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unr.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeff Springer</md:GivenName>
-      <md:EmailAddress>jeffs@unr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Nevada, Reno Help Desk</md:GivenName>
-      <md:EmailAddress>help@unr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cole Griggs</md:GivenName>
-      <md:EmailAddress>csgriggs@unr.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.unr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.unr.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nevada, Reno</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nevada, Reno</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unr.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeff Springer</md:GivenName>
+    <md:EmailAddress>jeffs@unr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Nevada, Reno Help Desk</md:GivenName>
+    <md:EmailAddress>help@unr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cole Griggs</md:GivenName>
+    <md:EmailAddress>csgriggs@unr.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
index eae66f10..f9da53b6 100644
--- a/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.uop.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uop.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of the Peloponnese</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.uop.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.uop.gr/</mdui:InformationURL>
+        <mdui:Logo height="64" width="64">http://www.uop.gr/images/stories/uop-logo-64px.png</mdui:Logo>
+        <mdui:Logo height="128" width="128">http://www.uop.gr/images/stories/uop-logo-128px.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uop.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.113.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.46.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.47.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.112.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.38.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.39.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.512646, 22.368098</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uop.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of the Peloponnese</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.uop.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.uop.gr/</mdui:InformationURL>
-          <mdui:Logo height="64" width="64">http://www.uop.gr/images/stories/uop-logo-64px.png</mdui:Logo>
-          <mdui:Logo height="128" width="128">http://www.uop.gr/images/stories/uop-logo-128px.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>uop.gr</mdui:DomainHint>
-          <mdui:IPHint>195.251.113.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.46.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.47.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.112.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.38.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.39.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:37.512646, 22.368098</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEmDCCA4CgAwIBAgIRAJ4WjeBWjXCLsEtthbCLLdIwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMTA1MjYwMDAwMDBaFw0xNDA1MjUyMzU5NTlaMGoxCzAJBgNV
@@ -59,26 +59,26 @@
                             nxSUIOPwdtiBGQ9uZAEvyq4Tph5oyT+LKD74O9lOzI5pkKkN1qPFR62/mbO4LPLB
                             9+3n1uZOewlkWpTDFl/dYoRwb0MHO7NF/JEiSA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uop.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uop.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uop.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uop.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uop.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uop.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uop.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uop.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uop.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uop.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uop.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uop.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uop.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uop.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEmDCCA4CgAwIBAgIRAJ4WjeBWjXCLsEtthbCLLdIwDQYJKoZIhvcNAQEFBQAw
                             NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
                             IFNTTCBDQTAeFw0xMTA1MjYwMDAwMDBaFw0xNDA1MjUyMzU5NTlaMGoxCzAJBgNV
@@ -105,30 +105,30 @@
                             nxSUIOPwdtiBGQ9uZAEvyq4Tph5oyT+LKD74O9lOzI5pkKkN1qPFR62/mbO4LPLB
                             9+3n1uZOewlkWpTDFl/dYoRwb0MHO7NF/JEiSA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uop.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uop.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Peloponnese</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Peloponnese</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uop.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.uop.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kostas</md:GivenName>
-      <md:SurName>Mpalasis</md:SurName>
-      <md:EmailAddress>mpalasis@uop.gr</md:EmailAddress>
-      <md:TelephoneNumber>2710372278</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Peloponnese Helpdesk</md:Company>
-      <md:EmailAddress>helpdesk@uop.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uop.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uop.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Peloponnese</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Peloponnese</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uop.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.uop.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kostas</md:GivenName>
+    <md:SurName>Mpalasis</md:SurName>
+    <md:EmailAddress>mpalasis@uop.gr</md:EmailAddress>
+    <md:TelephoneNumber>2710372278</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Peloponnese Helpdesk</md:Company>
+    <md:EmailAddress>helpdesk@uop.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml
index 7d7c8b49..619e4093 100644
--- a/swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3-test.is.ed.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3-test.is.ed.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-18T15:16:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-18T15:16:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Edinburgh v3 Development IdP (do not use!)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This IdP is a v3 Development/Test IdP for the University of Edinburgh. It is not for use by end users.</mdui:Description>
+        <mdui:Logo height="70" width="315">https://idp3-test.is.ed.ac.uk/university.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Edinburgh v3 Development IdP (do not use!)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This IdP is a v3 Development/Test IdP for the University of Edinburgh. It is not for use by end users.</mdui:Description>
-          <mdui:Logo height="70" width="315">https://idp3-test.is.ed.ac.uk/university.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUC9RSZ16U7S2HCaW/X+yYUz+cBckwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVaWRwMy10ZXN0LmlzLmVkLmFjLnVrMB4XDTE1MDYyOTE1
 						NDUwOVoXDTM1MDYyOTE1NDUwOVowIDEeMBwGA1UEAwwVaWRwMy10ZXN0LmlzLmVk
@@ -42,26 +42,26 @@
 						pYtZijPo2mE5m/mvPLCBJdMlCfZx95YNryTv7qyf+p53hXm+DCp+ClYk4Xr3FcDo
 						SWGiXiIGBRVBJvfHk3t5caCrGA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3-test.is.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3-test.is.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3-test.is.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3-test.is.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3-test.is.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3-test.is.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3-test.is.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3-test.is.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUC9RSZ16U7S2HCaW/X+yYUz+cBckwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVaWRwMy10ZXN0LmlzLmVkLmFjLnVrMB4XDTE1MDYyOTE1
 						NDUwOVoXDTM1MDYyOTE1NDUwOVowIDEeMBwGA1UEAwwVaWRwMy10ZXN0LmlzLmVk
@@ -81,23 +81,23 @@
 						pYtZijPo2mE5m/mvPLCBJdMlCfZx95YNryTv7qyf+p53hXm+DCp+ClYk4Xr3FcDo
 						SWGiXiIGBRVBJvfHk3t5caCrGA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh v3 Development IdP (do not use!)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS ITI Enterprise Services</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS ITI Enterprise Services</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3-test.is.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh v3 Development IdP (do not use!)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS ITI Enterprise Services</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS ITI Enterprise Services</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
index 4ac75de9..b8c99f2f 100644
--- a/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.bucks.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T11:14:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T11:14:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Buckinghamshire New University (Test Only)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">BNU Shib 3 test facilty</mdui:Description>
+        <mdui:Logo height="70" width="208">https://idp3.bucks.ac.uk/idp/buckslogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Buckinghamshire New University (Test Only)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">BNU Shib 3 test facilty</mdui:Description>
-          <mdui:Logo height="70" width="208">https://idp3.bucks.ac.uk/idp/buckslogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUcF2+rhqg1Bkw5f32M83xfEhRa8EwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwMy5idWNrcy5hYy51azAeFw0xNTExMTIxNDE3NTha
 						Fw0zNTExMTIxNDE3NThaMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswggEi
@@ -41,13 +41,13 @@
 						MerL+bqLgF8ha1zmFCDQYst25i4+p4i5OFYEG9v/70WZaG+CKx0rZbA1z2sfCZl8
 						syWhQSP5tdqQepmqMo8f8TVdHAU4IXlBL9qROtr5BlTAVNpUB98cX12KJwl4OjE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOzsg1/QvG6GlxDD0oixe7saqY58MA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU2
 						WhcNMzUxMTEyMTQxNzU2WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
@@ -66,13 +66,13 @@
 						IsskCLVsmeAnKVlvqOhPOWzw15NcK0RQZxuxUFqGxFIGwDRm8bhhsXZql6NSqZWS
 						TQZq49Nrw0CYAAaMBdh38rSxAbF/RkpQjh265fw0s0GXrCbacEhONcqNl3PIL09L
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAJJgU10aDKjkSRc9fnYGv63VALGeMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU3
 						WhcNMzUxMTEyMTQxNzU3WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
@@ -91,26 +91,26 @@
 						9dMTFSDNYzvy8DXVVhOJQ1QSzeWfszC11PxjNmLnt4wQ7iJ6mgiZ2eCTg8tJnhlj
 						IkB9rjmfh3VWJXkX4+k73yaY7QsyGPCJ4FeNj8S1uhMBMm2h7wZr65aGQvaMVfLP
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.bucks.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.bucks.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucks.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUcF2+rhqg1Bkw5f32M83xfEhRa8EwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwMy5idWNrcy5hYy51azAeFw0xNTExMTIxNDE3NTha
 						Fw0zNTExMTIxNDE3NThaMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswggEi
@@ -129,13 +129,13 @@
 						MerL+bqLgF8ha1zmFCDQYst25i4+p4i5OFYEG9v/70WZaG+CKx0rZbA1z2sfCZl8
 						syWhQSP5tdqQepmqMo8f8TVdHAU4IXlBL9qROtr5BlTAVNpUB98cX12KJwl4OjE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOzsg1/QvG6GlxDD0oixe7saqY58MA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU2
 						WhcNMzUxMTEyMTQxNzU2WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
@@ -154,13 +154,13 @@
 						IsskCLVsmeAnKVlvqOhPOWzw15NcK0RQZxuxUFqGxFIGwDRm8bhhsXZql6NSqZWS
 						TQZq49Nrw0CYAAaMBdh38rSxAbF/RkpQjh265fw0s0GXrCbacEhONcqNl3PIL09L
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAJJgU10aDKjkSRc9fnYGv63VALGeMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU3
 						WhcNMzUxMTEyMTQxNzU3WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
@@ -179,23 +179,23 @@
 						9dMTFSDNYzvy8DXVVhOJQ1QSzeWfszC11PxjNmLnt4wQ7iJ6mgiZ2eCTg8tJnhlj
 						IkB9rjmfh3VWJXkX4+k73yaY7QsyGPCJ4FeNj8S1uhMBMm2h7wZr65aGQvaMVfLP
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Buckinghamshire New University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Buckinghamshire New University (Test Only)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Core Systems</md:GivenName>
-      <md:EmailAddress>mailto:coresystems@bucks.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Oliver</md:GivenName>
-      <md:SurName>Facey</md:SurName>
-      <md:EmailAddress>mailto:oliver.facey@bucks.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Buckinghamshire New University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Buckinghamshire New University (Test Only)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Core Systems</md:GivenName>
+    <md:EmailAddress>mailto:coresystems@bucks.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Facey</md:SurName>
+    <md:EmailAddress>mailto:oliver.facey@bucks.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml
index 467f7502..eff022bc 100644
--- a/swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.cereq.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-01-08T16:06:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-01-08T16:06:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cereq.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.cereq.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Etablissement Cereq</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etablissement Cereq</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cereq.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.cereq.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Etablissement Cereq</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etablissement Cereq</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIDCCAgigAwIBAgIVAO96+MdOaQe5EMJnglGjZfU46nrSMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWlkcDMuY2VyZXEuZnIwHhcNMTYwMTA3MTQzNzAxWhcN
 MzYwMTA3MTQzNzAxWjAYMRYwFAYDVQQDDA1pZHAzLmNlcmVxLmZyMIIBIjANBgkq
@@ -38,26 +38,26 @@ AeeGhn6Mqu7/QBY9T2fFIHk4S+pK3mRRaBktJqM1ILlUVw0A87VlOhB8ZA+QyVR4
 AMIInfjfMnhKe6k3H8rKxHl1VlIjQAoEG8SgagYkb01ybrYuOeAns7FIwItd5Wib
 vuXR32cEGvWpoYBL2Q2J/C4FQjIW5bxWi45SC7V39d6G64Ok
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.cereq.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cereq.fr/idp/profile/Shibbboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cereq.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Pelé jean</md:SurName>
-      <md:EmailAddress>pele@cereq.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Silvère Chieusse</md:SurName>
-      <md:EmailAddress>silvere.chieusse@cereq.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.cereq.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cereq.fr/idp/profile/Shibbboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cereq.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pelé jean</md:SurName>
+    <md:EmailAddress>pele@cereq.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Silvère Chieusse</md:SurName>
+    <md:EmailAddress>silvere.chieusse@cereq.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml
index 32ad03ba..9fded05e 100644
--- a/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.cyceron.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-02T15:40:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-02T15:40:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cyceron</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wwCDwEr/r6u7AAAAhVJREFUOMttk02IjWEYhq/7mzlNI8k0zaTs2Ig6RzaSGspPyopS0qREsqbQec8CnfeEDVvC0kKEskBk/JXC4vs0iUyWZmxmLGRM47stvEdf0zyrt6f7uZ7fVyQL9UgsAqEej0oatn1J0k+gF7hg+y7wCrgu6ZDt/bEIt7IuIAUH4ApwDnjXzpsAe4DjwO35+XkBBwEBkUQHoNXoZMAo4CRY02p0hsqyfJBl2RNJ92q12glgFlgi6TFJSAVyB9gLYBtgCJiWZNvfgUHgs6R9c3NzH2q1mrNQj/8Btjen55gkgAlJU7YngGWSkDRcluX4xY9nHItAr6T1rUbnGdBnu9d2TyxCGepxi6QxAEmDtr/aXi5pQFIN+AOgUI8fgHX6l/IbsLKdN50241QJwJt23tyUWp0B+oDYC6xOwbY9FIvgUI+Hga2SfgH9aR7nK60iqQ84mUm6bBvbktRuNTprJV2TNGq7HzglaSQW4X5l3q9ty/bNrJ03m8AuSdvbefMscLq6Gdt5O2++XHBwu4GhWIRjajU6pIPpCnZKelRhNIBPwO+qrmvVQ1ple6Okq7Zn0/omgRyYiUUYYBFTCh4BnqdBSlKjnTeLVqMzBQynIe6IRXiyEJClPo9UgcB08o9XtG8Xq6D7md6lLKS9d/0HbO+TtCEW4cdigJ50yu+BpZJmgBtlWT4cWbGtD8gkTQJfXkw99WKAvw6F+iqRRKrtAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.cyceron.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Idp cyceron</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Idp cyceron</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cyceron</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wwCDwEr/r6u7AAAAhVJREFUOMttk02IjWEYhq/7mzlNI8k0zaTs2Ig6RzaSGspPyopS0qREsqbQec8CnfeEDVvC0kKEskBk/JXC4vs0iUyWZmxmLGRM47stvEdf0zyrt6f7uZ7fVyQL9UgsAqEej0oatn1J0k+gF7hg+y7wCrgu6ZDt/bEIt7IuIAUH4ApwDnjXzpsAe4DjwO35+XkBBwEBkUQHoNXoZMAo4CRY02p0hsqyfJBl2RNJ92q12glgFlgi6TFJSAVyB9gLYBtgCJiWZNvfgUHgs6R9c3NzH2q1mrNQj/8Btjen55gkgAlJU7YngGWSkDRcluX4xY9nHItAr6T1rUbnGdBnu9d2TyxCGepxi6QxAEmDtr/aXi5pQFIN+AOgUI8fgHX6l/IbsLKdN50241QJwJt23tyUWp0B+oDYC6xOwbY9FIvgUI+Hga2SfgH9aR7nK60iqQ84mUm6bBvbktRuNTprJV2TNGq7HzglaSQW4X5l3q9ty/bNrJ03m8AuSdvbefMscLq6Gdt5O2++XHBwu4GhWIRjajU6pIPpCnZKelRhNIBPwO+qrmvVQ1ple6Okq7Zn0/omgRyYiUUYYBFTCh4BnqdBSlKjnTeLVqMzBQynIe6IRXiyEJClPo9UgcB08o9XtG8Xq6D7md6lLKS9d/0HbO+TtCEW4cdigJ50yu+BpZJmgBtlWT4cWbGtD8gkTQJfXkw99WKAvw6F+iqRRKrtAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.cyceron.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Idp cyceron</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Idp cyceron</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUd4yV7VyJaaQKxD07SGw7Mn368dkwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwMy5jeWNlcm9uLmZyMB4XDTE1MTIwMjEzMzQyM1oX
 DTM1MTIwMjEzMzQyM1owGjEYMBYGA1UEAwwPaWRwMy5jeWNlcm9uLmZyMIIBIjAN
@@ -39,22 +39,22 @@ fqnqIzjWt84UXNmCiVdQ/zhGF4KRkXxDR0lyW7MkTI0L3tZ/TY21Dcgbm7ACaHV0
 33nMIlovQpwCdCGTKk0WUUutJcCbrFFYZUHEzi4v3rqcLzaQ4xxK6tJTvGvAaQPA
 oHzPlWtlZWRz8eUkil/RDUfqu2/GSUhl0CIvH7Ib10F4sZlZP00xsWd4yA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.cyceron.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cyceron.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cyceron.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cyceron</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cyceron.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Antoine NOURRY</md:SurName>
-      <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.cyceron.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cyceron.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cyceron.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cyceron</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cyceron.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Antoine NOURRY</md:SurName>
+    <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.insa-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.insa-rennes.fr-idp-shibboleth.xml
index 0e2742ed..72400236 100644
--- a/swamid-interfederations-2.0/idp3.insa-rennes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3.insa-rennes.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.insa-rennes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-03-23T10:21:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-03-23T10:21:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA Rennes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkIyOEI1MTFDQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkIyOEI1MTFEQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QjI4QjUxMUFBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QjI4QjUxMUJBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5mRQOCAAABCUlEQVR42mL8//8/AymAiYFEQHsNLL9mTv42cyKbieWvM8e50vMhbKAEkAskeRq6mdQ1PkX6AtnTbX00HR1ZkHX/OXsKSP6+ee3/549sju6/z5z4tWUd6xdniKzUq6foToKYysjLB2Lv38lqYsHZ0PH77GlGXn6giMrXTyAnoXhISvbfs8csUjLsxdXfZ00G6vkDsu0TxAjJV09fo9nA7uAKsedzcQaLuiaQDdQPdB6EFPr1Q42PB0UDi7EZiFTXBvr7x6Y1EDuBJHdJDTA8gAy1L58YccX0mzdvzp07z8XFBWSIiIhASDk5WRZc4f3mzdsNGzcBVdy4cVNDQx1CarxRZxwGaQkgwACB/3sY4hVazQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-rennes.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">INSA Rennes users (student, teachers, employees)</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">INSA Rennes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Utilisateurs de INSA Rennes (étudiants + personnels</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSA Rennes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkIyOEI1MTFDQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkIyOEI1MTFEQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QjI4QjUxMUFBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QjI4QjUxMUJBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5mRQOCAAABCUlEQVR42mL8//8/AymAiYFEQHsNLL9mTv42cyKbieWvM8e50vMhbKAEkAskeRq6mdQ1PkX6AtnTbX00HR1ZkHX/OXsKSP6+ee3/549sju6/z5z4tWUd6xdniKzUq6foToKYysjLB2Lv38lqYsHZ0PH77GlGXn6giMrXTyAnoXhISvbfs8csUjLsxdXfZ00G6vkDsu0TxAjJV09fo9nA7uAKsedzcQaLuiaQDdQPdB6EFPr1Q42PB0UDi7EZiFTXBvr7x6Y1EDuBJHdJDTA8gAy1L58YccX0mzdvzp07z8XFBWSIiIhASDk5WRZc4f3mzdsNGzcBVdy4cVNDQx1CarxRZxwGaQkgwACB/3sY4hVazQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-rennes.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">INSA Rennes users (student, teachers, employees)</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">INSA Rennes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Utilisateurs de INSA Rennes (étudiants + personnels</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAIas2YvnU5+ji3Z0D6StJRztMtJMMA0GCSqGSIb3DQEB
 CwUAMB4xHDAaBgNVBAMME2lkcDMuaW5zYS1yZW5uZXMuZnIwHhcNMTYwMzIyMTI1
 MzU0WhcNMzYwMzIyMTI1MzU0WjAeMRwwGgYDVQQDDBNpZHAzLmluc2EtcmVubmVz
@@ -40,22 +40,22 @@ tjlOXQCejQy5qbK3HxC6pH6CcCSVAyMrevM/wL3uZcFMviovgUWwyQ/ixByrbrnM
 Ps2RM5UPYwzGWhiaO2aJhKggV0cMM7qAzIgQpiQdmcWYGQmQgEjoJxQU8PQs9/9e
 T/f/ec7+dA/05ijY
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSA Rennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSA Rennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-rennes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Vincent repain</md:SurName>
-      <md:EmailAddress>vincent.repain@insa-rennes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSA Rennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA Rennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-rennes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Vincent repain</md:SurName>
+    <md:EmailAddress>vincent.repain@insa-rennes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml
index c4770844..0ec84940 100644
--- a/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.leeds.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-25T11:01:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-25T11:01:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Leeds Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test IdP for University of Leeds</mdui:Description>
+        <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Leeds Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test IdP for University of Leeds</mdui:Description>
-          <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUYURZnINS9EeqJg0pAXf/MdmQ54gwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjVa
 						Fw0zNTA4MTgxMDAyMjVaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
@@ -41,13 +41,13 @@
 						wDSxOl7VTLDNRwSyhXrYozc8reRh0prFGigUqguyp/KTojHZG/M2aU9M7YzMh+U7
 						uEIXZi3EMZmm5CTTQtCTIVJC/VfROS3pgnC+ur3qQfmWPXsHH8l155E6jogL1Jc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVALRts/OJ9FYIac96GkaAZZXUS5IZMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswHhcNMTUwODE4MTAwMjIz
 						WhcNMzUwODE4MTAwMjIzWjAbMRkwFwYDVQQDDBBpZHAzLmxlZWRzLmFjLnVrMIIB
@@ -66,13 +66,13 @@
 						A0cvGu36rI4udLJQcopfcIwkXSdoUf61rWhHC4flU5k94R1MIOZcPNGioPWUgopB
 						kal0cnkoz2TNoT4WXv/Ob5J91TLyToRkod6npSNk+hSaCy554OiimCnyrqUPyKrW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUKhTirYyDRSrB8gvM2sn66nNngqQwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjRa
 						Fw0zNTA4MTgxMDAyMjRaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
@@ -91,26 +91,26 @@
 						roJ5ROffd5RGxn9XQzbuPN7iovAhN4rgzxaAb2seIX70IlHk7D13AUKJYV+8gW7S
 						b1/t3dWvVAtKbFtDuK6uceoSakimTq266X2PvA+HjRhZS0adgH4dYDtEkiG3Vg0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.leeds.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.leeds.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUYURZnINS9EeqJg0pAXf/MdmQ54gwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjVa
 						Fw0zNTA4MTgxMDAyMjVaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
@@ -129,13 +129,13 @@
 						wDSxOl7VTLDNRwSyhXrYozc8reRh0prFGigUqguyp/KTojHZG/M2aU9M7YzMh+U7
 						uEIXZi3EMZmm5CTTQtCTIVJC/VfROS3pgnC+ur3qQfmWPXsHH8l155E6jogL1Jc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVALRts/OJ9FYIac96GkaAZZXUS5IZMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswHhcNMTUwODE4MTAwMjIz
 						WhcNMzUwODE4MTAwMjIzWjAbMRkwFwYDVQQDDBBpZHAzLmxlZWRzLmFjLnVrMIIB
@@ -154,13 +154,13 @@
 						A0cvGu36rI4udLJQcopfcIwkXSdoUf61rWhHC4flU5k94R1MIOZcPNGioPWUgopB
 						kal0cnkoz2TNoT4WXv/Ob5J91TLyToRkod6npSNk+hSaCy554OiimCnyrqUPyKrW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUKhTirYyDRSrB8gvM2sn66nNngqQwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjRa
 						Fw0zNTA4MTgxMDAyMjRaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
@@ -179,23 +179,23 @@
 						roJ5ROffd5RGxn9XQzbuPN7iovAhN4rgzxaAb2seIX70IlHk7D13AUKJYV+8gW7S
 						b1/t3dWvVAtKbFtDuK6uceoSakimTq266X2PvA+HjRhZS0adgH4dYDtEkiG3Vg0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Leeds</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Leeds Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leeds.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@leeds.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Powell</md:SurName>
-      <md:EmailAddress>mailto:r.g.powell@leeds.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Leeds</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Leeds Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leeds.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@leeds.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Powell</md:SurName>
+    <md:EmailAddress>mailto:r.g.powell@leeds.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml
index 02c486b9..49b0a7f0 100644
--- a/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp4.halesowen.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-07T09:48:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-07T09:48:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halesowen.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halesowen.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUK9oe82/zsqUqklJuya/xb+7Fj7swDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwNC5oYWxlc293ZW4uYWMudWswHhcNMTIwNjA2MDky
 						NjQ4WhcNMzIwNjA2MDkyNjQ4WjAfMR0wGwYDVQQDExRpZHA0LmhhbGVzb3dlbi5h
@@ -32,26 +32,26 @@
 						5nzipbC1Y36S60xTelCkQz/bkQxdhGpeXAyGcjmVKESSPY5ZhIhQ5wIsD/HJhSCx
 						qdnuw21SDaBFMMFsh10J
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp4.halesowen.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halesowen.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp4.halesowen.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halesowen.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIUK9oe82/zsqUqklJuya/xb+7Fj7swDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUaWRwNC5oYWxlc293ZW4uYWMudWswHhcNMTIwNjA2MDky
 						NjQ4WhcNMzIwNjA2MDkyNjQ4WjAfMR0wGwYDVQQDExRpZHA0LmhhbGVzb3dlbi5h
@@ -71,27 +71,27 @@
 						5nzipbC1Y36S60xTelCkQz/bkQxdhGpeXAyGcjmVKESSPY5ZhIhQ5wIsD/HJhSCx
 						qdnuw21SDaBFMMFsh10J
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Halesowen College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Halesowen College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.halesowen.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Crees</md:SurName>
-      <md:EmailAddress>mailto:tcrees@halesowen.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Priest</md:SurName>
-      <md:EmailAddress>mailto:jpriest@halesowen.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Halesowen College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Halesowen College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.halesowen.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Crees</md:SurName>
+    <md:EmailAddress>mailto:tcrees@halesowen.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Priest</md:SurName>
+    <md:EmailAddress>mailto:jpriest@halesowen.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml
index 761612c5..7a94a363 100644
--- a/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp4.londonlibrary.co.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp4.londonlibrary.co.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-18T18:00:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-18T18:00:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London Library</mdui:DisplayName>
+        <mdui:Logo height="122" width="122">https://idp4.londonlibrary.co.uk/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London Library</mdui:DisplayName>
-          <mdui:Logo height="122" width="122">https://idp4.londonlibrary.co.uk/idp/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVANU4ahFCyREJu8AncXjGLDT0D6P3MA0GCSqGSIb3DQEB
 						CwUAMCMxITAfBgNVBAMMGGlkcDQubG9uZG9ubGlicmFyeS5jby51azAeFw0xNTEy
 						MjMxNDM2MzVaFw0zNTEyMjMxNDM2MzVaMCMxITAfBgNVBAMMGGlkcDQubG9uZG9u
@@ -36,13 +36,13 @@
 						4QUpkVc51DHl17kX6EFmwtB8KPVd0qOl4MgPueYN+vYpkqvXdsXmClX0BHH7D9/l
 						wziHAcu2ZDvDd+U7O3U8bcnV/jUXt4PDHcDarKvmHDg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSzCCAjOgAwIBAgIUX2TNeT7B9swpWFpSgg3etUWCg/8wDQYJKoZIhvcNAQEL
 						BQAwIzEhMB8GA1UEAwwYaWRwNC5sb25kb25saWJyYXJ5LmNvLnVrMB4XDTE1MTIy
 						MzE0MzYzNloXDTM1MTIyMzE0MzYzNlowIzEhMB8GA1UEAwwYaWRwNC5sb25kb25s
@@ -62,13 +62,13 @@
 						TFCEQzRqrF4Ce3rqTwWUgpNOAENvJpwAyxpL7RdNB2SbDW9+cdOxVikgj7kzOD+j
 						qWH4Y40DCwr1AzCC4oXb3df22B9y8VqKMDVQU1aHVw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDuTCCAqGgAwIBAgIJALXV9dV3yr97MA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xGzAZ
 						BgNVBAoMElRoZSBMb25kb24gTGlicmFyeTEhMB8GA1UEAwwYaWRwNC5sb25kb25s
@@ -90,30 +90,30 @@
 						s+8EuCx+rPd//ZgkZbXpBQSjJ1hlzvTOWlle48d/9LuHdink5vvRKNiOHSFk2cLe
 						8ysYf5LGOy9GSO12g2+E24IJYWIedNgCMyTz9zwCcIFuVmaam1Xgdwhp8DhO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp4.londonlibrary.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp4.londonlibrary.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.londonlibrary.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonlibrary.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVANU4ahFCyREJu8AncXjGLDT0D6P3MA0GCSqGSIb3DQEB
 						CwUAMCMxITAfBgNVBAMMGGlkcDQubG9uZG9ubGlicmFyeS5jby51azAeFw0xNTEy
 						MjMxNDM2MzVaFw0zNTEyMjMxNDM2MzVaMCMxITAfBgNVBAMMGGlkcDQubG9uZG9u
@@ -133,13 +133,13 @@
 						4QUpkVc51DHl17kX6EFmwtB8KPVd0qOl4MgPueYN+vYpkqvXdsXmClX0BHH7D9/l
 						wziHAcu2ZDvDd+U7O3U8bcnV/jUXt4PDHcDarKvmHDg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSzCCAjOgAwIBAgIUX2TNeT7B9swpWFpSgg3etUWCg/8wDQYJKoZIhvcNAQEL
 						BQAwIzEhMB8GA1UEAwwYaWRwNC5sb25kb25saWJyYXJ5LmNvLnVrMB4XDTE1MTIy
 						MzE0MzYzNloXDTM1MTIyMzE0MzYzNlowIzEhMB8GA1UEAwwYaWRwNC5sb25kb25s
@@ -159,13 +159,13 @@
 						TFCEQzRqrF4Ce3rqTwWUgpNOAENvJpwAyxpL7RdNB2SbDW9+cdOxVikgj7kzOD+j
 						qWH4Y40DCwr1AzCC4oXb3df22B9y8VqKMDVQU1aHVw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDuTCCAqGgAwIBAgIJALXV9dV3yr97MA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xGzAZ
 						BgNVBAoMElRoZSBMb25kb24gTGlicmFyeTEhMB8GA1UEAwwYaWRwNC5sb25kb25s
@@ -187,24 +187,24 @@
 						s+8EuCx+rPd//ZgkZbXpBQSjJ1hlzvTOWlle48d/9LuHdink5vvRKNiOHSFk2cLe
 						8ysYf5LGOy9GSO12g2+E24IJYWIedNgCMyTz9zwCcIFuVmaam1Xgdwhp8DhO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London Library</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.londonlibrary.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>David</md:SurName>
-      <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>David</md:SurName>
-      <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London Library</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.londonlibrary.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>David</md:SurName>
+    <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>David</md:SurName>
+    <md:EmailAddress>mailto:will.david@londonlibrary.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml
index 9e4f4080..206f4681 100644
--- a/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpStaging.miamioh.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idptest.miamioh.edu/shibboleth/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">zTEST_MUOhioIdP</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idptest.miamioh.edu/shibboleth/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">zTEST_MUOhioIdP</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJAPI7S0Hg1hxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2lkcHRlc3QubWlhbWlvaC5lZHUwHhcNMTQwMjE3MTY0NzMzWhcNMjQwMjE1
 MTY0NzMzWjAeMRwwGgYDVQQDExNpZHB0ZXN0Lm1pYW1pb2guZWR1MIIBIjANBgkq
@@ -39,23 +39,23 @@ eoKLu82UwkCAPtbKR5oqAyr+0FUDuLv8pwIrfeA/TaGGm9KwG2ddk/QnxTf5Io3R
 nD4EJJtThpP8l6iMoV9RRnOlrqfK+xuogzBC1lzJDDIM0KTSCMlN8G2qqAsswnrw
 5Cj8SlfNPom7OhnCL7HOCbzC
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.miamioh.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.miamioh.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.miamioh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.miamioh.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.miamioh.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.miamioh.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJAPI7S0Hg1hxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2lkcHRlc3QubWlhbWlvaC5lZHUwHhcNMTQwMjE3MTY0NzMzWhcNMjQwMjE1
 MTY0NzMzWjAeMRwwGgYDVQQDExNpZHB0ZXN0Lm1pYW1pb2guZWR1MIIBIjANBgkq
@@ -75,22 +75,22 @@ eoKLu82UwkCAPtbKR5oqAyr+0FUDuLv8pwIrfeA/TaGGm9KwG2ddk/QnxTf5Io3R
 nD4EJJtThpP8l6iMoV9RRnOlrqfK+xuogzBC1lzJDDIM0KTSCMlN8G2qqAsswnrw
 5Cj8SlfNPom7OhnCL7HOCbzC
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Miami University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">zTEST_MUOhioIdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.muohio.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Don Kidd</md:GivenName>
-      <md:EmailAddress>dkidd@miamioh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike Beck</md:GivenName>
-      <md:EmailAddress>beckmd@miamioh.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Miami University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">zTEST_MUOhioIdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.muohio.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Don Kidd</md:GivenName>
+    <md:EmailAddress>dkidd@miamioh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike Beck</md:GivenName>
+    <md:EmailAddress>beckmd@miamioh.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
index 725b3b0a..fa954951 100644
--- a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcafe.ifsc.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifsc.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsc.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsc.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifsc.edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifsc.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifsc.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
 byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
 VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
@@ -44,26 +44,26 @@ fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
 iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
 +PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
 byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
@@ -87,24 +87,24 @@ iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
 +PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
 	    
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Diretoria de TIC - IFSC</md:SurName>
-      <md:EmailAddress>suporte.reitoria@ifsc.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Diretoria de TIC - IFSC</md:SurName>
+    <md:EmailAddress>suporte.reitoria@ifsc.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
index cbe40d0a..d34ff7ab 100644
--- a/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcafe.ufjf.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufjf.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufjf.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufjf.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufjf.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufjf.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufjf.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
 Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
@@ -46,26 +46,26 @@ u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
 IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
 VHUsC0A0Nd9rEkuwkV0GdA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ufjf.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufjf.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ufjf.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufjf.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
@@ -91,24 +91,24 @@ IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
 VHUsC0A0Nd9rEkuwkV0GdA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufjf.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufjf.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jose Luiz Ribeiro de Souza Filho</md:SurName>
-      <md:EmailAddress>engenharia.redes@ufjf.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufjf.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufjf.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jose Luiz Ribeiro de Souza Filho</md:SurName>
+    <md:EmailAddress>engenharia.redes@ufjf.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
index 2b0df0dd..b19d0dca 100644
--- a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcafe.usp.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">USP - Universidade de Sao Paulo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">USP - Universidade de Sao Paulo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">USP - Universidade de Sao Paulo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usp.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">USP - Universidade de Sao Paulo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">USP - Universidade de Sao Paulo</mdui:Description>
-          <mdui:Description xml:lang="pt-br">USP - Universidade de Sao Paulo</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEADCCAugCAQAwDQYJKoZIhvcNAQELBQAwgcUxIjAgBgNVBAoTGVVOSVZFUlNJ
 REFERSBERSBTQU8gUEFVTE8xNTAzBgNVBAsTLFNVUEVSSU5URU5ERU5DSUEgREUg
 VEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYJKoZIhvcNAQkBFgtzY252QHVz
@@ -46,26 +46,26 @@ utKY4CRyqBVaJhpmf1A8QzmAR+iXoI2Zh4U2xO8sWUUuxOEP1fsv1rs2VorQHrBw
 mWthxf1cxDLaWMV6/uWFy+iKPiHKDB4X1NFOEXU7teIz8LgzsGiF/PPoMeNRCfn1
 XmViErkqVYyvS+Fpeslb5K1Zlyk=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usp.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEADCCAugCAQAwDQYJKoZIhvcNAQELBQAwgcUxIjAgBgNVBAoTGVVOSVZFUlNJ
 REFERSBERSBTQU8gUEFVTE8xNTAzBgNVBAsTLFNVUEVSSU5URU5ERU5DSUEgREUg
@@ -91,24 +91,24 @@ mWthxf1cxDLaWMV6/uWFy+iKPiHKDB4X1NFOEXU7teIz8LgzsGiF/PPoMeNRCfn1
 XmViErkqVYyvS+Fpeslb5K1Zlyk=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.usp.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.usp.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>DTI - Departamento de Tecnologia da Informacao</md:SurName>
-      <md:EmailAddress>consulta@usp.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.usp.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.usp.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>DTI - Departamento de Tecnologia da Informacao</md:SurName>
+    <md:EmailAddress>consulta@usp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
index 4ff475a5..afbb49e6 100644
--- a/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcnous.cnous.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T10:05:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T10:05:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnous.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNOUS Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMJSAnKwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTYrMDI6MDDl3SQQAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.cnous.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CNOUS Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnous.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNOUS Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMJSAnKwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTYrMDI6MDDl3SQQAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.cnous.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CNOUS Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEgzCCA2ugAwIBAgIRAN+fTxO99oLKFyV67Q3f9oUwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMFwxCzAJBgNV
@@ -45,21 +45,21 @@ GgtSQhKmeEnFDu1WDJo3hEgmJ1vual3s2T/+yDWswMdXVdsSVV6gjwMVCMLmhmEQ
 BYCUKfQUTVt7q7XD2d4Jc9DujMUsEUM+narQH37dQbMFli95mGkeqq+Eui33KuHN
 jwAZiSN1rg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcnous.cnous.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CNOUS Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNOUS Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cnous.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>equipe.systeme@cnous.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcnous.cnous.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CNOUS Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNOUS Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cnous.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>equipe.systeme@cnous.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml
index 54d7a011..5c0954f8 100644
--- a/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcove.trafford.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-23T17:18:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-23T17:18:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trafford.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trafford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlICCQCVc3XLOQv9+zANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJH
 						QjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBUaW1wZXJsZXkx
 						GTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlkcGNvdmUudHJh
@@ -33,26 +33,26 @@
 						zyHmhmFL4JdeMZVKlYOBfa5BaRelpB0b43d6BJj7U3DYWaloLk+5Ybf1rXm+DN6f
 						T8iifVdbRcCwOj+bpI8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcove.trafford.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trafford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcove.trafford.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trafford.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlICCQCVc3XLOQv9+zANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJH
 						QjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBUaW1wZXJsZXkx
 						GTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlkcGNvdmUudHJh
@@ -73,27 +73,27 @@
 						zyHmhmFL4JdeMZVKlYOBfa5BaRelpB0b43d6BJj7U3DYWaloLk+5Ybf1rXm+DN6f
 						T8iifVdbRcCwOj+bpI8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Trafford College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Trafford College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.trafford.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Fitton</md:SurName>
-      <md:EmailAddress>mailto:Dave.Fitton@trafford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Fitton</md:SurName>
-      <md:EmailAddress>mailto:Dave.Fitton@trafford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Trafford College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Trafford College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.trafford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Fitton</md:SurName>
+    <md:EmailAddress>mailto:Dave.Fitton@trafford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Fitton</md:SurName>
+    <md:EmailAddress>mailto:Dave.Fitton@trafford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
index 4808839d..540957d5 100644
--- a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpdev.bham.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-30T12:57:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-30T12:57:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Birmingham (Development IdP)</mdui:DisplayName>
+        <mdui:Logo height="34" width="141">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
+        <mdui:Logo height="48" width="39">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Birmingham (Development IdP)</mdui:DisplayName>
-          <mdui:Logo height="34" width="141">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
-          <mdui:Logo height="48" width="39">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
 						WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -37,13 +37,13 @@
 						sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
 						tHKz
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
 						N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
@@ -63,13 +63,13 @@
 						OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
 						1eJP3Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
 						WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -89,26 +89,26 @@
 						SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
 						2T4z
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpdev.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpdev.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
 						WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -128,13 +128,13 @@
 						sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
 						tHKz
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
 						CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
 						N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
@@ -154,13 +154,13 @@
 						OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
 						1eJP3Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
 						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
 						WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
@@ -180,23 +180,23 @@
 						SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
 						2T4z
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Birmingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Birmingham (Development IdP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:ServiceDesk@contacts.bham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Bryan</md:SurName>
-      <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Birmingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Birmingham (Development IdP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:ServiceDesk@contacts.bham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Bryan</md:SurName>
+    <md:EmailAddress>mailto:J.G.Bryan@bham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml
index 940b28eb..8f47152a 100644
--- a/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpglyndwr.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpglyndwr.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-09T15:51:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-09T15:51:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glyndwr.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -35,23 +35,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/glyndwr.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/glyndwr.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glyndwr University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glyndwr.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/glyndwr.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/glyndwr.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glyndwr University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glyndwr.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
index bdfe7345..0cba31f1 100644
--- a/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpi.unirc.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:22:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:22:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unirc.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mediterranea University of Reggio Calabria</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Mediterranea University of Reggio Calabria users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi Mediterranea di Reggio Calabria</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idpi.unirc.it</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idpi.unirc.it</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idpi.unirc.it</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idpi.unirc.it</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="102" xml:lang="en">https://idpi.unirc.it/logo-unirc.o.png</mdui:Logo>
+        <mdui:Logo height="100" width="102" xml:lang="it">https://idpi.unirc.it/logo-unirc.o.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unirc.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mediterranea University of Reggio Calabria</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Mediterranea University of Reggio Calabria users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi Mediterranea di Reggio Calabria</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://idpi.unirc.it</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://idpi.unirc.it</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://idpi.unirc.it</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idpi.unirc.it</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="102" xml:lang="en">https://idpi.unirc.it/logo-unirc.o.png</mdui:Logo>
-          <mdui:Logo height="100" width="102" xml:lang="it">https://idpi.unirc.it/logo-unirc.o.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAP9rufN0eSE9pab/uPB5F3qtxR/sMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMMDWlkcGkudW5pcmMuaXQwHhcNMTQxMDI1MDk0ODQ0WhcN
 MzQxMDI1MDk0ODQ0WjAYMRYwFAYDVQQDDA1pZHBpLnVuaXJjLml0MIIBIjANBgkq
@@ -43,29 +43,29 @@ Su7qkWDBUkdm+JA9XRu05A8Sttnnd9WifufDMw1nPSyu9CpwUt7VgcYAYbFiQZY9
 joCMIlANlK9KJhAHSoChOUD4v1fFQhJNhTL/BBzB/EzD5TP08OO90RqImZshz3lq
 dXTRcbayBsGx/v0QyGOZOQgifSDQ3RXX0KuWo4rFbAiaeUuG
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpi.unirc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpi.unirc.it/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpi.unirc.it/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpi.unirc.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpi.unirc.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpi.unirc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpi.unirc.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unirc.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpi.unirc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpi.unirc.it/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpi.unirc.it/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpi.unirc.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpi.unirc.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpi.unirc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpi.unirc.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unirc.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAP9rufN0eSE9pab/uPB5F3qtxR/sMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMMDWlkcGkudW5pcmMuaXQwHhcNMTQxMDI1MDk0ODQ0WhcN
 MzQxMDI1MDk0ODQ0WjAYMRYwFAYDVQQDDA1pZHBpLnVuaXJjLml0MIIBIjANBgkq
@@ -84,30 +84,30 @@ Su7qkWDBUkdm+JA9XRu05A8Sttnnd9WifufDMw1nPSyu9CpwUt7VgcYAYbFiQZY9
 joCMIlANlK9KJhAHSoChOUD4v1fFQhJNhTL/BBzB/EzD5TP08OO90RqImZshz3lq
 dXTRcbayBsGx/v0QyGOZOQgifSDQ3RXX0KuWo4rFbAiaeUuG
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpi.unirc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Mediterranea University of Reggio Calabria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Mediterranea University of Reggio Calabria</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unirc.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unirc.it/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Idem Technical</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:idem.tech.support@unirc.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Idem</md:GivenName>
-      <md:SurName>Help</md:SurName>
-      <md:EmailAddress>mailto:idem-help@unirc.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpi.unirc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Mediterranea University of Reggio Calabria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mediterranea University of Reggio Calabria</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unirc.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unirc.it/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Idem Technical</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:idem.tech.support@unirc.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Idem</md:GivenName>
+    <md:SurName>Help</md:SurName>
+    <md:EmailAddress>mailto:idem-help@unirc.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
index 6d7448c3..6c39d1e8 100644
--- a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpr.tem-tsp.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-26T10:38:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-26T10:38:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Telecom School of Management and Telecom SudParis</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.tem-tsp.eu</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Members of Evry Campus of Institute Mines Telecom, Telecom School of Management and Telecom SudParis</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Telecom SudParis et Telecom Management</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Membres du Campus d'Evry de l'Institut Mines Telecom , Telecom école de  Management et Telecom SudParis</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Telecom School of Management and Telecom SudParis</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.tem-tsp.eu</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Members of Evry Campus of Institute Mines Telecom, Telecom School of Management and Telecom SudParis</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Telecom SudParis et Telecom Management</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Membres du Campus d'Evry de l'Institut Mines Telecom , Telecom école de  Management et Telecom SudParis</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
 DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
@@ -42,13 +42,13 @@ V8HZzsUOdJsa5F0WieIy6ENpxXqDsn54w/zLub+s+ZzJoX+jzD1ZAtOaRwmUCa8q
 pqwDllq5XdnRupVTEi5djUgqxLX1GZUhxJal+nW51SoZR8exZSikJlfRhrH2lgOj
 nY0kBaFLyUpV84QgSKKM4CoxwLx+J96/Obnkk5BpUp59XyUh75DR54XUQA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
 NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
@@ -68,27 +68,27 @@ W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
 PoLdCyt/DO1aGflUdiQA/DF96+XlbGEQL7edHtEsELKz66Z8WK6fasHqNInlTe+S
 SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpr.tem-tsp.eu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpr.tem-tsp.eu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
 DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
@@ -107,13 +107,13 @@ V8HZzsUOdJsa5F0WieIy6ENpxXqDsn54w/zLub+s+ZzJoX+jzD1ZAtOaRwmUCa8q
 pqwDllq5XdnRupVTEi5djUgqxLX1GZUhxJal+nW51SoZR8exZSikJlfRhrH2lgOj
 nY0kBaFLyUpV84QgSKKM4CoxwLx+J96/Obnkk5BpUp59XyUh75DR54XUQA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
 NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
@@ -133,19 +133,19 @@ W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
 PoLdCyt/DO1aGflUdiQA/DF96+XlbGEQL7edHtEsELKz66Z8WK6fasHqNInlTe+S
 SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpr.tem-tsp.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Telecom SudParis et Telecom Management</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Telecom SudParis et Telecom Management</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tem-tsp.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>infomatique@tem-tsp.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpr.tem-tsp.eu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Telecom SudParis et Telecom Management</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Telecom SudParis et Telecom Management</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tem-tsp.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>infomatique@tem-tsp.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idprnp.univates.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idprnp.univates.br-idp-shibboleth.xml
index 2149efbf..488c8975 100644
--- a/swamid-interfederations-2.0/idprnp.univates.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idprnp.univates.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idprnp.univates.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univates.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.univates.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.univates.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univates.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.univates.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.univates.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDTlRJMQswCQYD
 VQQGEwJCUjEPMA0GA1UEAxMGaWRwcm5wMB4XDTE2MDUwMjE5MTA1OVoXDTE5MDUw
 MjE5MTA1OVowLDEMMAoGA1UECxMDTlRJMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
@@ -39,26 +39,26 @@ e+hAxKKnukSyUmNCsA7+vdU51D54JtWuMoZujojTWCG84DTTiP2OKmqmpW0UnUYW
 V+oJC5g/LBIkRWMDP3kJaEKiDmrTx/DNdn0j+9vgPWhEtgsO4lFOP1dpr9gvEVCF
 5RKMouauxifRfRmbLeTOamhOQjufPr0ju9mTzVfousq4zHLTvTMO4DFamA81JOuo
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idprnp.univates.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idprnp.univates.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idprnp.univates.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idprnp.univates.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idprnp.univates.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idprnp.univates.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univates.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idprnp.univates.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idprnp.univates.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idprnp.univates.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idprnp.univates.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idprnp.univates.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idprnp.univates.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univates.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDTlRJMQswCQYD
 VQQGEwJCUjEPMA0GA1UEAxMGaWRwcm5wMB4XDTE2MDUwMjE5MTA1OVoXDTE5MDUw
@@ -77,24 +77,24 @@ V+oJC5g/LBIkRWMDP3kJaEKiDmrTx/DNdn0j+9vgPWhEtgsO4lFOP1dpr9gvEVCF
 5RKMouauxifRfRmbLeTOamhOQjufPr0ju9mTzVfousq4zHLTvTMO4DFamA81JOuo
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idprnp.univates.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idprnp.univates.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univates.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.univates.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Giovani Lanzini</md:SurName>
-      <md:EmailAddress>redes@univates.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idprnp.univates.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idprnp.univates.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIVATES - Fundacao Vale do Taquari de Educacao e Desenvolvimento Social</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univates.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.univates.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Giovani Lanzini</md:SurName>
+    <md:EmailAddress>redes@univates.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
index c4a7318b..08d83ffe 100644
--- a/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpshib01.ifma.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T15:38:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T15:38:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABhUlEQVQoz2P8//8/Aww8zKn6c/fNv5c/Vc8tZMAF/sPAy5nzIYxbNom3NGP/4wBQDd/v3kEWvWUYh0sDE8QeDiVlFHu5me8ap2N1ERMDA8Pfb1/RhRkZ/v3/gVUDI7KniQEsDAwMt22TVA/PQ5iRsRYRJDOCIYwP334LcLEyZqxluOdYessw7rZzyv///xnS17z78uP7rz/QAElfg8x49uE7Q/oaJsV9XQw//qvsmQ0xSah4y4rTjxYcu8/AwHCsxA7ZQqnyrVBP///x/7Z5AtwBCVaK4SJ/HHoPWqqIOvQd/D8juN5bU6BwI0rE3TKMg9j77eefV/OXwp1h3LBHoHDj////M5aehQhCNfy48ZAhfQ1D+ppnXZMgItFzT8I9gOwZkoMVGtMzD9+TLNsK8Z9J417Nhl0Q7ybMP3ng2jOH3oMMDAw/fv8VKNxIgg1//v5jYWZigXCMG/acbXApXH3RSVE0d+35aCP5qcfuOqqJuWuLrzj10ENH8vzjjy8/fjtQ4ggAN8oz0EB0uF4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDBDp9MfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwMvprowAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ifma.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABhUlEQVQoz2P8//8/Aww8zKn6c/fNv5c/Vc8tZMAF/sPAy5nzIYxbNom3NGP/4wBQDd/v3kEWvWUYh0sDE8QeDiVlFHu5me8ap2N1ERMDA8Pfb1/RhRkZ/v3/gVUDI7KniQEsDAwMt22TVA/PQ5iRsRYRJDOCIYwP334LcLEyZqxluOdYessw7rZzyv///xnS17z78uP7rz/QAElfg8x49uE7Q/oaJsV9XQw//qvsmQ0xSah4y4rTjxYcu8/AwHCsxA7ZQqnyrVBP///x/7Z5AtwBCVaK4SJ/HHoPWqqIOvQd/D8juN5bU6BwI0rE3TKMg9j77eefV/OXwp1h3LBHoHDj////M5aehQhCNfy48ZAhfQ1D+ppnXZMgItFzT8I9gOwZkoMVGtMzD9+TLNsK8Z9J417Nhl0Q7ybMP3ng2jOH3oMMDAw/fv8VKNxIgg1//v5jYWZigXCMG/acbXApXH3RSVE0d+35aCP5qcfuOqqJuWuLrzj10ENH8vzjjy8/fjtQ4ggAN8oz0EB0uF4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDBDp9MfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwMvprowAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ifma.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC4DCCAkmgAwIBAgIJAMWigPxuLL5RMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
 VQQGEwJGUjERMA8GA1UECAwIQXV2ZXJnbmUxEDAOBgNVBAcMB0FVQklFUkUxDTAL
 BgNVBAoMBElGTUExDDAKBgNVBAsMA0NSSTEaMBgGA1UEAwwRaWRwc2hpYjAxLmlm
@@ -36,13 +36,13 @@ d4yuQHjMIVdzNOOmIaEBhiD6DJtUd3PzRkLygxXCgEjsqsXKPvI/SAaEHm3v3YTK
 j1sOHmXiHYkOuZiqSkP+Foyrenc96ZRSq1T4y8HdwRwvMnG6Y9sJ5P87XmeupUyL
 U60eCzyytFHcDjlnz1S/qeEMni0=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEcDCCA1igAwIBAgIQeWTtozL+4yMlqLCyZXkkqjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTExMTIyMDAwMDAwMFoXDTEzMDEwODIzNTk1OVowUjELMAkGA1UE
@@ -68,26 +68,26 @@ l4Qpi4VdqnK4Tt47CqosYm5Y/NwMsE20yw4IbQSFJyhWthhVJ62lyekh+SnRRUNn
 s50/E8fZWkQetEbw3KpZy2H/eL7loEb6/mJdDFmXd1onNu+4U366Rw3501o7NGbF
 1disNesj8I3wk+psj7WYU56fxmDDdj/F/XB66PmkewkLZL5p
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshib01.ifma.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifma.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christophe DUMONET</md:SurName>
-      <md:EmailAddress>christophe.dumonet@ifma.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Frédéric DEDIEU</md:SurName>
-      <md:EmailAddress>frederic.dedieu@ifma.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshib01.ifma.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifma.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christophe DUMONET</md:SurName>
+    <md:EmailAddress>christophe.dumonet@ifma.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frédéric DEDIEU</md:SurName>
+    <md:EmailAddress>frederic.dedieu@ifma.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index eeb3517e..8138fc88 100644
--- a/swamid-interfederations-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpshibboleth.irf.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irf.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
+        <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>irf.se</mdui:DomainHint>
+        <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
+        <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irf.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
-          <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>irf.se</mdui:DomainHint>
-          <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
-          <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUA93wi+Avn0weW0JMfqJ3DxZWLjgwDQYJKoZIhvcNAQEL
 BQAwHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5pcmYuc2UwHhcNMTYwMjA4MTIy
 MDMzWhcNMzYwMjA4MTIyMDMzWjAfMR0wGwYDVQQDDBRpZHBzaGliYm9sZXRoLmly
@@ -52,13 +52,13 @@ AJ1MDeT4luzSG1Vc/bfH8RkaDI+lhR0FZe0xmhYaS2nG7kyEn0lBYjbevE1ZpaRe
 wrDZBcvSQ6jJw91F/CHHutF2nzaZuALlK9/3azDGx5LbUFCIxvmeM4Gmz8csx8rz
 4okhyqwoeyl2XUl1z+PB
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
@@ -78,13 +78,13 @@ FYtcAWcGkYZsHioAMaaKNuVnk2srKT4lNrIVMFn+8mzri18rIs7GPrUi2tK2LoX0
 CkZfFUJynwfG4GDixCdVykAiT+DJAZ0AUOGAD0ASgp0fcYp4q54WqFngl3IvCr2T
 0Kcn98Fuw5/qCHZ1mIAgyA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAN/1x1Wau72Xw/BL88E9dnVPnD1MMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
@@ -104,25 +104,25 @@ SUpvSthL7xqz9bSHJsH3LBh/0fnQ1+eEY5XkMAKzdjaesWYSfJOUWcUojcyYY7TO
 vsUgGd85RO4yz1NF7JL/8KMHODq6/vHeE53VgHXRdeH0ntl04Gvzu6oyl7En3G5B
 CQNfH97cIrTE5N/RQ7XWcw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshibboleth.irf.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irf.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshibboleth.irf.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irf.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUA93wi+Avn0weW0JMfqJ3DxZWLjgwDQYJKoZIhvcNAQEL
 BQAwHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5pcmYuc2UwHhcNMTYwMjA4MTIy
 MDMzWhcNMzYwMjA4MTIyMDMzWjAfMR0wGwYDVQQDDBRpZHBzaGliYm9sZXRoLmly
@@ -142,13 +142,13 @@ AJ1MDeT4luzSG1Vc/bfH8RkaDI+lhR0FZe0xmhYaS2nG7kyEn0lBYjbevE1ZpaRe
 wrDZBcvSQ6jJw91F/CHHutF2nzaZuALlK9/3azDGx5LbUFCIxvmeM4Gmz8csx8rz
 4okhyqwoeyl2XUl1z+PB
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
@@ -168,13 +168,13 @@ FYtcAWcGkYZsHioAMaaKNuVnk2srKT4lNrIVMFn+8mzri18rIs7GPrUi2tK2LoX0
 CkZfFUJynwfG4GDixCdVykAiT+DJAZ0AUOGAD0ASgp0fcYp4q54WqFngl3IvCr2T
 0Kcn98Fuw5/qCHZ1mIAgyA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAN/1x1Wau72Xw/BL88E9dnVPnD1MMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
@@ -194,33 +194,33 @@ SUpvSthL7xqz9bSHJsH3LBh/0fnQ1+eEY5XkMAKzdjaesWYSfJOUWcUojcyYY7TO
 vsUgGd85RO4yz1NF7JL/8KMHODq6/vHeE53VgHXRdeH0ntl04Gvzu6oyl7En3G5B
 CQNfH97cIrTE5N/RQ7XWcw==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRF</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.irf.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Swedish Institute of Space Physics</md:Company>
-      <md:SurName>Mats Luspa</md:SurName>
-      <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
-      <md:TelephoneNumber>+4698079000</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Swedish Institute of Space Physics</md:Company>
-      <md:SurName>Mats Luspa</md:SurName>
-      <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
-      <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Swedish Institute of Space Physics</md:Company>
-      <md:SurName>Mats Luspa</md:SurName>
-      <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
-      <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRF</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.irf.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Institute of Space Physics</md:Company>
+    <md:SurName>Mats Luspa</md:SurName>
+    <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
+    <md:TelephoneNumber>+4698079000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Swedish Institute of Space Physics</md:Company>
+    <md:SurName>Mats Luspa</md:SurName>
+    <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
+    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Swedish Institute of Space Physics</md:Company>
+    <md:SurName>Mats Luspa</md:SurName>
+    <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
+    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
index 900a754f..1dd16a52 100644
--- a/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpstaff-ha.belnet.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
+        <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
+        <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
+        <mdui:DomainHint>belnet.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
-          <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
-          <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
-          <mdui:DomainHint>belnet.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFhTCCBG2gAwIBAgIQAbu/mz6B3uQHzR3sVYBohTANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -56,30 +56,30 @@ Na+iw1Vgtc8JHrdTnpMUuqMoIQj3P4r05Udx66T/cWTneDZIO02s3nmiPnOUlk5Z
 LPAq+dQEmHEHrN6uQyM6zCVLcrYt9T44SlwUFnddBpB9zblq1iveB96mSvpPlnsX
 /zsUJwYbMt+gLa9vzGSwaDg0dP+4TrQNSw==
                   </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpstaff-ha.belnet.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpstaff-ha.belnet.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFhTCCBG2gAwIBAgIQAbu/mz6B3uQHzR3sVYBohTANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -112,20 +112,20 @@ LPAq+dQEmHEHrN6uQyM6zCVLcrYt9T44SlwUFnddBpB9zblq1iveB96mSvpPlnsX
 /zsUJwYbMt+gLa9vzGSwaDg0dP+4TrQNSw==
 
                  </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Belnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Belnet staff HA IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
-      <md:SurName>Belnet Federation</md:SurName>
-      <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
-      <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Belnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Belnet staff HA IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
+    <md:SurName>Belnet Federation</md:SurName>
+    <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
+    <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
index e05e2de6..2d2d58c2 100644
--- a/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpstaff.belnet.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
+        <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
+        <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
+        <mdui:DomainHint>belnet.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
-          <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
-          <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
-          <mdui:DomainHint>belnet.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIHBjCCBO6gAwIBAgIJAKNh2zINnSimMA0GCSqGSIb3DQEBCwUAMIGyMQswCQYD
 VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQw
 MgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVy
@@ -63,27 +63,27 @@ RQzoz1wqXX6OcU6uqu2yUZoZzUmPc4u2gCE2bxNeEWqHmz5k33LicM3KcaDn3QjS
 wTsM3P1mxKzK7lAzy6SA76BSuYstnOQxQQxmJTwhUnticjkyMB3Z6iuR9fyuDaJX
 RZH2wUb6jtZi83IXvN4KOxY4B0P3aRFH73Q4apG3hs8q+LQHTrWJ7ZbIikX9Nqmo
 tE/exBceOZoTFnIs53BmWCHYW6Vf8DWxkds=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpstaff.belnet.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpstaff.belnet.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIHBjCCBO6gAwIBAgIJAKNh2zINnSimMA0GCSqGSIb3DQEBCwUAMIGyMQswCQYD
 VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQw
 MgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVy
@@ -122,24 +122,24 @@ RQzoz1wqXX6OcU6uqu2yUZoZzUmPc4u2gCE2bxNeEWqHmz5k33LicM3KcaDn3QjS
 wTsM3P1mxKzK7lAzy6SA76BSuYstnOQxQQxmJTwhUnticjkyMB3Z6iuR9fyuDaJX
 RZH2wUb6jtZi83IXvN4KOxY4B0P3aRFH73Q4apG3hs8q+LQHTrWJ7ZbIikX9Nqmo
 tE/exBceOZoTFnIs53BmWCHYW6Vf8DWxkds=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Belnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Belnet staff</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
-      <md:SurName>Belnet Federation</md:SurName>
-      <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
-      <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Belnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Belnet staff</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
+    <md:SurName>Belnet Federation</md:SurName>
+    <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
+    <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml
index 93a256b4..f0b97865 100644
--- a/swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptest.arts.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-24T11:56:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-24T11:56:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEQzCCAyugAwIBAgIJAPSUoUxlNXOCMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJHQjEXMBUGA1UECAwOR3JlYXRlciBMb25kb24xDzANBgNVBAcMBkxvbmRv
 						bjEnMCUGA1UECgweVW5pdmVyc2l0eSBvZiB0aGUgQXJ0cywgTG9uZG9uMRQwEgYD
@@ -42,29 +42,29 @@
 						cSv7+YOHKs3p5aBYeuvvTsv1hZMwtD7ehNNzSGwv9S+nfIGQ16B1JRcmXSN14V1+
 						BKVZVakKzX6WCxengZ2A8lbx/oQPp5rbxtWkiv9dYMUY2nyQsjGF
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.arts.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.arts.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arts.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEQzCCAyugAwIBAgIJAPSUoUxlNXOCMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJHQjEXMBUGA1UECAwOR3JlYXRlciBMb25kb24xDzANBgNVBAcMBkxvbmRv
 						bjEnMCUGA1UECgweVW5pdmVyc2l0eSBvZiB0aGUgQXJ0cywgTG9uZG9uMRQwEgYD
@@ -89,26 +89,26 @@
 						cSv7+YOHKs3p5aBYeuvvTsv1hZMwtD7ehNNzSGwv9S+nfIGQ16B1JRcmXSN14V1+
 						BKVZVakKzX6WCxengZ2A8lbx/oQPp5rbxtWkiv9dYMUY2nyQsjGF
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the Arts London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the Arts London Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.arts.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UAL Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:shib-support@arts.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Justin</md:GivenName>
-      <md:SurName>Birt</md:SurName>
-      <md:EmailAddress>mailto:j.birt@arts.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the Arts London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the Arts London Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.arts.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UAL Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:shib-support@arts.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Justin</md:GivenName>
+    <md:SurName>Birt</md:SurName>
+    <md:EmailAddress>mailto:j.birt@arts.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml
index 9a13722a..b0e7260f 100644
--- a/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptest.brunel.ac.uk/entity">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T13:14:14Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T13:14:14Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brunel University (Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Brunel University test identity provider</mdui:Description>
+        <mdui:Logo height="60" width="80">https://idptest.brunel.ac.uk/logo/80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://idptest.brunel.ac.uk/logo/16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brunel University (Test)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Brunel University test identity provider</mdui:Description>
-          <mdui:Logo height="60" width="80">https://idptest.brunel.ac.uk/logo/80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://idptest.brunel.ac.uk/logo/16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVANgJSDgjyA0miJmS6WdosLWR8bo3MA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcHRlc3QuYnJ1bmVsLmFjLnVrMB4XDTEzMDUxMzA4
 						NDEyM1oXDTMzMDUxMzA4NDEyM1owHzEdMBsGA1UEAxMUaWRwdGVzdC5icnVuZWwu
@@ -41,29 +41,29 @@
 						bmvYeuDZtLYLGxK6LdrBY2JUf4diIibARVq+AbGCakqOmEB6A00OU1kNWnHZ1s2F
 						ZxYoLjTTweY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVANgJSDgjyA0miJmS6WdosLWR8bo3MA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFGlkcHRlc3QuYnJ1bmVsLmFjLnVrMB4XDTEzMDUxMzA4
 						NDEyM1oXDTMzMDUxMzA4NDEyM1owHzEdMBsGA1UEAxMUaWRwdGVzdC5icnVuZWwu
@@ -83,25 +83,25 @@
 						bmvYeuDZtLYLGxK6LdrBY2JUf4diIibARVq+AbGCakqOmEB6A00OU1kNWnHZ1s2F
 						ZxYoLjTTweY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brunel University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brunel University (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Systems Web</md:GivenName>
-      <md:EmailAddress>mailto:sysweb@brunel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Web</md:GivenName>
-      <md:EmailAddress>mailto:sysweb@brunel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brunel University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brunel University (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Systems Web</md:GivenName>
+    <md:EmailAddress>mailto:sysweb@brunel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Web</md:GivenName>
+    <md:EmailAddress>mailto:sysweb@brunel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml b/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml
index 4b939484..4f3bf3ff 100644
--- a/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml
+++ b/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptest.coventry.ac.uk/idp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-12T17:10:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-12T17:10:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coventry.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coventry.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUQz1y+3PpqxFtSJF1dmrHYsxzNNcwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWaWRwdGVzdC5jb3ZlbnRyeS5hYy51azAeFw0xMzA1MTMw
 						ODA1NTJaFw0zMzA1MTMwODA1NTJaMCExHzAdBgNVBAMTFmlkcHRlc3QuY292ZW50
@@ -37,26 +37,26 @@
 						+/Ma6jjJQqwMn6waLPwWgaFF4D1dDYNiBycXZFUdxq7QGfMLNM/3087BXZmx1cwA
 						ShCd45aNLiB4OnAyl5fHO3EMmgcw2n8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.coventry.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coventry.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.coventry.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coventry.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUQz1y+3PpqxFtSJF1dmrHYsxzNNcwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWaWRwdGVzdC5jb3ZlbnRyeS5hYy51azAeFw0xMzA1MTMw
 						ODA1NTJaFw0zMzA1MTMwODA1NTJaMCExHzAdBgNVBAMTFmlkcHRlc3QuY292ZW50
@@ -76,27 +76,27 @@
 						+/Ma6jjJQqwMn6waLPwWgaFF4D1dDYNiBycXZFUdxq7QGfMLNM/3087BXZmx1cwA
 						ShCd45aNLiB4OnAyl5fHO3EMmgcw2n8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coventry University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coventry University (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.coventry.ac.uk/cu/its/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Walton</md:SurName>
-      <md:EmailAddress>mailto:g.walton@coventry.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Walton</md:SurName>
-      <md:EmailAddress>mailto:g.walton@coventry.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coventry University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coventry University (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.coventry.ac.uk/cu/its/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Walton</md:SurName>
+    <md:EmailAddress>mailto:g.walton@coventry.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Walton</md:SurName>
+    <md:EmailAddress>mailto:g.walton@coventry.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml
index 5b4286fb..d9729633 100644
--- a/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptest.dundee.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-23T14:52:51Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-23T14:52:51Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEdjCCA16gAwIBAgIRALhrcSNiz3jY22Uy2UdbVDQwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTQwMDAwMDBaFw0xNjA1MTMyMzU5NTlaMEIxITAfBgNV
@@ -41,29 +41,29 @@
 						4mRlAi9j6dLf6h8MDqNkxRi/EOMXU5zpoMWniSSUuqpkUnjmYVttGCdo5hSVYlOK
 						OKpIjPVYOu9sGvFLTmnQTOHk3UVSj+5NQpEpCMbSPoElsd4ZZQAneHdB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.dundee.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.dundee.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundee.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEdjCCA16gAwIBAgIRALhrcSNiz3jY22Uy2UdbVDQwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTQwMDAwMDBaFw0xNjA1MTMyMzU5NTlaMEIxITAfBgNV
@@ -89,27 +89,27 @@
 						4mRlAi9j6dLf6h8MDqNkxRi/EOMXU5zpoMWniSSUuqpkUnjmYVttGCdo5hSVYlOK
 						OKpIjPVYOu9sGvFLTmnQTOHk3UVSj+5NQpEpCMbSPoElsd4ZZQAneHdB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Dundee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Dundee test 2.4 IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dundee.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Swiffin</md:SurName>
-      <md:EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Swiffin</md:SurName>
-      <md:EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Dundee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Dundee test 2.4 IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dundee.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Swiffin</md:SurName>
+    <md:EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Swiffin</md:SurName>
+    <md:EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml
index 4db6c64a..3e746f71 100644
--- a/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptest.gla.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Glasgow (test idp)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://milngavie.cent.gla.ac.uk/UoG_colour_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.209.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>gla.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.8719,4.2875</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Glasgow (test idp)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://milngavie.cent.gla.ac.uk/UoG_colour_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>130.209.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>gla.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:55.8719,4.2875</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIJAMpwaiffXLvnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmlkcDIuZ2xhLmFjLnVrMB4XDTEzMDczMTA5NTIxM1oXDTIzMDcyOTA5NTIx
 						M1owGTEXMBUGA1UEAxMOaWRwMi5nbGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
@@ -45,26 +45,26 @@
 						Y+WN9I8MHc2fP7w2koKhHc5bM0yKnmIQ9qlZfoliAWKLaCaoDkFJ0mQiYjtieiXf
 						qP4p1g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gla.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIJAMpwaiffXLvnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmlkcDIuZ2xhLmFjLnVrMB4XDTEzMDczMTA5NTIxM1oXDTIzMDcyOTA5NTIx
 						M1owGTEXMBUGA1UEAxMOaWRwMi5nbGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
@@ -84,26 +84,26 @@
 						Y+WN9I8MHc2fP7w2koKhHc5bM0yKnmIQ9qlZfoliAWKLaCaoDkFJ0mQiYjtieiXf
 						qP4p1g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Glasgow (test idp)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/services/it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User Support</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@it.gla.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:d.anderson@compserv.gla.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Glasgow (test idp)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/services/it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User Support</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@it.gla.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:d.anderson@compserv.gla.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml
index 3381b895..66a1e6c5 100644
--- a/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptest.northumbria.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXDCCA0SgAwIBAgIJAN+n/8ddfvukMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
 						dGxlIHVwb24gVHluZTEvMC0GA1UECgwmVW5pdmVyc2l0eSBvZiBOb3J0aHVtYnJp
@@ -41,26 +41,26 @@
 						KzbaZ7XJsXv5KSqZ+N9KNAOKB2OtibZ4JRaqLDFnEjpNUbMou6hds2bq5qSLu0y4
 						0SCI9EzS1OHjuqq4XJ2vLg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.northumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.northumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXDCCA0SgAwIBAgIJAN+n/8ddfvukMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
 						dGxlIHVwb24gVHluZTEvMC0GA1UECgwmVW5pdmVyc2l0eSBvZiBOb3J0aHVtYnJp
@@ -86,27 +86,27 @@
 						KzbaZ7XJsXv5KSqZ+N9KNAOKB2OtibZ4JRaqLDFnEjpNUbMou6hds2bq5qSLu0y4
 						0SCI9EzS1OHjuqq4XJ2vLg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Northumbria at Newcastle</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northumbria University: IT Services Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northumbria.ac.uk/sd/central/its/dept_structure_etc/?view=Standard</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Graham</md:SurName>
-      <md:EmailAddress>mailto:neil.graham@northumbria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Graham</md:SurName>
-      <md:EmailAddress>mailto:neil.graham@northumbria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Northumbria at Newcastle</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northumbria University: IT Services Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northumbria.ac.uk/sd/central/its/dept_structure_etc/?view=Standard</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Graham</md:SurName>
+    <md:EmailAddress>mailto:neil.graham@northumbria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Graham</md:SurName>
+    <md:EmailAddress>mailto:neil.graham@northumbria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
index 29b95123..fdd8994f 100644
--- a/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptl.telecom-lille.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T16:05:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T16:05:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Telecom Lille</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABFklEQVQ4y82Su0oDYRCFv/k3m0WJMRcDATWQRovghViIjdpaWlhZmpfwJWziEwg2PoIvIDZiZZpgkVJkgxEWdS9jscHddLJr4cA0c5gPZs4B0Az9AfQBCmQrBzgDPmVKzFpeXkBociwD8HeA/TrsVgWAxQKcdwynrYS/XhL6XcNl19CeSwA/LpysWrwHyv1Y2asJvU3Dy6tyPQLbgosNw1FLEGDZEY7vwllA0Yq9AajYsKDC11TtlISVsuD74IXQLEPNBtdPAQYTxQtiQ54mysM4YuTG2uObcvUc0VszgHIzjHD95AwFdMlBq8UkbTsV0fb8bAIPG6IHDUnPgv+RAy8PwALqwBZgZ9hXC7gFmsB2+qm/7OAb/y9ptHSlOm8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDDH7d3lAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwtrBlWQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.telecom-lille.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Teachers, Researchers and students.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Télécom Lille</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Enseignants, Chercheurs et Etudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Telecom Lille</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABFklEQVQ4y82Su0oDYRCFv/k3m0WJMRcDATWQRovghViIjdpaWlhZmpfwJWziEwg2PoIvIDZiZZpgkVJkgxEWdS9jscHddLJr4cA0c5gPZs4B0Az9AfQBCmQrBzgDPmVKzFpeXkBociwD8HeA/TrsVgWAxQKcdwynrYS/XhL6XcNl19CeSwA/LpysWrwHyv1Y2asJvU3Dy6tyPQLbgosNw1FLEGDZEY7vwllA0Yq9AajYsKDC11TtlISVsuD74IXQLEPNBtdPAQYTxQtiQ54mysM4YuTG2uObcvUc0VszgHIzjHD95AwFdMlBq8UkbTsV0fb8bAIPG6IHDUnPgv+RAy8PwALqwBZgZ9hXC7gFmsB2+qm/7OAb/y9ptHSlOm8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDDH7d3lAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwtrBlWQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.telecom-lille.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Teachers, Researchers and students.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Télécom Lille</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Enseignants, Chercheurs et Etudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUdOTTpXbEHWneZrmj++dQu587hqYwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaWRwdGwudGVsZWNvbS1saWxsZS5mcjAeFw0xNDAyMjcw
 ODMwMDJaFw0zNDAyMjcwODMwMDJaMCExHzAdBgNVBAMTFmlkcHRsLnRlbGVjb20t
@@ -40,26 +40,26 @@ HTHjakbY9quIy8peLhmpjkl85T4mX53V2E90RzOPUhyk1GUzAHiN+O1YBP0n+PEr
 3sd4/75bHQK+6Ec/SBCJA86j/zbK8IPdSqZOWs/zbKYA0Qdava8bErtA5+Qje91C
 qdWukaTYTGYIy6blrFvq4vQQgLPbDGY=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptl.telecom-lille.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Télécom Lille</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Télécom Lille</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.telecom-lille.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Tovo Rakotonavalona</md:SurName>
-      <md:EmailAddress>tovo.rakotonavalona@telecom-lille.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Martine Sion</md:SurName>
-      <md:EmailAddress>martine.sion@telecom-lille.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptl.telecom-lille.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Télécom Lille</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Télécom Lille</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.telecom-lille.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Tovo Rakotonavalona</md:SurName>
+    <md:EmailAddress>tovo.rakotonavalona@telecom-lille.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Martine Sion</md:SurName>
+    <md:EmailAddress>martine.sion@telecom-lille.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
index 9774c9a7..41e50988 100644
--- a/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptoo.osu.cz/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-03-21T14:50:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-03-21T14:50:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="cs">Ostravská univerzita v Ostravě</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Ostrava</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="la">Universitas Ostraviensis</mdui:DisplayName>
+        <mdui:Description xml:lang="cs">Identity Provider pro Ostravskou univerzitu v Ostravě</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for University of Ostrava</mdui:Description>
+        <mdui:InformationURL xml:lang="cs">http://www.osu.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.osu.eu/</mdui:InformationURL>
+        <mdui:Logo height="40" width="133">https://idptoo.osu.cz/simplesaml/logo_ou.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="cs">Ostravská univerzita v Ostravě</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Ostrava</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="la">Universitas Ostraviensis</mdui:DisplayName>
-          <mdui:Description xml:lang="cs">Identity Provider pro Ostravskou univerzitu v Ostravě</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for University of Ostrava</mdui:Description>
-          <mdui:InformationURL xml:lang="cs">http://www.osu.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.osu.eu/</mdui:InformationURL>
-          <mdui:Logo height="40" width="133">https://idptoo.osu.cz/simplesaml/logo_ou.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Ostrava</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationName>
-      <md:OrganizationName xml:lang="la">Universitas Ostraviensis</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Ostrava</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="la">Universitas Ostraviensis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="cs">http://www.osu.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.osu.eu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alice</md:GivenName>
-      <md:SurName>Vixie</md:SurName>
-      <md:EmailAddress>eduid@osu.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Ostrava</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationName>
+    <md:OrganizationName xml:lang="la">Universitas Ostraviensis</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Ostrava</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="la">Universitas Ostraviensis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.osu.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.osu.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alice</md:GivenName>
+    <md:SurName>Vixie</md:SurName>
+    <md:EmailAddress>eduid@osu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
index b1d787fe..0773a9b8 100644
--- a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-20T22:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-20T22:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniba.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Bari Aldo Moro</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Bari Aldo Moro</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the users of University of Bari Aldo Moro</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="80" width="60" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
+        <mdui:Logo height="80" width="60" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniba.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Bari Aldo Moro</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Bari Aldo Moro</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for the users of University of Bari Aldo Moro</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="80" width="60" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
-          <mdui:Logo height="80" width="60" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
 BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
@@ -48,13 +48,13 @@ VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
 cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
 kA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
 BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
@@ -78,23 +78,23 @@ VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
 cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
 kA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Bari Aldo Moro</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Bari Aldo Moro</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bari Aldo Moro</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.uniba.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uniba.it/english-version</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Administrator</md:SurName>
-      <md:EmailAddress>mailto:staff@uniba.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Bari Aldo Moro</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Bari Aldo Moro</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bari Aldo Moro</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.uniba.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uniba.it/english-version</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:staff@uniba.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
index 91ca1455..50fea100 100644
--- a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpunict.unict.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-27T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-27T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unict.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Catania</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Catania</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Catania users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Catania</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unict.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Catania</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Catania</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for University of Catania users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Catania</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAN3muNVpnUKhVVYLS4LTiTLhtjaeMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcHVuaWN0LnVuaWN0Lml0MB4XDTEzMDYxMjA4Mzgx
 MFoXDTMzMDYxMjA4MzgxMFowHDEaMBgGA1UEAxMRaWRwdW5pY3QudW5pY3QuaXQw
@@ -42,26 +42,26 @@ V5i2qJtpsBkgwbQjpfjs5ReIMxl4QhEbnshqKNJVUf8IsTGGmYLuj2Sn/t29K6sC
 8rUp8lyUvZ8nyy/IRvMb+fFmx4/KUicxeUfqmbbwCZXdMtciGfSHVXLyhhs0xAAH
 /xmo2Q==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpunict.unict.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpunict.unict.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpunict.unict.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpunict.unict.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpunict.unict.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpunict.unict.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unict.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpunict.unict.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpunict.unict.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpunict.unict.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpunict.unict.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpunict.unict.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpunict.unict.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unict.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAN3muNVpnUKhVVYLS4LTiTLhtjaeMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcHVuaWN0LnVuaWN0Lml0MB4XDTEzMDYxMjA4Mzgx
 MFoXDTMzMDYxMjA4MzgxMFowHDEaMBgGA1UEAxMRaWRwdW5pY3QudW5pY3QuaXQw
@@ -81,23 +81,23 @@ V5i2qJtpsBkgwbQjpfjs5ReIMxl4QhEbnshqKNJVUf8IsTGGmYLuj2Sn/t29K6sC
 8rUp8lyUvZ8nyy/IRvMb+fFmx4/KUicxeUfqmbbwCZXdMtciGfSHVXLyhhs0xAAH
 /xmo2Q==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpunict.unict.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpunict.unict.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Catania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Catania</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Catania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unict.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unict.it/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:support-idem@unict.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpunict.unict.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpunict.unict.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unict.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unict.it/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support-idem@unict.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
index b5016cf5..80fb797e 100644
--- a/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.essingtoncc.co.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-06T12:07:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-06T12:07:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVANxdvblrHmOwk0K/rl10Sda/mMrFMA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
 						NDE1NTYxNFoXDTM1MTAxNDE1NTYxNFowIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
@@ -37,13 +37,13 @@
 						DshYuafoNMzlhChAmEjZgwbU+bMtjQv6A0J49uebhyyIbd5k3UGtuafv1XQXERL+
 						LmiAYOW7xsIlMcU3oGuPig1k5E9I4mtPxgqfQw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUQ+2SQEeM841I+Pr+e1Rf1G2mWtYwDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5ndG9uY2MuY28udWswHhcNMTUxMDE0
 						MTU1NjA5WhcNMzUxMDE0MTU1NjA5WjAiMSAwHgYDVQQDDBdpZHB2My5lc3Npbmd0
@@ -63,13 +63,13 @@
 						Sc5v7jqZOGcVPtR9xiewWBb5p9LjWLezZPYyM2nz6bJktSea75YDiJpFYIsGX1EA
 						gtlBzrAHoC/fd8GGCq5HZ0mQyNzrF70sEXN7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAPzpG2xrtqp1K0RSsJJUezfEZvB1MA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
 						NDE1NTYxM1oXDTM1MTAxNDE1NTYxM1owIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
@@ -89,26 +89,26 @@
 						q1Jv3WZ9N9b7LT17+KzD30WQMYlRRO++T+j7McCQB2I32ymF8xo8NkpUjKA43m+z
 						1oHqE+W7b2W2PL9JJ7zQEP5c4qax7abevAa5yw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essingtoncc.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVANxdvblrHmOwk0K/rl10Sda/mMrFMA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
 						NDE1NTYxNFoXDTM1MTAxNDE1NTYxNFowIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
@@ -128,13 +128,13 @@
 						DshYuafoNMzlhChAmEjZgwbU+bMtjQv6A0J49uebhyyIbd5k3UGtuafv1XQXERL+
 						LmiAYOW7xsIlMcU3oGuPig1k5E9I4mtPxgqfQw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUQ+2SQEeM841I+Pr+e1Rf1G2mWtYwDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5ndG9uY2MuY28udWswHhcNMTUxMDE0
 						MTU1NjA5WhcNMzUxMDE0MTU1NjA5WjAiMSAwHgYDVQQDDBdpZHB2My5lc3Npbmd0
@@ -154,13 +154,13 @@
 						Sc5v7jqZOGcVPtR9xiewWBb5p9LjWLezZPYyM2nz6bJktSea75YDiJpFYIsGX1EA
 						gtlBzrAHoC/fd8GGCq5HZ0mQyNzrF70sEXN7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAPzpG2xrtqp1K0RSsJJUezfEZvB1MA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
 						NDE1NTYxM1oXDTM1MTAxNDE1NTYxM1owIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
@@ -180,24 +180,24 @@
 						q1Jv3WZ9N9b7LT17+KzD30WQMYlRRO++T+j7McCQB2I32ymF8xo8NkpUjKA43m+z
 						1oHqE+W7b2W2PL9JJ7zQEP5c4qax7abevAa5yw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Essington Computer Consultancy Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Essington Computer Consultancy Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:andy@essingtoncc.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
index bdaeca40..765a59c6 100644
--- a/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.lu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://lucat.blogg.lu.se/anvandarvillkor-personuppgifter/hantering-av-personuppgifter</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://lucat.blogg.lu.se/anvandarvillkor-personuppgifter/acceptable-use-policy</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">lu lth Lunds+universitet Lund+University</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">lu lth Lunds+universitet Lund+University</mdui:Keywords>
+        <mdui:Logo height="78" width="450" xml:lang="sv">https://idpv3.lu.se/idp/images/LU_swe_logo_450px.jpg</mdui:Logo>
+        <mdui:Logo height="78" width="382" xml:lang="en">https://idpv3.lu.se/idp/images/LU_eng_logo_382px.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>lu.se</mdui:DomainHint>
+        <mdui:DomainHint>lth.se</mdui:DomainHint>
+        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://lucat.blogg.lu.se/anvandarvillkor-personuppgifter/hantering-av-personuppgifter</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://lucat.blogg.lu.se/anvandarvillkor-personuppgifter/acceptable-use-policy</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">lu lth Lunds+universitet Lund+University</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">lu lth Lunds+universitet Lund+University</mdui:Keywords>
-          <mdui:Logo height="78" width="450" xml:lang="sv">https://idpv3.lu.se/idp/images/LU_swe_logo_450px.jpg</mdui:Logo>
-          <mdui:Logo height="78" width="382" xml:lang="en">https://idpv3.lu.se/idp/images/LU_eng_logo_382px.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>lu.se</mdui:DomainHint>
-          <mdui:DomainHint>lth.se</mdui:DomainHint>
-          <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUD4RyhLFIuNZ5O77xXaRFLYeZgJAwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA2WhcNMzYw
 MjIyMDc1NDA2WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
@@ -60,13 +60,13 @@ xCsMdAMr8CrJMoK+1sBIgfIr8nBuIo3SvXAsHd6ts0xYVqgeYM6qPg97qiHytJvU
 RkaCJ5ca0ZutSetcL3mkXdHIl+5S9zhgcs3hOLA6v7Yqsd+lWA8Jqh4wbBXixpGu
 cGOFP9UH1ptYCE+azH3kJ0N00MmrXdZgH323
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAOAJRp4FcZsN0Apk6n6NJRREV+6VMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC2lkcHYzLmx1LnNlMB4XDTE2MDIyMjA3NTQwNVoXDTM2
 MDIyMjA3NTQwNVowFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwggEiMA0GCSqGSIb3
@@ -85,13 +85,13 @@ HEa8UnjwOtglHEiRxQwyildnenAuXn37ZEe1n9jLiMAzPRFVxIrnuSyalUSyvGc2
 6c9Aozb+3ozGufmWcuVc6wZeZtGdHYRT3N1uVBN2agzRNrlhcuP/gDDjhFHlFMDs
 4YT1j/q6c6UU7MANv5mTzc3hL5MSrvj4CCpVgA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUauI49n1u/B9z1f0b/KUMu1vDD3EwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwdjMubHUuc2UwHhcNMTYwMjIyMDc1NDA1WhcNMzYw
 MjIyMDc1NDA1WjAWMRQwEgYDVQQDDAtpZHB2My5sdS5zZTCCASIwDQYJKoZIhvcN
@@ -110,38 +110,38 @@ rA86XwGeATly1iQu9EVWH+nCBYs+MLogsB9qtA/2vd4nCM9jNGe9+PhC+p84l3nK
 KE7aiSxYsHeCrgDI13bWgb/5xaYBMwJLDYj/KTIrtThku/WU8kDgEZtjcfCWCMiJ
 9rjFqJ/gXzCEj4IVOIWKvE1TswY/c0hymlJ3
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.lu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eskil</md:GivenName>
-      <md:SurName>Swahn</md:SurName>
-      <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Johan</md:GivenName>
-      <md:SurName>Silverup</md:SurName>
-      <md:EmailAddress>mailto:johan.silverup@ldc.lu.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>LU Servicedesk</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.lu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.lu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eskil</md:GivenName>
+    <md:SurName>Swahn</md:SurName>
+    <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Silverup</md:SurName>
+    <md:EmailAddress>mailto:johan.silverup@ldc.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>LU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
index 175e51b8..b05181d3 100644
--- a/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.rnp.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.rnp.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IDP V3 - Laerte  RNP Campinas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IDP V3 - Laerte  RNP Campinas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IDP V3 - Laerte  RNP Campinas</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IDP V3 - Laerte  RNP Campinas</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.rnp.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
 ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
 MCsGCSqGSIb3DQEJARYebGFlcnRlLmJlbG90dG9AdGVyY2Vpcm8ucm5wLmJyMREw
@@ -46,26 +46,26 @@ Cu0TgwLPpqMwaxEqdFhISrmKiQDCUrgSFYa5LdeHeNqYzB6cQAN7LWF1eutgaxyv
 rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
 BLw=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.rnp.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.rnp.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.rnp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.rnp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.rnp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.rnp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rnp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMTAvBgNVBAoTKFJOUCAtIFJl
 ZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2ExDDAKBgNVBAsTA0dUSTEt
@@ -91,24 +91,24 @@ rwzjZkFiGeBWPDwP+z0ujfn5lrTAghRDc3f51qSgar/SybqN6bZxjOZF8EzcMqOI
 BLw=
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IDP V3 - Laerte  RNP Campinas</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IDP V3 - Laerte  RNP Campinas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Laerte F Belotto</md:SurName>
-      <md:EmailAddress>laerte.belotto@terceiro.rnp.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.rnp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IDP V3 - Laerte  RNP Campinas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDP V3 - Laerte  RNP Campinas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IDP V3 - Laerte  RNP Campinas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rnp.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.rnp.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Laerte F Belotto</md:SurName>
+    <md:EmailAddress>laerte.belotto@terceiro.rnp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.staffs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.staffs.ac.uk-idp-shibboleth.xml
index 786582a2..cb3c1484 100644
--- a/swamid-interfederations-2.0/idpv3.staffs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.staffs.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.staffs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-18T13:25:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-18T13:25:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Staffordshire University TEST ONLY, DO NOT USE</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.staffs.ac.uk/images/logo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Staffordshire University TEST ONLY, DO NOT USE</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.staffs.ac.uk/images/logo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAM7pWNqQadlamL8YePYTlxVBghTiMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcHYzLnN0YWZmcy5hYy51azAeFw0xNjA0MjcxNDMx
 						MzdaFw0zNjA0MjcxNDMxMzdaMB0xGzAZBgNVBAMMEmlkcHYzLnN0YWZmcy5hYy51
@@ -41,13 +41,13 @@
 						4gFtR6FQYe7DD31co3rZEww9Zi7hPTEg7JTJVT7OOSY3aTtNOLyFUNJnZyO0EtIn
 						d2EqyQkA05E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUdbmL39yAhs6RTSbzO9NpeNdR9jswDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVrMB4XDTE2MDQyNzE0MzEz
 						NVoXDTM2MDQyNzE0MzEzNVowHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVr
@@ -67,13 +67,13 @@
 						4eeuQyesoQ3GZVhewoVvnrE4+C/5wUztpk6DVfoH82fD4B+xR4afOgTsWMFFXv5T
 						8n+tJu3HmA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUdT3dYC42CRA7XnI8/PUDPUrCvY4wDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVrMB4XDTE2MDQyNzE0MzEz
 						NloXDTM2MDQyNzE0MzEzNlowHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVr
@@ -93,30 +93,30 @@
 						OP5TaSTYJ81hNoQYiaim02FM5IVqaQNVF7R4Sp3KjAR5dw1gQ/YTF0NrzlwoDxff
 						I8lU4UFh2w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.staffs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.staffs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.staffs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAM7pWNqQadlamL8YePYTlxVBghTiMA0GCSqGSIb3DQEB
 						CwUAMB0xGzAZBgNVBAMMEmlkcHYzLnN0YWZmcy5hYy51azAeFw0xNjA0MjcxNDMx
 						MzdaFw0zNjA0MjcxNDMxMzdaMB0xGzAZBgNVBAMMEmlkcHYzLnN0YWZmcy5hYy51
@@ -136,13 +136,13 @@
 						4gFtR6FQYe7DD31co3rZEww9Zi7hPTEg7JTJVT7OOSY3aTtNOLyFUNJnZyO0EtIn
 						d2EqyQkA05E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUdbmL39yAhs6RTSbzO9NpeNdR9jswDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVrMB4XDTE2MDQyNzE0MzEz
 						NVoXDTM2MDQyNzE0MzEzNVowHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVr
@@ -162,13 +162,13 @@
 						4eeuQyesoQ3GZVhewoVvnrE4+C/5wUztpk6DVfoH82fD4B+xR4afOgTsWMFFXv5T
 						8n+tJu3HmA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUdT3dYC42CRA7XnI8/PUDPUrCvY4wDQYJKoZIhvcNAQEL
 						BQAwHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVrMB4XDTE2MDQyNzE0MzEz
 						NloXDTM2MDQyNzE0MzEzNlowHTEbMBkGA1UEAwwSaWRwdjMuc3RhZmZzLmFjLnVr
@@ -188,23 +188,23 @@
 						OP5TaSTYJ81hNoQYiaim02FM5IVqaQNVF7R4Sp3KjAR5dw1gQ/YTF0NrzlwoDxff
 						I8lU4UFh2w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Staffordshire University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Staffordshire University TEST ONLY, DO NOT USE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.staffs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Services customer support</md:GivenName>
-      <md:EmailAddress>mailto:3800@staffs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Client Technology &amp; Applications Group</md:GivenName>
-      <md:EmailAddress>mailto:isitcta@staffs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Staffordshire University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Staffordshire University TEST ONLY, DO NOT USE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.staffs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Services customer support</md:GivenName>
+    <md:EmailAddress>mailto:3800@staffs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Client Technology &amp; Applications Group</md:GivenName>
+    <md:EmailAddress>mailto:isitcta@staffs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.tcat.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.tcat.ac.uk-idp-shibboleth.xml
index 89b9257f..acc0de82 100644
--- a/swamid-interfederations-2.0/idpv3.tcat.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpv3.tcat.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.tcat.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T14:41:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T14:41:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOBMajKp2CG0hVoA44bOJbqBNkGaMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcHYzLnRjYXQuYWMudWswHhcNMTYwMzE3MTYxNDAx
 						WhcNMzYwMzE3MTYxNDAxWjAbMRkwFwYDVQQDDBBpZHB2My50Y2F0LmFjLnVrMIIB
@@ -36,13 +36,13 @@
 						MSD87NW33aLYYU0b3kwFd2jHleXrdNk9aWxsnXU6QPMV5WoOZJp9ayHf74pnQfE0
 						h5o3wdlf0+1DSCW7LV6BdnKKHlkJyrwDy0qjMGe1glryNMUVlox1khRcIVrv/zK8
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUdFcq18oDZ3rQ/B7ojTE3MjOt19owDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwdjMudGNhdC5hYy51azAeFw0xNjAzMTcxNjEzNTla
 						Fw0zNjAzMTcxNjEzNTlaMBsxGTAXBgNVBAMMEGlkcHYzLnRjYXQuYWMudWswggEi
@@ -61,13 +61,13 @@
 						YV5BWEjRcGXc9CqLrdCx3sMGwXbRCVirz6L1Cx57elDzyhD3EBWmjPenQwxf1FNP
 						PVWUfE4Bp4izXf9rDWjndV1vdErI4PPLsgowoafSA2t2FGwrqOLd45bfRaHX2E4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUYyJaB93hWN6ooM6ThXuuRWoIrKgwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwdjMudGNhdC5hYy51azAeFw0xNjAzMTcxNjE0MDBa
 						Fw0zNjAzMTcxNjE0MDBaMBsxGTAXBgNVBAMMEGlkcHYzLnRjYXQuYWMudWswggEi
@@ -86,26 +86,26 @@
 						q1VT+nIgdCXl5bKcI+AUQRekHFFJ7Ks0IxCGJfCoLdV7Xllh8Hau5qkX1AkfXGWI
 						xabE4BLAENnwbuLvB/zYwAZc12Szcuo7vsWD7T0FGpRr8sQci2XqpAp2bA786Uc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.tcat.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.tcat.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.tcat.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.tcat.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.tcat.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.tcat.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpv3.tcat.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.tcat.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.tcat.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.tcat.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcat.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOBMajKp2CG0hVoA44bOJbqBNkGaMA0GCSqGSIb3DQEB
 						CwUAMBsxGTAXBgNVBAMMEGlkcHYzLnRjYXQuYWMudWswHhcNMTYwMzE3MTYxNDAx
 						WhcNMzYwMzE3MTYxNDAxWjAbMRkwFwYDVQQDDBBpZHB2My50Y2F0LmFjLnVrMIIB
@@ -124,13 +124,13 @@
 						MSD87NW33aLYYU0b3kwFd2jHleXrdNk9aWxsnXU6QPMV5WoOZJp9ayHf74pnQfE0
 						h5o3wdlf0+1DSCW7LV6BdnKKHlkJyrwDy0qjMGe1glryNMUVlox1khRcIVrv/zK8
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUdFcq18oDZ3rQ/B7ojTE3MjOt19owDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwdjMudGNhdC5hYy51azAeFw0xNjAzMTcxNjEzNTla
 						Fw0zNjAzMTcxNjEzNTlaMBsxGTAXBgNVBAMMEGlkcHYzLnRjYXQuYWMudWswggEi
@@ -149,13 +149,13 @@
 						YV5BWEjRcGXc9CqLrdCx3sMGwXbRCVirz6L1Cx57elDzyhD3EBWmjPenQwxf1FNP
 						PVWUfE4Bp4izXf9rDWjndV1vdErI4PPLsgowoafSA2t2FGwrqOLd45bfRaHX2E4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIUYyJaB93hWN6ooM6ThXuuRWoIrKgwDQYJKoZIhvcNAQEL
 						BQAwGzEZMBcGA1UEAwwQaWRwdjMudGNhdC5hYy51azAeFw0xNjAzMTcxNjE0MDBa
 						Fw0zNjAzMTcxNjE0MDBaMBsxGTAXBgNVBAMMEGlkcHYzLnRjYXQuYWMudWswggEi
@@ -174,24 +174,24 @@
 						q1VT+nIgdCXl5bKcI+AUQRekHFFJ7Ks0IxCGJfCoLdV7Xllh8Hau5qkX1AkfXGWI
 						xabE4BLAENnwbuLvB/zYwAZc12Szcuo7vsWD7T0FGpRr8sQci2XqpAp2bA786Uc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Telford College of Arts and Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Telford College of Arts &amp; Technology - TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tcat.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Flanders</md:SurName>
-      <md:EmailAddress>mailto:Paul.Flanders@tcat.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Flanders</md:SurName>
-      <md:EmailAddress>mailto:Paul.Flanders@tcat.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Telford College of Arts and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Telford College of Arts &amp; Technology - TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tcat.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Flanders</md:SurName>
+    <md:EmailAddress>mailto:Paul.Flanders@tcat.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Flanders</md:SurName>
+    <md:EmailAddress>mailto:Paul.Flanders@tcat.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml
index fe738248..ca71b1ae 100644
--- a/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpx.ua.ac.be/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ua.ac.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Universiteit Antwerpen</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Antwerp is a young, dynamic and forward-thinking university. It integrates the assets of its historic roots with its ambition to contribute positively to society.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idpx.ua.ac.be/ua_small.png</mdui:Logo>
+        <mdui:Logo height="75" width="153">https://idpx.ua.ac.be/ua_big.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>143.169.0.0/16</mdui:IPHint>
+        <mdui:IPHint>143.129.0.0/16</mdui:IPHint>
+        <mdui:IPHint>146.175.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>idpx.ua.ac.be</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ua.ac.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Universiteit Antwerpen</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Antwerp is a young, dynamic and forward-thinking university. It integrates the assets of its historic roots with its ambition to contribute positively to society.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://idpx.ua.ac.be/ua_small.png</mdui:Logo>
-          <mdui:Logo height="75" width="153">https://idpx.ua.ac.be/ua_big.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>143.169.0.0/16</mdui:IPHint>
-          <mdui:IPHint>143.129.0.0/16</mdui:IPHint>
-          <mdui:IPHint>146.175.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>idpx.ua.ac.be</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAN35bNDF/CV2nOx1eMcNH1z01yvsMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcHgudWEuYWMuYmUwHhcNMTMwMzIxMDgxNzMwWhcN
 MzMwMzIxMDgxNzMwWjAYMRYwFAYDVQQDEw1pZHB4LnVhLmFjLmJlMIIBIjANBgkq
@@ -44,26 +44,26 @@ p5U39b+mNsQXGPTpuahnCbuctNW7Mc3chwFsbxjXPyinY4yxcBzqh1e97himRJaY
 NpiD0CuosCt4MZj94vQ6z/XALYvkr3baOjCB3pek0xXnftOd
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpx.ua.ac.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpx.ua.ac.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpx.ua.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpx.ua.ac.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpx.ua.ac.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpx.ua.ac.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpx.ua.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpx.ua.ac.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAN35bNDF/CV2nOx1eMcNH1z01yvsMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcHgudWEuYWMuYmUwHhcNMTMwMzIxMDgxNzMwWhcN
 MzMwMzIxMDgxNzMwWjAYMRYwFAYDVQQDEw1pZHB4LnVhLmFjLmJlMIIBIjANBgkq
@@ -83,22 +83,22 @@ p5U39b+mNsQXGPTpuahnCbuctNW7Mc3chwFsbxjXPyinY4yxcBzqh1e97himRJaY
 NpiD0CuosCt4MZj94vQ6z/XALYvkr3baOjCB3pek0xXnftOd
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Universiteit Antwerpen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Universiteit Antwerpen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uantwerpen.be/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vincent</md:GivenName>
-      <md:SurName>Feyaerts</md:SurName>
-      <md:EmailAddress>vincent.feyaerts@uantwerpen.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universiteit Antwerpen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit Antwerpen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uantwerpen.be/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vincent</md:GivenName>
+    <md:SurName>Feyaerts</md:SurName>
+    <md:EmailAddress>vincent.feyaerts@uantwerpen.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
index 325fa184..f3476251 100644
--- a/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idservice.zuyd.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-03T14:07:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-03T14:07:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Zuyd Hogeschool</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Zuyd University</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Zuyd Hogeschool</mdui:Description>
+        <mdui:Description xml:lang="en">Zuyd University</mdui:Description>
+        <mdui:Logo height="48" width="45">https://static.surfconext.nl/logos/idp/hszuyd.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Zuyd University Hogeschool HBO</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Zuyd University Hogeschool HBO</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Zuyd Hogeschool</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Zuyd University</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Zuyd Hogeschool</mdui:Description>
-          <mdui:Description xml:lang="en">Zuyd University</mdui:Description>
-          <mdui:Logo height="48" width="45">https://static.surfconext.nl/logos/idp/hszuyd.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Zuyd University Hogeschool HBO</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Zuyd University Hogeschool HBO</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9b25cfa7cbe15117b1eca6b7f04fcf5d"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Zuyd Hogeschool</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Zuyd University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Zuyd Hogeschool</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Zuyd University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.zuyd.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.zuyd.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9b25cfa7cbe15117b1eca6b7f04fcf5d"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Zuyd Hogeschool</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Zuyd University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Zuyd Hogeschool</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Zuyd University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.zuyd.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.zuyd.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml b/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
index d0ff4f4d..a680ffc7 100644
--- a/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ieeexplore.ieee.org/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICuDCCAaCgAwIBAgIEUdwYxzANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNpZWVleHBsb3Jl
 						LmllZWUub3JnMB4XDTEzMDcwOTE0MDU1OVoXDTE2MDcwODE0MDU1OVowHjEcMBoGA1UEAxMTaWVl
 						ZXhwbG9yZS5pZWVlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOA75zEbFib1
@@ -22,27 +22,27 @@
 						ite5CXfTutjiX6Wlmy2iiCp09SzEy2Zfan4iMf8hgdD/8994EkEQSYluvKKl+tc0BwdpKxxuoNke
 						xhXvRxt/N3hR1GDsAZjQow==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Institute of Electrical And Electronics Engineers, Incorporated</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IEEE XploreDigital Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ieee.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Don</md:GivenName>
-      <md:SurName>Caldwell</md:SurName>
-      <md:EmailAddress>mailto:d.caldwell@ieee.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mehul</md:GivenName>
-      <md:SurName>Trivedi</md:SurName>
-      <md:EmailAddress>mailto:mh.trivedi@ieee.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Institute of Electrical And Electronics Engineers, Incorporated</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IEEE XploreDigital Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ieee.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Don</md:GivenName>
+    <md:SurName>Caldwell</md:SurName>
+    <md:EmailAddress>mailto:d.caldwell@ieee.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mehul</md:GivenName>
+    <md:SurName>Trivedi</md:SurName>
+    <md:EmailAddress>mailto:mh.trivedi@ieee.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml
index 6d8d01e4..a01e495e 100644
--- a/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ifg-srv-cafe.ifg.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFG - Instituto Federal de Goias</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFG - Instituto Federal de Goias</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifg.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifg.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFG - Instituto Federal de Goias</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFG - Instituto Federal de Goias</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifg.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifg.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxIzAhBgNVBAoTGkluc3RpdHV0
 byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
 DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
@@ -44,26 +44,26 @@ YTHjkyT7rPewJERdNu18ClDr3Srbeo2wOpw8xoct3hWA80CuXdAqEaEi5XzR9AiG
 qZHDzBemsNLwR7IBmZngXvnrysVf9nUIXTOct1KgJhqpBAQ+ySB0sGpGUjMow7S1
 nivla3ZHx3NkSg0K+ctKO7/L6VXK5w42gzTzOt/+Q1w05HVTY48caTgiXY3Dg6mP
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxIzAhBgNVBAoTGkluc3RpdHV0
 byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
@@ -87,24 +87,24 @@ qZHDzBemsNLwR7IBmZngXvnrysVf9nUIXTOct1KgJhqpBAQ+ySB0sGpGUjMow7S1
 nivla3ZHx3NkSg0K+ctKO7/L6VXK5w42gzTzOt/+Q1w05HVTY48caTgiXY3Dg6mP
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifg.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Roberval Lustosa de Aguiar Filho</md:SurName>
-      <md:EmailAddress>roberval.filho@ifg.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifg.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Roberval Lustosa de Aguiar Filho</md:SurName>
+    <md:EmailAddress>roberval.filho@ifg.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
index 850a610f..3736eaa8 100644
--- a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ifs00sv056.ifsul.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsul.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsul.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifsul.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifsul.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
 SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
 SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
@@ -48,26 +48,26 @@ mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
 0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
 2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
 SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
@@ -95,24 +95,24 @@ mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
 2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Maicon Anca dos Santos</md:SurName>
-      <md:EmailAddress>dtic@ifsul.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Maicon Anca dos Santos</md:SurName>
+    <md:EmailAddress>dtic@ifsul.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
index 97d7abc3..fc67778e 100644
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iif.iucc.ac.il/idp/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2014-11-20T10:35:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2014-11-20T10:35:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Inter University Computation Center</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Inter University Computation Center</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">IUCC</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Inter University Computational Center</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Administrator</md:GivenName>
-      <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>info@iif.iucc.ac.il</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">IUCC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Inter University Computational Center</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>info@iif.iucc.ac.il</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
index d61b0af3..d0559a55 100644
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iif.iucc.ac.il/idp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2008-01-17T11:28:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2008-01-17T11:28:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Inter University Computation Center</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Inter University Computation Center</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Administrator</md:SurName>
-      <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml
index 71e02b94..e9285f36 100644
--- a/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ilearn.totton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-01T17:28:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-01T17:28:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAKZfsG5cBfubMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3NoaWJzcC50b3R0b24uYWMudWswHhcNMTQwNjI0MTIyODU1WhcNMjQwNjIx
 						MTIyODU1WjAeMRwwGgYDVQQDExNzaGlic3AudG90dG9uLmFjLnVrMIIBIjANBgkq
@@ -31,37 +31,37 @@
 						EulAkrbXTYFy8Xg91X4za6NQ7jydmP3aaPyE0GqqMcbHLq/Gm+qsjG/dHsviHPjQ
 						v2u+Ew==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Totton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Totton College VLE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.totton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Dawson</md:SurName>
-      <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Dawson</md:SurName>
-      <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Totton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Totton College VLE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.totton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Dawson</md:SurName>
+    <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Dawson</md:SurName>
+    <md:EmailAddress>mailto:mdawson@totton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml b/swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml
index 665d767e..58fcec77 100644
--- a/swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml
+++ b/swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://imodarugula.imodules.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">iModules Preload: Arugula</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">iModules Preload: Arugula</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
 MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
 MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
@@ -36,18 +36,18 @@ pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
 6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
 MJlfQnuceWY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://imodarugula.imodules.com/controls/login/AssertionConsumerService.aspx" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Wicoff</md:GivenName>
-      <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://imodarugula.imodules.com/controls/login/AssertionConsumerService.aspx" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Wicoff</md:GivenName>
+    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml b/swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml
index d3cce7d3..ae583198 100644
--- a/swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml
+++ b/swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://imodrhubarb.imodules.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">iModules Preload: rhubarb</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">iModules Preload: rhubarb</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
 MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
 MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
@@ -36,20 +36,20 @@ pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
 6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
 MJlfQnuceWY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=1" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=2" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=3" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Wicoff</md:GivenName>
-      <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=2" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=3" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Wicoff</md:GivenName>
+    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml
index f42ae380..3d02e058 100644
--- a/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://imperial.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T10:28:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T10:28:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://imperial.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://imperial.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo Imperial Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Imperial Online Resource Booking</mdui:Description>
+        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://imperial.siso.co/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://imperial.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SiSo Imperial Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo Imperial Online Resource Booking</mdui:Description>
-          <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -51,34 +51,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imperial.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo Imperial Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imperial.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo Imperial Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/inacademia.org-metadata-t01-p-test.xml.xml b/swamid-interfederations-2.0/inacademia.org-metadata-t01-p-test.xml.xml
index cef753d4..0b9c2c6f 100644
--- a/swamid-interfederations-2.0/inacademia.org-metadata-t01-p-test.xml.xml
+++ b/swamid-interfederations-2.0/inacademia.org-metadata-t01-p-test.xml.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://inacademia.org/metadata/t01-p-test.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://op.srv.inacademia.org/disco" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InAcademia.org - TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</mdui:Description>
+        <mdui:Keywords xml:lang="en">Affiliation Validation Eligibility</mdui:Keywords>
+        <mdui:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://inacademia.org/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://op.srv.inacademia.org/disco" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">InAcademia.org - TEST</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</mdui:Description>
-          <mdui:Keywords xml:lang="en">Affiliation Validation Eligibility</mdui:Keywords>
-          <mdui:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://inacademia.org/about</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>inacademia.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>inacademia.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFaTCCA1GgAwIBAgIJAOVIW1ydZNQHMA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
 BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDETMBEGA1UECwwKaW5BY2FkZW1pYTEXMBUG
 A1UEAwwOaW5BY2FkZW1pYS5vcmcwHhcNMTUwNjEyMTM0MzU5WhcNMTUwNzEyMTM0
@@ -52,39 +52,39 @@ cW2UvyMopt49CyWT7TzVNACjY1H8DI22rZtBfBvMYIgCx7+ROCURerVct9qmAOZl
 r5xDQglUD/qMe+0guM4L7bSQsfirlfaySMulUL6uw16AzsVGNBayaFUxDck8S1Na
 OyAi2+3zJled9np2rxthyGEms4wOwEwziFgWzHdWhO+ySrtp9vtSFjJMpRfg
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/acs/post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://op.srv.inacademia.org/acs/redirect" index="2"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">InAcademia.org - TEST</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">The InAcademia Simple validation Service allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="edupersontargetedid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="edupersonprincipalname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>InAcademia</md:GivenName>
-      <md:SurName>Enduser Support</md:SurName>
-      <md:EmailAddress>help@inacademia.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>InAcademia</md:GivenName>
-      <md:SurName>Administrative Support</md:SurName>
-      <md:EmailAddress>admin@inacademia.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>InAcademia</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>tech@inacademia.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://op.srv.inacademia.org/acs/redirect" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">InAcademia.org - TEST</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The InAcademia Simple validation Service allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="edupersontargetedid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="edupersonprincipalname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:SurName>Enduser Support</md:SurName>
+    <md:EmailAddress>help@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:SurName>Administrative Support</md:SurName>
+    <md:EmailAddress>admin@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>tech@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/inacademia.org-metadata-t01-t-test.xml.xml b/swamid-interfederations-2.0/inacademia.org-metadata-t01-t-test.xml.xml
index 09a1a2bb..08f0a2f8 100644
--- a/swamid-interfederations-2.0/inacademia.org-metadata-t01-t-test.xml.xml
+++ b/swamid-interfederations-2.0/inacademia.org-metadata-t01-t-test.xml.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://inacademia.org/metadata/t01-t-test.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://op.srv.inacademia.org/disco" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InAcademia.org - TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</mdui:Description>
+        <mdui:Keywords xml:lang="en">Affiliation Validation Eligibility</mdui:Keywords>
+        <mdui:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://inacademia.org/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://op.srv.inacademia.org/disco" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">InAcademia.org - TEST</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</mdui:Description>
-          <mdui:Keywords xml:lang="en">Affiliation Validation Eligibility</mdui:Keywords>
-          <mdui:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://inacademia.org/about</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>inacademia.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>inacademia.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFaTCCA1GgAwIBAgIJAOVIW1ydZNQHMA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
 BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDETMBEGA1UECwwKaW5BY2FkZW1pYTEXMBUG
 A1UEAwwOaW5BY2FkZW1pYS5vcmcwHhcNMTUwNjEyMTM0MzU5WhcNMTUwNzEyMTM0
@@ -52,37 +52,37 @@ cW2UvyMopt49CyWT7TzVNACjY1H8DI22rZtBfBvMYIgCx7+ROCURerVct9qmAOZl
 r5xDQglUD/qMe+0guM4L7bSQsfirlfaySMulUL6uw16AzsVGNBayaFUxDck8S1Na
 OyAi2+3zJled9np2rxthyGEms4wOwEwziFgWzHdWhO+ySrtp9vtSFjJMpRfg
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/acs/post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://op.srv.inacademia.org/acs/redirect" index="2"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">InAcademia.org - TEST</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">The InAcademia Simple validation Service allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>InAcademia</md:GivenName>
-      <md:SurName>Enduser Support</md:SurName>
-      <md:EmailAddress>help@inacademia.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>InAcademia</md:GivenName>
-      <md:SurName>Administrative Support</md:SurName>
-      <md:EmailAddress>admin@inacademia.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>InAcademia</md:GivenName>
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>tech@inacademia.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://op.srv.inacademia.org/acs/redirect" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">InAcademia.org - TEST</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The InAcademia Simple validation Service allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:SurName>Enduser Support</md:SurName>
+    <md:EmailAddress>help@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:SurName>Administrative Support</md:SurName>
+    <md:EmailAddress>admin@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>tech@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/incommon.slb.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/incommon.slb.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d2e840ce..cb131352 100644
--- a/swamid-interfederations-2.0/incommon.slb.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/incommon.slb.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://incommon.slb.com/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Schlumberger Federated Resources</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Schlumberger will leverage Simplesamlphp on Incommon.slb.com to provide service to trusted Identity providers</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Schlumberger Federated Resources</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Schlumberger will leverage Simplesamlphp on Incommon.slb.com to provide service to trusted Identity providers</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIElTCCA32gAwIBAgIJAJcc5Hf2fo6oMA0GCSqGSIb3DQEBCwUAMIGNMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xFTATBgNVBAoT
 DFNjaGx1bWJlcmdlcjELMAkGA1UECxMCSVQxGTAXBgNVBAMTEFRva2VuIEVuY3J5
@@ -45,37 +45,37 @@ MLHo+cYNfyUHKRh9N2hJ3u5vRfYSMWZwjPGpFPTUipK4DrCk8daUfN1wN4xpCFv0
 WT4vmL/TsVbWVVJPkvUyqhYEMO7REsp4W7nz1P2UEjVHQOZwyTJvy5Kdudlspxch
 aD3z+32MqMLcKRqOhSCStLCAyZIqdMJEfA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Schlumberger Federated Resources</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Schlumberger will leverage Simplesamlphp on Incommon.slb.com to provide service to trusted Identity providers</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Schlumberger</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Schlumberger</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.slb.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Huy Nguyen</md:GivenName>
-      <md:EmailAddress>hnguyen39@slb.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brad Schmid</md:GivenName>
-      <md:EmailAddress>schmid1@slb.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Ali Chinwala</md:GivenName>
-      <md:EmailAddress>chinwala@slb.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://incommon.slb.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Schlumberger Federated Resources</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Schlumberger will leverage Simplesamlphp on Incommon.slb.com to provide service to trusted Identity providers</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Schlumberger</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Schlumberger</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.slb.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Huy Nguyen</md:GivenName>
+    <md:EmailAddress>hnguyen39@slb.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brad Schmid</md:GivenName>
+    <md:EmailAddress>schmid1@slb.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Ali Chinwala</md:GivenName>
+    <md:EmailAddress>chinwala@slb.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml b/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml
index 6c555715..a4a02fc5 100644
--- a/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://incommon.sunycnse.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunycnse.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SUNY Polytechnic Institute</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunycnse.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SUNY Polytechnic Institute</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUzCCAjugAwIBAgIUNlPRT/wyMz9vjHRYl0MkLeoK0zwwDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAwwaaW5jb21tb24udW5pdi5zdW55Y25zZS5jb20wHhcNMTQw
 OTI5MTczNDQzWhcNMzQwOTI5MTczNDQzWjAlMSMwIQYDVQQDDBppbmNvbW1vbi51
@@ -38,23 +38,23 @@ Cghk6dXYhVpYc5fakaOcDNM7tIsG9AfPL37Piisn1eg5BNuHb6TzthxbJW8gq9Q5
 X/5/NVPkxIZlwfd1UUjHO0T0OrkWTgIsesPGvBkRIJO6hUmSUI6YZHA5FmSEVYB1
 BvvZMKZ3B0ygTK7PIe0RRTPUMFgtZNMUNNgqywHDyDbt+y+REp9K
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.sunycnse.com:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.sunycnse.com:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon.sunycnse.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.sunycnse.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.sunycnse.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunycnse.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.sunycnse.com:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.sunycnse.com:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon.sunycnse.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.sunycnse.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.sunycnse.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunycnse.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUzCCAjugAwIBAgIUNlPRT/wyMz9vjHRYl0MkLeoK0zwwDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAwwaaW5jb21tb24udW5pdi5zdW55Y25zZS5jb20wHhcNMTQw
 OTI5MTczNDQzWhcNMzQwOTI5MTczNDQzWjAlMSMwIQYDVQQDDBppbmNvbW1vbi51
@@ -74,30 +74,30 @@ Cghk6dXYhVpYc5fakaOcDNM7tIsG9AfPL37Piisn1eg5BNuHb6TzthxbJW8gq9Q5
 X/5/NVPkxIZlwfd1UUjHO0T0OrkWTgIsesPGvBkRIJO6hUmSUI6YZHA5FmSEVYB1
 BvvZMKZ3B0ygTK7PIe0RRTPUMFgtZNMUNNgqywHDyDbt+y+REp9K
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.sunycnse.com:443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SUNY Polytechnic Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SUNY Polytechnic Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sunyit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kyle Rosher</md:GivenName>
-      <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ralph Gartner</md:GivenName>
-      <md:EmailAddress>rgartner@sunycnse.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kyle Rosher</md:GivenName>
-      <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Kyle Rosher</md:GivenName>
-      <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.sunycnse.com:443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNY Polytechnic Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNY Polytechnic Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sunyit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kyle Rosher</md:GivenName>
+    <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ralph Gartner</md:GivenName>
+    <md:EmailAddress>rgartner@sunycnse.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kyle Rosher</md:GivenName>
+    <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Kyle Rosher</md:GivenName>
+    <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
index ea0f6ad7..226079b1 100644
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
                         This service allows users to access the digital repositories created for the INDICATE
                         project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
                         Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
                         e-Infrastructure providers and the general public.
                     </mdui:Description>
-          <mdui:Description xml:lang="it">
+        <mdui:Description xml:lang="it">
                         Questo servizio permette agli utenti di accedere gli archivi digitali creati per il progetto
                         europeo INDICATE con l'obiettivo di dimostrare l'opportunità di adottare e-Infrastrutture per
                         i patrimoni culturali digitali. Esso è indirizzato ai partner di INDICATE ed altre istituzioni
                         culturali, i fornitori di e-Infrastrutture ed al pubblico.
                     </mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
@@ -62,63 +62,63 @@ JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
 W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
                     project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
                     Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
                     e-Infrastructure providers and the general public.
                 </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Riccardo</md:GivenName>
-      <md:SurName>Rotondo</md:SurName>
-      <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Giuseppe</md:GivenName>
-      <md:SurName>Platania</md:SurName>
-      <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Carlo</md:GivenName>
-      <md:SurName>Rocca</md:SurName>
-      <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml b/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml
index 83241780..52463c0f 100644
--- a/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indiid.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-07T16:35:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-07T16:35:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">indiid.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Indiid</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://indiid.net/assets/images/logo-compact-tiny.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://indiid.net/assets/images/logo-compact-medium.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">indiid.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Indiid</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://indiid.net/assets/images/logo-compact-tiny.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://indiid.net/assets/images/logo-compact-medium.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEzCCAfugAwIBAgIUT6jU1lE/HRPejPdsm8epM0vUa7EwDQYJKoZIhvcNAQEF
 						BQAwFTETMBEGA1UEAxMKaW5kaWlkLm5ldDAeFw0xNDExMTAxMjM3MzVaFw0zNDEx
 						MTAxMjM3MzVaMBUxEzARBgNVBAMTCmluZGlpZC5uZXQwggEiMA0GCSqGSIb3DQEB
@@ -36,26 +36,26 @@
 						+pwjmhLlMoHc/E1WZD8jEIzp0tVhjA9xS85X1UyJxLPnBcWnf0f24DNnPPCywlcz
 						7PimycEKJ5Gu+L53LzzM6aMlPyWhm8Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://indiid.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indiid.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://indiid.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indiid.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indiid.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indiid.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">indiid.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://indiid.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indiid.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://indiid.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indiid.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indiid.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indiid.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">indiid.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEzCCAfugAwIBAgIUT6jU1lE/HRPejPdsm8epM0vUa7EwDQYJKoZIhvcNAQEF
 						BQAwFTETMBEGA1UEAxMKaW5kaWlkLm5ldDAeFw0xNDExMTAxMjM3MzVaFw0zNDEx
 						MTAxMjM3MzVaMBUxEzARBgNVBAMTCmluZGlpZC5uZXQwggEiMA0GCSqGSIb3DQEB
@@ -74,25 +74,25 @@
 						+pwjmhLlMoHc/E1WZD8jEIzp0tVhjA9xS85X1UyJxLPnBcWnf0f24DNnPPCywlcz
 						7PimycEKJ5Gu+L53LzzM6aMlPyWhm8Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://indiid.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indiid.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digital Identity Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Indiid</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://indiid.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@digitalidentitylabs.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@digitalidentitylabs.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://indiid.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indiid.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digital Identity Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Indiid</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://indiid.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@digitalidentitylabs.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@digitalidentitylabs.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml b/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml
index e4076eb4..a8fc3852 100644
--- a/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://informationservice-test.idoxgroup.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-24T15:55:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-24T15:55:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
 						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
 						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
@@ -31,13 +31,13 @@
 						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
 						S5PKEEUqwEK65g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
 						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
 						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
@@ -59,36 +59,36 @@
 						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
 						S5PKEEUqwEK65g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IDOX Information Services Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IDOX Information Services Ltd: PLANEX Test site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://informationservice-test.idoxgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@idoxgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ukfederation@idoxgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IDOX Information Services Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDOX Information Services Ltd: PLANEX Test site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://informationservice-test.idoxgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@idoxgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ukfederation@idoxgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml b/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
index 647cc10b..cd295d36 100644
--- a/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://informationservice.idoxgroup.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-19T15:37:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-19T15:37:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/UKfederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/UKfederation" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PLANEX, The Idox Information Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to UK public policy bibliographic database, from the 1980s to today</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/UKfederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/UKfederation" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PLANEX, The Idox Information Service</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access to UK public policy bibliographic database, from the 1980s to today</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
 						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
 						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
@@ -56,13 +56,13 @@
 						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
 						S5PKEEUqwEK65g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
 						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
 						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
@@ -84,45 +84,45 @@
 						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
 						S5PKEEUqwEK65g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IDOX Information Services Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IDOX Information Services Ltd: PLANEX</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://iis.idoxgroup.com/infoservice/index.cfm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@idoxgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ukfederation@idoxgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IDOX Information Services Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDOX Information Services Ltd: PLANEX</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://iis.idoxgroup.com/infoservice/index.cfm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@idoxgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ukfederation@idoxgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml
index 52c5f60a..900dbf0b 100644
--- a/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infp-shib-01.uthct.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.uthealth.org/about-us/contact-us/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthct.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At Tyler</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.uthealth.org/about-us/contact-us/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthct.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At Tyler</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUPrqY2FoL3o+Is2MLqnRmpQ3pMKIwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaW5mcC1zaGliLTAxLnV0aGN0LmVkdTAeFw0wOTEyMTYx
 NTE3MTdaFw0yOTEyMTYxNTE3MTdaMCExHzAdBgNVBAMTFmluZnAtc2hpYi0wMS51
@@ -38,23 +38,23 @@ zQSXyDWBDGAry3h+RPCrVQAf+BTomagR4/nK6gd0Vche7iZWmYxmGJPUfHHsxa3I
 tjvTYXIPtDwkjXDvnGNiDGXwEEhieOBfGdW8gNJoaFG1JIn4gS4yT+9vs88ujUbs
 jOT4n2SYHIFJfAfYw8JnSJ7PWVKQ4F4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://infp-shib-01.uthct.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infp-shib-01.uthct.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infp-shib-01.uthct.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthct.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://infp-shib-01.uthct.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infp-shib-01.uthct.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infp-shib-01.uthct.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthct.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUPrqY2FoL3o+Is2MLqnRmpQ3pMKIwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaW5mcC1zaGliLTAxLnV0aGN0LmVkdTAeFw0wOTEyMTYx
 NTE3MTdaFw0yOTEyMTYxNTE3MTdaMCExHzAdBgNVBAMTFmluZnAtc2hpYi0wMS51
@@ -74,18 +74,18 @@ zQSXyDWBDGAry3h+RPCrVQAf+BTomagR4/nK6gd0Vche7iZWmYxmGJPUfHHsxa3I
 tjvTYXIPtDwkjXDvnGNiDGXwEEhieOBfGdW8gNJoaFG1JIn4gS4yT+9vs88ujUbs
 jOT4n2SYHIFJfAfYw8JnSJ7PWVKQ4F4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas Health Science Center At Tyler</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At Tyler</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uthct.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Nettleton</md:GivenName>
-      <md:EmailAddress>david.nettleton@uthct.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas Health Science Center At Tyler</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At Tyler</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uthct.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Nettleton</md:GivenName>
+    <md:EmailAddress>david.nettleton@uthct.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
index 04b8df12..00c96136 100644
--- a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
+++ b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infra.clarin.dk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-10T20:41:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-10T20:41:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://infra.clarin.dk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN-DK-UCPH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN-DK-UCPH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</mdui:Description>
+        <mdui:Logo height="53" width="250">https://clarin.dk/clarindk/img/clarin-dk.logo.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://info.clarin.dk/en/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://info.clarin.dk/en/overview/privacypolicy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://infra.clarin.dk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">CLARIN-DK-UCPH</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CLARIN-DK-UCPH</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</mdui:Description>
-          <mdui:Description xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</mdui:Description>
-          <mdui:Logo height="53" width="250">https://clarin.dk/clarindk/img/clarin-dk.logo.jpg</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://info.clarin.dk/en/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://info.clarin.dk/en/overview/privacypolicy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>infra.clarin.dk</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=infra.clarin.dk</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDMjCCAhqgAwIBAgIJAOTsxgZuTQFoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>infra.clarin.dk</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=infra.clarin.dk</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMjCCAhqgAwIBAgIJAOTsxgZuTQFoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
 BAMTD2luZnJhLmNsYXJpbi5kazAeFw0xNTAyMDQxMzUyMjJaFw0yNTAyMDExMzUy
 MjJaMBoxGDAWBgNVBAMTD2luZnJhLmNsYXJpbi5kazCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALxh1F3m7++sELN0g7ZsIsqtbAWPDu08/Yo3i8kRJmP+
@@ -49,54 +49,54 @@ HUQ3NG7ubyG1oGFMYqHkJY83aZGgUxsKcS2TsAkY5iz42ZhnHTZUTiu9GXyYdKDj
 8Uh2QptwTDlncmuRJL64djt9iKmLL2dDm1K38WLjQn2NwbWtCD2jLX3CvF3z07qQ
 CnbRCoj2
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">CLARIN-DK-UCPH</md:ServiceName>
-        <md:ServiceName xml:lang="en">CLARIN-DK-UCPH</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mitchell</md:GivenName>
-      <md:SurName>Seaton</md:SurName>
-      <md:EmailAddress>mailto:seaton@hum.ku.dk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CLARIN-DK</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:info@clarin.dk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>CLARIN-DK</md:GivenName>
-      <md:SurName>Administration</md:SurName>
-      <md:EmailAddress>mailto:admin@clarin.dk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARIN-DK-UCPH</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN-DK-UCPH</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mitchell</md:GivenName>
+    <md:SurName>Seaton</md:SurName>
+    <md:EmailAddress>mailto:seaton@hum.ku.dk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CLARIN-DK</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:info@clarin.dk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>CLARIN-DK</md:GivenName>
+    <md:SurName>Administration</md:SurName>
+    <md:EmailAddress>mailto:admin@clarin.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml b/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
index d5690d42..acc0ec09 100644
--- a/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
+++ b/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://inloggen.hogeschoolutrecht.nl/openaselect/profiles/saml2/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Hogeschool Utrecht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HU University of Applied Sciences Utrecht</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Hogeschool Utrecht</mdui:Description>
+        <mdui:Description xml:lang="en">Hogeschool Utrecht</mdui:Description>
+        <mdui:Logo height="39" width="108">https://static.surfconext.nl/logos/idp/hu.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">hu university of applied sciences utrecht hogeschool utrecht hbo</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">hu university of applied sciences utrecht  hogeschool utrecht hbo</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Hogeschool Utrecht</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">HU University of Applied Sciences Utrecht</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Hogeschool Utrecht</mdui:Description>
-          <mdui:Description xml:lang="en">Hogeschool Utrecht</mdui:Description>
-          <mdui:Logo height="39" width="108">https://static.surfconext.nl/logos/idp/hu.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">hu university of applied sciences utrecht hogeschool utrecht hbo</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">hu university of applied sciences utrecht  hogeschool utrecht hbo</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/265c1f948fe360d0755dfd7310985bc0"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Applied Sciences Utrecht</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hogeschool Utrecht</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hu.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/265c1f948fe360d0755dfd7310985bc0"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Applied Sciences Utrecht</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hogeschool Utrecht</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hu.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
index 46b81d0b..b26d56c0 100644
--- a/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
+++ b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://instantanatomy.co.uk/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-17T08:48:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-17T08:48:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://instantanatomy.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://instantanatomy.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="62" width="450">https://www.instantanatomy.co.uk/images/title.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Instant Anatomy</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://instantanatomy.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://instantanatomy.co.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="62" width="450">https://www.instantanatomy.co.uk/images/title.jpg</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">Instant Anatomy</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJAOU2/77+QBVIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG2Rhcndpbi5pbnN0YW50YW5hdG9teS5jby51azAeFw0xMjA4MTcwMTQ5MzFa
 						Fw0yMjA4MTUwMTQ5MzFaMCYxJDAiBgNVBAMTG2Rhcndpbi5pbnN0YW50YW5hdG9t
@@ -47,45 +47,45 @@
 						1L8iCT+oVfbn8m7vBIwAey/qzie5Av0Q2XHH0cAwff2AQUrlyTcPbkpfna8jnaaK
 						5mOU0vif+aQQFPvwVH2BegxgQF+M+0NVs02wMQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://instantanatomy.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Instant Anatomy</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Andrew Whitaker trading as Instant Anatomy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Instant Anatomy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://instantanatomy.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Whitaker</md:SurName>
-      <md:EmailAddress>mailto:info@instantanatomy.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Whitaker</md:SurName>
-      <md:EmailAddress>mailto:info@instantanatomy.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://instantanatomy.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Instant Anatomy</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Andrew Whitaker trading as Instant Anatomy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Instant Anatomy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://instantanatomy.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Whitaker</md:SurName>
+    <md:EmailAddress>mailto:info@instantanatomy.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Whitaker</md:SurName>
+    <md:EmailAddress>mailto:info@instantanatomy.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml
index 033398ea..86cc2449 100644
--- a/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://integration.wcn.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://integration.wcn.co.uk/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/UKfederation" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/UKfederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/BAML"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://integration.wcn.co.uk/Shibboleth.sso/DS" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/UKfederation" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/UKfederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/BAML"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFjDCCA3QCCQDY/5lx43eOoTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMSIwIAYDVQQKExlX
 						b3JsZCBDYXJlZXJzIE5ldHdvcmsgUExDMRIwEAYDVQQLEwl0ZWNobmljYWwxHjAc
@@ -46,13 +46,13 @@
 						9ARQE6+zAMp2Rx7N8cOYipc2h+eZF+jjgoCByAJiOB81x+/diB5UmCLwLx0u2BQq
 						2KalbJoEekyZZ3ki7yfgLvyquDs9xGAqGbQ7pVnYKHM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFjDCCA3QCCQDY/5lx43eOoTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMSIwIAYDVQQKExlX
 						b3JsZCBDYXJlZXJzIE5ldHdvcmsgUExDMRIwEAYDVQQLEwl0ZWNobmljYWwxHjAc
@@ -84,43 +84,43 @@
 						9ARQE6+zAMp2Rx7N8cOYipc2h+eZF+jjgoCByAJiOB81x+/diB5UmCLwLx0u2BQq
 						2KalbJoEekyZZ3ki7yfgLvyquDs9xGAqGbQ7pVnYKHM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">World Careers Network plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">World Careers Network plc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wcn.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Duncan</md:GivenName>
-      <md:SurName>Forsyth</md:SurName>
-      <md:EmailAddress>mailto:duncan@wcn.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Duncan</md:GivenName>
-      <md:SurName>Forsyth</md:SurName>
-      <md:EmailAddress>mailto:duncan@wcn.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">World Careers Network plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">World Careers Network plc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wcn.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Duncan</md:GivenName>
+    <md:SurName>Forsyth</md:SurName>
+    <md:EmailAddress>mailto:duncan@wcn.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Duncan</md:GivenName>
+    <md:SurName>Forsyth</md:SurName>
+    <md:EmailAddress>mailto:duncan@wcn.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/involvio.com-saml.xml b/swamid-interfederations-2.0/involvio.com-saml.xml
index 203323d4..630b38b0 100644
--- a/swamid-interfederations-2.0/involvio.com-saml.xml
+++ b/swamid-interfederations-2.0/involvio.com-saml.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://involvio.com/saml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Involvio</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Involvio is a student engagement platform</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://involvio.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://involvio.com/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="319" xml:lang="en">https://s3.amazonaws.com/involvio-production/involvio.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Involvio</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Involvio is a student engagement platform</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://involvio.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://involvio.com/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="319" xml:lang="en">https://s3.amazonaws.com/involvio-production/involvio.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFUDCCBDigAwIBAgIQCC0M0Kc2/YNjE4dQDyg+EzANBgkqhkiG9w0BAQsFADCB
 kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
@@ -52,41 +52,41 @@ jP/CprjIL/d7DaruZFiSmnfUa1FeOryhuKzbqcm6GpV0tzfsNT47kpngsTtTK1Cy
 4+OA7UVWic/3LCX+lQkFzRWGgvOikUp1phZ18NFpS3ak/c7H3teur2CFfpWTKdxz
 GF977KpzHlIAUY/y8JmOWhaTjR0=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://involvio.com/saml/logout"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://involvio.com/saml/acs" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Involvio</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Involvio is a student engagement platform</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Involvio</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Involvio</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://involvio.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ari Winkleman</md:GivenName>
-      <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ari Winkleman</md:GivenName>
-      <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ari Winkleman</md:GivenName>
-      <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Ari Winkleman</md:GivenName>
-      <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://involvio.com/saml/logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://involvio.com/saml/acs" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Involvio</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Involvio is a student engagement platform</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Involvio</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Involvio</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://involvio.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ari Winkleman</md:GivenName>
+    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ari Winkleman</md:GivenName>
+    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ari Winkleman</md:GivenName>
+    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Ari Winkleman</md:GivenName>
+    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml
index cb066229..f329408c 100644
--- a/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ioe-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-16T14:50:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-16T14:50:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Education University of London - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Institute of Education University of London</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Education University of London - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Institute of Education University of London</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJANemOX300yXbMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMDEwHhcNMTQwNjE2MDgwNTMzWhcNMjQwNjEzMDgwNTMzWjASMRAw
 						DgYDVQQDEwdhaW8wMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -46,40 +46,40 @@
 						YvAe8GMbg+SIR/OH7OnK2mZAAmwA+Ec7OPJ3ryuqxLuV+qPNFBFqKYb3VNqn+/s1
 						JQxu5wsZ5HTxB1jpsbsKBw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Education University of London - Primo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Education University of London - Primo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ipm.weill.cornell.edu-federated-sp.xml b/swamid-interfederations-2.0/ipm.weill.cornell.edu-federated-sp.xml
index b8056b07..b65a7c4d 100644
--- a/swamid-interfederations-2.0/ipm.weill.cornell.edu-federated-sp.xml
+++ b/swamid-interfederations-2.0/ipm.weill.cornell.edu-federated-sp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ipm.weill.cornell.edu/federated-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pmkb-local.weill.cornell.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Weill Cornell Institute for Precision Medicine</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://ipm.weill.cornell.edu/about/about-institute</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pmkb-local.weill.cornell.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Weill Cornell Institute for Precision Medicine</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://ipm.weill.cornell.edu/about/about-institute</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6zCCAdOgAwIBAgIJAPqg8605cVWPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGMzZTUxNjk5OTIwZTAeFw0xNjAyMjUyMDM4NDJaFw0yNjAyMjIyMDM4NDJa
 MBcxFTATBgNVBAMTDGMzZTUxNjk5OTIwZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -37,41 +37,41 @@ uMEg1eXrrJbt2WgkP7woViJvkRmmkweuBkA3EEd7198jx8wxDZiqWBDOk1VzAIBv
 xPFX7aGmryJwMudoa1LAFIosj1Q3rEBLKVYhhqUQ4ZXUtgSzvi0baN8v8LV17i3w
 YgcqnuA/snTukkLF/01orTzUp2MzQu8XI/qSfUv/Gg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pmkb-local.weill.cornell.edu/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmkb-local.weill.cornell.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ipm-saml-test.weill.cornell.edu/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Weill Cornell Institute for Precision Medicine</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Weill Cornell Medical College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.med.cornell.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Linda Huang</md:GivenName>
-      <md:EmailAddress>lih3001@med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Alexandros Sigaras</md:GivenName>
-      <md:EmailAddress>als2076@med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Linda Huang</md:GivenName>
-      <md:EmailAddress>lih3001@med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Linda Huang</md:GivenName>
-      <md:EmailAddress>lih3001@med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pmkb-local.weill.cornell.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmkb-local.weill.cornell.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ipm-saml-test.weill.cornell.edu/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Weill Cornell Institute for Precision Medicine</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Weill Cornell Medical College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.med.cornell.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Linda Huang</md:GivenName>
+    <md:EmailAddress>lih3001@med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Alexandros Sigaras</md:GivenName>
+    <md:EmailAddress>als2076@med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Linda Huang</md:GivenName>
+    <md:EmailAddress>lih3001@med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Linda Huang</md:GivenName>
+    <md:EmailAddress>lih3001@med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
index a4f5f808..f0e5d832 100644
--- a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ir-lan-fid.images-et-reseaux.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-16T11:30:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-16T11:30:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">images-et-reseaux.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACS0lEQVQ4y4WSzUtUURiHn3PuuffOlIx9oGmOxFAaipuiNhVtXLQQalHbJEN3QSSI/0CEIS5C+oCgVbQyoTZFH5DYIsJNZopNgSmKmlqmM+O9d+a+LWZUHAvP5ny9v+e87++8SlLLtE7E+mdtqmNlOfba1uLd3Y+7ofFtGFZiWYodhxrMrZ4+0ynUnxcSF2WoF8lI6Q3flx21WuaSyKqHNWlBqgb8BL8/xsiwbIfhzo8bKT+MJGZOjU7e+jTOARxWKPXSaZveV66VRbw0KL2pEMA4iFJorTDKS3M7UtW2+MEbiQbTxCur55vKhxv7k8d5n+VlNGYCxwUpVLOWxb5UOXbnBLUvMhkh79BALt3woCs68nMQPIeh1ueUNg901NyPd+u+DkKVgUIoOUNn/BtdD0cnVnKSMACVQeDXvFmIJt1avEAz1w9Os7fr3Nh3vgwfJBXdLOEXhl/vstCzElICBkCUInQVGAERdAQUSnJGoVxBjOCjSANYChcfzJoDBQCynmHxtylEFCk0TeEszQuvSaSWCADSPTcjsXWAWteqIoiAyu8zPyyO9i1Rf2FKYeJ4WYjYCr09g6LOk/VJ0AI5MweSFwNsuiNqewZFvPzS3nKmN27+1fIbPPlPQMGDWT+wsyg8FGAhgKC1L+ApRYAm2ABs7W8juTUefXWfjk+NX/5T4bAvE6A1lPA5eaXi5PSz+cmqxf0ux5jBB6BsKyDQLldjM8201+3BRAJCMRw6O7jgXX/ScqR/peVaXRuOExDU2jTcaw+kCqM3y/kLc/Hvm8C2SvYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTMrMDI6MDApetg1AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwWCdgiQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.images-et-reseaux.com</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Permanents du pôle Images et Réseaux</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Permanents du pôle Images et Réseaux</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">images-et-reseaux.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACS0lEQVQ4y4WSzUtUURiHn3PuuffOlIx9oGmOxFAaipuiNhVtXLQQalHbJEN3QSSI/0CEIS5C+oCgVbQyoTZFH5DYIsJNZopNgSmKmlqmM+O9d+a+LWZUHAvP5ny9v+e87++8SlLLtE7E+mdtqmNlOfba1uLd3Y+7ofFtGFZiWYodhxrMrZ4+0ynUnxcSF2WoF8lI6Q3flx21WuaSyKqHNWlBqgb8BL8/xsiwbIfhzo8bKT+MJGZOjU7e+jTOARxWKPXSaZveV66VRbw0KL2pEMA4iFJorTDKS3M7UtW2+MEbiQbTxCur55vKhxv7k8d5n+VlNGYCxwUpVLOWxb5UOXbnBLUvMhkh79BALt3woCs68nMQPIeh1ueUNg901NyPd+u+DkKVgUIoOUNn/BtdD0cnVnKSMACVQeDXvFmIJt1avEAz1w9Os7fr3Nh3vgwfJBXdLOEXhl/vstCzElICBkCUInQVGAERdAQUSnJGoVxBjOCjSANYChcfzJoDBQCynmHxtylEFCk0TeEszQuvSaSWCADSPTcjsXWAWteqIoiAyu8zPyyO9i1Rf2FKYeJ4WYjYCr09g6LOk/VJ0AI5MweSFwNsuiNqewZFvPzS3nKmN27+1fIbPPlPQMGDWT+wsyg8FGAhgKC1L+ApRYAm2ABs7W8juTUefXWfjk+NX/5T4bAvE6A1lPA5eaXi5PSz+cmqxf0ux5jBB6BsKyDQLldjM8201+3BRAJCMRw6O7jgXX/ScqR/peVaXRuOExDU2jTcaw+kCqM3y/kLc/Hvm8C2SvYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTMrMDI6MDApetg1AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwWCdgiQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.images-et-reseaux.com</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Permanents du pôle Images et Réseaux</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Permanents du pôle Images et Réseaux</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDdTCCAl2gAwIBAgIUfVeQwiqB95BAl22ynEYVWqJBclowDQYJKoZIhvcNAQEF
 BQAwLTErMCkGA1UEAwwiaXItbGFuLWZpZDAxLmltYWdlcy1ldC1yZXNlYXV4LmNv
 bTAeFw0xNDEwMTQxNDU4MzFaFw0xNzEwMTQxNDU4MzFaMC0xKzApBgNVBAMMImly
@@ -41,22 +41,22 @@ C2PYZIo9GQlKMb3kQ3nwsvo9yHGJAoFOVO2idUpEwnRik7OldKPz8JC0tqgcU7ek
 dxih2c1aTtAR8ppMcajXPEpBCfYPLCM/OqiMVe8uYgPXqIt7LmKibPQKYEof2FfJ
 J50vJWk7ByIh8CfHI1165+hJArgbrRdkvw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Images et Réseaux - Pôle de compétitivité</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.images-et-reseaux.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sergio MORANT</md:SurName>
-      <md:EmailAddress>smorant@images-et-reseaux.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Images et Réseaux - Pôle de compétitivité</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.images-et-reseaux.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sergio MORANT</md:SurName>
+    <md:EmailAddress>smorant@images-et-reseaux.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/is.proteomics.ceitec.cz-shibboleth.xml b/swamid-interfederations-2.0/is.proteomics.ceitec.cz-shibboleth.xml
index 4cd3d2c0..50998e4d 100644
--- a/swamid-interfederations-2.0/is.proteomics.ceitec.cz-shibboleth.xml
+++ b/swamid-interfederations-2.0/is.proteomics.ceitec.cz-shibboleth.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://is.proteomics.ceitec.cz/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-26T18:37:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-04-26T18:37:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Proteomics Core Facility</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Centrální laboratoř - Proteomika</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Order administration</mdui:Description>
+        <mdui:Description xml:lang="cs">Administrace objednávek</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ceitec.eu/ceitec-mu/proteomics-core-facility/z8</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ceitec.cz/ceitec-mu/centralni-laborator-proteomika/z8</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Proteomics Core Facility</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Centrální laboratoř - Proteomika</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Order administration</mdui:Description>
-          <mdui:Description xml:lang="cs">Administrace objednávek</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ceitec.eu/ceitec-mu/proteomics-core-facility/z8</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.ceitec.cz/ceitec-mu/centralni-laborator-proteomika/z8</mdui:InformationURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://is.proteomics.ceitec.cz/shibboleth</ds:KeyName>
-          <ds:KeyName>is.proteomics.ceitec.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=is.proteomics.ceitec.cz</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAPLLk6ldIP3YMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://is.proteomics.ceitec.cz/shibboleth</ds:KeyName>
+        <ds:KeyName>is.proteomics.ceitec.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=is.proteomics.ceitec.cz</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAPLLk6ldIP3YMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF2lzLnByb3Rlb21pY3MuY2VpdGVjLmN6MB4XDTE1MTExOTEyMDkzN1oXDTI1
 MTExNjEyMDkzN1owIjEgMB4GA1UEAxMXaXMucHJvdGVvbWljcy5jZWl0ZWMuY3ow
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDotcZpNGzOFvcedVPy5HYm
@@ -63,52 +63,52 @@ NUB5fpxzvZtVGu1MhJTp4vOTeHhkPS9jjbYQU/8BNK3iT+8zoVGepc70/23Ep5YD
 ekxna4TTDo68gFCaSVihDtsWW5qShXHjhWhHr7FYk34Hu3zlAEvVBsGyUbtBCcpR
 vpdCUeJQKf3/f7V6
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Proteomics Core Facility</md:ServiceName>
-        <md:ServiceName xml:lang="cs">Centrální laboratoř - Proteomika</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Central European Institute of Technology - Masaryk University</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Středoevropský technologický institut - Masarykova univerzita</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CEITEC MU</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">CEITEC MU</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ceitec.eu/ceitec-masaryk-university/in1</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ceitec.cz/ceitec-masarykova-univerzita/in1</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Bednarik</md:SurName>
-      <md:EmailAddress>325480@mail.muni.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michal</md:GivenName>
-      <md:SurName>Oboril</md:SurName>
-      <md:EmailAddress>175648@mail.muni.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://is.proteomics.ceitec.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Proteomics Core Facility</md:ServiceName>
+      <md:ServiceName xml:lang="cs">Centrální laboratoř - Proteomika</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Central European Institute of Technology - Masaryk University</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Středoevropský technologický institut - Masarykova univerzita</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CEITEC MU</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CEITEC MU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ceitec.eu/ceitec-masaryk-university/in1</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ceitec.cz/ceitec-masarykova-univerzita/in1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Bednarik</md:SurName>
+    <md:EmailAddress>325480@mail.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Oboril</md:SurName>
+    <md:EmailAddress>175648@mail.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml
index fa1c8698..1cd10930 100644
--- a/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://isls-shibsp1.wmin.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID2zCCAsOgAwIBAgIJAM1xo75otDN8MA0GCSqGSIb3DQEBCwUAMIGDMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSIwIAYD
 						VQQKDBlVbml2ZXJzaXR5IG9mIFdlc3RtaW5zdGVyMQswCQYDVQQLDAJJUzEgMB4G
@@ -51,43 +51,43 @@
 						OFzmfkNPF49EO97PUM/tItM11zTRWzZ/O1xOXiTQlGUVBC33PU1SGLvPy+sf80yc
 						4IPkBOq2AQG2oSGblk2hlDpCvRTYsSikik5D+3SlvQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Westminster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Westminster: Shibboleth Service Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wmin.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ann</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:a.e.munn@westminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dave</md:GivenName>
-      <md:SurName>Marriott</md:SurName>
-      <md:EmailAddress>mailto:d.marriott@westminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Westminster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Westminster: Shibboleth Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wmin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ann</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:a.e.munn@westminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Marriott</md:SurName>
+    <md:EmailAddress>mailto:d.marriott@westminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
index 22706b91..022a1470 100644
--- a/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iss-openathensla-runtime.swan.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-16T13:09:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-16T13:09:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swan.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Swansea University</mdui:DisplayName>
+        <mdui:Logo height="25" width="80">https://iss-openathensla-runtime.swan.ac.uk/oala/images/uk-federation-branding.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://iss-openathensla-runtime.swan.ac.uk/oala/images/swansea-university-icon.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swan.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Swansea University</mdui:DisplayName>
-          <mdui:Logo height="25" width="80">https://iss-openathensla-runtime.swan.ac.uk/oala/images/uk-federation-branding.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://iss-openathensla-runtime.swan.ac.uk/oala/images/swansea-university-icon.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxzCCAq+gAwIBAgIJAKaRp6YdpxbFMA0GCSqGSIb3DQEBBQUAMEsxGzAZBgNV
 						BAoTElN3YW5zZWEgVW5pdmVyc2l0eTEsMCoGA1UEAxMjaXNzLW9wZW5hdGhlbnNs
 						YS1ydW50aW1lLnN3YW4uYWMudWswHhcNMTQwMzIxMTAzMzI5WhcNMjQwMzE4MTAz
@@ -40,25 +40,25 @@
 						hbOM1aMGtZOY6ba1luEWp7tuBHQGIdBHJaZyLUjiYpSDquuiYm9oZai2NIksjDq9
 						Yjbfp1B8p/YQJQw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Swansea University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Swansea University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swan.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nina</md:GivenName>
-      <md:SurName>Whitcombe</md:SurName>
-      <md:EmailAddress>mailto:N.Whitcombe@swansea.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Brown</md:SurName>
-      <md:EmailAddress>mailto:A.T.Brown@swansea.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swansea University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swansea University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swan.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nina</md:GivenName>
+    <md:SurName>Whitcombe</md:SurName>
+    <md:EmailAddress>mailto:N.Whitcombe@swansea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:A.T.Brown@swansea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
index 1b04f1b4..8ce0d24f 100644
--- a/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
 					The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
 					Unauthenticated users may view submitted issues.  Authenticated users may submit new
 					issues and comment on existing ones.
 				</mdui:Description>
-          <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
 						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
 						VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw
@@ -55,62 +55,62 @@
 						umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU
 						PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Shibboleth.net Issue Tracking</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Shibboleth.net Issue Tracking</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
 				Unauthenticated users may view submitted issues.  Authenticated users may submit new
 				issues and comment on existing ones.
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shibboleth.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth.Net Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:contact@shibboleth.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Cantor</md:SurName>
-      <md:EmailAddress>mailto:cantor.2@osu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:ukfed@iay.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shibboleth.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth.Net Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:contact@shibboleth.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Cantor</md:SurName>
+    <md:EmailAddress>mailto:cantor.2@osu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:ukfed@iay.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
index 209d57e7..165bc423 100644
--- a/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://itacare.bahiana.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
+        <mdui:Description xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bahiana.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.bahiana.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
-          <mdui:Description xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.bahiana.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.bahiana.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
 RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
 BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
@@ -48,26 +48,26 @@ dB9LD1cUTQOHl3pALNiJEUoalHigtqsPtZx1ld1qskHvvv/6WhObJBh0DbSXJtak
 qz1SUhwFk05GOst5iQ3sVVkZdS78DpDCuNPGEdj9YDPZVsdd9CepbgkWV29AX/yB
 o4OFX+ZHPirEOF/8flK2xmI8xJ7blH+6
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itacare.bahiana.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itacare.bahiana.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
 RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
@@ -95,24 +95,24 @@ qz1SUhwFk05GOst5iQ3sVVkZdS78DpDCuNPGEdj9YDPZVsdd9CepbgkWV29AX/yB
 o4OFX+ZHPirEOF/8flK2xmI8xJ7blH+6
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bahiana.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.bahiana.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Claudio Santos</md:SurName>
-      <md:EmailAddress>nti-claudiosantos@bahiana.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bahiana.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.bahiana.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Claudio Santos</md:SurName>
+    <md:EmailAddress>nti-claudiosantos@bahiana.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml
index ca75d127..33c6bd8b 100644
--- a/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-shib.its.csulb.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csulb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Long Beach</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csulb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Long Beach</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAJPL4jmebB2O17/3wHKhz8V1qEArMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFml0cy1zaGliLml0cy5jc3VsYi5lZHUwHhcNMTAwMjAz
 MTg1NzQ1WhcNMzAwMjAzMTg1NzQ1WjAhMR8wHQYDVQQDExZpdHMtc2hpYi5pdHMu
@@ -38,22 +38,22 @@ BIFqM69GfneuKbZkLsDsZDL6CLXWz2BYE4Z/RGRRWwN2+IE//9vcDra+7q0bqfqf
 7eMgq13DOjl3gbhvE1Hq1pkmzrwv1ewjHCxd4ILQC05MYFPAJiq3hzhske1DU8xO
 BqRi7xc2j/DiFKyFbqwPCyGLSIlDG9Tu
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-shib.its.csulb.edu/idp/profile/Logout"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-shib.its.csulb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-shib.its.csulb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csulb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-shib.its.csulb.edu/idp/profile/Logout"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-shib.its.csulb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-shib.its.csulb.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csulb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAJPL4jmebB2O17/3wHKhz8V1qEArMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFml0cy1zaGliLml0cy5jc3VsYi5lZHUwHhcNMTAwMjAz
 MTg1NzQ1WhcNMzAwMjAzMTg1NzQ1WjAhMR8wHQYDVQQDExZpdHMtc2hpYi5pdHMu
@@ -73,23 +73,23 @@ BIFqM69GfneuKbZkLsDsZDL6CLXWz2BYE4Z/RGRRWwN2+IE//9vcDra+7q0bqfqf
 7eMgq13DOjl3gbhvE1Hq1pkmzrwv1ewjHCxd4ILQC05MYFPAJiq3hzhske1DU8xO
 BqRi7xc2j/DiFKyFbqwPCyGLSIlDG9Tu
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Long Beach</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Long Beach</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csulb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jesse Santana</md:GivenName>
-      <md:EmailAddress>jsantana@csulb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ryan Tapp</md:GivenName>
-      <md:EmailAddress>ryan.tapp@csulb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Long Beach</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Long Beach</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csulb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jesse Santana</md:GivenName>
+    <md:EmailAddress>jsantana@csulb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ryan Tapp</md:GivenName>
+    <md:EmailAddress>ryan.tapp@csulb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/its.longwood.edu-idp.xml b/swamid-interfederations-2.0/its.longwood.edu-idp.xml
index 8331ba53..79408081 100644
--- a/swamid-interfederations-2.0/its.longwood.edu-idp.xml
+++ b/swamid-interfederations-2.0/its.longwood.edu-idp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its.longwood.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longwood.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Longwood University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Longwood University IDP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.longwood.edu/usersupport/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.longwood.edu/privacy.htm</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longwood.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Longwood University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Longwood University IDP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.longwood.edu/usersupport/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.longwood.edu/privacy.htm</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC3DCCAcSgAwIBAgIQGTkoicdk3YRKsF+pc6x+nzANBgkqhkiG9w0BAQsFADAq
 MSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBzc28ubG9uZ3dvb2QuZWR1MB4XDTE2
 MDExNDE1MTIwNFoXDTE3MDExMzE1MTIwNFowKjEoMCYGA1UEAxMfQURGUyBTaWdu
@@ -40,25 +40,25 @@ CUbfhz3R1EeWX7Sxq6Cu/gQXQglrEtQxxx2wFGDOTWxCm8ijh+mFl9nfTM9EQgOZ
 6hIOiToAnIWC91GvJ9FrFnH/75vytbnQsC/Q9tidet69j8N+u1Tm2j+/LK2+FjvU
 QMGLNQjWv7sdiPodIiirkA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.longwood.edu/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.longwood.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.longwood.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.longwood.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Longwood University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Longwood University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.longwood.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew Ribeiro</md:GivenName>
-      <md:EmailAddress>ribeiroam@longwood.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User Support Services</md:GivenName>
-      <md:EmailAddress>helpdesk@longwood.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.longwood.edu/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.longwood.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.longwood.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.longwood.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Longwood University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Longwood University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.longwood.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew Ribeiro</md:GivenName>
+    <md:EmailAddress>ribeiroam@longwood.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User Support Services</md:GivenName>
+    <md:EmailAddress>helpdesk@longwood.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
index 2a835bf2..b0f9052b 100644
--- a/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://janus.bordeaux.archi.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-03T11:39:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-03T11:39:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bordeaux.archi.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/gif;base64,R0lGODlhEAAQAGAAACH5BAEAAGEALAAAAAAQABAAhwAAAAAAMwAAZgAAmQAAzAAA/wArAAArMwArZgArmQArzAAr/wBVAABVMwBVZgBVmQBVzABV/wCAAACAMwCAZgCAmQCAzACA/wCqAACqMwCqZgCqmQCqzACq/wDVAADVMwDVZgDVmQDVzADV/wD/AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMrADMrMzMrZjMrmTMrzDMr/zNVADNVMzNVZjNVmTNVzDNV/zOAADOAMzOAZjOAmTOAzDOA/zOqADOqMzOqZjOqmTOqzDOq/zPVADPVMzPVZjPVmTPVzDPV/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYAmWYAzGYA/2YrAGYrM2YrZmYrmWYrzGYr/2ZVAGZVM2ZVZmZVmWZVzGZV/2aAAGaAM2aAZmaAmWaAzGaA/2aqAGaqM2aqZmaqmWaqzGaq/2bVAGbVM2bVZmbVmWbVzGbV/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5krAJkrM5krZpkrmZkrzJkr/5lVAJlVM5lVZplVmZlVzJlV/5mAAJmAM5mAZpmAmZmAzJmA/5mqAJmqM5mqZpmqmZmqzJmq/5nVAJnVM5nVZpnVmZnVzJnV/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wrAMwrM8wrZswrmcwrzMwr/8xVAMxVM8xVZsxVmcxVzMxV/8yAAMyAM8yAZsyAmcyAzMyA/8yqAMyqM8yqZsyqmcyqzMyq/8zVAMzVM8zVZszVmczVzMzV/8z/AMz/M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8rAP8rM/8rZv8rmf8rzP8r//9VAP9VM/9VZv9Vmf9VzP9V//+AAP+AM/+AZv+Amf+AzP+A//+qAP+qM/+qZv+qmf+qzP+q///VAP/VM//VZv/Vmf/VzP/V////AP//M///Zv//mf//zP///wAAAAAAAAAAAAAAAAiYAPcJHEiPnj6DAxMKbDcvIb2GCvc1TOaNVsV2+4bpSyhsHy12HL3twyiwoTeSDmlJFEhvGMiI+9gNE7hR5Ddh5YSx28Wulj6RBz1mPFiwHTuQKukp+7nQ3C6B0QQCFagy5q5y7aoKpSexXcd2Odl9EyisHUmTEB1y5bowmjdeCdmpTKYQY9aKtOxuVPgw4by0A6Oy1BdUYUAAOw==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.bordeaux.archi.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Etudiants en architecture et paysage</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants en architecture et paysage</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bordeaux.archi.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/gif;base64,R0lGODlhEAAQAGAAACH5BAEAAGEALAAAAAAQABAAhwAAAAAAMwAAZgAAmQAAzAAA/wArAAArMwArZgArmQArzAAr/wBVAABVMwBVZgBVmQBVzABV/wCAAACAMwCAZgCAmQCAzACA/wCqAACqMwCqZgCqmQCqzACq/wDVAADVMwDVZgDVmQDVzADV/wD/AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMrADMrMzMrZjMrmTMrzDMr/zNVADNVMzNVZjNVmTNVzDNV/zOAADOAMzOAZjOAmTOAzDOA/zOqADOqMzOqZjOqmTOqzDOq/zPVADPVMzPVZjPVmTPVzDPV/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYAmWYAzGYA/2YrAGYrM2YrZmYrmWYrzGYr/2ZVAGZVM2ZVZmZVmWZVzGZV/2aAAGaAM2aAZmaAmWaAzGaA/2aqAGaqM2aqZmaqmWaqzGaq/2bVAGbVM2bVZmbVmWbVzGbV/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5krAJkrM5krZpkrmZkrzJkr/5lVAJlVM5lVZplVmZlVzJlV/5mAAJmAM5mAZpmAmZmAzJmA/5mqAJmqM5mqZpmqmZmqzJmq/5nVAJnVM5nVZpnVmZnVzJnV/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wrAMwrM8wrZswrmcwrzMwr/8xVAMxVM8xVZsxVmcxVzMxV/8yAAMyAM8yAZsyAmcyAzMyA/8yqAMyqM8yqZsyqmcyqzMyq/8zVAMzVM8zVZszVmczVzMzV/8z/AMz/M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8rAP8rM/8rZv8rmf8rzP8r//9VAP9VM/9VZv9Vmf9VzP9V//+AAP+AM/+AZv+Amf+AzP+A//+qAP+qM/+qZv+qmf+qzP+q///VAP/VM//VZv/Vmf/VzP/V////AP//M///Zv//mf//zP///wAAAAAAAAAAAAAAAAiYAPcJHEiPnj6DAxMKbDcvIb2GCvc1TOaNVsV2+4bpSyhsHy12HL3twyiwoTeSDmlJFEhvGMiI+9gNE7hR5Ddh5YSx28Wulj6RBz1mPFiwHTuQKukp+7nQ3C6B0QQCFagy5q5y7aoKpSexXcd2Odl9EyisHUmTEB1y5bowmjdeCdmpTKYQY9aKtOxuVPgw4by0A6Oy1BdUYUAAOw==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.bordeaux.archi.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Etudiants en architecture et paysage</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants en architecture et paysage</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSDCCAjCgAwIBAgIVANQRFAgpYoToGKMWg8l5CtEP+fE3MA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyMB4XDTE0MDEw
 NjE0MzYyN1oXDTM0MDEwNjE0MzYyN1owIjEgMB4GA1UEAxMXamFudXMuYm9yZGVh
@@ -40,26 +40,26 @@ fiHuBltSrUbuScoYIDjv/VIiG5XrPe791/OUKEONUzwulye26Lz5qOZcwIUgmCV1
 Yt1QoZ6/V4O7uCiPDiad1bluCsGR6Y0o5BJTcPNSSluKuzc/DwJOY9obsR7rYY0m
 QrKLREVlmoE0vK7znYaAPUaXVpJwmNe9GPqvsw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.bordeaux.archi.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bordeaux.archi.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Dépinay</md:SurName>
-      <md:EmailAddress>guillaume.depinay@bordeaux.archi.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Dumas</md:SurName>
-      <md:EmailAddress>jean-louis.dumas@bordeaux.archi.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.bordeaux.archi.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bordeaux.archi.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dépinay</md:SurName>
+    <md:EmailAddress>guillaume.depinay@bordeaux.archi.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dumas</md:SurName>
+    <md:EmailAddress>jean-louis.dumas@bordeaux.archi.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml b/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml
index f66bf821..3eb7c1d9 100644
--- a/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml
+++ b/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://janus.cnrs.fr/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T14:55:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T14:55:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNRS</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC1klEQVQ4y4WTaUjTARjGf/+5NaduqzXLWK5a1+yge2W3SZeQMfpUEF2mFB1QBBFZUQRddNIlFEIRVtBh9MGi0o6PLpOif5uFdijZGrbSTf/b3j5YRgf0fHo/PM/z4eX3KPxDq3aXnKyofjmvLRYzO3vZ6hdNH3+1eMWCg/xPe85fP4UyWnDmCVNXCrOKhOmrhcFeITNPio5cuvNnRvl5OPI3qB/Kbw5l0gwwGUGvhyQ9GPSdtngCAu/hU5C3deX5TrvlFoAOYOPRC2c+3K0Yyrgp0PgJPgbhWwQlkaDb1zZo/AwJQZdph3FZOJ2Lyh+8eL0cABExYugrq/aXiki7SPtXYetZoSog3H8hFB4SaQmLiMiwktuiVKrCkesCbgFIqg2Zzqu+plHXLhTTI3Ua6Y7eZCzOw3/jHp5Xdbybl8uuXqnoczbT7J1J8o7jxPyvwGhj3c7tVl2N/+0Ie7ab2uo66GFl3Zq9ALhSjAxITgCg2tMwKVHMz/1oWwphRBbYTVTWBGbp0oz6b8HmEFazCcdYN47cbACaox1dnw4rCu29baRUPCTpWCmsXQoGAx1tEaNuxoTh1TTUMyV7DAD+s8UEQl+Ia/HOtBbHo+jRPgYJeuej5Xgg0gFaB067tUE3e+qYO7S2Mq1wF/V3S8jdd45HBbuxqWpnweUbFJ24AslG4r5axNkXdhwA3zu8c7Kv/uBgpOB2QWMIMtIh2cCQYS48bgcXL1WBzQw9LRCJQqgFUk1Q44fWJ4oOYPaKhfdRVXD1AasJknQQj3V2mwyQ1g2iUSAB3c3wxMem/esP/0YiZAiusWBJg5gwJKs/nuH9uFhWBelmfkADzwLgcsCzy0oXiQDhcIObNw+gJQwx7VdvJAKaBtF2eOwDa0pX+C+JiBtcAplimbhE3N6NwsB8wTJZYIAsKz5R+d9FAuw9VbZlYE7B03TP4qZBc4vUgm3HTouI9V/e77ShIdcL4sPwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.dsi.cnrs.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">CNRS IDP server</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CNRS</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Serveur IDP du CNRS</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNRS</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC1klEQVQ4y4WTaUjTARjGf/+5NaduqzXLWK5a1+yge2W3SZeQMfpUEF2mFB1QBBFZUQRddNIlFEIRVtBh9MGi0o6PLpOif5uFdijZGrbSTf/b3j5YRgf0fHo/PM/z4eX3KPxDq3aXnKyofjmvLRYzO3vZ6hdNH3+1eMWCg/xPe85fP4UyWnDmCVNXCrOKhOmrhcFeITNPio5cuvNnRvl5OPI3qB/Kbw5l0gwwGUGvhyQ9GPSdtngCAu/hU5C3deX5TrvlFoAOYOPRC2c+3K0Yyrgp0PgJPgbhWwQlkaDb1zZo/AwJQZdph3FZOJ2Lyh+8eL0cABExYugrq/aXiki7SPtXYetZoSog3H8hFB4SaQmLiMiwktuiVKrCkesCbgFIqg2Zzqu+plHXLhTTI3Ua6Y7eZCzOw3/jHp5Xdbybl8uuXqnoczbT7J1J8o7jxPyvwGhj3c7tVl2N/+0Ie7ab2uo66GFl3Zq9ALhSjAxITgCg2tMwKVHMz/1oWwphRBbYTVTWBGbp0oz6b8HmEFazCcdYN47cbACaox1dnw4rCu29baRUPCTpWCmsXQoGAx1tEaNuxoTh1TTUMyV7DAD+s8UEQl+Ia/HOtBbHo+jRPgYJeuej5Xgg0gFaB067tUE3e+qYO7S2Mq1wF/V3S8jdd45HBbuxqWpnweUbFJ24AslG4r5axNkXdhwA3zu8c7Kv/uBgpOB2QWMIMtIh2cCQYS48bgcXL1WBzQw9LRCJQqgFUk1Q44fWJ4oOYPaKhfdRVXD1AasJknQQj3V2mwyQ1g2iUSAB3c3wxMem/esP/0YiZAiusWBJg5gwJKs/nuH9uFhWBelmfkADzwLgcsCzy0oXiQDhcIObNw+gJQwx7VdvJAKaBtF2eOwDa0pX+C+JiBtcAplimbhE3N6NwsB8wTJZYIAsKz5R+d9FAuw9VbZlYE7B03TP4qZBc4vUgm3HTouI9V/e77ShIdcL4sPwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.dsi.cnrs.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">CNRS IDP server</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CNRS</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Serveur IDP du CNRS</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUcyCcvrPE6sFdJyVsCKfKmZg0/70wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNamFudXMuY25ycy5mcjAeFw0xNDA2MTYyMTA1MDZaFw0y
 NDA2MTYyMTA1MDZaMBgxFjAUBgNVBAMTDWphbnVzLmNucnMuZnIwggEiMA0GCSqG
@@ -39,21 +39,21 @@ bKQsdICU4/Q+thqPKtYHL5T3leyJKCoEQC0o7jZ2q7T2SF6j7d7kwoa58qopcMTz
 J9FdzyFEdepofr6Cj3sQu4nA28iAc91t0ZYvTbbrFu1KBby90rPH1p4+xLV42/Fy
 wPrS8Iosd99N9HZcyPWEuGXeoFyLRK8VArJPtD6f2ZHusXQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.cnrs.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.cnrs.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.cnrs.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsichangement@dsi.cnrs.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.cnrs.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.cnrs.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.cnrs.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsichangement@dsi.cnrs.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml
index 15e596a6..8c90f1c4 100644
--- a/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcolls.mimas.ac.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKzCCAxOgAwIBAgIJAP8Lcrq8+dIXMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
 						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
@@ -32,13 +32,13 @@
 						3lvtbpwmo4D+SXsCeK/1HShRFHIAqLF2nSip/Usbg29FLN2tSe0E8D6zyHURdLn5
 						RlTNvtB/OM17VzVTJT0i
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKzCCAxOgAwIBAgIJAP8Lcrq8+dIXMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
 						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
@@ -63,35 +63,35 @@
 						3lvtbpwmo4D+SXsCeK/1HShRFHIAqLF2nSip/Usbg29FLN2tSe0E8D6zyHURdLn5
 						RlTNvtB/OM17VzVTJT0i
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MIMAS: JISC Collections Content</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mimas Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:info@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS: JISC Collections Content</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mimas Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:info@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml b/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml
index 9af39dbb..4fb3d8d8 100644
--- a/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml
+++ b/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jenkins.ukfederation.org.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-12T10:52:56Z"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-12T10:52:56Z"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UK federation Jenkins CI server</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UK federation Jenkins CI server</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
 					This continuous integration server is part of the UK federation infrastructure and is only
 					available to UK federation team members.
 				</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/EDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/EDS" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/EDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/EDS" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEPjCCAyagAwIBAgIJAOVnQ3eBaoIXMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDFD
 						MEEGA1UEChM6VUsgQWNjZXNzIE1hbmFnZW1lbnQgRmVkZXJhdGlvbiBmb3IgRWR1
@@ -56,43 +56,43 @@
 						HrX1GuA4GsXXdKYi1Deaj2JIATS/7YTYt4S2vyx+gEN/0+Rg70YC5P9xFWsibAIr
 						WXY859KC7gEzlErCQS2KPKYA4abXdTiut4yaeh+HZN1Ctw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">UK federation Jenkins CI server</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">UK federation Jenkins CI server</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				This continuous integration server is part of the UK federation infrastructure and is only
 				available to UK federation team members.
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UK federation Jenkins CI server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UK federation helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:service@ukfederation.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UK federation infrastructure</md:GivenName>
-      <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UK federation Jenkins CI server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UK federation helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:service@ukfederation.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UK federation infrastructure</md:GivenName>
+    <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml b/swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml
index a32c47bd..f445e4a9 100644
--- a/swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jidp.jlab.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://jidp.jlab.org/error-main.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jlab.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Thomas Jefferson National Accelerator Facility</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Jeffrsson Lab Federation / Single Sign-On server.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://jidp.jlab.org/info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://jidp.jlab.org/notices/PrivacyAndSecurityNotice.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="89" width="314" xml:lang="en">https://jidp.jlab.org/images/jlab-logo-2015.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://jidp.jlab.org/error-main.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jlab.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Thomas Jefferson National Accelerator Facility</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Jeffrsson Lab Federation / Single Sign-On server.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://jidp.jlab.org/info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://jidp.jlab.org/notices/PrivacyAndSecurityNotice.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="89" width="314" xml:lang="en">https://jidp.jlab.org/images/jlab-logo-2015.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJALnZSc3W8jbPMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
 BAMMDWppZHAuamxhYi5vcmcwHhcNMTUxMDA2MTAxNjA4WhcNMjUxMDAzMTAxNjA4
 WjAYMRYwFAYDVQQDDA1qaWRwLmpsYWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -41,23 +41,23 @@ zQ22wyEgR+wadv1F8mNMuy36OX2p1J+uAGcf5H369ILzrHnx+pLgfLwcI+g9ykGU
 1i9hmm8hl7nCznl7VjdmpM+K+o/3PLkJDUFDlh0rIdUkjd8/2RjU1xYipNlaRZv8
 5WBcTMLk6w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jidp.jlab.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jidp.jlab.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://jidp.jlab.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jidp.jlab.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jidp.jlab.org/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jlab.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jidp.jlab.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jidp.jlab.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://jidp.jlab.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jidp.jlab.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jidp.jlab.org/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jlab.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJALnZSc3W8jbPMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
 BAMMDWppZHAuamxhYi5vcmcwHhcNMTUxMDA2MTAxNjA4WhcNMjUxMDAzMTAxNjA4
 WjAYMRYwFAYDVQQDDA1qaWRwLmpsYWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -76,30 +76,30 @@ zQ22wyEgR+wadv1F8mNMuy36OX2p1J+uAGcf5H369ILzrHnx+pLgfLwcI+g9ykGU
 1i9hmm8hl7nCznl7VjdmpM+K+o/3PLkJDUFDlh0rIdUkjd8/2RjU1xYipNlaRZv8
 5WBcTMLk6w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jidp.jlab.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomas Jefferson National Accelerator Facility</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Thomas Jefferson National Accelerator Facility</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://education.jlab.org/index.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marty Wise</md:GivenName>
-      <md:EmailAddress>wise@jlab.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marty Wise</md:GivenName>
-      <md:EmailAddress>wise@jlab.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JLab IT Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@jlab.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>JLab Cyber Security Operations</md:GivenName>
-      <md:EmailAddress>secops@jlab.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jidp.jlab.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomas Jefferson National Accelerator Facility</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Thomas Jefferson National Accelerator Facility</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://education.jlab.org/index.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marty Wise</md:GivenName>
+    <md:EmailAddress>wise@jlab.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marty Wise</md:GivenName>
+    <md:EmailAddress>wise@jlab.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JLab IT Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@jlab.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>JLab Cyber Security Operations</md:GivenName>
+    <md:EmailAddress>secops@jlab.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
index d2350671..cc0a3fd0 100644
--- a/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jisrc.mercury.hosting.eduserv.org.uk/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqTCCApGgAwIBAgIJAPDI+Ol0Xn6oMA0GCSqGSIb3DQEBBQUAMEExEDAOBgNV
 						BAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5lZHVz
 						ZXJ2Lm9yZy51azAeFw0xMTA2MzAxMzI3MDBaFw0yMTA2MjcxMzI3MDBaMEExEDAO
@@ -29,13 +29,13 @@
 						QN9mVYa8gEYLRvVkAz5ufqMmYkVorild4HsDy3/ZAAYp6f/vS30IYiOXiIRVyP0C
 						UaM4zFto2VO2ZYhxM7KHthHBUKzw3SRmx7MJSsQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqTCCApGgAwIBAgIJAPDI+Ol0Xn6oMA0GCSqGSIb3DQEBBQUAMEExEDAOBgNV
 						BAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5lZHVz
 						ZXJ2Lm9yZy51azAeFw0xMTA2MzAxMzI3MDBaFw0yMTA2MjcxMzI3MDBaMEExEDAO
@@ -57,25 +57,25 @@
 						QN9mVYa8gEYLRvVkAz5ufqMmYkVorild4HsDy3/ZAAYp6f/vS30IYiOXiIRVyP0C
 						UaM4zFto2VO2ZYhxM7KHthHBUKzw3SRmx7MJSsQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc RSC CMS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Eduserve Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eduserve Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc RSC CMS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Eduserve Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eduserve Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
index 2beb8d22..dffa288c 100644
--- a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://joaodebarro.iffarroupilha.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iffarroupilha.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.iffarroupilha.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
 cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
 Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
@@ -47,26 +47,26 @@ u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
 BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
 7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
 cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
@@ -94,24 +94,24 @@ BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iffarroupilha.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Everton Fava</md:SurName>
-      <md:EmailAddress>everton.fava@iffarroupilha.edub.r</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iffarroupilha.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Everton Fava</md:SurName>
+    <md:EmailAddress>everton.fava@iffarroupilha.edub.r</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml
index a963bbc7..9ad620ce 100644
--- a/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jomectechnicaloffice.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-01T11:48:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-01T11:48:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</mdui:Description>
+        <mdui:Logo height="60" width="60">https://jomectechnicaloffice.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</mdui:Description>
-          <mdui:Logo height="60" width="60">https://jomectechnicaloffice.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -51,34 +51,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml
index 73359f78..ac53c4d0 100644
--- a/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journalarchives.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-28T11:24:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-28T11:24:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Journal Archives</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Journal archives from a range of publishers and societies</mdui:Description>
+        <mdui:Logo height="78" width="258">https://journalarchives.jisc.ac.uk/Login/journalarchives.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Journal Archives</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Journal archives from a range of publishers and societies</mdui:Description>
-          <mdui:Logo height="78" width="258">https://journalarchives.jisc.ac.uk/Login/journalarchives.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEETCCAvmgAwIBAgIJAKgxolJV/8T9MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
 						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMaam91cm5h
@@ -58,41 +58,41 @@
 						9HoL2DVz9hb4oJf8j5nolo8C/Kcve9hdMeA84NgWZc0RJV19OBLr/2FNUPsb8csF
 						lUdHvWbKrO6c0VrEQ9nI9+A2GvR9SRsaUJRnEUBnw+ZwSjXlfQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Journal Archives</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Journal Archives Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:journalarchives@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Journal Archives</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Journal Archives Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:journalarchives@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml b/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml
index 23a84e49..3f241e62 100644
--- a/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.bmj.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-27T11:16:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-27T11:16:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">BMJ Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://journals.bmj.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BMJ Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://journals.bmj.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
index c66d2062..95c2e49c 100644
--- a/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.rcni.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T13:47:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T13:47:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RCNi</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RCNi</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
 					RCNi is the premier provider of innovative and creative information solutions 
 					for the whole nursing team and allied health professionals.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://journals.rcni.com/page/about-us</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:InformationURL xml:lang="en">http://journals.rcni.com/page/about-us</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIJAMqMZUiIsl4nMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXJjbnB1Ymxpc2hpbmcuY29tMB4XDTEzMTAwMzIxMzU1OFoXDTIzMTAwMTIx
 						MzU1OFowHDEaMBgGA1UEAxMRcmNucHVibGlzaGluZy5jb20wggEiMA0GCSqGSIb3
@@ -37,24 +37,24 @@
 						BBfwdYT/FpEL/nu+CPZwOcochpjY1HNtmq8tYGHv85r3mZkaLLnd+t0HGTw8X/Rs
 						Ulakv64cRCvOJRV/8DpP8bRsMrlqMkCQ2N3nu3eWKuQsgp67
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.rcni.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.rcni.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.rcni.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://journals.rcni.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.rcni.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.rcni.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.rcni.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://journals.rcni.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml
index d32be619..99bbe2fa 100644
--- a/swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://judge.wcu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Western Carolina University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.wcu.edu</mdui:InformationURL>
+        <mdui:Logo height="70" width="171" xml:lang="en">https://judge.wcu.edu/idp/images/wculogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Western Carolina University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.wcu.edu</mdui:InformationURL>
-          <mdui:Logo height="70" width="171" xml:lang="en">https://judge.wcu.edu/idp/images/wculogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAMwcokVuvUtTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMMDWp1ZGdlLndjdS5lZHUwHhcNMTMwMzAxMjAyMzA0WhcNMjMwMzAyMjAyMzA0
 WjAYMRYwFAYDVQQDDA1qdWRnZS53Y3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -39,23 +39,23 @@ nu9QYDv3QLT3bKbbVxlHgmcF375m4y6ztSn9NTVI9vbQ1DwP8kbOGyfHZ4mIr+jb
 xOXJMBYALX0MFAdPtoE+V5+8GhV4syXPQmL4HFrK/Ywdx+4ER+/Ld7ovoZCxI1eb
 u+Vt6r08yQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://judge.wcu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://judge.wcu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://judge.wcu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://judge.wcu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://judge.wcu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://judge.wcu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://judge.wcu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://judge.wcu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://judge.wcu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://judge.wcu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAMwcokVuvUtTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMMDWp1ZGdlLndjdS5lZHUwHhcNMTMwMzAxMjAyMzA0WhcNMjMwMzAyMjAyMzA0
 WjAYMRYwFAYDVQQDDA1qdWRnZS53Y3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -74,30 +74,30 @@ nu9QYDv3QLT3bKbbVxlHgmcF375m4y6ztSn9NTVI9vbQ1DwP8kbOGyfHZ4mIr+jb
 xOXJMBYALX0MFAdPtoE+V5+8GhV4syXPQmL4HFrK/Ywdx+4ER+/Ld7ovoZCxI1eb
 u+Vt6r08yQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://judge.wcu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Western Carolina University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Western Carolina University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wcu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Joshua Bright</md:GivenName>
-      <md:EmailAddress>jbright@wcu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joshua Bright</md:GivenName>
-      <md:EmailAddress>jbright@wcu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Joel McKenzie</md:GivenName>
-      <md:EmailAddress>mckenzie@wcu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Stan Hammer</md:GivenName>
-      <md:EmailAddress>shammer@wcu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://judge.wcu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Western Carolina University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Western Carolina University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wcu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Joshua Bright</md:GivenName>
+    <md:EmailAddress>jbright@wcu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joshua Bright</md:GivenName>
+    <md:EmailAddress>jbright@wcu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Joel McKenzie</md:GivenName>
+    <md:EmailAddress>mckenzie@wcu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Stan Hammer</md:GivenName>
+    <md:EmailAddress>shammer@wcu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml
index ab212009..8de74b8f 100644
--- a/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://junebug.mcc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mott Community College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mott Community College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAPBoW9t0fielvd212h1N5MgEuZUVMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTAeFw0xMzA1MTYxNTE2MzRa
 Fw0zMzA1MTYxNTE2MzRaMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTCCASIw
@@ -37,23 +37,23 @@ Xz2Xa12ODXqbT6o7v6IB6FPP30mM8pbeH5hONcXg1wubBDVBq06YNpWpLtBRP0uM
 6Als7GmwG6Kzt8d09co99CPLCwDmGPgS/LVCL0XixRn6tmlTmf8ljSFwYEqPBiIP
 TI96HuGWzFL4Q5mXqWBbH1c2guyGQH9+31AtSqhqEPSf+nUwZmK5nB2wbBA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://junebug.mcc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://junebug.mcc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://junebug.mcc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://junebug.mcc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://junebug.mcc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://junebug.mcc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://junebug.mcc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://junebug.mcc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://junebug.mcc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://junebug.mcc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAPBoW9t0fielvd212h1N5MgEuZUVMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTAeFw0xMzA1MTYxNTE2MzRa
 Fw0zMzA1MTYxNTE2MzRaMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTCCASIw
@@ -72,18 +72,18 @@ Xz2Xa12ODXqbT6o7v6IB6FPP30mM8pbeH5hONcXg1wubBDVBq06YNpWpLtBRP0uM
 6Als7GmwG6Kzt8d09co99CPLCwDmGPgS/LVCL0XixRn6tmlTmf8ljSFwYEqPBiIP
 TI96HuGWzFL4Q5mXqWBbH1c2guyGQH9+31AtSqhqEPSf+nUwZmK5nB2wbBA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://junebug.mcc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mott Community College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mott Community College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mcc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marc Smith</md:GivenName>
-      <md:EmailAddress>marc.smith@mcc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://junebug.mcc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mott Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mott Community College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mcc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc Smith</md:GivenName>
+    <md:EmailAddress>marc.smith@mcc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/karma.cines.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/karma.cines.fr-idp-shibboleth.xml
index c6eb2361..5e5f87e0 100644
--- a/swamid-interfederations-2.0/karma.cines.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/karma.cines.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://karma.cines.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-19T09:38:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-19T09:38:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cines.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CINES</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUAAAIsSURBVDhPfVPNS1RRFB8pcqXv01EREULHaegDlEjR1/Pdc+/1SSRECGpBIogfEFELN7nTdkULpYW6CtoEQbjoD2jZqkVIOIFuNCKmQHBX5u/cuUP51YHDPXPe7/c75557JnPUGtK0LpBy3id6EQgxi/N2KESHJ6VjIacbQBO+lEt1WrdmhagPlLoJgXu+EMpP01oLO9lAfBwQjWaJziN+i/gXOvkD37fnTws9br5St1DpPs5rIJbg6/A7NUQBPld5Wjfj93QZfcRa07Qa5Fdos4nJiNe4XdORlKvIPYfwmJskLZZy2EIpR3BXAeIyCFtOHLuIX2al7PoUFxosLJOJ47M2OmyosBgMDtaAtIeqDyAyhVhuUO7hhsj9/pLkOy30ZAOYp36FB8XTh+AK54uU7y5S2+vPcS40wNMMVbvw3gkE9rn9UGtT0SW6BLF13gFgvuKadz2iFLk3yA1zDsV3jAgGZDoItM6bBIyJAJdMgfJTfse8eE/egzgO/4jh6jK6UDgH8A8k58oJCKCTigBXgq/BtysCjIe/s3AMU4hn+PDNvv0xAd4FxLv/CGzCnxgyW63WPtrcAuBDvVJZs8pEM2F/fyPEJxnDLYdKDXtKXQyJHrEbcsWQyFllbm8BQ+vGvdtAug7xeQdr7kRRhytEBL8cJEm7pf41p7fXQ4tPIVAyg7WOXJE31IuiZr4OP/n//2BDQ2e4I7Tbw2BkqnC9C25f3w1zLaKrnhADB48yt5B9HTWRAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">https://www.cines.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">CINES IDP</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CINES</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">CINES IDP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cines.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CINES</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuNWWFMmUAAAIsSURBVDhPfVPNS1RRFB8pcqXv01EREULHaegDlEjR1/Pdc+/1SSRECGpBIogfEFELN7nTdkULpYW6CtoEQbjoD2jZqkVIOIFuNCKmQHBX5u/cuUP51YHDPXPe7/c75557JnPUGtK0LpBy3id6EQgxi/N2KESHJ6VjIacbQBO+lEt1WrdmhagPlLoJgXu+EMpP01oLO9lAfBwQjWaJziN+i/gXOvkD37fnTws9br5St1DpPs5rIJbg6/A7NUQBPld5Wjfj93QZfcRa07Qa5Fdos4nJiNe4XdORlKvIPYfwmJskLZZy2EIpR3BXAeIyCFtOHLuIX2al7PoUFxosLJOJ47M2OmyosBgMDtaAtIeqDyAyhVhuUO7hhsj9/pLkOy30ZAOYp36FB8XTh+AK54uU7y5S2+vPcS40wNMMVbvw3gkE9rn9UGtT0SW6BLF13gFgvuKadz2iFLk3yA1zDsV3jAgGZDoItM6bBIyJAJdMgfJTfse8eE/egzgO/4jh6jK6UDgH8A8k58oJCKCTigBXgq/BtysCjIe/s3AMU4hn+PDNvv0xAd4FxLv/CGzCnxgyW63WPtrcAuBDvVJZs8pEM2F/fyPEJxnDLYdKDXtKXQyJHrEbcsWQyFllbm8BQ+vGvdtAug7xeQdr7kRRhytEBL8cJEm7pf41p7fXQ4tPIVAyg7WOXJE31IuiZr4OP/n//2BDQ2e4I7Tbw2BkqnC9C25f3w1zLaKrnhADB48yt5B9HTWRAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">https://www.cines.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">CINES IDP</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CINES</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">CINES IDP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIzCCAgugAwIBAgIUIUg5/YXCbKUqS49yhXNkA/d6yuYwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwOa2FybWEuY2luZXMuZnIwHhcNMTYwMTI1MTM0NDQ4WhcN
 MzYwMTI1MTM0NDQ4WjAZMRcwFQYDVQQDDA5rYXJtYS5jaW5lcy5mcjCCASIwDQYJ
@@ -39,21 +39,21 @@ PgG568uVvKcKA+/H5Ne+XxfJ1dM/3nFAHPG+KEMaS28HT0a3PSP8YgMlMdm4yuT8
 tcvxNWnLsewMI+3jLvujDxbAPUpP7Fb40MqNum9B2ItoZ/eJDZoMJFj30rAnv3Ao
 zjGWswXH8rAJppsF/BSPLm652s9rwwoC1cib/3d/NNALEla2aWlP
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://karma.cines.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://karma.cines.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://karma.cines.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CINES</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CINES</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.cines.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>krasinski@cines.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://karma.cines.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://karma.cines.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://karma.cines.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CINES</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CINES</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.cines.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>krasinski@cines.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
index a230e8ac..6e7f0eda 100644
--- a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://katalog.svkos.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-08T16:18:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-08T16:18:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkos.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Moravian-Silesian Research Library in Ostrava</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Moravskoslezské vědecké knihovny v Ostravě</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.svkos.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.svkos.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://katalog.svkos.cz/logo/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="91">https://katalog.svkos.cz/logo/logo_90.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkos.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Moravian-Silesian Research Library in Ostrava</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Moravskoslezské vědecké knihovny v Ostravě</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.svkos.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.svkos.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://katalog.svkos.cz/logo/logo_40.png</mdui:Logo>
-          <mdui:Logo height="90" width="91">https://katalog.svkos.cz/logo/logo_90.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUOaQEEERrbashpZa05w//pJQCTE0wDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQa2F0YWxvZy5zdmtvcy5jejAeFw0xNTA4MTIyMTE4NTla
 Fw0yNTA4MTIyMTE4NTlaMBsxGTAXBgNVBAMMEGthdGFsb2cuc3Zrb3MuY3owggEi
@@ -50,31 +50,31 @@ JE6TMVker9+t4OjM0aTX5LeBvJs7ZKwbTDsnm9y9I8EPwtPnX96M3cd/D7H5h4mF
 UUObFs5lyLqvErUgn3FwKNMmi2FrTI0J1HQtLx87hfeUvriApTOW/apm+kqWE6P5
 iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://katalog.svkos.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkos.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://katalog.svkos.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkos.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUOaQEEERrbashpZa05w//pJQCTE0wDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQa2F0YWxvZy5zdmtvcy5jejAeFw0xNTA4MTIyMTE4NTla
 Fw0yNTA4MTIyMTE4NTlaMBsxGTAXBgNVBAMMEGthdGFsb2cuc3Zrb3MuY3owggEi
@@ -93,23 +93,23 @@ JE6TMVker9+t4OjM0aTX5LeBvJs7ZKwbTDsnm9y9I8EPwtPnX96M3cd/D7H5h4mF
 UUObFs5lyLqvErUgn3FwKNMmi2FrTI0J1HQtLx87hfeUvriApTOW/apm+kqWE6P5
 iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
                 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Moravian-Silesian Research Library in Ostrava</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.svkos.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.svkos.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Magda</md:GivenName>
-      <md:SurName>Zavilová</md:SurName>
-      <md:EmailAddress>zavilova@svkos.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Moravian-Silesian Research Library in Ostrava</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.svkos.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.svkos.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Magda</md:GivenName>
+    <md:SurName>Zavilová</md:SurName>
+    <md:EmailAddress>zavilova@svkos.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml b/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml
index 6dae4f0d..fdcfdb5d 100644
--- a/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kbplus.k-int.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T11:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T11:58:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Knowledge Integration Ltd</mdui:DisplayName>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kbplus.k-int.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kbplus.k-int.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Knowledge Integration Ltd</mdui:DisplayName>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kbplus.k-int.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kbplus.k-int.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAPwTavbo3IrSMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGticGx1cy5rLWludC5jb20wHhcNMTMxMjIzMTgzMDA4WhcNMjMxMjIxMTgz
 						MDA4WjAbMRkwFwYDVQQDExBrYnBsdXMuay1pbnQuY29tMIIBIjANBgkqhkiG9w0B
@@ -50,42 +50,42 @@
 						ONhG9WkWV4mhkNIePyzF8WLxiNrs74KC7h0evoTQwR+gNINC6yK6C5vLa+TOKrVR
 						zoDxn+7khuE9bs7vdei/u4oVG/BnncNtry895Df0G9S/S51tNfnRxNh18Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.k-int.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Knowledge Integration Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Knowledge Integration Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.k-int.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@k-int.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Ibbotson</md:SurName>
-      <md:EmailAddress>mailto:ian.ibbotson@k-int.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.k-int.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Knowledge Integration Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Knowledge Integration Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.k-int.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Ibbotson</md:SurName>
+    <md:EmailAddress>mailto:ian.ibbotson@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml
index 40f39a7e..6ef3b3a9 100644
--- a/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kclidp.kcl.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcl.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">King's College London</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://kclidp.kcl.ac.uk/logo1.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://kclidp.kcl.ac.uk/logo2.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcl.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">King's College London</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://kclidp.kcl.ac.uk/logo1.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://kclidp.kcl.ac.uk/logo2.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJHQjEP
 						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAbBgNVBAoTFEtpbmdz
 						IENvbGxlZ2UgTG9uZG9uMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQa2NsaWRwLmtj
@@ -41,26 +41,26 @@
 						hZEob0ux+XK8uPgMAepyHgBduBcJgDhABlkLSZ5qECgDRpQXzgZglrHzU8k0Y0PA
 						lTZdf+SSG52AWWaNmRD/L5fOY0EKkCphfrs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kclidp.kcl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kclidp.kcl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJHQjEP
 						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAbBgNVBAoTFEtpbmdz
 						IENvbGxlZ2UgTG9uZG9uMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQa2NsaWRwLmtj
@@ -86,30 +86,30 @@
 						hZEob0ux+XK8uPgMAepyHgBduBcJgDhABlkLSZ5qECgDRpQXzgZglrHzU8k0Y0PA
 						lTZdf+SSG52AWWaNmRD/L5fOY0EKkCphfrs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">King's College London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">King's College London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kcl.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ISS Servers and Data Storage Team</md:GivenName>
-      <md:EmailAddress>mailto:systemsteam@kcl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ISS Servers and Data Storage Team</md:GivenName>
-      <md:EmailAddress>mailto:systemsteam@kcl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Fitzpatrick</md:SurName>
-      <md:EmailAddress>mailto:Mike.Fitzpatrick@kcl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">King's College London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">King's College London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kcl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ISS Servers and Data Storage Team</md:GivenName>
+    <md:EmailAddress>mailto:systemsteam@kcl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ISS Servers and Data Storage Team</md:GivenName>
+    <md:EmailAddress>mailto:systemsteam@kcl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Fitzpatrick</md:SurName>
+    <md:EmailAddress>mailto:Mike.Fitzpatrick@kcl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/keelesu.com-shibboleth.xml b/swamid-interfederations-2.0/keelesu.com-shibboleth.xml
index df0cdfa2..1b7a971c 100644
--- a/swamid-interfederations-2.0/keelesu.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/keelesu.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://keelesu.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-19T10:52:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-19T10:52:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://keelesu.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://keelesu.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keelesu.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keelesu.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://keelesu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://keelesu.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://keelesu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://keelesu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Keele SU</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://keelesu.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keelesu.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keelesu.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://keelesu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://keelesu.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://keelesu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://keelesu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Keele SU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://keelesu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kent.simitive.com.xml b/swamid-interfederations-2.0/kent.simitive.com.xml
index d43e8a51..d967ab6d 100644
--- a/swamid-interfederations-2.0/kent.simitive.com.xml
+++ b/swamid-interfederations-2.0/kent.simitive.com.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kent.simitive.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-13T14:10:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-13T14:10:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kent.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kent.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kent.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kent.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKjCCAhKgAwIBAgIJAKASu6FhhCKNMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNjAxMTExMzIxNDVaFw0y
 						NjAxMDgxMzIxNDVaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
@@ -43,40 +43,40 @@
 						sHkhIdbrNOFUKPuD9FlcoPrSh27rp8k/pwVMD7sAupkTqzKTZ8SIS0HXFXkGZ/cX
 						Ay3Sgf//TmFLuD+hZ3pcLObCW6r+1w/0THCU2CkNgy7N+YK4Fw+BkPDUqLgdjQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kent.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kent.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kent.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kent.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kent.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kent.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kent.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kent.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kent.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kent.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kent.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kent.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kent.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kent.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kentsso.simitive.com.xml b/swamid-interfederations-2.0/kentsso.simitive.com.xml
index 35962bef..9b4dda83 100644
--- a/swamid-interfederations-2.0/kentsso.simitive.com.xml
+++ b/swamid-interfederations-2.0/kentsso.simitive.com.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kentsso.simitive.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T15:17:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T15:17:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kentsso.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kentsso.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kentsso.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kentsso.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLTCCAhWgAwIBAgIJAPuc4ZrD2thhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNTEwMDIxNDI3MDVaFw0y
 						NTA5MjkxNDI3MDVaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
@@ -44,40 +44,40 @@
 						NFIvl9x747DAi2Vm92ULH9Qgy4/k21c0P8sSJZD+P6nHAB5G2XecceewxYkH4s+z
 						cA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index 2769bafb..cb9f5da0 100644
--- a/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://keybucket.app.nordu.net/saml2/sp/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The KeyBucket</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The KeyBucket</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
 BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
@@ -41,26 +41,26 @@ kO/ehJVo4K64KVCbjOr1bavp665TtcIQX2qoPsnTZY30gQ/X/K2UJQSUE5Qc+o19
 BkvvVT5jNYdeLZHXbC6X4kXYNhFKZaz9nURgfaFQIeIEu/zmsIM8tcwLjZyF1veH
 wXXiBDXS3PNHXQnnpys=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keybucket.app.nordu.net/saml2/sp/ls/"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keybucket.app.nordu.net/saml2/sp/acs/" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">The KeyBucket</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>NORDUnet</md:Company>
-      <md:GivenName>Leif</md:GivenName>
-      <md:SurName>Johansson</md:SurName>
-      <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keybucket.app.nordu.net/saml2/sp/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keybucket.app.nordu.net/saml2/sp/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">The KeyBucket</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>Leif</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
index 582c11ac..27e1c571 100644
--- a/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiidp.ki.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
+        <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ki.se</mdui:DomainHint>
+        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
-          <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>ki.se</mdui:DomainHint>
-          <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
-          <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
-          <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
-          <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
-          <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
-          <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
-          <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
-          <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
-          <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
-          <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
 MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
@@ -59,26 +59,26 @@ y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
 uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
 MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
@@ -98,36 +98,36 @@ y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
 uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Karolinska Institutet</md:Company>
-      <md:SurName>Parisa Farzbod</md:SurName>
-      <md:EmailAddress>mailto:parisa.farzbod@ki.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 524 86488</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Karolinska Institutet</md:Company>
-      <md:SurName>Eric Johansson</md:SurName>
-      <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Karolinska Institutet</md:Company>
-      <md:SurName>IT-support</md:SurName>
-      <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Parisa Farzbod</md:SurName>
+    <md:EmailAddress>mailto:parisa.farzbod@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86488</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Eric Johansson</md:SurName>
+    <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml
index 77bdc3b2..79528e72 100644
--- a/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kitcatalogue.alpha.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-08T14:34:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-08T14:34:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Kit-Catalogue Test Site</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test site for Jisc Kit-Catalogue pilot</mdui:Description>
+        <mdui:Logo height="54" width="194">https://kitcatalogue.alpha.jisc.ac.uk/images/logo-kc.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Kit-Catalogue Test Site</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test site for Jisc Kit-Catalogue pilot</mdui:Description>
-          <mdui:Logo height="54" width="194">https://kitcatalogue.alpha.jisc.ac.uk/images/logo-kc.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAKMeseZKJGIoMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD2lwLTE3Mi0zMS01LTI1MzAeFw0xNTEyMTQxOTQ1NDlaFw0yNTEyMTExOTQ1
 						NDlaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS01LTI1MzCCASIwDQYJKoZIhvcNAQEB
@@ -51,43 +51,43 @@
 						oE077Tm5R1jVQ2zGmZWncGY13wiGAJOskAkQQN7MsdwWfjdnlywG/tH1pcSgXEiJ
 						VAt7x31QCs60bw6OBdviHmBM95dSxeJ6UECgCYv53RAqTOqBW1cG9g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc Kit-Catalogue Test Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Hamilton</md:SurName>
-      <md:EmailAddress>mailto:martin.hamilton@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Hamilton</md:SurName>
-      <md:EmailAddress>mailto:martin.hamilton@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc Kit-Catalogue Test Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Hamilton</md:SurName>
+    <md:EmailAddress>mailto:martin.hamilton@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Hamilton</md:SurName>
+    <md:EmailAddress>mailto:martin.hamilton@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml
index 84ce042c..692f63ab 100644
--- a/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://knowledge.sagepub.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T10:12:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T10:12:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SAGE Knowledge</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SAGE's ebook and reference platform</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SAGE Knowledge</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SAGE's ebook and reference platform</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIEUqnsnzANBgkqhkiG9w0BAQUFADA5MRcwFQYDVQQKEw5T
 						QUdFIEtub3dsZWRnZTEeMBwGA1UEAxMVa25vd2xlZGdlLnNhZ2VwdWIuY29tMB4X
 						DTEzMTIxMjE3MDQzMVoXDTIzMTIxMDE3MDQzMVowOTEXMBUGA1UEChMOU0FHRSBL
@@ -33,13 +33,13 @@
 						r5NoRY3Ztd9AOTg48jCeyumPUOyk3ZBSt17RfnyCqCuRujbDVCi1WH9+rOW3nBb6
 						CgnionTlX4+VFoFbt4CJjGVxZuSczulc6XkpPlJnAvSuhQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIEUqnsnzANBgkqhkiG9w0BAQUFADA5MRcwFQYDVQQKEw5T
 						QUdFIEtub3dsZWRnZTEeMBwGA1UEAxMVa25vd2xlZGdlLnNhZ2VwdWIuY29tMB4X
 						DTEzMTIxMjE3MDQzMVoXDTIzMTIxMDE3MDQzMVowOTEXMBUGA1UEChMOU0FHRSBL
@@ -57,26 +57,26 @@
 						r5NoRY3Ztd9AOTg48jCeyumPUOyk3ZBSt17RfnyCqCuRujbDVCi1WH9+rOW3nBb6
 						CgnionTlX4+VFoFbt4CJjGVxZuSczulc6XkpPlJnAvSuhQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://knowledge.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://knowledge.sagepub.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://knowledge.sagepub.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://knowledge.sagepub.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SAGE Publications Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SAGE Knowledge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sagepublications.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SAGE Online Support</md:GivenName>
-      <md:EmailAddress>mailto:onlinesupport@sagepub.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:rob.smith@sagepub.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://knowledge.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://knowledge.sagepub.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://knowledge.sagepub.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://knowledge.sagepub.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SAGE Publications Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SAGE Knowledge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sagepublications.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SAGE Online Support</md:GivenName>
+    <md:EmailAddress>mailto:onlinesupport@sagepub.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:rob.smith@sagepub.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml
index 285229ae..d5e7ad69 100644
--- a/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://krad.cityplym.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityplym.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityplym.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAMOc1kqMl4mYFgYDAXyXKjoH9obQMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguY2l0eXBseW0uYWMudWswHhcNMTEw
 						NjE3MTEzNjUwWhcNMzEwNjE3MTEzNjUwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -30,26 +30,26 @@
 						KZ8R8jX4oT44/g+blazA+IP5Jz7/i28JHHdwdq7YXZ13eLezyVV3UI+ldTRvPx8k
 						6kGOv0JdsjheocsdY7/KuT0E+oqGEMvnZbXRlF8UKvgxgUgE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cityplym.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityplym.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cityplym.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cityplym.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAMOc1kqMl4mYFgYDAXyXKjoH9obQMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguY2l0eXBseW0uYWMudWswHhcNMTEw
 						NjE3MTEzNjUwWhcNMzEwNjE3MTEzNjUwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -69,25 +69,25 @@
 						KZ8R8jX4oT44/g+blazA+IP5Jz7/i28JHHdwdq7YXZ13eLezyVV3UI+ldTRvPx8k
 						6kGOv0JdsjheocsdY7/KuT0E+oqGEMvnZbXRlF8UKvgxgUgE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City College Plymouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City College Plymouth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cityplym.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@cityplym.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:itservices@cityplym.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City College Plymouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City College Plymouth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cityplym.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@cityplym.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:itservices@cityplym.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml
index 39b62e79..8a42c6bf 100644
--- a/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ku-primo.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-28T14:43:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-28T14:43:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kingston University - Primo Production</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Kingston University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kingston University - Primo Production</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Kingston University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJAOj3Zz/p9Vx7MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
 						BAMTJWRjMDNrZzAzNTFldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
 						MjI2MDYwNDE0WhcNMjQwMjI0MDYwNDE0WjAwMS4wLAYDVQQDEyVkYzAza2cwMzUx
@@ -48,40 +48,40 @@
 						APMzE/0MXO3jaiZ2cfUUB12yOjNZj8owMUBTx+2lv35IC/QuEZ3KLf7qyY2fDD5i
 						3SdruRngVtkFYA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Primo Resource Discovery at Kingston University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Primo Resource Discovery at Kingston University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ku.nupark.com-sp.xml b/swamid-interfederations-2.0/ku.nupark.com-sp.xml
index 1759e6a8..c600ec6d 100644
--- a/swamid-interfederations-2.0/ku.nupark.com-sp.xml
+++ b/swamid-interfederations-2.0/ku.nupark.com-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ku.nupark.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NuPark Inc</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NuPark Inc</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFqTCCBJGgAwIBAgIRANyV4qxFIn2HIWhpS2CN6I4wDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 BAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAY
 BgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYDVQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlv
@@ -45,40 +45,40 @@ tQLTtnHsObba27af6XF6l4dASmJc97csHrXCdx4xiqedPnLuAemgnQqOfMzieXt0Zmxyxl2GTU95
 l0IIEvGH8twjVy00jBgrTJZiz8LiTN958X/dWQDubmFhr27S66R3/9wyGqGnEIvY+6gsWvitoX2L
 QzkVTGIslCDUoFF35o+DrDRHpQNl3C2PSLgXrQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku.nupark.com/portal/authservices/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku.nupark.com/portal/authservices/acs" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku.nupark.com/portal/authservices/acs" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku.nupark.com/portal/authservices/acs" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NuPark Inc</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NuPark LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NuPark LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nupark.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephen Lambert</md:GivenName>
-      <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ron Frick</md:GivenName>
-      <md:EmailAddress>ron.frick@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Stephen Lambert</md:GivenName>
-      <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Stephen Lambert</md:GivenName>
-      <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku.nupark.com/portal/authservices/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku.nupark.com/portal/authservices/acs" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku.nupark.com/portal/authservices/acs" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku.nupark.com/portal/authservices/acs" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NuPark Inc</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NuPark LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NuPark LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nupark.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen Lambert</md:GivenName>
+    <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ron Frick</md:GivenName>
+    <md:EmailAddress>ron.frick@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Stephen Lambert</md:GivenName>
+    <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Stephen Lambert</md:GivenName>
+    <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml b/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
index c0da9d46..591223cd 100644
--- a/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
+++ b/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://l-aai.sztaki.hu/idp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>sztaki</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>sztaki</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Sztaki Munkatársak</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MTA Sztaki staff</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:Description>
+        <mdui:Description xml:lang="en">Hungarian Academy of Sciences Institute for Computer Science and Control</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">http://www.sztaki.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://www.sztaki.hu</mdui:PrivacyStatementURL>
+        <mdui:Logo height="66" width="125">https://ujwiki.sztaki.hu/sztaki/resources/assets/Sztaki_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">MTA Sztaki Munkatársak</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">MTA Sztaki staff</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:Description>
-          <mdui:Description xml:lang="en">Hungarian Academy of Sciences Institute for Computer Science and Control</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">http://www.sztaki.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://www.sztaki.hu</mdui:PrivacyStatementURL>
-          <mdui:Logo height="66" width="125">https://ujwiki.sztaki.hu/sztaki/resources/assets/Sztaki_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOw27qeW2Vj/MA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJIVTENMAsGA1UECAwEUGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTenRha2kxDTALBgNVBAsMBEhCSVQxGDAWBgNVBAMMD2wtYWFpLnN6dGFraS5odTEiMCAGCSqGSIb3DQEJARYTdWd5ZWxldGVzQHN6dGFraS5odTAeFw0xNDExMjcwNzM1NTdaFw0yNDExMjYwNzM1NTdaMIGRMQswCQYDVQQGEwJIVTENMAsGA1UECAwEUGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTenRha2kxDTALBgNVBAsMBEhCSVQxGDAWBgNVBAMMD2wtYWFpLnN6dGFraS5odTEiMCAGCSqGSIb3DQEJARYTdWd5ZWxldGVzQHN6dGFraS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqwZ3/JJWJ/+A6OGJqWkkS6ZQUoQ8dwc9nJL8wfCjJis3bLV8NW3hU1Ue0eFU+HgR39sljwpOYjbq/veMOtI2iRDq7h2ebi22L6La/XaEmGNHKOufDGUE9NyQkFSl+8dQqX3nHY58uiaY2JE0LRfkhwV64p7JAi6tWA8fnmn6e7DVt1F6b+sp44JK5Qq++HsC4MhQoj7RjJ13CY6qP6x8nyUesXjPe9+PwltPiMjoI2lYDdRF8UGH0oqCNguRRQTPVPY8VqMFvcNz9K7GCsuVIHBhbXRnU+GlstAUwsTzioMG/tnyBX/ZpF+k+kISPT/7lRwoa4esozxO+0341v1YECAwEAAaNQME4wHQYDVR0OBBYEFEX6oDj3ai1cb71F4i3yYwUSif9SMB8GA1UdIwQYMBaAFEX6oDj3ai1cb71F4i3yYwUSif9SMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHJSf1EkFt7mwh+dOb+jAFD3vidmli3wuqbwwTUfZSn0O1btPbb93C5epXMtcR6MBST8BQIjdoNJUPRohjayH6xKz7lXi7MP+uZ7kSwemucTopM6oMgiGmnp93hq4d6ubpw0CKKT5taPVpXXnELKtrA1MhCXGCt3hrWbVrtRhBNjzZLBj7QevGH86D3/cISyVjTnqzPv+Pv+hYa39VLfIfZ6yUd6aSTqysMnVbr0P4Ks+11HgXDqF68vs+YJu9n1VDAJ51yE9lDnzZ88juXPX7AtyEA/uo3jMga1yRBTD5LOvQr2GbJ2zOmCFvqeKv1PluxQ2a2q3SOwIb1bU42MYbw=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>l-aai.sztaki.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://l-aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Sztaki AAI team</md:SurName>
-      <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sztaki AAI team</md:SurName>
-      <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Sztaki AAI team</md:SurName>
-      <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOw27qeW2Vj/MA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJIVTENMAsGA1UECAwEUGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTenRha2kxDTALBgNVBAsMBEhCSVQxGDAWBgNVBAMMD2wtYWFpLnN6dGFraS5odTEiMCAGCSqGSIb3DQEJARYTdWd5ZWxldGVzQHN6dGFraS5odTAeFw0xNDExMjcwNzM1NTdaFw0yNDExMjYwNzM1NTdaMIGRMQswCQYDVQQGEwJIVTENMAsGA1UECAwEUGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTenRha2kxDTALBgNVBAsMBEhCSVQxGDAWBgNVBAMMD2wtYWFpLnN6dGFraS5odTEiMCAGCSqGSIb3DQEJARYTdWd5ZWxldGVzQHN6dGFraS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqwZ3/JJWJ/+A6OGJqWkkS6ZQUoQ8dwc9nJL8wfCjJis3bLV8NW3hU1Ue0eFU+HgR39sljwpOYjbq/veMOtI2iRDq7h2ebi22L6La/XaEmGNHKOufDGUE9NyQkFSl+8dQqX3nHY58uiaY2JE0LRfkhwV64p7JAi6tWA8fnmn6e7DVt1F6b+sp44JK5Qq++HsC4MhQoj7RjJ13CY6qP6x8nyUesXjPe9+PwltPiMjoI2lYDdRF8UGH0oqCNguRRQTPVPY8VqMFvcNz9K7GCsuVIHBhbXRnU+GlstAUwsTzioMG/tnyBX/ZpF+k+kISPT/7lRwoa4esozxO+0341v1YECAwEAAaNQME4wHQYDVR0OBBYEFEX6oDj3ai1cb71F4i3yYwUSif9SMB8GA1UdIwQYMBaAFEX6oDj3ai1cb71F4i3yYwUSif9SMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHJSf1EkFt7mwh+dOb+jAFD3vidmli3wuqbwwTUfZSn0O1btPbb93C5epXMtcR6MBST8BQIjdoNJUPRohjayH6xKz7lXi7MP+uZ7kSwemucTopM6oMgiGmnp93hq4d6ubpw0CKKT5taPVpXXnELKtrA1MhCXGCt3hrWbVrtRhBNjzZLBj7QevGH86D3/cISyVjTnqzPv+Pv+hYa39VLfIfZ6yUd6aSTqysMnVbr0P4Ks+11HgXDqF68vs+YJu9n1VDAJ51yE9lDnzZ88juXPX7AtyEA/uo3jMga1yRBTD5LOvQr2GbJ2zOmCFvqeKv1PluxQ2a2q3SOwIb1bU42MYbw=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>l-aai.sztaki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://l-aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Sztaki AAI team</md:SurName>
+    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sztaki AAI team</md:SurName>
+    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Sztaki AAI team</md:SurName>
+    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml b/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml
index 81e1a03d..cd89ecc1 100644
--- a/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://l4l-sp-02.kent.ac.uk/entity">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEJjCCAw6gAwIBAgIJAKa9P2cE2HGrMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJVSzENMAsGA1UECBMES2VudDETMBEGA1UEBxMKQ2FudGVyYnVyeTEbMBkG
 						A1UEChMSVW5pdmVyc2l0eSBvZiBLZW50MQ4wDAYDVQQLEwVpc3NyZzETMBEGA1UE
@@ -32,13 +32,13 @@
 						DsKvkemCd+Dir273mcUN+zhGKUhjPAYJsFhb/wWkTmbdk1mBNjIhqavarm/OIyG8
 						c91vv7jVI/bPgA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEJjCCAw6gAwIBAgIJAKa9P2cE2HGrMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJVSzENMAsGA1UECBMES2VudDETMBEGA1UEBxMKQ2FudGVyYnVyeTEbMBkG
 						A1UEChMSVW5pdmVyc2l0eSBvZiBLZW50MQ4wDAYDVQQLEwVpc3NyZzETMBEGA1UE
@@ -63,28 +63,28 @@
 						DsKvkemCd+Dir273mcUN+zhGKUhjPAYJsFhb/wWkTmbdk1mBNjIhqavarm/OIyG8
 						c91vv7jVI/bPgA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/UK-AMF"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/UK-AMF" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/UK-AMF" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/UK-AMF" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/UK-AMF/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Kent: Logins for Life</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Slowe</md:SurName>
-      <md:EmailAddress>mailto:M.Slowe@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kristy</md:GivenName>
-      <md:SurName>Siu</md:SurName>
-      <md:EmailAddress>mailto:K.W.S.Siu@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/UK-AMF"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/UK-AMF" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/UK-AMF" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/UK-AMF" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/UK-AMF/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Kent: Logins for Life</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Slowe</md:SurName>
+    <md:EmailAddress>mailto:M.Slowe@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kristy</md:GivenName>
+    <md:SurName>Siu</md:SurName>
+    <md:EmailAddress>mailto:K.W.S.Siu@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lafayette.mediaspace.kaltura.com.xml b/swamid-interfederations-2.0/lafayette.mediaspace.kaltura.com.xml
index 2ed77706..ec55feee 100644
--- a/swamid-interfederations-2.0/lafayette.mediaspace.kaltura.com.xml
+++ b/swamid-interfederations-2.0/lafayette.mediaspace.kaltura.com.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lafayette.mediaspace.kaltura.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEiTCCA3GgAwIBAgIJAOyrZAAkoIp4MA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCTlkxETAPBgNVBAcTCE5ldyBZb3JrMRUwEwYDVQQK
 EwxLYWx0dXJhIEluYy4xHDAaBgNVBAMTE21lZGlhLmxhZmF5ZXR0ZS5lZHUxJTAj
@@ -45,27 +45,27 @@ mtwmEEeBHz0Y3TbHYtyizg/I9tIqQZSptfnTVFxic4yQ0L0377JmM/09SRA6njNv
 jjMmaCPk96SAyXcvLoirbDa1ujr0XGeqvQmIcUnJksqAztTx58V8U5E8MQN1RxN4
 9rlTypUcCBOgYdw0Wg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://media.lafayette.edu/user/logout"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://media.lafayette.edu/user/authenticate" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kaltura Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kaltura Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kaltura.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SAML admin</md:GivenName>
-      <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://media.lafayette.edu/user/logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://media.lafayette.edu/user/authenticate" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Lafayette College  - Kaltura's MediaSpace Instane</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kaltura Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kaltura Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kaltura.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SAML admin</md:GivenName>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml
index d54480cc..febcf2ec 100644
--- a/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lamlash.edina.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-04T15:19:50Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-04T15:19:50Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lamlash.edina.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lamlash test IdP</mdui:DisplayName>
+        <mdui:Logo height="60" width="79">https://lamlash.edina.ac.uk/idp/images/pussycat-idp1.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://lamlash.edina.ac.uk/idp/images/pussycat-idp2.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lamlash.edina.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lamlash test IdP</mdui:DisplayName>
-          <mdui:Logo height="60" width="79">https://lamlash.edina.ac.uk/idp/images/pussycat-idp1.jpg</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://lamlash.edina.ac.uk/idp/images/pussycat-idp2.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAKvJ0PaKlvVefbTn1IBkeTbOYlJ+MA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTA1
 						MjUyWhcNMzQwNDIxMTA1MjUyWjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFj
@@ -35,26 +35,26 @@
 						TKag3zAplAMLFW0+6HQrvFEg9GcDg6zesygdffRhG9He8X4oM6vwx490+BHHss9q
 						SfPXTTAZLsyW8T2q
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lamlash.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lamlash.edina.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lamlash.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lamlash.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAKvJ0PaKlvVefbTn1IBkeTbOYlJ+MA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTA1
 						MjUyWhcNMzQwNDIxMTA1MjUyWjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFj
@@ -74,27 +74,27 @@
 						TKag3zAplAMLFW0+6HQrvFEg9GcDg6zesygdffRhG9He8X4oM6vwx490+BHHss9q
 						SfPXTTAZLsyW8T2q
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lamlash test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sara</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sara</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lamlash test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
index b6fb7c35..92280e24 100644
--- a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lanet-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LANET</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LANET</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - LANET</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LANET - LANET IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.lanet.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LANET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LANET - LANET IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.lanet.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 0a1a6fca..60c8d32d 100644
--- a/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/lap.clarino.uio.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2016-03-11T16:15:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2016-03-11T16:15:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/user/privacy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.mn.uio.no/ifi/english/research/projects/clarino/user/privacy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uio.no</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephan</md:GivenName>
-      <md:SurName>Oepen</md:SurName>
-      <md:EmailAddress>lap-developers@ifi.uio.no</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/zCCA+egAwIBAgIRAJIQa4w218rFk4verorM7VswDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NMIENBIDIwHhcNMTUwNjMwMDAwMDAwWhcNMTgwNjI5MjM1OTU5WjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMTDmNsYXJpbm8udWlvLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzWtCRL9wf3nor/dUkG00Xg4jmr6nZX5qxOCHDX0rRJB8VWU52kfQyKWViv5BtcsnIweBqJ75sobprZuKcDILRf36F4i4D6lPcxFvDac1DA6smlfP+sMyf5ntfJkc6sMjgDQ/2CQKFvcwYlhJSXStR1Hc95+GRXK4ou30XXv6MaU98OR+laQuOqsQB6VBh60iRDXNrKhrePG3HJujn79VcLB4N79Tk5GV+BuqvZP8Mh+cTK6q/XN5EM13/CMXdPtng0Fh9RPJNBYgA/cmXHFdEM+/9HfdUOfyByeYEHOuKXUr/dLJQ7tYUds494qxCdkEckt0o92OxpRTztsvI+YcDQIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFMUNIwQsUMuAUNhNsROf0SU9l2aZMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMIGABgNVHREEeTB3gg5jbGFyaW5vLnVpby5ub4ISZWRkLmNsYXJpbm8udWlvLm5vghVnbG9zc2EuY2xhcmluby51aW8ubm+CEmxhcC5jbGFyaW5vLnVpby5ub4ISc3ZuLmNsYXJpbm8udWlvLm5vghJ3d3cuY2xhcmluby51aW8ubm8wDQYJKoZIhvcNAQELBQADggEBADHuVaZ2ymF0bhfypJB0w2XfTXTcO7wbkuRLcrvv+3BQgHGv5j5xTjK6AesSxXE0KCtpJnTrR8TEQFbLhuUs0m4VyHlW8DivkccYbSzGvTewkxWSuxUFQhBWKhfNX4bPV88w9aLog358lHQBiqwY+cJYW8+Y48w49noiZDTCY7Z8jMbVj8jTVqC6bMELBMeV4stgzkT/RBFc1rroBhDeyjElugiph5RUtjwP/H/tAlLO241jMtIfbzRV/CwF9aEfpe/fAj4PXAWnK+KYz3ZqG4Q9s3GRNQZQfuLoEilwGvLSfhmdDXHQdDlubsO6iCUOwH0YwVRHP2OY95WzeMuD+H8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lap.clarino.uio.no/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">LAP: UiO Language Analysis Portal (Production)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Ready-to-Run and State-of-the-Art Language Analysis Tools in the Cloud</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uio.no</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephan</md:GivenName>
+    <md:SurName>Oepen</md:SurName>
+    <md:EmailAddress>lap-developers@ifi.uio.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
index 9996e492..0c19d8c6 100644
--- a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lbr.csc.fi/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:28:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:28:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Language Bank Rights</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Language Bank Rights</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
+        <mdui:Description xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://lbr.csc.fi/home</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/en_GB/web/guest/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Language Bank Rights</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Language Bank Rights</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
-          <mdui:Description xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://lbr.csc.fi/home</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/en_GB/web/guest/privacy-policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lbr.csc.fi</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lbr.csc.fi,OU=Domain Control Validated</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIQWBOOp78lJI42EYlJleUqwDANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lbr.csc.fi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lbr.csc.fi,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIQWBOOp78lJI42EYlJleUqwDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowODEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwpsYnIuY3NjLmZp
@@ -59,48 +59,48 @@ qotUhjkJ+hNlRXZabFwp9LUSWiN0av0zpwMzxSHU1saTfgN0tB7KABKjYnriI7N+
 0k3tNgXiJfaZ3TCGNOPYWvv8Vqj9hqIzOvLFEPnPJ+TACiFBQUArI/2ges4bol7I
 InF/qlfqDoaoTI1ZSkpyr+97qTyFYFlbC5IFJCeCjcQAzscSUA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lbr.csc.fi/Shibboleth.sso/SLO/Redirect"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Language Bank Rights</md:ServiceName>
-        <md:ServiceName xml:lang="en">Language Bank Rights</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Matthiesen</md:SurName>
-      <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Timo</md:GivenName>
-      <md:SurName>Mustonen</md:SurName>
-      <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Matthiesen</md:SurName>
-      <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lbr.csc.fi/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Language Bank Rights</md:ServiceName>
+      <md:ServiceName xml:lang="en">Language Bank Rights</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml
index aad7d4a2..aad262ac 100644
--- a/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lc-idp.lincolncollege.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincolncollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincolncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQD46bmBVwfiXDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEVMBMGA1UECBMMTGluY29sbnNoaXJlMRAwDgYDVQQHEwdMaW5jb2xuMRgwFgYD
 						VQQKEw9MaW5jb2xuIENvbGxlZ2UxJDAiBgNVBAMTG2xjLWlkcC5saW5jb2xuY29s
@@ -31,26 +31,26 @@
 						WcqedLVOpjYFQ3I6Z4vQ/io3czPPfBmxlAKaGgItuNLFT97z66QJUM7yMLwjlP0j
 						gOEDoZmzZH+n3JY1
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincolncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lincolncollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQD46bmBVwfiXDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEVMBMGA1UECBMMTGluY29sbnNoaXJlMRAwDgYDVQQHEwdMaW5jb2xuMRgwFgYD
 						VQQKEw9MaW5jb2xuIENvbGxlZ2UxJDAiBgNVBAMTG2xjLWlkcC5saW5jb2xuY29s
@@ -71,25 +71,25 @@
 						WcqedLVOpjYFQ3I6Z4vQ/io3czPPfBmxlAKaGgItuNLFT97z66QJUM7yMLwjlP0j
 						gOEDoZmzZH+n3JY1
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lincoln College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lincoln College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lincolncollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT help desk</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@lincolncollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT help desk</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@lincolncollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lincoln College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lincoln College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lincolncollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT help desk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@lincolncollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT help desk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@lincolncollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml
index b3c680b4..c0103749 100644
--- a/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lcm.idm.oclc.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T17:14:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T17:14:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBgMRswGQYDVQQDFBIqLmxj
 						bS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUwIwYJ
 						KoZIhvcNAQkBFhZqdWxpYW4ubWNmYWxsQG9jbGMub3JnMB4XDTEzMTAxODE2MDMw
@@ -33,25 +33,25 @@
 						m8VxEpX1XIKFFn3LbFNLFmAJqmz0w09hVS7XVQfViRbYnWHNf44l7xD75gTQ+qPS
 						RRihYOyFbxq/SI85
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds College of Music Hosted EZproxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds College of Music Hosted EZproxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml
index 8bb64052..24b019ce 100644
--- a/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lcmshibboleth.lcm.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-09T15:13:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-09T15:13:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcm.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlYCCQDlpTunux/L3jANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
 						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMR8wHQYD
 						VQQKExZMZWVkcyBDb2xsZWdlIG9mIE11c2ljMSAwHgYDVQQDExdsY21zaGliYm9s
@@ -33,26 +33,26 @@
 						mdfOzS24Lu8OQK3ko8PU0fRIO3Sp12+sNv56axCEPipV+6ZE8cbEv35oS2IDrHYI
 						yj+gkgbi6alm4ubSsJj3Bkv6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lcm.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlYCCQDlpTunux/L3jANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
 						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMR8wHQYD
 						VQQKExZMZWVkcyBDb2xsZWdlIG9mIE11c2ljMSAwHgYDVQQDExdsY21zaGliYm9s
@@ -73,27 +73,27 @@
 						mdfOzS24Lu8OQK3ko8PU0fRIO3Sp12+sNv56axCEPipV+6ZE8cbEv35oS2IDrHYI
 						yj+gkgbi6alm4ubSsJj3Bkv6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Leeds College of Music</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds College of Music</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lcm.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ruth</md:GivenName>
-      <md:SurName>Clark</md:SurName>
-      <md:EmailAddress>mailto:r.clark@lcm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Yas</md:GivenName>
-      <md:SurName>Sharif</md:SurName>
-      <md:EmailAddress>mailto:y.sharif@lcm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leeds College of Music</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds College of Music</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lcm.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ruth</md:GivenName>
+    <md:SurName>Clark</md:SurName>
+    <md:EmailAddress>mailto:r.clark@lcm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yas</md:GivenName>
+    <md:SurName>Sharif</md:SurName>
+    <md:EmailAddress>mailto:y.sharif@lcm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
index 48f1c207..3f60e51a 100644
--- a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldap-dariah.esc.rzg.mpg.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:17:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:17:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH Homeless IdP</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH Homeless IdP</mdui:Description>
+        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
+        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DARIAH</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DARIAH</mdui:DisplayName>
-          <mdui:Description xml:lang="de">DARIAH Homeless IdP</mdui:Description>
-          <mdui:Description xml:lang="en">DARIAH Homeless IdP</mdui:Description>
-          <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-          <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
 EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
 Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
 MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
@@ -60,29 +60,29 @@ KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
 aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
 q1AZvg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
 EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
 Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
 MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
@@ -111,35 +111,35 @@ KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
 aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
 q1AZvg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Haase</md:SurName>
-      <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Gietz</md:SurName>
-      <md:EmailAddress>mailto:peter.gietz@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DARIAH</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:info@de.dariah.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Haase</md:SurName>
+    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Gietz</md:SurName>
+    <md:EmailAddress>mailto:peter.gietz@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DARIAH</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:info@de.dariah.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml b/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
index 652362db..5b8f6318 100644
--- a/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
+++ b/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldf.data.kit.edu/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-03T14:28:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-03T14:28:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">LDF Data</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">LDF Data</mdui:DisplayName>
+        <mdui:Description xml:lang="de">LDF Data</mdui:Description>
+        <mdui:Description xml:lang="en">LDF Data</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">LDF Data</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">LDF Data</mdui:DisplayName>
-          <mdui:Description xml:lang="de">LDF Data</mdui:Description>
-          <mdui:Description xml:lang="en">LDF Data</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>ldf.data.kit.edu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=ldf.data.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHGLIW1QWZrDANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldf.data.kit.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldf.data.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHGLIW1QWZrDANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
 bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
 Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
@@ -53,37 +53,37 @@ DFVFWaeUjYZI98zuQ4yODFpkp5CzGsP3DBuuRwka+xZPUkB5Tsl3feXNKTRrAGPg
 ISJrWi9dzteo74ky9VlAWqA3QaTluyj/Ta51g1hi+v0iSL4pnbwHlbJa3Wow7MfY
 W2PUbu6ZE6ytGjWg3f7aijrOGqQaAnWJ/W7w7zywiw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldf.data.kit.edu/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldf.data.kit.edu/Shibboleth.sso/SAML2/ECP" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">LDF Data</md:ServiceName>
-        <md:ServiceName xml:lang="en">LDF Data</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">LDF Data</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">LDF Data</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marcus</md:GivenName>
-      <md:SurName>Hardt</md:SurName>
-      <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Arsen</md:GivenName>
-      <md:SurName>Hayrapetyan</md:SurName>
-      <md:EmailAddress>mailto:arsen.hayrapetyan@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldf.data.kit.edu/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldf.data.kit.edu/Shibboleth.sso/SAML2/ECP" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">LDF Data</md:ServiceName>
+      <md:ServiceName xml:lang="en">LDF Data</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">LDF Data</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">LDF Data</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marcus</md:GivenName>
+    <md:SurName>Hardt</md:SurName>
+    <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Arsen</md:GivenName>
+    <md:SurName>Hayrapetyan</md:SurName>
+    <md:EmailAddress>mailto:arsen.hayrapetyan@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml
index 35757f9c..dc42d8ef 100644
--- a/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldp.esc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjACCQCbDs0NVoukPTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MRAwDgYDVQQHEwdSZWRoaWxsMRwwGgYDVQQKExNF
 						YXN0IFN1cnJleSBDb2xsZWdlMRYwFAYDVQQDEw1sZHAuZXNjLmFjLnVrMB4XDTEz
@@ -30,26 +30,26 @@
 						fuxb+x4Agg1mqJiR5txLQfJjXDqnd6mbPRipuilvglK0cApdAl5rIPXJ5AzrguTq
 						EOa26/uzKHmeNsbTWjKpMo3U/1Nz0fW6hltQtQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ldp.esc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ldp.esc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjACCQCbDs0NVoukPTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGU3VycmV5MRAwDgYDVQQHEwdSZWRoaWxsMRwwGgYDVQQKExNF
 						YXN0IFN1cnJleSBDb2xsZWdlMRYwFAYDVQQDEw1sZHAuZXNjLmFjLnVrMB4XDTEz
@@ -69,25 +69,25 @@
 						fuxb+x4Agg1mqJiR5txLQfJjXDqnd6mbPRipuilvglK0cApdAl5rIPXJ5AzrguTq
 						EOa26/uzKHmeNsbTWjKpMo3U/1Nz0fW6hltQtQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">East Surrey College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">East Surrey College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.esc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:support@esc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:support@esc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">East Surrey College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">East Surrey College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.esc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@esc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@esc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/learn.eduopen.org-shibboleth.xml b/swamid-interfederations-2.0/learn.eduopen.org-shibboleth.xml
index 76408c55..a583a1ac 100644
--- a/swamid-interfederations-2.0/learn.eduopen.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/learn.eduopen.org-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://learn.eduopen.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-03-31T10:18:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-03-31T10:18:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://learn.eduopen.org/Shibboleth.sso/DS"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://learn.eduopen.org/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://learn.eduopen.org/Shibboleth.sso/WAYF"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://learn.eduopen.org/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduOpen MOOC Italia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">eduOpen MOOC Italy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Portal for providing demonstration courses for EDUOPEN Network in a federated environment</mdui:Description>
+        <mdui:Description xml:lang="it">Portale per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://learn.eduopen.org/eduopen/information-en.php</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://learn.eduopen.org/eduopen/information-it.php</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://learn.eduopen.org/eduopen/privacy-en.php</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://learn.eduopen.org/eduopen/privacy-it.php</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://learn.eduopen.org/theme/eduopen/pix/eduopen60english.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://learn.eduopen.org/theme/eduopen/pix/eduopen60italian.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://learn.eduopen.org/theme/eduopen/pix/eduopen16english.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://learn.eduopen.org/theme/eduopen/pix/eduopen16italian.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://learn.eduopen.org/Shibboleth.sso/DS"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://learn.eduopen.org/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://learn.eduopen.org/Shibboleth.sso/WAYF"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://learn.eduopen.org/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">eduOpen MOOC Italia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">eduOpen MOOC Italy</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Portal for providing demonstration courses for EDUOPEN Network in a federated environment</mdui:Description>
-          <mdui:Description xml:lang="it">Portale per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://learn.eduopen.org/eduopen/information-en.php</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://learn.eduopen.org/eduopen/information-it.php</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://learn.eduopen.org/eduopen/privacy-en.php</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://learn.eduopen.org/eduopen/privacy-it.php</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://learn.eduopen.org/theme/eduopen/pix/eduopen60english.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://learn.eduopen.org/theme/eduopen/pix/eduopen60italian.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://learn.eduopen.org/theme/eduopen/pix/eduopen16english.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://learn.eduopen.org/theme/eduopen/pix/eduopen16italian.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIJAJgJgkpaC7xFMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEWxlYXJuLmVkdW9wZW4ub3JnMB4XDTE2MDMxNTA5MTI0NFoXDTI2MDMxMzA5
 MTI0NFowHDEaMBgGA1UEAxMRbGVhcm4uZWR1b3Blbi5vcmcwggEiMA0GCSqGSIb3
@@ -54,50 +54,50 @@ VhL18Lwuxw7CbX/sxPNDvJXrbWvrAEOpwcz9feVDBdj5J4r0Nwbutm4ahk1xTXzm
 R8kwgs6koOxQduST9dwIjI3L1VaD5t32aeQgZGxqV6yDVW+wMmEKHO2mLTTjhI46
 w44pEUtbE0j6vHrF7T229AWQzYX/b5F8Mg3OV+WVYW0AP84V
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://learn.eduopen.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">eduOpen MOOC Italia</md:ServiceName>
-        <md:ServiceName xml:lang="it">eduOpen MOOC Italy</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Portal for providing demonstration courses for EDUOPEN Network in a federated environment</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Portale per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">eduOpen MOOC Italia erogato da Università di Modena e Reggio Emilia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">eduOpen MOOC Italy provided by University of Modena e Reggio Emilia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unimore.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.international.unimore.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tommaso</md:GivenName>
-      <md:SurName>Minerva</md:SurName>
-      <md:EmailAddress>mailto:cea@unimore.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://learn.eduopen.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://learn.eduopen.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://learn.eduopen.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">eduOpen MOOC Italia</md:ServiceName>
+      <md:ServiceName xml:lang="it">eduOpen MOOC Italy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Portal for providing demonstration courses for EDUOPEN Network in a federated environment</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Portale per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">eduOpen MOOC Italia erogato da Università di Modena e Reggio Emilia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">eduOpen MOOC Italy provided by University of Modena e Reggio Emilia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unimore.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.international.unimore.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tommaso</md:GivenName>
+    <md:SurName>Minerva</md:SurName>
+    <md:EmailAddress>mailto:cea@unimore.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml b/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml
index 1e3b5e34..6b1dc161 100644
--- a/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml
+++ b/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://libauth.com/saml/module.php/saml/sp/metadata.php/springy-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-23T09:43:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-23T09:43:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Springshare LibApps</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Springshare's LibApps helps libraries share knowledge, analyze services, and connect with users.</mdui:Description>
+        <mdui:Logo height="150" width="183" xml:lang="en">https://libauth.com/static/springshare-incommon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Springshare LibApps</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Springshare's LibApps helps libraries share knowledge, analyze services, and connect with users.</mdui:Description>
-          <mdui:Logo height="150" width="183" xml:lang="en">https://libauth.com/static/springshare-incommon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE4TCCA8mgAwIBAgIQW9IQE6lOfxilMVYUD3eYQTANBgkqhkiG9w0BAQsFADBE
 						MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
 						R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTQwOTMwMDAwMDAwWhcNMTYwOTI5MjM1
@@ -45,13 +45,13 @@
 						AJv0x5aloVA/YBekndNFXDC+mtxo+pKrWyGsTcA33n+twUZ7Agz8Fzsh+3VIJooQ
 						qqVHvtY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE4TCCA8mgAwIBAgIQW9IQE6lOfxilMVYUD3eYQTANBgkqhkiG9w0BAQsFADBE
 						MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
 						R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTQwOTMwMDAwMDAwWhcNMTYwOTI5MjM1
@@ -80,36 +80,36 @@
 						AJv0x5aloVA/YBekndNFXDC+mtxo+pKrWyGsTcA33n+twUZ7Agz8Fzsh+3VIJooQ
 						qqVHvtY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://libauth.com/saml/module.php/saml/sp/saml2-logout.php/springy-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://libauth.com/saml/module.php/saml/sp/saml2-acs.php/springy-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://libauth.com/saml/module.php/saml/sp/saml1-acs.php/springy-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://libauth.com/saml/module.php/saml/sp/saml2-acs.php/springy-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://libauth.com/saml/module.php/saml/sp/saml1-acs.php/springy-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Springshare LibApps</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Springshare's LibApps helps libraries share knowledge, analyze services, and connect with users.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Springshare LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Springshare LibApps</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://springshare.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jing</md:GivenName>
-      <md:SurName>Xiao</md:SurName>
-      <md:EmailAddress>mailto:jing@springshare.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jing</md:GivenName>
-      <md:SurName>Xiao</md:SurName>
-      <md:EmailAddress>mailto:jing@springshare.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://libauth.com/saml/module.php/saml/sp/saml2-logout.php/springy-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://libauth.com/saml/module.php/saml/sp/saml2-acs.php/springy-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://libauth.com/saml/module.php/saml/sp/saml1-acs.php/springy-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://libauth.com/saml/module.php/saml/sp/saml2-acs.php/springy-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://libauth.com/saml/module.php/saml/sp/saml1-acs.php/springy-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Springshare LibApps</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Springshare's LibApps helps libraries share knowledge, analyze services, and connect with users.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Springshare LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Springshare LibApps</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://springshare.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jing</md:GivenName>
+    <md:SurName>Xiao</md:SurName>
+    <md:EmailAddress>mailto:jing@springshare.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jing</md:GivenName>
+    <md:SurName>Xiao</md:SurName>
+    <md:EmailAddress>mailto:jing@springshare.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml
index b1465472..67bd4a61 100644
--- a/swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://library-test.lancs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T09:21:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T09:21:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lancaster University Library (Test)</mdui:DisplayName>
+        <mdui:Logo height="50" width="80">https://library.lancs.ac.uk/img/mdui-logo-test.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lancaster University Library (Test)</mdui:DisplayName>
-          <mdui:Logo height="50" width="80">https://library.lancs.ac.uk/img/mdui-logo-test.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAO4MPYx98Q9Mfc6FlCYoAKZNQ3t+MA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGGxpYnJhcnktdGVzdC5sYW5jcy5hYy51azAeFw0xNDEw
 						MjcxNzEwNDhaFw0zNDEwMjcxNjEwNDhaMCMxITAfBgNVBAMTGGxpYnJhcnktdGVz
@@ -41,26 +41,26 @@
 						js74IwmAPaxVM3IXz0laUEijn+KlMBnOn3z/G/RWrn97NBdbuNyq7zBI0DjWLQHj
 						w9J0l69gw9nG5FltJm4dXurNFt58piC0BtrCKTTdvS0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://library-test.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://library-test.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAO4MPYx98Q9Mfc6FlCYoAKZNQ3t+MA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGGxpYnJhcnktdGVzdC5sYW5jcy5hYy51azAeFw0xNDEw
 						MjcxNzEwNDhaFw0zNDEwMjcxNjEwNDhaMCMxITAfBgNVBAMTGGxpYnJhcnktdGVz
@@ -80,27 +80,27 @@
 						js74IwmAPaxVM3IXz0laUEijn+KlMBnOn3z/G/RWrn97NBdbuNyq7zBI0DjWLQHj
 						w9J0l69gw9nG5FltJm4dXurNFt58piC0BtrCKTTdvS0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Lancaster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lancaster University Library (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/library/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Hartland</md:SurName>
-      <md:EmailAddress>mailto:a.hartland@lancaster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Hartland</md:SurName>
-      <md:EmailAddress>mailto:a.hartland@lancaster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Lancaster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lancaster University Library (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/library/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Hartland</md:SurName>
+    <md:EmailAddress>mailto:a.hartland@lancaster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Hartland</md:SurName>
+    <md:EmailAddress>mailto:a.hartland@lancaster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml
index 5442a358..8909f0d7 100644
--- a/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://library.qub.ac.uk/shibboleth/metadata">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-31T09:25:24Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-31T09:25:24Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://raptor.qub.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Queen's University SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Queen's University SP for special access Library E-Resources</mdui:Description>
+        <mdui:Logo height="95" width="80">https://ezproxy1.qub.ac.uk:8443/icons/Q.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://raptor.qub.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Queen's University SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Queen's University SP for special access Library E-Resources</mdui:Description>
-          <mdui:Logo height="95" width="80">https://ezproxy1.qub.ac.uk:8443/icons/Q.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC2TCCAcGgAwIBAgIJANx6SVUginfkMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 						BAMTBnJhcHRvcjAeFw0xMzA0MjQwODU0MTdaFw0yMzA0MjIwODU0MTdaMBExDzAN
 						BgNVBAMTBnJhcHRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKB3
@@ -44,39 +44,39 @@
 						7dODX4wncRad73U0SAmqFt9fpftB4rOuHloEKkkoGGKSvqlWUGkiT5GWw/BH0o1n
 						eZkMlsZjMmrX7Nk0/A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://raptor.qub.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Queen's University of Belfast</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen's University SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qub.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>E-Resouces Team</md:GivenName>
-      <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Goodall</md:SurName>
-      <md:EmailAddress>mailto:m.goodall@qub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://raptor.qub.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Queen's University of Belfast</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen's University SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qub.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Resouces Team</md:GivenName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Goodall</md:SurName>
+    <md:EmailAddress>mailto:m.goodall@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
index 9c492e64..68e11769 100644
--- a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://liepu-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Liepaja University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Liepaja University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - LIEPU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Liepaja University - LIEPU IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LIEPU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Liepaja University - LIEPU IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml b/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
index 1bdf5283..bac84a31 100644
--- a/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ligo.org/ligovirgo/cbcnote/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LIGO CBC Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wiki for the LIGO/Virgo Compact Binary Coalescence Data Analysis Working Group</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89286</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LIGO CBC Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Wiki for the LIGO/Virgo Compact Binary Coalescence Data Analysis Working Group</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89286</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEbzCCA1egAwIBAgIBLDANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -49,43 +49,43 @@ De6W4llFiV5Dls+j6EpHzuCET/e6s1cMclB7OMjcdNdecBX0xCGCm91u3OtEQGKM
 rzjVenErOkaR2hlPpssGfuLrGE8XT0qOvouycF+tC4MCElQnRQUjv5Gm7rnDnCFo
 abdn3KRVra6I57DBgGlc3hNW7pWrWcB+roy1O73/Cb/ZIpo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LIGO CBC Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Wiki for the LIGO/Virgo Compact Binary Coalescence Data Analysis Working Group</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott Koranda</md:GivenName>
-      <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-      <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LIGO CBC Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wiki for the LIGO/Virgo Compact Binary Coalescence Data Analysis Working Group</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott Koranda</md:GivenName>
+    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
+    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lincbattels.linc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lincbattels.linc.ox.ac.uk-shibboleth.xml
index b376b607..502271a8 100644
--- a/swamid-interfederations-2.0/lincbattels.linc.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/lincbattels.linc.ox.ac.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lincbattels.linc.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T12:03:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T12:03:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Oxford, Lincoln College Battels Payments</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Payments gateway for Lincoln College, Oxford</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Oxford, Lincoln College Battels Payments</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Payments gateway for Lincoln College, Oxford</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJAJw2qNx2ggkaMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC2xpbmNiYXR0ZWxzMB4XDTE2MDMwMTEwNTY0MFoXDTI2MDIyNzEwNTY0MFow
 						FjEUMBIGA1UEAxMLbGluY2JhdHRlbHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -50,41 +50,41 @@
 						KBtpPH0FaQ/KbAqyHVF1Sg5wvoJnw8zKMKEdAf76zO3QY6TYkeR9tR9UzGbyYbyW
 						2nZllHItz1LVOeER46d3rCUD42UfZWJx0nFG/w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford, Lincoln College Battels Payments</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lincoln.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help</md:GivenName>
-      <md:EmailAddress>mailto:help@lincoln.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@lincoln.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lincbattelsnew.linc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, Lincoln College Battels Payments</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lincoln.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help</md:GivenName>
+    <md:EmailAddress>mailto:help@lincoln.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@lincoln.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml
index 59ea3b8d..bd3fa7be 100644
--- a/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://list-manager.larpp.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) List Manager</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's list manager.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://list-manager.larpp.internet2.edu/spinfo.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="275" xml:lang="en">https://list-manager.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) List Manager</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's list manager.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://list-manager.larpp.internet2.edu/spinfo.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="275" xml:lang="en">https://list-manager.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTTCCAjWgAwIBAgIJAMl1ozU9T/x6MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 BAMTG2p1cGl0ZXIubGFycHAuaW50ZXJuZXQyLmVkdTAeFw0xNDA1MjIxMTM5MjFa
 Fw0zNDA1MTcxMTM5MjFaMCYxJDAiBgNVBAMTG2p1cGl0ZXIubGFycHAuaW50ZXJu
@@ -43,39 +43,39 @@ KGySFi/1FxCDdLnFoQp++ZViH291O0KmuGjvGpuqzbu/8VvoBPDk6wMwOf/T5YlB
 KyGwcp4870RdzHe7cjkuIUh0H+X+AA+66j3ReQDlYJQ1iy6h745IsAACYiT03VI5
 mt7E5MgE8Qei4tnTbjhWxj4XwFfGCsMJqR5rVV3bbVCY
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) List Manager</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's list manager.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tracy Beth Mitrano</md:GivenName>
-      <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LARPP Technical Support</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LARPP Support</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LARPP Incident Response</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) List Manager</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's list manager.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tracy Beth Mitrano</md:GivenName>
+    <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LARPP Technical Support</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LARPP Support</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LARPP Incident Response</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.eocoe.eu.xml b/swamid-interfederations-2.0/lists.eocoe.eu.xml
index e821ac17..5ed9cb7d 100644
--- a/swamid-interfederations-2.0/lists.eocoe.eu.xml
+++ b/swamid-interfederations-2.0/lists.eocoe.eu.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.eocoe.eu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-03T17:30:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-03T17:30:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EoCoE Mailing List Service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://lists.eocoe.eu/sympa</mdui:InformationURL>
+        <mdui:Description xml:lang="en">EoCoE groupware service. This service offers mailing lsits along with other collaborative tools linked to these lists (wiki, surveys).</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Service de listes de l'EoCoE</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service de groupware de l'EoCoE. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lists.eocoe.eu/coco.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EoCoE Mailing List Service</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://lists.eocoe.eu/sympa</mdui:InformationURL>
-          <mdui:Description xml:lang="en">EoCoE groupware service. This service offers mailing lsits along with other collaborative tools linked to these lists (wiki, surveys).</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Service de listes de l'EoCoE</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Service de groupware de l'EoCoE. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lists.eocoe.eu/coco.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
 NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
@@ -44,13 +44,13 @@ ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
 KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
 qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
 NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
@@ -68,31 +68,30 @@ ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
 KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
 qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.eocoe.eu/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.eocoe.eu/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Service de listes de l'EoCoE</md:ServiceName>
-        <md:ServiceName xml:lang="en">EoCoE Mailing List Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Service de groupware de l'EoCoE. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">EoCoE groupware service. This service offers mailing lsits along with other collaborative tools linked to these lists (wiki, surveys).</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Pol Moal</md:SurName>
-      <md:EmailAddress>pol.moal@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>David Verdin</md:SurName>
-      <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.eocoe.eu/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.eocoe.eu/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Service de listes de l'EoCoE</md:ServiceName>
+      <md:ServiceName xml:lang="en">EoCoE Mailing List Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Service de groupware de l'EoCoE. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">EoCoE groupware service. This service offers mailing lsits along with other collaborative tools linked to these lists (wiki, surveys).</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pol Moal</md:SurName>
+    <md:EmailAddress>pol.moal@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>David Verdin</md:SurName>
+    <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.geant.net.xml b/swamid-interfederations-2.0/lists.geant.net.xml
index 04c3392b..8e6e9ef2 100644
--- a/swamid-interfederations-2.0/lists.geant.net.xml
+++ b/swamid-interfederations-2.0/lists.geant.net.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.geant.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-27T17:24:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-27T17:24:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Geant test mailing list service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://lists.geant.net/sympa</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Service de listes de test de Geant</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.net/coc.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Geant test mailing list service</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://lists.geant.net/sympa</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Service de listes de test de Geant</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.net/coc.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
 NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
@@ -44,13 +44,13 @@ ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
 KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
 qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
 NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
@@ -68,31 +68,30 @@ ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
 KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
 qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.net/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.net/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Service de listes de test de Geant</md:ServiceName>
-        <md:ServiceName xml:lang="en">Geant test mailing list service</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Pol Moal</md:SurName>
-      <md:EmailAddress>pol.moal@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>David Verdin</md:SurName>
-      <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.net/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.net/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Service de listes de test de Geant</md:ServiceName>
+      <md:ServiceName xml:lang="en">Geant test mailing list service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pol Moal</md:SurName>
+    <md:EmailAddress>pol.moal@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>David Verdin</md:SurName>
+    <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.geant.org.xml b/swamid-interfederations-2.0/lists.geant.org.xml
index de5b8b6b..fd2524ff 100644
--- a/swamid-interfederations-2.0/lists.geant.org.xml
+++ b/swamid-interfederations-2.0/lists.geant.org.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.geant.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-29T09:35:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-29T09:35:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Geant Groupware service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://lists.geant.org/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">GN4 project collaborative tools (mailing lists and wikis).</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Geant Groupware service</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ce service fournit des outils de travail collaboratif aux membres du projet GN4, notamment des lists de diffusion et des wikis</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.org/coc.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Geant Groupware service</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://lists.geant.org/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">GN4 project collaborative tools (mailing lists and wikis).</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Geant Groupware service</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Ce service fournit des outils de travail collaboratif aux membres du projet GN4, notamment des lists de diffusion et des wikis</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.org/coc.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDCTCCAfGgAwIBAgIJAKXf1V/KCXwLMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFnRlc3QtbGlzdHMwMS5nZWFudC5uZXQwHhcNMTUwNDAxMTM1MTQ1WhcNMjUw
 MzI5MTM1MTQ1WjAhMR8wHQYDVQQDExZ0ZXN0LWxpc3RzMDEuZ2VhbnQubmV0MIIB
@@ -45,13 +45,13 @@ bkeBfYrxyNLXpg3EbMJ5c7lQ7UJxEcUk7RyqX7whVwIEChIlnSb1i1GSdw+eZafE
 cFHyCkGxqfrSPB381C4XX43hNs4gH/w0gXZ9k9bopeuBQc5lJG+isAotHjHQwQ5r
 lLRJvk9cfZmZAyHc8w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDCTCCAfGgAwIBAgIJAKXf1V/KCXwLMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFnRlc3QtbGlzdHMwMS5nZWFudC5uZXQwHhcNMTUwNDAxMTM1MTQ1WhcNMjUw
 MzI5MTM1MTQ1WjAhMR8wHQYDVQQDExZ0ZXN0LWxpc3RzMDEuZ2VhbnQubmV0MIIB
@@ -70,31 +70,30 @@ bkeBfYrxyNLXpg3EbMJ5c7lQ7UJxEcUk7RyqX7whVwIEChIlnSb1i1GSdw+eZafE
 cFHyCkGxqfrSPB381C4XX43hNs4gH/w0gXZ9k9bopeuBQc5lJG+isAotHjHQwQ5r
 lLRJvk9cfZmZAyHc8w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Geant Groupware service</md:ServiceName>
-        <md:ServiceName xml:lang="en">Geant Groupware service</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Ce service fournit des outils de travail collaboratif aux membres du projet GN4, notamment des lists de diffusion et des wikis</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">GN4 project collaborative tools (mailing lists and wikis).</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>David Verdin</md:SurName>
-      <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Michael Haller</md:SurName>
-      <md:EmailAddress>michael.haller@dante.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Geant Groupware service</md:ServiceName>
+      <md:ServiceName xml:lang="en">Geant Groupware service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Ce service fournit des outils de travail collaboratif aux membres du projet GN4, notamment des lists de diffusion et des wikis</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">GN4 project collaborative tools (mailing lists and wikis).</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>David Verdin</md:SurName>
+    <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Michael Haller</md:SurName>
+    <md:EmailAddress>michael.haller@dante.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.lbl.gov-shibboleth.xml b/swamid-interfederations-2.0/lists.lbl.gov-shibboleth.xml
index 48b688fa..4f1004f8 100644
--- a/swamid-interfederations-2.0/lists.lbl.gov-shibboleth.xml
+++ b/swamid-interfederations-2.0/lists.lbl.gov-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.lbl.gov/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.lbl.gov/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LBL Lists</mdui:DisplayName>
+        <mdui:Description xml:lang="en">LBL Self-Service mailing list manager</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/TQFdAw</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.lbl.gov/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LBL Lists</mdui:DisplayName>
-          <mdui:Description xml:lang="en">LBL Self-Service mailing list manager</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/TQFdAw</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC7jCCAdagAwIBAgIJAK9Fhyrkn2P+MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWxpc3RzLmxibC5nb3YwHhcNMTIxMjE4MDQyMjM3WhcNMjIxMjE2MDQyMjM3
 WjAYMRYwFAYDVQQDEw1saXN0cy5sYmwuZ292MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -40,36 +40,36 @@ K/cEsAlc6xihomi6/WmIWIt08II0kOfe5fKiASby9oSQRO5N4u7vZO31V1uYMrKv
 gaqdKv1PYCkYhs/+2Y5s78MvMYc3MI5dmTo4Beyouojl5alxK6Uop/wZNXeXbr1s
 U6hFIQBas74Lpep6QLfuTw3jc/JsWnNNs9j3WOdW4meS5A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LBL Lists</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">LBL Self-Service mailing list manager</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LBL Listmaster</md:GivenName>
-      <md:EmailAddress>listmaster@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>LBL Listmaster</md:GivenName>
-      <md:EmailAddress>listmaster@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LBL IT Help Desk</md:GivenName>
-      <md:EmailAddress>help@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.lbl.gov/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LBL Lists</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">LBL Self-Service mailing list manager</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LBL Listmaster</md:GivenName>
+    <md:EmailAddress>listmaster@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>LBL Listmaster</md:GivenName>
+    <md:EmailAddress>listmaster@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LBL IT Help Desk</md:GivenName>
+    <md:EmailAddress>help@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.test.lbl.gov-shibboleth.xml b/swamid-interfederations-2.0/lists.test.lbl.gov-shibboleth.xml
index f470ddac..7087e13e 100644
--- a/swamid-interfederations-2.0/lists.test.lbl.gov-shibboleth.xml
+++ b/swamid-interfederations-2.0/lists.test.lbl.gov-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.test.lbl.gov/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.test2.lbl.gov/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LBL Lists Test Server</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/TQFdAw</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.test2.lbl.gov/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LBL Lists Test Server</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/x/TQFdAw</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/disclaimers/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDADCCAeigAwIBAgIJAJ9rfDitgr16MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2xpc3RzLnRlc3QyLmxibC5nb3YwHhcNMTYwMjE3MjI0MzM5WhcNMjYwMjE0
 MjI0MzM5WjAeMRwwGgYDVQQDExNsaXN0cy50ZXN0Mi5sYmwuZ292MIIBIjANBgkq
@@ -39,31 +39,31 @@ vVPyMrPFq+8xfkeXT0PESmgIWfNpw/hxq+t8GXlTW8/B/K5rwBoNmo5lYsHaLcQH
 yCWXE3GmM0kTDro4ZG3N5kQYljTL/bJJFhca76Grvjn6zSsJy6rEhTgYdxcdhX+P
 VjeUKQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.test2.lbl.gov/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.test2.lbl.gov/Shibboleth.sso/SAML2/ECP" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.test.lbl.gov/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.test.lbl.gov/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LBL Lists Test Server</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LBL Listmaster</md:GivenName>
-      <md:EmailAddress>listmaster@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LBL IT Help Desk</md:GivenName>
-      <md:EmailAddress>help@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.test2.lbl.gov/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.test2.lbl.gov/Shibboleth.sso/SAML2/ECP" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.test.lbl.gov/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lists.test.lbl.gov/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LBL Lists Test Server</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LBL Listmaster</md:GivenName>
+    <md:EmailAddress>listmaster@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LBL IT Help Desk</md:GivenName>
+    <md:EmailAddress>help@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml
index 2bcf1fa4..70792187 100644
--- a/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://liverpool.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-10T09:48:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-10T09:48:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIECzCCAvOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBmMSEwHwYDVQQDFBgqLmxp
 						dmVycG9vbC5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xD
 						MSUwIwYJKoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE0MTEw
@@ -36,25 +36,25 @@
 						KvELFtpZjI6wYAmWgr2ERYbKlOGXCLNOTTD3u+t2WvIQsk9iWrDUGJuXP6rjadr2
 						uGQq30Q0dqFgd1jyc5ZHakixPZMu9DniEhOkcW5oHA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Liverpool Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Liverpool Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
index 04b45f31..50590818 100644
--- a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lma-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Art Academy of Latvia</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Art Academy of Latvia</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - LMA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Art Academy of Latvia - LMA IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.lma.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lanet.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LMA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Art Academy of Latvia - LMA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.lma.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lanet.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml
index bfd56bba..56cfc210 100644
--- a/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmet.aiwip.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T11:32:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T11:32:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lmet.aiwip.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aiwip for London Metropolitan</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Free printing for London Metropolitan students</mdui:Description>
+        <mdui:Logo height="135" width="90">https://lmet.aiwip.com/static/images/logo2-dark.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lmet.aiwip.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aiwip for London Metropolitan</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Free printing for London Metropolitan students</mdui:Description>
-          <mdui:Logo height="135" width="90">https://lmet.aiwip.com/static/images/logo2-dark.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDlDCCAnygAwIBAgIJAN9ls5zbDz+1MA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDEXMBUG
 						A1UEAwwObG1ldC5haXdpcC5jb20wHhcNMTUwOTE0MTExMTA3WhcNMjUwOTExMTEx
@@ -55,43 +55,43 @@
 						cEduhkrPF1g42Vc36GGScFGwHwqUHWsp3a7i5ziGsBy0nnPOVDJ0jRJA6m903JDa
 						mFPqGq9ZnxI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aiwip Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aiwip for London Metropolitan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://lmet.aiwip.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ruslan</md:GivenName>
-      <md:SurName>Khazarchiev</md:SurName>
-      <md:EmailAddress>mailto:ruslan@aiwip.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ruslan</md:GivenName>
-      <md:SurName>Khazarchiev</md:SurName>
-      <md:EmailAddress>mailto:ruslan@aiwip.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aiwip Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aiwip for London Metropolitan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://lmet.aiwip.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ruslan</md:GivenName>
+    <md:SurName>Khazarchiev</md:SurName>
+    <md:EmailAddress>mailto:ruslan@aiwip.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ruslan</md:GivenName>
+    <md:SurName>Khazarchiev</md:SurName>
+    <md:EmailAddress>mailto:ruslan@aiwip.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml
index 3d12160e..6a87bd5e 100644
--- a/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmu.idm.oclc.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-27T10:30:53Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-27T10:30:53Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID6DCCAtCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBbMRswGQYDVQQDFBIqLmxt
 						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVTMQ0wCwYDVQQKEwRPQ0xDMSAwHgYJ
 						KoZIhvcNAQkBFhFha2tpbmVudkBvY2xjLm9yZzAeFw0xNDAxMTMxMzU5MTRaFw0y
@@ -30,27 +30,27 @@
 						njFDG99cbz/SNQZeuHImmpuxcnghxMtSC7W2GI4QLYoafZLuwMgtxrKsQxXXL5/E
 						uyJFO0rw4hghAQcMJxL7r0N5J3Nr0Yj6uXjI8TFrsJGICo8HcLhGHaxx82U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Metropolitan University hosted EZproxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Vasu</md:GivenName>
-      <md:SurName>Akkineni</md:SurName>
-      <md:EmailAddress>mailto:ezproxy@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vasu</md:GivenName>
-      <md:SurName>Akkineni</md:SurName>
-      <md:EmailAddress>mailto:ezproxy@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Metropolitan University hosted EZproxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vasu</md:GivenName>
+    <md:SurName>Akkineni</md:SurName>
+    <md:EmailAddress>mailto:ezproxy@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vasu</md:GivenName>
+    <md:SurName>Akkineni</md:SurName>
+    <md:EmailAddress>mailto:ezproxy@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
index 7f7b142f..fbfd28ed 100644
--- a/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
-          <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -66,15 +66,15 @@ oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
 rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
 X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -108,29 +108,29 @@ oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
 rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
 X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -164,15 +164,15 @@ oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
 rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
 X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -206,31 +206,31 @@ oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
 rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
 X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e29</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e29</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">https://lmuidp.lrz.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://lmuidp.lrz.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ralf</md:GivenName>
-      <md:SurName>Ebner</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LMU-Helpdesk</md:GivenName>
-      <md:SurName>LMU-Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@campus.lmu.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e29</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e29</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">https://lmuidp.lrz.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://lmuidp.lrz.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Ebner</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LMU-Helpdesk</md:GivenName>
+    <md:SurName>LMU-Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@campus.lmu.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
index 04c60eed..7f0485aa 100644
--- a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuza-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Latvian Academy of Music</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Latvian Academy of Music</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - LMUZA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Latvian Academy of Music - LMUZA IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.jvlma.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LMUZA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Latvian Academy of Music - LMUZA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.jvlma.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml
index da4ddc7c..09bb0dc2 100644
--- a/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-test.st-andrews.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-12T18:25:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-12T18:25:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFUTCCBDmgAwIBAgICEKQwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
 						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
 						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
@@ -48,26 +48,26 @@
 						J7VjokUiLsonrTB+iDya4u4bBuVPrBamOUEW56hK5mw9KolgJZJ0ZBdWdUKKZbAp
 						HJJWwiaz/8zD1c45FhMrVqCyySQs
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-test.st-andrews.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-test.st-andrews.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-andrews.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFUTCCBDmgAwIBAgICEKQwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
 						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
 						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
@@ -98,27 +98,27 @@
 						J7VjokUiLsonrTB+iDya4u4bBuVPrBamOUEW56hK5mw9KolgJZJ0ZBdWdUKKZbAp
 						HJJWwiaz/8zD1c45FhMrVqCyySQs
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of St Andrews</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of St Andrews (2.2 test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.st-andrews.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Duncan</md:GivenName>
-      <md:SurName>Brannen</md:SurName>
-      <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Duncan</md:GivenName>
-      <md:SurName>Brannen</md:SurName>
-      <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of St Andrews</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of St Andrews (2.2 test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.st-andrews.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Duncan</md:GivenName>
+    <md:SurName>Brannen</md:SurName>
+    <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Duncan</md:GivenName>
+    <md:SurName>Brannen</md:SurName>
+    <md:EmailAddress>mailto:dbb@st-andrews.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
index 0e930e88..8f4ba438 100644
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aai.pionier.net.pl/IdP/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2013-12-15T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2013-12-15T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aai.pionier.net.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PIONIER Consortium</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aai.pionier.net.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PIONIER Consortium</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
             PIONIER Consortium Identity Provider 
          </mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PIONIER Consortium</md:OrganizationName>
-      <md:OrganizationName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PIONIER Consortium</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pionier.net.pl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>PIONIER IdP</md:SurName>
-      <md:EmailAddress>mailto:admin@aai.pionier.net.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PIONIER Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PIONIER Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pionier.net.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>PIONIER IdP</md:SurName>
+    <md:EmailAddress>mailto:admin@aai.pionier.net.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
index f434e569..7b5978c0 100644
--- a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
@@ -1,279 +1,279 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/edugain/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acmt.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agr.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apuri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhitekt.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhiv.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asoo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspira.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azoo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc-institut.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bernays.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bicro.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boginst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-karlovac.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-srebrnjak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-zadar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diplomacija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">djkbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eihp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eizg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evtos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fer.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fesb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffdi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitnes-uciliste.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkit.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foozos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fthm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ftidi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">galapagos-ic.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geof.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfv.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkpz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkvk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkzd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grad.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">h-r-z.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hatz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hazu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hck.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hera.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hgi-cgs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hpm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrbi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu-morh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ief.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">igh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihjj.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inantro.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iptpo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipv-zg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irmo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izor.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iztzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb-merkur.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-rijeka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-zagreb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbcsm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf-st.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsplit.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kdb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kif.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kifst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koncar-institut.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">krs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktf-split.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">libertas.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lzmk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">matica.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mato.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medils.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mev.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mobilnost.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muza.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncvvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obhpknin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obrtnicko-uciliste.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oikon.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">par.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pharma.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pilar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmfst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politehnika-pula.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poljinos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou-amc.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pozeska-bolnica.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">public.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racunarstvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgn.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riteh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scsi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scvz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sczg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skolski-sport.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srce.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stampar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumfak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumins.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suvag.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tv-akademija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uciliste-janus.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umas.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicath.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unidu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unios.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unist.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vef.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veinst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">velegs-nikolatesla.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleknin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vernnet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vevu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vguk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vhzk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">visoka-skola-rrif.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vps-minerva.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsvisnjan.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsa.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsfp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsikmp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsite.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsmti.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vszrinski.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vtsbj.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vuka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vup.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vus.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vusb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vvg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zkzd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zsem.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvu.hr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="hr">AAI@EduHr sustav jedinstvene autentikacije korisnika</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
+        <mdui:Description xml:lang="hr">Centralni autentikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentikacije korisnika</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acmt.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agr.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apuri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhitekt.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhiv.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asoo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspira.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azoo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azvo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bak.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc-institut.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bernays.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfm.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bicro.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boginst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-karlovac.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-srebrnjak.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-zadar.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnet.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diplomacija.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">djkbf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkd.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eihp.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eizg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epsz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etfos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evtos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fer.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fesb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffdi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitnes-uciliste.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkit.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foozos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fthm.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ftidi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">galapagos-ic.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geof.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfv.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkka.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkpz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkvk.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkzd.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grad.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">h-r-z.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hatz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hazu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hck.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hera.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hgi-cgs.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hpm.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrbi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu-morh.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ief.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">igh.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihjj.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imin.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inantro.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iptpo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipv-zg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irmo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isp.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izor.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iztzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb-merkur.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-rijeka.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-zagreb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbcsm.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbd.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf-st.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsd.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsplit.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kdb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kif.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kifst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koncar-institut.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">krs.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktf-split.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">libertas.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lzmk.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">matica.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mato.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medils.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mev.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mobilnost.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muza.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncvvo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsk.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obhpknin.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obrtnicko-uciliste.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oikon.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pak.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">par.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pbf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pharma.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pilar.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmfst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politehnika-pula.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poljinos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou-amc.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pozeska-bolnica.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptfos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">public.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racunarstvo.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgn.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riteh.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scsi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scvz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sczg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simet.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skolski-sport.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srce.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stampar.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stin.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucsb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumfak.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumins.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suvag.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttf.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tv-akademija.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaos.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uciliste-janus.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufzg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umas.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicath.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unidu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unin.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unios.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unist.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizd.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vef.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veinst.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">velegs-nikolatesla.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleknin.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleri.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vernnet.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vevu.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vguk.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vhzk.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">visoka-skola-rrif.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vps-minerva.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsvisnjan.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsz.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsa.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsfp.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsikmp.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsite.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsmti.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vszrinski.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vtsbj.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vuka.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vup.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vus.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vusb.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vvg.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zkzd.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zsem.hr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvu.hr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="hr">AAI@EduHr sustav jedinstvene autentikacije korisnika</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
-          <mdui:Description xml:lang="hr">Centralni autentikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentikacije korisnika</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
-      <md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentikacijska i autorizacijska infrastruktura sustava znanosti i visokog obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dubravko</md:GivenName>
-      <md:SurName>Voncina</md:SurName>
-      <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
+    <md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentikacijska i autorizacijska infrastruktura sustava znanosti i visokog obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dubravko</md:GivenName>
+    <md:SurName>Voncina</md:SurName>
+    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
index c5d6e8de..a8f94f2e 100644
--- a/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/wayf/module.php/saml/sp/metadata.php/default-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2014-07-01T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">WAYF bridging element for eduGAIN enabled services</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">WAYF bridging element for eduGAIN enabled services registered within AAI@EduHr federation</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">AAI@EduHr</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dubravko</md:GivenName>
-      <md:SurName>Voncina</md:SurName>
-      <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>AAI@EduHr operations team</md:Company>
-      <md:EmailAddress>aai@srce.hr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2014-07-01T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHfjCCBmagAwIBAgIQCWGsVxLC3qXbHbpSfkUV4DANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHlRFUkVOQSBTU0wgSGlnaCBBc3N1cmFuY2UgQ0EgMzAeFw0xNTA3MjMwMDAwMDBaFw0xNzA3MjcxMjAwMDBaMIIBFDEaMBgGA1UEDwwRR292ZXJubWVudCBFbnRpdHkxEzARBgsrBgEEAYI3PAIBAxMCSFIxGjAYBgNVBAUTEUdvdmVybm1lbnQgRW50aXR5MRwwGgYDVQQJDBNKb3NpcGEgTWFyb2huacSNYSA1MREwDwYDVQQREwhIUi0xMDAwMDELMAkGA1UEBhMCSFIxDzANBgNVBAgTBlphZ3JlYjEPMA0GA1UEBxMGWmFncmViMUswSQYDVQQKDEJTUkNFIChTdmV1xI1pbGnFoXRlIHUgWmFncmVidSBTdmV1xI1pbGnFoW5pIHJhxI11bnNraSBjZW50YXIgU3JjZSkxGDAWBgNVBAMTD2xvZ2luLmFhaWVkdS5ocjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcu6B2cF+9YN2s1ui2vnC1IviEN9EoXgOgUMtkA6XmHPAnw/PJnTaqu5vWTIPNWyktGB/nbMeP0kX7rNV3sryaRZ2HhG345OBzG6MJIJ/C+woWnqW6VbxIxjhPedVrQ5kYYZqyO2JsTmSx+G/oCNHFZDOlIvx+Fp4Wx+PPyOWsxLTpcRYTLJJw5JCorJWuLHJ8wEIeugp9/gUzzA9txq6x/UcOX6keBYhOircofMfuZulHUXqs+vZVeEecLGjuNi1g4oOv8QNtEAKjOURrywhfmiSYq9rV/y7d2arhMOxhJun5prxZLrIhaOZbY9AwFk633n8g0txcjiZ8mPG2Ut0kCAwEAAaOCA2kwggNlMB8GA1UdIwQYMBaAFMK4hdfhuRO90Ui8/V7cfZBCeoqpMB0GA1UdDgQWBBQ+WPibu9hc7mgiZb8D2RGKVP0/UjAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTEhpZ2hBc3N1cmFuY2VDQTMuY3JsMDygOqA4hjZodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMSGlnaEFzc3VyYW5jZUNBMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAgEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB7BggrBgEFBQcBAQRvMG0wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBFBggrBgEFBQcwAoY5aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTEhpZ2hBc3N1cmFuY2VDQTMuY3J0MAwGA1UdEwEB/wQCMAAwggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB3AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABTrz6Iw4AAAQDAEgwRgIhAO57T4MBDf3n4/vuT4JLvxk7D380fvCNGWQZi86jkmugAiEAo/k/DqV6bd94tUV0r7dMg3lznfy34cNf3J06XuTZgGkAdQBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAU68+iMQAAAEAwBGMEQCICONwqhLeEzqCn/rsay9BRcftidBFORjDC1rlAJmL9pNAiBaNsqGb9leF0Lq5H5MytKXK4+5BXVPnge8BU3cJzUIRgB3AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABTrz6JG0AAAQDAEgwRgIhANpcqj6MYPfs6UUPvaqgZKUdayRJEcvZN6bK/vaAa1nIAiEA3oUjRCEc+MByNewW8MW/7J0hOWfVbiEYyXl8v7ytP+0wDQYJKoZIhvcNAQELBQADggEBABMB006qcQzAHCAKdWnqt8ePx7A+jTGc6iCOP8XHz7UA4aIQL6jeurfQUUnFM3nh+Bfiue1wVsbPu1GKxvwVTrrtO8jXuajzhG9M+z9m6dTtpqCGfMqkpVzMQNcpCFE+giICytsxPFoalkiWBmrygCFY4Nd5dVg70ZIgefhqROuJI5jvWORWrl50nt33A9BgFVv4gdswYcf5VHuPCREHXG/mNe5BgDdgEOUVbhIlcsd7HnHK55C3lQ6//VDdFrrB69+5oJrZo5Od8kbX2ptmdkT2bT2qiKvVdb8WpL9PiHWlVcmAfT7QJOBoFWoN92sxxExoDjRws+/IoNlOMiIPnGQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">WAYF bridging element for eduGAIN enabled services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WAYF bridging element for eduGAIN enabled services registered within AAI@EduHr federation</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AAI@EduHr</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dubravko</md:GivenName>
+    <md:SurName>Voncina</md:SurName>
+    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>AAI@EduHr operations team</md:Company>
+    <md:EmailAddress>aai@srce.hr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.airhead.io-shibboleth.xml b/swamid-interfederations-2.0/login.airhead.io-shibboleth.xml
index df0155ce..fa757506 100644
--- a/swamid-interfederations-2.0/login.airhead.io-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.airhead.io-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.airhead.io/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T14:06:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T14:06:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.airhead.io/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.airhead.io/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Airhead</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The award-winning platform for education.</mdui:Description>
+        <mdui:Logo height="122" width="137">https://cdn.airhead.io/public/img/airhead-logo-blue.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.airhead.io/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.airhead.io/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Airhead</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The award-winning platform for education.</mdui:Description>
-          <mdui:Logo height="122" width="137">https://cdn.airhead.io/public/img/airhead-logo-blue.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAhCgAwIBAgIQoOJCTVTKALBDuVQdpeQa8jAJBgUrDgMCHQUAMC0xKzAp
 						BgNVBAMTIkFpcmhlYWQgUHJvZHVjdGlvbiBJbnRlcm1lZGlhdGUgQ0EwHhcNMTQw
 						NjI0MTA1MTU3WhcNMzkxMjMxMjM1OTU5WjAmMSQwIgYDVQQDExtsb2dpbi5wcm9k
@@ -53,43 +53,43 @@
 						/c70n+btqrMJbjz5N4CdW1S9tDrC40eEeVU2X8+bN5nP5J67glGc+i3Ypm8ojayS
 						+8QbhGAot/z38FpozABMxuPrPgQpzd7UzSpez59dlmrOyEOJUnkY3g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.airhead.io/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.airhead.io/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.airhead.io/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.airhead.io/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.airhead.io/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.airhead.io/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.airhead.io/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.airhead.io/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.airhead.io/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.airhead.io/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.airhead.io/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Airhead Education Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Airhead</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.airhead-education.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Anthony</md:GivenName>
-      <md:SurName>Gibbons</md:SurName>
-      <md:EmailAddress>mailto:anthony@airhead-education.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fraser</md:GivenName>
-      <md:SurName>Davidson</md:SurName>
-      <md:EmailAddress>mailto:fraser@airhead-education.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.airhead.io/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.airhead.io/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.airhead.io/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.airhead.io/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.airhead.io/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.airhead.io/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.airhead.io/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.airhead.io/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.airhead.io/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.airhead.io/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.airhead.io/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Airhead Education Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Airhead</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.airhead-education.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anthony</md:GivenName>
+    <md:SurName>Gibbons</md:SurName>
+    <md:EmailAddress>mailto:anthony@airhead-education.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fraser</md:GivenName>
+    <md:SurName>Davidson</md:SurName>
+    <md:EmailAddress>mailto:fraser@airhead-education.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
index e8951f3e..fabc2644 100644
--- a/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Athena - Research and Innovation Center</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.athena-innovation.gr/en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.athena-innovation.gr/el.html</mdui:InformationURL>
+        <mdui:Logo height="90" width="73">https://login.athena-innovation.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>athena-innovation.gr</mdui:DomainHint>
+        <mdui:DomainHint>imis.athena-innovation.gr</mdui:DomainHint>
+        <mdui:DomainHint>ilsp.gr</mdui:DomainHint>
+        <mdui:DomainHint>ceti.gr</mdui:DomainHint>
+        <mdui:DomainHint>isi.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.63.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.3.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.58.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.192.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.217.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2600::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.0365046,23.802512</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Athena - Research and Innovation Center</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.athena-innovation.gr/en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.athena-innovation.gr/el.html</mdui:InformationURL>
-          <mdui:Logo height="90" width="73">https://login.athena-innovation.gr/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>athena-innovation.gr</mdui:DomainHint>
-          <mdui:DomainHint>imis.athena-innovation.gr</mdui:DomainHint>
-          <mdui:DomainHint>ilsp.gr</mdui:DomainHint>
-          <mdui:DomainHint>ceti.gr</mdui:DomainHint>
-          <mdui:DomainHint>isi.gr</mdui:DomainHint>
-          <mdui:IPHint>195.251.63.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.3.0/24</mdui:IPHint>
-          <mdui:IPHint>195.251.58.0/24</mdui:IPHint>
-          <mdui:IPHint>194.177.192.0/24</mdui:IPHint>
-          <mdui:IPHint>194.177.217.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:648:2600::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:38.0365046,23.802512</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
@@ -65,31 +65,31 @@
                             iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
                             bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.athena-innovation.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.athena-innovation.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
@@ -116,29 +116,29 @@
                             iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
                             bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Athena - Research and Innovation Center</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Research Center Athena - Institute for the Management of Information Systems</md:Company>
-      <md:EmailAddress>staff@imis.athena-innovation.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Research Center Athena - Institute for the Management of Information Systems</md:Company>
-      <md:EmailAddress>staff@imis.athena-innovation.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Athena - Research and Innovation Center</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Research Center Athena - Institute for the Management of Information Systems</md:Company>
+    <md:EmailAddress>staff@imis.athena-innovation.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Research Center Athena - Institute for the Management of Information Systems</md:Company>
+    <md:EmailAddress>staff@imis.athena-innovation.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.auth.gr-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.auth.gr-saml2-idp-metadata.php.xml
index 6b384fac..9fceb642 100644
--- a/swamid-interfederations-2.0/login.auth.gr-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.auth.gr-saml2-idp-metadata.php.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.auth.gr/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auth.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aristotle University of Thessaloniki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.auth.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.auth.gr/</mdui:InformationURL>
+        <mdui:Logo width="300" height="64">https://it.auth.gr/login-auth-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>auth.gr</mdui:DomainHint>
+        <mdui:IPHint>155.207.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.104.147.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2800::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:40.6308255004333, 22.959268014038116</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auth.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aristotle University of Thessaloniki</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.auth.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.auth.gr/</mdui:InformationURL>
-          <mdui:Logo width="300" height="64">https://it.auth.gr/login-auth-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>auth.gr</mdui:DomainHint>
-          <mdui:IPHint>155.207.0.0/16</mdui:IPHint>
-          <mdui:IPHint>192.104.147.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:648:2800::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:40.6308255004333, 22.959268014038116</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDPDCCAiQCCQDFOxuYF+tatzANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJHUjEtMCsGA1UECgwkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQDDBlJZGVudGl0eSBQcm92aWRlciBvZiBBVVRoMB4XDTE2MDIyMzA5Mzk0MVoXDTM2MDIxODA5Mzk0MVowYDELMAkGA1UEBhMCR1IxLTArBgNVBAoMJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraTEiMCAGA1UEAwwZSWRlbnRpdHkgUHJvdmlkZXIgb2YgQVVUaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKt37BJXp6hsDS5QTlY4v2AKpV/qHvYWxnbyPQl/SLS/XpoI69fyf+9Qww9L+rHcSQ27t0xoawX3TmmE5pdh2MY4a/V4s8pkOTxTbOSV4YrBLQEmqi2Q62jYQPyhPyA7moLL4SwK4RYaf9MMfEMUB65nmd8xKU0iIo0dGCarCn9Xrqn032sIU6eWf3kA4kDAlGyPvRWOvlSYFz+Df5rXlUrhKmA9nfQ1m8ZGxorT7f+H1XgaIPFRU2ob4ukwN5hWD3C4PCGKAVQiC8kBqTeVn/JUxC49+NXMZpeJkmARoFuw+lAl9GqwV1B6KXQAbBfsNmV/dMQjokBeC0v+x0oRhCcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAPHxUKs8kKZisCV+nsj+RYquyVQRIm/clXI4SsfJXfFfyz1GxZrJGxs3kIyX8IX/rdX+wWQSOYpM6XEOM8aUdztvX5H5iGgiG2AKak3lE0OhheS//7NykaCFUQ70WDeF08CRdz9fZxIdx8RW2eHu+5acqitOZmEpb0irRk/YpiRIjsJ5sHbr+A4m+7GBtWscTU7kixfwtzEPzZSAx1DdBdsMi1F1CR/75Jbai2F8/odNiDOXUJrOw+SDMjbUc8580eqa0B/e7sCW8Gd+uMlGaI5l+ZJuES3Rj370S8wbf0JjdNGbpM4RtKx/Gn7+8PM28CKnKisi+LBu2K1KyNXys0Q==
                             
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDPDCCAiQCCQDFOxuYF+tatzANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJHUjEtMCsGA1UECgwkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQDDBlJZGVudGl0eSBQcm92aWRlciBvZiBBVVRoMB4XDTE2MDIyMzA5Mzk0MVoXDTM2MDIxODA5Mzk0MVowYDELMAkGA1UEBhMCR1IxLTArBgNVBAoMJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraTEiMCAGA1UEAwwZSWRlbnRpdHkgUHJvdmlkZXIgb2YgQVVUaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKt37BJXp6hsDS5QTlY4v2AKpV/qHvYWxnbyPQl/SLS/XpoI69fyf+9Qww9L+rHcSQ27t0xoawX3TmmE5pdh2MY4a/V4s8pkOTxTbOSV4YrBLQEmqi2Q62jYQPyhPyA7moLL4SwK4RYaf9MMfEMUB65nmd8xKU0iIo0dGCarCn9Xrqn032sIU6eWf3kA4kDAlGyPvRWOvlSYFz+Df5rXlUrhKmA9nfQ1m8ZGxorT7f+H1XgaIPFRU2ob4ukwN5hWD3C4PCGKAVQiC8kBqTeVn/JUxC49+NXMZpeJkmARoFuw+lAl9GqwV1B6KXQAbBfsNmV/dMQjokBeC0v+x0oRhCcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAPHxUKs8kKZisCV+nsj+RYquyVQRIm/clXI4SsfJXfFfyz1GxZrJGxs3kIyX8IX/rdX+wWQSOYpM6XEOM8aUdztvX5H5iGgiG2AKak3lE0OhheS//7NykaCFUQ70WDeF08CRdz9fZxIdx8RW2eHu+5acqitOZmEpb0irRk/YpiRIjsJ5sHbr+A4m+7GBtWscTU7kixfwtzEPzZSAx1DdBdsMi1F1CR/75Jbai2F8/odNiDOXUJrOw+SDMjbUc8580eqa0B/e7sCW8Gd+uMlGaI5l+ZJuES3Rj370S8wbf0JjdNGbpM4RtKx/Gn7+8PM28CKnKisi+LBu2K1KyNXys0Q==
                             
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.auth.gr/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.auth.gr/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aristotle University of Thessaloniki</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aristotle University of Thessaloniki</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.auth.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.auth.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>AUTH IT Center AAI Administrators</md:Company>
-      <md:EmailAddress>aaiadmin@it.auth.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-2310999000</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>AUTH IT Center Helpdesk</md:Company>
-      <md:EmailAddress>support@auth.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-2310999000</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.auth.gr/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.auth.gr/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aristotle University of Thessaloniki</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aristotle University of Thessaloniki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.auth.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.auth.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>AUTH IT Center AAI Administrators</md:Company>
+    <md:EmailAddress>aaiadmin@it.auth.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-2310999000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>AUTH IT Center Helpdesk</md:Company>
+    <md:EmailAddress>support@auth.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-2310999000</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
index 1c60332e..ed4cc501 100644
--- a/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.avans.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">avans.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Avans Hogeschool</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Avans University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Avans Hogeschool</mdui:Description>
+        <mdui:Description xml:lang="en">Avans</mdui:Description>
+        <mdui:Logo height="49" width="108">https://static.surfconext.nl/logos/idp/avans.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">avans university of applied sciences avans hogeschool</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">avans hogeschool avans university of applied sciences</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">avans.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Avans Hogeschool</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Avans University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Avans Hogeschool</mdui:Description>
-          <mdui:Description xml:lang="en">Avans</mdui:Description>
-          <mdui:Logo height="49" width="108">https://static.surfconext.nl/logos/idp/avans.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">avans university of applied sciences avans hogeschool</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">avans hogeschool avans university of applied sciences</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d67f6b2a3375ecdb6c53f27b210d3d0e"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Avans</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Avans Hogeschool</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://login.avans.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d67f6b2a3375ecdb6c53f27b210d3d0e"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Avans</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Avans Hogeschool</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://login.avans.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml
index c92b8c20..aecd1da9 100644
--- a/swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Boston College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Boston College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUNqVrGTZ1ObP8ynrLZeicH8ACC+swDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MB4XDTEyMDgyMjExNTMyMVoXDTMy
 MDgyMjExNTMyMVowFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MIIBIjANBgkqhkiG
@@ -37,24 +37,24 @@ m+E/1T7dPZ6uyTj2+FfsWM5sZ+zmhEwBngw2iNo7OXhGJs3Up2Z/Yb4zYdkQQMXP
 vsbOjVXxfv5WlNMfa2CCDgFEu8VeXUxXmj43/61cbg/OkthrwC449F4R7moFwj4h
 a8GpUOmIbYuu2Vka1/STY1+UXQT2C6bgR5DlEstXgA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.bc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.bc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.bc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.bc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUNqVrGTZ1ObP8ynrLZeicH8ACC+swDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MB4XDTEyMDgyMjExNTMyMVoXDTMy
 MDgyMjExNTMyMVowFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MIIBIjANBgkqhkiG
@@ -73,26 +73,26 @@ m+E/1T7dPZ6uyTj2+FfsWM5sZ+zmhEwBngw2iNo7OXhGJs3Up2Z/Yb4zYdkQQMXP
 vsbOjVXxfv5WlNMfa2CCDgFEu8VeXUxXmj43/61cbg/OkthrwC449F4R7moFwj4h
 a8GpUOmIbYuu2Vka1/STY1+UXQT2C6bgR5DlEstXgA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.bc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Boston College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Boston College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>BC IAM Technical Team</md:GivenName>
-      <md:EmailAddress>itsstaff.iam.technical@bc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>BC IAM Support Team</md:GivenName>
-      <md:EmailAddress>itsstaff.iam.support@bc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>BC IAM Administrative Team</md:GivenName>
-      <md:EmailAddress>itsstaff.iam.administrative@bc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.bc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Boston College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Boston College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>BC IAM Technical Team</md:GivenName>
+    <md:EmailAddress>itsstaff.iam.technical@bc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>BC IAM Support Team</md:GivenName>
+    <md:EmailAddress>itsstaff.iam.support@bc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>BC IAM Administrative Team</md:GivenName>
+    <md:EmailAddress>itsstaff.iam.administrative@bc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
index d946c0bd..9e3b3bc5 100644
--- a/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bme.hu/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:other</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>bme</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:other</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>bme</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Budapest University of Technology and Economics</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Budapest University of Technology and Economics</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Budapest University of Technology and Economics</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:Description>
-          <mdui:Description xml:lang="en">Budapest University of Technology and Economics</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>login.bme.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bme.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>login.bme.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Budapest University of Technology and Economics</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Budapest University of Technology and Economics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://bme.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://bme.hu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Gyenes Tamás</md:SurName>
-      <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Gyenes Tamás</md:SurName>
-      <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Gyenes Tamás</md:SurName>
-      <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>login.bme.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bme.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>login.bme.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Budapest University of Technology and Economics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Budapest University of Technology and Economics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://bme.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://bme.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gyenes Tamás</md:SurName>
+    <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Gyenes Tamás</md:SurName>
+    <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Gyenes Tamás</md:SurName>
+    <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
index cd5efdbb..0903a35d 100644
--- a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
+++ b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bufvc.ac.uk/saml/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T17:15:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T17:15:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID1zCCAr+gAwIBAgIJAM+d/l59FkocMA0GCSqGSIb3DQEBBQUAMFAxMjAwBgNV
 						BAoMKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMRow
 						GAYDVQQDExFsb2dpbi5idWZ2Yy5hYy51azAeFw0xNTExMTEwOTQ5NThaFw0yNTEx
@@ -32,31 +32,31 @@
 						r+2/Ralwp6eyn60NKcP1MZlrne/KA9Sa/QKuYGZYoz36AlU5lU9tCxL99nqNe4qq
 						phTjYEg3bCrvDWUfGuj2BC1Uoo0OAO8Y7FLC
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/post" index="5" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/art" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="8"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">British Universities Film &amp; Video Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://bufvc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lotfallah</md:GivenName>
-      <md:SurName>Bekhradi</md:SurName>
-      <md:EmailAddress>mailto:federation@bufvc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lotfallah</md:GivenName>
-      <md:SurName>Bekhradi</md:SurName>
-      <md:EmailAddress>mailto:federation@bufvc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/post" index="5" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/art" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">British Universities Film &amp; Video Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://bufvc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lotfallah</md:GivenName>
+    <md:SurName>Bekhradi</md:SurName>
+    <md:EmailAddress>mailto:federation@bufvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lotfallah</md:GivenName>
+    <md:SurName>Bekhradi</md:SurName>
+    <md:EmailAddress>mailto:federation@bufvc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.cedia.org.ec.xml b/swamid-interfederations-2.0/login.cedia.org.ec.xml
index ffec73a8..e63817cc 100644
--- a/swamid-interfederations-2.0/login.cedia.org.ec.xml
+++ b/swamid-interfederations-2.0/login.cedia.org.ec.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.cedia.org.ec">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-11-27T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.cedia.org.ec/minga</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="es">https://www.cedia.org.ec/minga</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-11-27T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.cedia.org.ec/minga</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="es">https://www.cedia.org.ec/minga</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedia.org.ec</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epn.edu.ec</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tecnologicoitca.edu.ec</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucuenca.edu.ec</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uta.edu.ec</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.edu.ec</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">redCEDIA - Ecuadorian National Research and Education Network</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">redCEDIA - Red nacional de Investigación y Educación del Ecuador</mdui:DisplayName>
+        <mdui:Description xml:lang="en">redCEDIA - Ecuadorian National Research and Education Network</mdui:Description>
+        <mdui:Description xml:lang="es">redCEDIA - Red nacional de Investigación y Educación del Ecuador</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.cedia.org.ec</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">https://www.cedia.org.ec</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.cedia.org.ec</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="es">https://www.cedia.org.ec</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">communication federated+session</mdui:Keywords>
+        <mdui:Keywords xml:lang="es">comunicación sesión+federada</mdui:Keywords>
+        <mdui:Logo height="200" width="400" xml:lang="en">https://www.cedia.org.ec/logocedia400x200.png</mdui:Logo>
+        <mdui:Logo height="103" width="376">https://www.cedia.org.ec/images/logoredcediaweb.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedia.org.ec</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epn.edu.ec</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tecnologicoitca.edu.ec</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucuenca.edu.ec</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uta.edu.ec</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.edu.ec</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">redCEDIA - Ecuadorian National Research and Education Network</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">redCEDIA - Red nacional de Investigación y Educación del Ecuador</mdui:DisplayName>
-          <mdui:Description xml:lang="en">redCEDIA - Ecuadorian National Research and Education Network</mdui:Description>
-          <mdui:Description xml:lang="es">redCEDIA - Red nacional de Investigación y Educación del Ecuador</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.cedia.org.ec</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">https://www.cedia.org.ec</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.cedia.org.ec</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="es">https://www.cedia.org.ec</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="en">communication federated+session</mdui:Keywords>
-          <mdui:Keywords xml:lang="es">comunicación sesión+federada</mdui:Keywords>
-          <mdui:Logo height="200" width="400" xml:lang="en">https://www.cedia.org.ec/logocedia400x200.png</mdui:Logo>
-          <mdui:Logo height="103" width="376">https://www.cedia.org.ec/images/logoredcediaweb.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID0TCCArmgAwIBAgIJAIAAdR6wFHTnMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIDAVBenVheTEPMA0GA1UEBwwGQ3VlbmNhMREwDwYDVQQKDAhyZWRDRURJQTEbMBkGA1UEAwwSbG9naW4uY2VkaWEub3JnLmVjMR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE1MTIxNDE3NDY1MVoXDTI1MTIxMzE3NDY1MVowfzELMAkGA1UEBhMCRUMxDjAMBgNVBAgMBUF6dWF5MQ8wDQYDVQQHDAZDdWVuY2ExETAPBgNVBAoMCHJlZENFRElBMRswGQYDVQQDDBJsb2dpbi5jZWRpYS5vcmcuZWMxHzAdBgkqhkiG9w0BCQEWEG5lZ0BjZWRpYS5vcmcuZWMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrPcmeyFIRHh4ty8K03U5y/BuJdhBXnrGcRbaziwcGHXIuprs0/4pqVa1325eiHfti1Bgm3Gw6w0FJTdNobyV/kLrU5+3LUmqbb8NQvo51pgGRLE9+5jUR1sRyCezDQeQdgws6CLdJok53HbHPqYS/zZXbySPkVjrIJs4vKW9XXwNj+W7N62iCCzVG/ZeiftiII25VqxtpFNK50oLUpsV1nN7g0NpRQLJcob2eYMqk304bzLnPbkZqhf1QWMc52oKmb4bdqhHSR9In9lbxW+96rxHPFUhsmyC7sbPFgzgy2UQQB1xKTAJtgK+0tsAkOLsoif2XY7oyr55G7QngBV4tAgMBAAGjUDBOMB0GA1UdDgQWBBThVhJUhlk6aFtqCJKqz3QI0DRERjAfBgNVHSMEGDAWgBThVhJUhlk6aFtqCJKqz3QI0DRERjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI+URiLgDI+FfqyzpFmORms4fWDtkTbLLTe/qJl/vnBh6vZoPZLUr/JCCGJ9eiWDD1LljMCnc+UV3Bs08kPFFeeXzZxhDSblluznmDzPbHDKfPNoEthLzq+2jYDUP1kTHVEhNFjs/zwuFyFdJpw8bGMdWKJOtx9T+cgjdwpFSWBP6CjKzFQNbidjSy9G4g62htHyGnfElWSiYA29XHhsAra9navAk0S5/8mmMYHUl2pII3lSw+lh7Ra7Ds3/Ar/jn1oCW6opshbDu+CIgJ6q00AbIj6ZG09uSkDz6Ep5EW7b0QSnCJND7FXV3rW+9r1w4IcuUOyoMxto2XZODmiHL/</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID0TCCArmgAwIBAgIJAIAAdR6wFHTnMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIDAVBenVheTEPMA0GA1UEBwwGQ3VlbmNhMREwDwYDVQQKDAhyZWRDRURJQTEbMBkGA1UEAwwSbG9naW4uY2VkaWEub3JnLmVjMR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE1MTIxNDE3NDY1MVoXDTI1MTIxMzE3NDY1MVowfzELMAkGA1UEBhMCRUMxDjAMBgNVBAgMBUF6dWF5MQ8wDQYDVQQHDAZDdWVuY2ExETAPBgNVBAoMCHJlZENFRElBMRswGQYDVQQDDBJsb2dpbi5jZWRpYS5vcmcuZWMxHzAdBgkqhkiG9w0BCQEWEG5lZ0BjZWRpYS5vcmcuZWMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrPcmeyFIRHh4ty8K03U5y/BuJdhBXnrGcRbaziwcGHXIuprs0/4pqVa1325eiHfti1Bgm3Gw6w0FJTdNobyV/kLrU5+3LUmqbb8NQvo51pgGRLE9+5jUR1sRyCezDQeQdgws6CLdJok53HbHPqYS/zZXbySPkVjrIJs4vKW9XXwNj+W7N62iCCzVG/ZeiftiII25VqxtpFNK50oLUpsV1nN7g0NpRQLJcob2eYMqk304bzLnPbkZqhf1QWMc52oKmb4bdqhHSR9In9lbxW+96rxHPFUhsmyC7sbPFgzgy2UQQB1xKTAJtgK+0tsAkOLsoif2XY7oyr55G7QngBV4tAgMBAAGjUDBOMB0GA1UdDgQWBBThVhJUhlk6aFtqCJKqz3QI0DRERjAfBgNVHSMEGDAWgBThVhJUhlk6aFtqCJKqz3QI0DRERjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI+URiLgDI+FfqyzpFmORms4fWDtkTbLLTe/qJl/vnBh6vZoPZLUr/JCCGJ9eiWDD1LljMCnc+UV3Bs08kPFFeeXzZxhDSblluznmDzPbHDKfPNoEthLzq+2jYDUP1kTHVEhNFjs/zwuFyFdJpw8bGMdWKJOtx9T+cgjdwpFSWBP6CjKzFQNbidjSy9G4g62htHyGnfElWSiYA29XHhsAra9navAk0S5/8mmMYHUl2pII3lSw+lh7Ra7Ds3/Ar/jn1oCW6opshbDu+CIgJ6q00AbIj6ZG09uSkDz6Ep5EW7b0QSnCJND7FXV3rW+9r1w4IcuUOyoMxto2XZODmiHL/</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cedia.org.ec/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cedia.org.ec/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">redCEDIA</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">redCEDIA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">redCEDIA</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">redCEDIA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.cedia.org.ec</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Claudio</md:GivenName>
-      <md:SurName>Chacon</md:SurName>
-      <md:EmailAddress>neg@cedia.org.ec</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID0TCCArmgAwIBAgIJAIAAdR6wFHTnMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIDAVBenVheTEPMA0GA1UEBwwGQ3VlbmNhMREwDwYDVQQKDAhyZWRDRURJQTEbMBkGA1UEAwwSbG9naW4uY2VkaWEub3JnLmVjMR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE1MTIxNDE3NDY1MVoXDTI1MTIxMzE3NDY1MVowfzELMAkGA1UEBhMCRUMxDjAMBgNVBAgMBUF6dWF5MQ8wDQYDVQQHDAZDdWVuY2ExETAPBgNVBAoMCHJlZENFRElBMRswGQYDVQQDDBJsb2dpbi5jZWRpYS5vcmcuZWMxHzAdBgkqhkiG9w0BCQEWEG5lZ0BjZWRpYS5vcmcuZWMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrPcmeyFIRHh4ty8K03U5y/BuJdhBXnrGcRbaziwcGHXIuprs0/4pqVa1325eiHfti1Bgm3Gw6w0FJTdNobyV/kLrU5+3LUmqbb8NQvo51pgGRLE9+5jUR1sRyCezDQeQdgws6CLdJok53HbHPqYS/zZXbySPkVjrIJs4vKW9XXwNj+W7N62iCCzVG/ZeiftiII25VqxtpFNK50oLUpsV1nN7g0NpRQLJcob2eYMqk304bzLnPbkZqhf1QWMc52oKmb4bdqhHSR9In9lbxW+96rxHPFUhsmyC7sbPFgzgy2UQQB1xKTAJtgK+0tsAkOLsoif2XY7oyr55G7QngBV4tAgMBAAGjUDBOMB0GA1UdDgQWBBThVhJUhlk6aFtqCJKqz3QI0DRERjAfBgNVHSMEGDAWgBThVhJUhlk6aFtqCJKqz3QI0DRERjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI+URiLgDI+FfqyzpFmORms4fWDtkTbLLTe/qJl/vnBh6vZoPZLUr/JCCGJ9eiWDD1LljMCnc+UV3Bs08kPFFeeXzZxhDSblluznmDzPbHDKfPNoEthLzq+2jYDUP1kTHVEhNFjs/zwuFyFdJpw8bGMdWKJOtx9T+cgjdwpFSWBP6CjKzFQNbidjSy9G4g62htHyGnfElWSiYA29XHhsAra9navAk0S5/8mmMYHUl2pII3lSw+lh7Ra7Ds3/Ar/jn1oCW6opshbDu+CIgJ6q00AbIj6ZG09uSkDz6Ep5EW7b0QSnCJND7FXV3rW+9r1w4IcuUOyoMxto2XZODmiHL/</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID0TCCArmgAwIBAgIJAIAAdR6wFHTnMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIDAVBenVheTEPMA0GA1UEBwwGQ3VlbmNhMREwDwYDVQQKDAhyZWRDRURJQTEbMBkGA1UEAwwSbG9naW4uY2VkaWEub3JnLmVjMR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE1MTIxNDE3NDY1MVoXDTI1MTIxMzE3NDY1MVowfzELMAkGA1UEBhMCRUMxDjAMBgNVBAgMBUF6dWF5MQ8wDQYDVQQHDAZDdWVuY2ExETAPBgNVBAoMCHJlZENFRElBMRswGQYDVQQDDBJsb2dpbi5jZWRpYS5vcmcuZWMxHzAdBgkqhkiG9w0BCQEWEG5lZ0BjZWRpYS5vcmcuZWMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrPcmeyFIRHh4ty8K03U5y/BuJdhBXnrGcRbaziwcGHXIuprs0/4pqVa1325eiHfti1Bgm3Gw6w0FJTdNobyV/kLrU5+3LUmqbb8NQvo51pgGRLE9+5jUR1sRyCezDQeQdgws6CLdJok53HbHPqYS/zZXbySPkVjrIJs4vKW9XXwNj+W7N62iCCzVG/ZeiftiII25VqxtpFNK50oLUpsV1nN7g0NpRQLJcob2eYMqk304bzLnPbkZqhf1QWMc52oKmb4bdqhHSR9In9lbxW+96rxHPFUhsmyC7sbPFgzgy2UQQB1xKTAJtgK+0tsAkOLsoif2XY7oyr55G7QngBV4tAgMBAAGjUDBOMB0GA1UdDgQWBBThVhJUhlk6aFtqCJKqz3QI0DRERjAfBgNVHSMEGDAWgBThVhJUhlk6aFtqCJKqz3QI0DRERjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI+URiLgDI+FfqyzpFmORms4fWDtkTbLLTe/qJl/vnBh6vZoPZLUr/JCCGJ9eiWDD1LljMCnc+UV3Bs08kPFFeeXzZxhDSblluznmDzPbHDKfPNoEthLzq+2jYDUP1kTHVEhNFjs/zwuFyFdJpw8bGMdWKJOtx9T+cgjdwpFSWBP6CjKzFQNbidjSy9G4g62htHyGnfElWSiYA29XHhsAra9navAk0S5/8mmMYHUl2pII3lSw+lh7Ra7Ds3/Ar/jn1oCW6opshbDu+CIgJ6q00AbIj6ZG09uSkDz6Ep5EW7b0QSnCJND7FXV3rW+9r1w4IcuUOyoMxto2XZODmiHL/</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cedia.org.ec/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cedia.org.ec/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">redCEDIA</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">redCEDIA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">redCEDIA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">redCEDIA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.cedia.org.ec</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Claudio</md:GivenName>
+    <md:SurName>Chacon</md:SurName>
+    <md:EmailAddress>neg@cedia.org.ec</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml
index dbd73435..c1e2418c 100644
--- a/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.cmu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.cmu.edu/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andrew.cmu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Carnegie Mellon University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Carnegie Mellon University Identity Provider</mdui:Description>
+        <mdui:Logo height="125" width="181" xml:lang="en">https://identity.andrew.cmu.edu/incommon/cmu-181x125.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.cmu.edu/error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andrew.cmu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Carnegie Mellon University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Carnegie Mellon University Identity Provider</mdui:Description>
-          <mdui:Logo height="125" width="181" xml:lang="en">https://identity.andrew.cmu.edu/incommon/cmu-181x125.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAO1Zt6Sg0xhmMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWxvZ2luLmNtdS5lZHUwHhcNMTQwMTIyMTkzMDM2WhcNMzAwNjI5MTkzMDM2
 WjAYMRYwFAYDVQQDEw1sb2dpbi5jbXUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -42,24 +42,24 @@ AeT3Q5Gyghji0emF0nbZpNjPjE9bXavMbUppXF2/VHbuBtzEMBxIKV53X2et2MMc
 mI4FNx0pQnirAvrQxxgFTwVV5SEm87DBYRblUb4ba0yYVSBQg0EVbIb7QEDxHFWb
 zt4+NLolAQAMSQW+SJKf9V7+6+4uhMwpJxQwezzn41u9kGTIg9F8/s0IrgsTlAm3
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.cmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.cmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cmu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.cmu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.cmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cmu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andrew.cmu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.cmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.cmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cmu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.cmu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.cmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cmu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andrew.cmu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAO1Zt6Sg0xhmMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWxvZ2luLmNtdS5lZHUwHhcNMTQwMTIyMTkzMDM2WhcNMzAwNjI5MTkzMDM2
 WjAYMRYwFAYDVQQDEw1sb2dpbi5jbXUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -78,31 +78,31 @@ AeT3Q5Gyghji0emF0nbZpNjPjE9bXavMbUppXF2/VHbuBtzEMBxIKV53X2et2MMc
 mI4FNx0pQnirAvrQxxgFTwVV5SEm87DBYRblUb4ba0yYVSBQg0EVbIb7QEDxHFWb
 zt4+NLolAQAMSQW+SJKf9V7+6+4uhMwpJxQwezzn41u9kGTIg9F8/s0IrgsTlAm3
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.cmu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.cmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Carnegie Mellon University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Carnegie Mellon University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cmu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Support Team</md:GivenName>
-      <md:EmailAddress>shibboleth-team@andrew.cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Computing Services Help Center</md:GivenName>
-      <md:EmailAddress>it-help@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeffrey Eaton</md:GivenName>
-      <md:EmailAddress>jeaton@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Deborah Schill</md:GivenName>
-      <md:EmailAddress>dschill@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.cmu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.cmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Carnegie Mellon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carnegie Mellon University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cmu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Support Team</md:GivenName>
+    <md:EmailAddress>shibboleth-team@andrew.cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Computing Services Help Center</md:GivenName>
+    <md:EmailAddress>it-help@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeffrey Eaton</md:GivenName>
+    <md:EmailAddress>jeaton@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Deborah Schill</md:GivenName>
+    <md:EmailAddress>dschill@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
index 823d7c33..6d2de2c8 100644
--- a/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.dhbw-heidenheim.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-18T15:07:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-18T15:07:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-heidenheim.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DHBW Heidenheim</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DHBW Heidenheim</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider für Angehörige der DHBW Heidenheim</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for members of DHBW Heidenheim</mdui:Description>
+        <mdui:Logo height="16" width="16">https://login.dhbw-heidenheim.de/idp/images/dhbw.ico</mdui:Logo>
+        <mdui:Logo height="71" width="426">https://login.dhbw-heidenheim.de/idp/images/dhbw-hdh-web.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dhbw-heidenheim.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dhbw-heidenheim.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-heidenheim.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DHBW Heidenheim</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DHBW Heidenheim</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider für Angehörige der DHBW Heidenheim</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for members of DHBW Heidenheim</mdui:Description>
-          <mdui:Logo height="16" width="16">https://login.dhbw-heidenheim.de/idp/images/dhbw.ico</mdui:Logo>
-          <mdui:Logo height="71" width="426">https://login.dhbw-heidenheim.de/idp/images/dhbw-hdh-web.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.dhbw-heidenheim.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.dhbw-heidenheim.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>login.dhbw-heidenheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=login.dhbw-heidenheim.de,OU=Heidenheim,O=Duale Hochschule Baden-Wuerttemberg,L=Heidenheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG0zCCBbugAwIBAgIHGJT3zZUAezANBgkqhkiG9w0BAQsFADByMQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>login.dhbw-heidenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=login.dhbw-heidenheim.de,OU=Heidenheim,O=Duale Hochschule Baden-Wuerttemberg,L=Heidenheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG0zCCBbugAwIBAgIHGJT3zZUAezANBgkqhkiG9w0BAQsFADByMQswCQYDVQQG
 EwJERTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJl
 cmcxFjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBk
 aGJ3LXZzLmRlMB4XDTE0MTEyNjA2NTkwOVoXDTE5MDcwOTIzNTkwMFowgaUxCzAJ
@@ -68,33 +68,33 @@ u2/8NrN63/uyzQZqXezMuxZGtISRhjGwT+qAQpzdnkYCUNM3JefJ0CciUbli22k2
 Cd57KQ9gjr2ZVwRl4I2+uN+fViiVtpm2jIMRQhJBnBjY3yNH9LgScagqJ0jorzJB
 hRxCQz6wGPVqxk8HY4ChZNjrhu4EKpQ=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dhbw-heidenheim.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-heidenheim.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>login.dhbw-heidenheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=login.dhbw-heidenheim.de,OU=Heidenheim,O=Duale Hochschule Baden-Wuerttemberg,L=Heidenheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG0zCCBbugAwIBAgIHGJT3zZUAezANBgkqhkiG9w0BAQsFADByMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dhbw-heidenheim.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-heidenheim.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>login.dhbw-heidenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=login.dhbw-heidenheim.de,OU=Heidenheim,O=Duale Hochschule Baden-Wuerttemberg,L=Heidenheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG0zCCBbugAwIBAgIHGJT3zZUAezANBgkqhkiG9w0BAQsFADByMQswCQYDVQQG
 EwJERTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJl
 cmcxFjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBk
 aGJ3LXZzLmRlMB4XDTE0MTEyNjA2NTkwOVoXDTE5MDcwOTIzNTkwMFowgaUxCzAJ
@@ -132,31 +132,31 @@ u2/8NrN63/uyzQZqXezMuxZGtISRhjGwT+qAQpzdnkYCUNM3JefJ0CciUbli22k2
 Cd57KQ9gjr2ZVwRl4I2+uN+fViiVtpm2jIMRQhJBnBjY3yNH9LgScagqJ0jorzJB
 hRxCQz6wGPVqxk8HY4ChZNjrhu4EKpQ=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e340</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e340</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Duale Hochschule Baden-Württemberg Heidenheim</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Duale Hochschule Baden-Württemberg Heidenheim</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.dhbw-heidenheim.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.dhbw-heidenheim.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e340</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e340</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Duale Hochschule Baden-Württemberg Heidenheim</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Duale Hochschule Baden-Württemberg Heidenheim</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.dhbw-heidenheim.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dhbw-heidenheim.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
index 99d2e4bb..79a75e0e 100644
--- a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.du.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="350" width="146">https://login.du.se/duse-logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="350" width="146">https://login.du.se/duse-logo-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>du.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="350" width="146">https://login.du.se/duse-logo-sv.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="350" width="146">https://login.du.se/duse-logo-en.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>du.se</mdui:DomainHint>
-          <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
-          <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
 MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
@@ -53,26 +53,26 @@ KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
 GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.du.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.du.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
 MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
@@ -92,36 +92,36 @@ KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
 GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.du.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Dalarna University</md:Company>
-      <md:SurName>IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Dalarna University</md:Company>
-      <md:SurName>IT-avdelningen</md:SurName>
-      <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Dalarna University</md:Company>
-      <md:SurName>Högskolan Dalarna Support</md:SurName>
-      <md:EmailAddress>mailto:support@du.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 23 778888</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.du.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Dalarna University</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Dalarna University</md:Company>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Dalarna University</md:Company>
+    <md:SurName>Högskolan Dalarna Support</md:SurName>
+    <md:EmailAddress>mailto:support@du.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 23 778888</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
index 02e8290e..65e592d2 100644
--- a/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.ecn.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-16T09:12:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-16T09:12:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Energieonderzoek Centrum Nederland</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Energieonderzoek Centrum Nederland</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Energieonderzoek Centrum Nederland</mdui:Description>
+        <mdui:Description xml:lang="en">Energieonderzoek Centrum Nederland</mdui:Description>
+        <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/ecn.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Energieonderzoek Centrum Nederland</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Energieonderzoek Centrum Nederland</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Energieonderzoek Centrum Nederland</mdui:Description>
-          <mdui:Description xml:lang="en">Energieonderzoek Centrum Nederland</mdui:Description>
-          <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/ecn.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/0b2fb22438aaa6a5e8b131f04a9f4607"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ecn.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/0b2fb22438aaa6a5e8b131f04a9f4607"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ecn.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml
index a11fee8a..47a9ceb8 100644
--- a/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.emory.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.emory.edu/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emory.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Emory University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.emory.edu/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emory.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Emory University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUfGsUnIe4ehQbVOK7801PiWLKSX8wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MB4XDTEwMDMyOTE2MjAwNVoX
 DTMwMDMyOTE2MjAwNVowGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MIIBIjAN
@@ -37,24 +37,24 @@ susrsZvVhayfNqiRlgvhHBpJTa9xUaAyZ45VUsieP4olSdfyiMVMIRkVgo/gF4W/
 4rjIktauEsi8Tj6QlhYFuo5WiEaVtNluIP3MzpBSxCUyEov49a4rxpHNKPxpSZyF
 GTDS8Zsm6tV8cZfn0eCypcm3lqm/X3HSODuN6n5+cVrRig01srF/2D9B1A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.emory.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.emory.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.emory.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.emory.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emory.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emory.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emory.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.emory.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.emory.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.emory.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.emory.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emory.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emory.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emory.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUfGsUnIe4ehQbVOK7801PiWLKSX8wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MB4XDTEwMDMyOTE2MjAwNVoX
 DTMwMDMyOTE2MjAwNVowGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MIIBIjAN
@@ -73,27 +73,27 @@ susrsZvVhayfNqiRlgvhHBpJTa9xUaAyZ45VUsieP4olSdfyiMVMIRkVgo/gF4W/
 4rjIktauEsi8Tj6QlhYFuo5WiEaVtNluIP3MzpBSxCUyEov49a4rxpHNKPxpSZyF
 GTDS8Zsm6tV8cZfn0eCypcm3lqm/X3HSODuN6n5+cVrRig01srF/2D9B1A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.emory.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.emory.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Emory University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Emory University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.emory.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Ellis</md:GivenName>
-      <md:EmailAddress>john.ellis@emory.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Anne Marie Alexander</md:GivenName>
-      <md:EmailAddress>anne.marie.alexander@emory.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter Day</md:GivenName>
-      <md:EmailAddress>peter.day@emory.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.emory.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.emory.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emory University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emory University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emory.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Ellis</md:GivenName>
+    <md:EmailAddress>john.ellis@emory.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anne Marie Alexander</md:GivenName>
+    <md:EmailAddress>anne.marie.alexander@emory.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter Day</md:GivenName>
+    <md:EmailAddress>peter.day@emory.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml
index ed15f786..1ffa6687 100644
--- a/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.ewu.edu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ewu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Eastern Washington University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://access.ewu.edu/OIT/Services/Accounts-Passwords.xml</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ewu.edu/Privacy-Policy.xml</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="180" xml:lang="en">https://login.ewu.edu/adfs/ls/images/ewulogo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ewu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Eastern Washington University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://access.ewu.edu/OIT/Services/Accounts-Passwords.xml</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ewu.edu/Privacy-Policy.xml</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="180" xml:lang="en">https://login.ewu.edu/adfs/ls/images/ewulogo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC1jCCAb6gAwIBAgIQd9rja1Yw76hDOrEcTgUaqjANBgkqhkiG9w0BAQsFADAn
 MSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbi5ld3UuZWR1MB4XDTE1MDky
 NjA0Mjk1NFoXDTE4MDkyNTA0Mjk1NFowJzElMCMGA1UEAxMcQURGUyBTaWduaW5n
@@ -39,24 +39,24 @@ sD++gFMNaUppLhyZE5sFBNYW0OuQLXTRsbY7b6o+7hhlNf+fJay3rEEiWCt80xKP
 XttampjZghUiB3nh4nQRLIIL8C/zUoCRJGKZGa7Um7hRBUH+NbeNMuRur7nLHqMC
 W9q2bbNngsgQ2w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ewu.edu/adfs/services/trust/artifactresolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ewu.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ewu.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eastern Washington University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Eastern Washington University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ewu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Gasper</md:GivenName>
-      <md:EmailAddress>jgasper@ewu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Gasper</md:GivenName>
-      <md:EmailAddress>jgasper@ewu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ewu.edu/adfs/services/trust/artifactresolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ewu.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ewu.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eastern Washington University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eastern Washington University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ewu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Gasper</md:GivenName>
+    <md:EmailAddress>jgasper@ewu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Gasper</md:GivenName>
+    <md:EmailAddress>jgasper@ewu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
index 2b16ba9a..f9b35c68 100644
--- a/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ezproxy.library.qmul.ac.uk/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-02T16:50:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-02T16:50:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFHzCCBAegAwIBAgIRANyZcMkOxifiYwLZXeooCQUwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMjgyMzU5NTlaMIHiMQswCQYD
@@ -39,29 +39,29 @@
 						UZ2o8/8T3a5/nnOtrKtdKbqRTQovbmwX5GkAKwkej4VRwObcYRvAHsznE0yuILAT
 						Cn1oyuVnnArb5xKg2XoAllszmA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary, University of London: EZProxy Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library Systems Team</md:GivenName>
-      <md:EmailAddress>mailto:lib-systems-team@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Evans</md:SurName>
-      <md:EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy</md:GivenName>
-      <md:SurName>Acland</md:SurName>
-      <md:EmailAddress>mailto:j.acland@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary, University of London: EZProxy Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:lib-systems-team@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Evans</md:SurName>
+    <md:EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy</md:GivenName>
+    <md:SurName>Acland</md:SurName>
+    <md:EmailAddress>mailto:j.acland@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml
index b552683a..11fd6898 100644
--- a/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fandm.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fandm.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Franklin &amp; Marshall College</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.fandm.edu/its/policies</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.fandm.edu/its/policies</mdui:PrivacyStatementURL>
+        <mdui:Logo height="77" width="265" xml:lang="en">https://secure.fandm.edu/images/fandmft.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fandm.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Franklin &amp; Marshall College</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.fandm.edu/its/policies</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.fandm.edu/its/policies</mdui:PrivacyStatementURL>
-          <mdui:Logo height="77" width="265" xml:lang="en">https://secure.fandm.edu/images/fandmft.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkACCQCgR54qxO43SDANBgkqhkiG9w0BAQUFADBuMRgwFgYDVQQDDA9s
 b2dpbi5mYW5kbS5lZHUxJDAiBgNVBAoMG0ZyYW5rbGluICYgTWFyc2hhbGwgQ29s
 bGVnZTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0
@@ -41,13 +41,13 @@ PKzE57kTpjjW07EiRyJoX5ZJgEAahuqnHr6oiPte03+wTNsggU/GPXtdHoLbuMb9
 Zu6vJeprCmXU9SY6J15CXDaG0QVXnwBgmYJSE6DJyjDRm/DQx8f2d2zA0AUueVRL
 Tst5Vgudzgfdi5v2XmFJxVABbku9IJRRBBIDfChUtC2b8LJl7PA34qknhMg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDvDCCAqQCCQDnGiNHgho1rjANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0ZXIxJDAiBgNVBAoMG0Zy
 YW5rbGluICYgTWFyc2hhbGwgQ29sbGVnZTEMMAoGA1UECwwDSVRTMRgwFgYDVQQD
@@ -69,24 +69,24 @@ OkLkJ88iMFpMBUxj4EuKNLP5XPj20ofG0H2yIiVUvOpAjU4lAqekKY16vnl7hJe4
 iwfMfHgdJvFXhnlv6keguRFmm3Kmdo9zVoHYI4QeMk7hhk2OYyoZMR1IFcMN16P9
 6y60fPr2Yyp6e9uyGPEZv4Qfum6VSa56tN9MXL3PQO0CHADwmM/PrucSPtYd6LR6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fandm.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fandm.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fandm.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fandm.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fandm.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fandm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fandm.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fandm.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fandm.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fandm.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fandm.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fandm.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fandm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fandm.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkACCQCgR54qxO43SDANBgkqhkiG9w0BAQUFADBuMRgwFgYDVQQDDA9s
 b2dpbi5mYW5kbS5lZHUxJDAiBgNVBAoMG0ZyYW5rbGluICYgTWFyc2hhbGwgQ29s
 bGVnZTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0
@@ -106,13 +106,13 @@ PKzE57kTpjjW07EiRyJoX5ZJgEAahuqnHr6oiPte03+wTNsggU/GPXtdHoLbuMb9
 Zu6vJeprCmXU9SY6J15CXDaG0QVXnwBgmYJSE6DJyjDRm/DQx8f2d2zA0AUueVRL
 Tst5Vgudzgfdi5v2XmFJxVABbku9IJRRBBIDfChUtC2b8LJl7PA34qknhMg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDvDCCAqQCCQDnGiNHgho1rjANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0ZXIxJDAiBgNVBAoMG0Zy
 YW5rbGluICYgTWFyc2hhbGwgQ29sbGVnZTEMMAoGA1UECwwDSVRTMRgwFgYDVQQD
@@ -134,27 +134,27 @@ OkLkJ88iMFpMBUxj4EuKNLP5XPj20ofG0H2yIiVUvOpAjU4lAqekKY16vnl7hJe4
 iwfMfHgdJvFXhnlv6keguRFmm3Kmdo9zVoHYI4QeMk7hhk2OYyoZMR1IFcMN16P9
 6y60fPr2Yyp6e9uyGPEZv4Qfum6VSa56tN9MXL3PQO0CHADwmM/PrucSPtYd6LR6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fandm.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fandm.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Franklin &amp; Marshall College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Franklin &amp; Marshall College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fandm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Alan Sutter</md:GivenName>
-      <md:EmailAddress>alan.sutter@fandm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Todd Higgins</md:GivenName>
-      <md:EmailAddress>thiggins@fandm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Baron</md:GivenName>
-      <md:EmailAddress>jbaron1@fandm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fandm.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fandm.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Franklin &amp; Marshall College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Franklin &amp; Marshall College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fandm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Alan Sutter</md:GivenName>
+    <md:EmailAddress>alan.sutter@fandm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Todd Higgins</md:GivenName>
+    <md:EmailAddress>thiggins@fandm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Baron</md:GivenName>
+    <md:EmailAddress>jbaron1@fandm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
index 77abf247..1a598857 100644
--- a/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fanshawec.ca/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
                 http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
             </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fanshawec.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Fanshawe College</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Fanshawe College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Fanshawe College</mdui:Description>
+        <mdui:Description xml:lang="fr">Fanshawe College</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fanshawec.ca/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.fanshawec.ca/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fanshawec.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Fanshawe College</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">Fanshawe College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Fanshawe College</mdui:Description>
-          <mdui:Description xml:lang="fr">Fanshawe College</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fanshawec.ca/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fr">http://www.fanshawec.ca/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                         MIIDMzCCAhugAwIBAgIUCXF2tM/DJVzBFEwQQH2q5KLdt3UwDQYJKoZIhvcNAQEF BQAwHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNhMB4XDTEzMTEwODE4Mzc0 MloXDTMzMTEwODE4Mzc0MlowHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNh MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiuS4iCDj0Nr7+o+sY+5N CZ1sx6RLgx00FlwQep1t8D8Aszrt+5dF2YzwhHYS80NtlB+aGjoK/Qfd2hPi7PXL CtZ7fCFJu2hEW3Nsit4zWeT6rwtivzXdVU8hzJ+IE71OzY0fhN+8TByzdxCzG2qp q77lxYvtk/HBQ7P3PnWSblEdiMD3x9hLGRpojPBtvMkFwBi28q+lkb8tIHHOPnNX 8dA3j455JUZw0Tt7GFDqi9/Ists7v5sGUT3u3A3+CB4TP8G8Y23XIdj085erMZHQ fOkxb0mMYSvXYRwZ8BAog9rp8EjiiOSr7/U3r4VLqWeMFtalNOAGm0DD9W0/g/Ym 9wIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5mYW5zaGF3ZWMuY2GGKWh0dHBz Oi8vbG9naW4uZmFuc2hhd2VjLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQl f5iwDg4cIOa6dyG4kxa5k4QE0jANBgkqhkiG9w0BAQUFAAOCAQEAKudffW4nWF+/ 3GDt54Jbq5DWogflPP9KhZMYy3L/G241zXvqqu/OyM+dw8qx9p5YCgvhGYBJJ+b7 n63f9QhK0y0K+r7sgy+Mce3Ceo33e0sglP9orY/xSu7iryQnVnNtRI/UFdOvEPc8 JPvaf+yKHnAkpzyWYI8FZragWJXpa2MVzTTKqqEdYsMES5NQ5U7Zv5A/tY/D90Cx 3R5IaWcxDxVgOZziRniD8XD5EWmAMLhl4emeWQXyfI6LuhL4pTaaR1XUxaouCkj2 K2PKk+T/tJ7BHzT8hbdIlYt08yDPLB6nwvEMRNGoy5yn5zDFFMzxV0DS043+xfCJ 2oLUUamGDQ==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fanshawec.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fanshawec.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fanshawec.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fanshawec.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
             urn:oasis:names:tc:SAML:2.0:nameid-format:transient
         </md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fanshawec.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fanshawec.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(.*\.|)fanshawec.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fanshawec.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fanshawec.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(.*\.|)fanshawec.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                         MIIDMzCCAhugAwIBAgIUCXF2tM/DJVzBFEwQQH2q5KLdt3UwDQYJKoZIhvcNAQEF BQAwHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNhMB4XDTEzMTEwODE4Mzc0 MloXDTMzMTEwODE4Mzc0MlowHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNh MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiuS4iCDj0Nr7+o+sY+5N CZ1sx6RLgx00FlwQep1t8D8Aszrt+5dF2YzwhHYS80NtlB+aGjoK/Qfd2hPi7PXL CtZ7fCFJu2hEW3Nsit4zWeT6rwtivzXdVU8hzJ+IE71OzY0fhN+8TByzdxCzG2qp q77lxYvtk/HBQ7P3PnWSblEdiMD3x9hLGRpojPBtvMkFwBi28q+lkb8tIHHOPnNX 8dA3j455JUZw0Tt7GFDqi9/Ists7v5sGUT3u3A3+CB4TP8G8Y23XIdj085erMZHQ fOkxb0mMYSvXYRwZ8BAog9rp8EjiiOSr7/U3r4VLqWeMFtalNOAGm0DD9W0/g/Ym 9wIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5mYW5zaGF3ZWMuY2GGKWh0dHBz Oi8vbG9naW4uZmFuc2hhd2VjLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQl f5iwDg4cIOa6dyG4kxa5k4QE0jANBgkqhkiG9w0BAQUFAAOCAQEAKudffW4nWF+/ 3GDt54Jbq5DWogflPP9KhZMYy3L/G241zXvqqu/OyM+dw8qx9p5YCgvhGYBJJ+b7 n63f9QhK0y0K+r7sgy+Mce3Ceo33e0sglP9orY/xSu7iryQnVnNtRI/UFdOvEPc8 JPvaf+yKHnAkpzyWYI8FZragWJXpa2MVzTTKqqEdYsMES5NQ5U7Zv5A/tY/D90Cx 3R5IaWcxDxVgOZziRniD8XD5EWmAMLhl4emeWQXyfI6LuhL4pTaaR1XUxaouCkj2 K2PKk+T/tJ7BHzT8hbdIlYt08yDPLB6nwvEMRNGoy5yn5zDFFMzxV0DS043+xfCJ 2oLUUamGDQ==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fanshawec.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fanshawec.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
             urn:oasis:names:tc:SAML:2.0:nameid-format:transient
         </md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Fanshawe College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Fanshawe College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://fanshawec.ca</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Technical contact</md:SurName>
-      <md:EmailAddress>pgilbert@fanshawec.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Fanshawe College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Fanshawe College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://fanshawec.ca</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical contact</md:SurName>
+    <md:EmailAddress>pgilbert@fanshawec.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
index 324424d0..0e21de8f 100644
--- a/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fhv.at/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhv.at</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclv.net</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.fhv.at</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">schlosshofen.at</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.schlosshofen.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
+        <mdui:Logo height="57" width="113">https://login.fhv.at/fhv-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhv.at</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclv.net</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.fhv.at</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">schlosshofen.at</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.schlosshofen.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
-          <mdui:Logo height="57" width="113">https://login.fhv.at/fhv-logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVANvjM2hsZMTPMmIUd7JVjV9bZ4d1MA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDAeFw0xMTA3MjYwOTQ1MTRaFw0z
 MTA3MjYwOTQ1MTRaMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDCCASIwDQYJKoZI
@@ -46,32 +46,32 @@ ewmlLixdIpZYWbQTkSovm0InLzBuoF77CFul8Nt2oIlbLg9Qfd4f94RsaNx/2MrZ
 /YXD0gncEwV9ijUqIUGJuGicMrTGeLhxlr6bltA8K9RyTgAU3dCImRUX0tbK0jRa
 ApOxw/gcmrRQwbhGEghVXhv3KlZ/xEkpVndXwiF651w=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fhv.at/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhv.at/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fhv.at/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhv.at/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Fachhochschule Vorarlberg GmbH</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Fachhochschule Vorarlberg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fhv.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fhv.at/en-fhv-portal?set_language=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>FHV</md:GivenName>
-      <md:SurName>System Management</md:SurName>
-      <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>FHV</md:GivenName>
-      <md:SurName>System Management</md:SurName>
-      <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fhv.at/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhv.at/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fhv.at/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhv.at/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Fachhochschule Vorarlberg GmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Vorarlberg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhv.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhv.at/en-fhv-portal?set_language=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>FHV</md:GivenName>
+    <md:SurName>System Management</md:SurName>
+    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>FHV</md:GivenName>
+    <md:SurName>System Management</md:SurName>
+    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.figsh.com-shibboleth.xml b/swamid-interfederations-2.0/login.figsh.com-shibboleth.xml
index 29c14f19..87445d50 100644
--- a/swamid-interfederations-2.0/login.figsh.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.figsh.com-shibboleth.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.figsh.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-26T09:14:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-26T09:14:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">figshare - stage</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud based repository for citable and discoverable research outputs</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/DS-Tuakiri"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figsh.com/Shibboleth.sso/DS-Tuakiri" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/DS-AAF"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figsh.com/Shibboleth.sso/DS-AAF" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/DS-UKF"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figsh.com/Shibboleth.sso/DS-UKF" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">figshare - stage</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Cloud based repository for citable and discoverable research outputs</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/DS-Tuakiri"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figsh.com/Shibboleth.sso/DS-Tuakiri" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/DS-AAF"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figsh.com/Shibboleth.sso/DS-AAF" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figsh.com/Shibboleth.sso/DS-UKF"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figsh.com/Shibboleth.sso/DS-UKF" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAINH4QeRdG4MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD2xvZ2luLmZpZ3NoLmNvbTAeFw0xNTAyMjIxNDU2NDBaFw0yNTAyMTkxNDU2
 						NDBaMBoxGDAWBgNVBAMTD2xvZ2luLmZpZ3NoLmNvbTCCASIwDQYJKoZIhvcNAQEB
@@ -56,43 +56,43 @@
 						X1Qnl4KpMY0bpGcnwMCRsptHxx/+dRKnli92HoZu814RTjBDYocFLfig8+i6tN3h
 						j9He1kO/aRDrQ+eJ+ussgNgbgO1BeUoZURlifrW5ofHXTs3DIpNF9g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figsh.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figsh.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.figsh.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figsh.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figsh.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figsh.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.figsh.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figsh.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.figsh.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.figsh.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.figsh.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Figshare LLP</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">figshare stage SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://figshare.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Gavrila</md:SurName>
-      <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Gavrila</md:SurName>
-      <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figsh.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figsh.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.figsh.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figsh.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figsh.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figsh.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.figsh.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figsh.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.figsh.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.figsh.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.figsh.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Figshare LLP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">figshare stage SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://figshare.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Gavrila</md:SurName>
+    <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Gavrila</md:SurName>
+    <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.figshare.com-shibboleth.xml b/swamid-interfederations-2.0/login.figshare.com-shibboleth.xml
index 859f300f..c52404da 100644
--- a/swamid-interfederations-2.0/login.figshare.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.figshare.com-shibboleth.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.figshare.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-26T09:27:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-26T09:27:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">figshare</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud based repository for citable and discoverable research outputs</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/DS-Tuakiri"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figshare.com/Shibboleth.sso/DS-Tuakiri" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/DS-AAF"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figshare.com/Shibboleth.sso/DS-AAF" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/DS-UKF"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figshare.com/Shibboleth.sso/DS-UKF" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">figshare</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Cloud based repository for citable and discoverable research outputs</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/DS-Tuakiri"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figshare.com/Shibboleth.sso/DS-Tuakiri" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/DS-AAF"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figshare.com/Shibboleth.sso/DS-AAF" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://login.figshare.com/Shibboleth.sso/DS-UKF"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.figshare.com/Shibboleth.sso/DS-UKF" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/TCCAeWgAwIBAgIJAK4oUXPZlUI6MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEmxvZ2luLmZpZ3NoYXJlLmNvbTAeFw0xNTAyMjMxNzAxNTRaFw0yNTAyMjAx
 						NzAxNTRaMB0xGzAZBgNVBAMTEmxvZ2luLmZpZ3NoYXJlLmNvbTCCASIwDQYJKoZI
@@ -57,43 +57,43 @@
 						mwc0DpOT1TgWrS49lmpDkxkz5ofJhh6T6Wd1DAqpn+fuQKwvcPbLCIChPVNRh22s
 						LQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figshare.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figshare.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.figshare.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figshare.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figshare.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figshare.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.figshare.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figshare.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.figshare.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.figshare.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.figshare.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Figshare LLP</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">figshare</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://figshare.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Gavrila</md:SurName>
-      <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Gavrila</md:SurName>
-      <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figshare.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figshare.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.figshare.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figshare.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figshare.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figshare.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.figshare.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figshare.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.figshare.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.figshare.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.figshare.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Figshare LLP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">figshare</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://figshare.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Gavrila</md:SurName>
+    <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Gavrila</md:SurName>
+    <md:EmailAddress>mailto:danielduduta@figshare.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
index 8ce16b81..f905738b 100644
--- a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fmach.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-01-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-01-03T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige users</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.fmach.it/idem</mdui:InformationURL>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmach.eu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti di Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige users</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.fmach.it/idem</mdui:InformationURL>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmach.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAL7RygPVs9a1+rjGCPpUtPOFwEDPMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmxvZ2luLmZtYWNoLmV1MB4XDTExMDYxMDA3NDEzNloX
 DTMxMDYxMDA3NDEzNlowGTEXMBUGA1UEAxMObG9naW4uZm1hY2guZXUwggEiMA0G
@@ -38,26 +38,26 @@ RprHixFjI9xrgp4Zet8rYTv/o8/LojuPVm/fmJiw0GCJ0u0hw53ZlXXM60DvXXoQ
 TXqc4gocZlFG277Sgl/6aJfl0lfQPgPE/dxVNZlPDXsjIiSUcoZxxCn3OgL/BvnO
 uvwjEOFt6flbryZ1Zz0z3DZK6p8V+wwSgUEXsY09lhmVtD0h++crnQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fmach.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fmach.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fmach.eu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fmach.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fmach.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fmach.eu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmach.eu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fmach.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fmach.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fmach.eu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fmach.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fmach.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fmach.eu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmach.eu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAL7RygPVs9a1+rjGCPpUtPOFwEDPMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmxvZ2luLmZtYWNoLmV1MB4XDTExMDYxMDA3NDEzNloX
 DTMxMDYxMDA3NDEzNlowGTEXMBUGA1UEAxMObG9naW4uZm1hY2guZXUwggEiMA0G
@@ -76,23 +76,23 @@ RprHixFjI9xrgp4Zet8rYTv/o8/LojuPVm/fmJiw0GCJ0u0hw53ZlXXM60DvXXoQ
 TXqc4gocZlFG277Sgl/6aJfl0lfQPgPE/dxVNZlPDXsjIiSUcoZxxCn3OgL/BvnO
 uvwjEOFt6flbryZ1Zz0z3DZK6p8V+wwSgUEXsY09lhmVtD0h++crnQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fmach.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fmach.eu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.fmach.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fmach.it/eng</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@fmach.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fmach.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fmach.eu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.fmach.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fmach.it/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@fmach.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index 28d67a63..5cf76618 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.helsinki.fi/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFnDCCBISgAwIBAgIQaa2rCkgYcvukeleEtUvyozANBgkqhkiG9w0BAQsFADBk
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFnDCCBISgAwIBAgIQaa2rCkgYcvukeleEtUvyozANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMjAeFw0xNTA0MjcwMDAwMDBaFw0xODA2MTMyMzU5NTlaMD8xITAfBgNVBAsT
@@ -52,32 +52,32 @@ CmB44srsj10lKAHcCDYbxUNj+EbewMXkXqBybjkqlih5JjdlH1eA72M8aDvtHIi9
 7YOfX0qkuYX1MC17UL+IlD1Ed5oSdckyPUCDrTksNmZ3AegQVJlDmk8KL7xXm6qZ
 1JFj+dX1uM1cPa0sf0ZK6fI8aOhPhKz+usclFplwR7ohnEp60S3KgH9VbhHpjItj
 DjLzl9rFbErZuexB3N7XJhesfd5IwneNaJ2oVjJZB9gzknuG6bwrURgOA8sHcxV0</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janne</md:GivenName>
-      <md:SurName>Peltonen</md:SurName>
-      <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Juha</md:GivenName>
-      <md:SurName>Niemi</md:SurName>
-      <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Juha</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml
index d35a9818..3e0508dc 100644
--- a/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hmc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.hmc.edu/idp/shibboleth/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hmc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Harvey Mudd College</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.hmc.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hmc.edu/cis/about-cis/policies/claremont-appropriate-use-policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="150" xml:lang="en">https://www.hmc.edu/communications/wp-content/uploads/sites/19/2013/11/HMC-BGW-RGB-150dpi-150x150.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.hmc.edu/idp/shibboleth/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hmc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Harvey Mudd College</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.hmc.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.hmc.edu/cis/about-cis/policies/claremont-appropriate-use-policy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="150" xml:lang="en">https://www.hmc.edu/communications/wp-content/uploads/sites/19/2013/11/HMC-BGW-RGB-150dpi-150x150.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGjCCAgKgAwIBAgIUN47xMNeIGq+9fTb4aJR1KEWc7wswDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVyaWRlbnRpdHkuY29tMB4XDTExMTIx
 MjE2NTc0NFoXDTMxMTIxMjE2NTc0NFowIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVy
@@ -40,31 +40,31 @@ pi+52yms2KD8klrC+Ptq76kKetJifRalHNK0cEMzNae6s+sQYxGVhqOHijEgXvTB
 abocdzekYdo3N1BoA3TNcqWvBcVEt6m9iW/cDKMr8xlkpII8A8p9piPozcFmCDll
 ip/lOg2kOdU7AB80pFPqQLvDSArQpzItz88dbws6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hmc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Harvey Mudd College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Harvey Mudd College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hmc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Cindy Abercrombie</md:GivenName>
-      <md:EmailAddress>cabercrombie@hmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mitch Shacklett</md:GivenName>
-      <md:EmailAddress>mshacklett@hmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Duke Vu</md:GivenName>
-      <md:EmailAddress>dvu@hmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy Davenport</md:GivenName>
-      <md:EmailAddress>andy@hmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hmc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hmc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Harvey Mudd College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Harvey Mudd College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hmc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Cindy Abercrombie</md:GivenName>
+    <md:EmailAddress>cabercrombie@hmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mitch Shacklett</md:GivenName>
+    <md:EmailAddress>mshacklett@hmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Duke Vu</md:GivenName>
+    <md:EmailAddress>dvu@hmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy Davenport</md:GivenName>
+    <md:EmailAddress>andy@hmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml b/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml
index 9a0fb5da..b4d51a38 100644
--- a/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.icermali.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.icermali.org/federation/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icermali.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ICER - Mali</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://login.icermali.org/federation/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://login.icermali.org/federation/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://login.icermali.org/federation/ui/logo/icermalilogo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.icermali.org/federation/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icermali.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ICER - Mali</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://login.icermali.org/federation/info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://login.icermali.org/federation/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://login.icermali.org/federation/ui/logo/icermalilogo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC/TCCAeWgAwIBAgIJAP/E5zTtSKQRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
 BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI3NDBaFw0yNTA1MDQy
 MDI3NDBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
@@ -43,13 +43,13 @@ IQOJxWPA3xS0JvEmdZRpcZzjo8quu4BM4J/FpBxCfLuEuNlhost8CuuYSphn10DQ
 b8J09UEArwi0vrZHClp0AanLon5PFgAkiXyT892CPD+Syo1ZFFMpB6JClp4Qh5cJ
 sQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC/TCCAeWgAwIBAgIJAIEHUdC/eXeBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
 BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI2MzBaFw0yNTA1MDQy
 MDI2MzBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
@@ -68,23 +68,23 @@ qC8+CU4C7E3PNpBU8tx3U3ZKwojStWpiiz82uoxewYxy1xla3hfVV7d0isR8YJhD
 O1GdrLusEqTXS0x86NfP8+J63P3Gd3iwpmHnFvuYu2OVDVeLas+nHQVkThNbnqN8
 cQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.icermali.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.icermali.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.icermali.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icermali.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.icermali.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.icermali.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.icermali.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icermali.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC/TCCAeWgAwIBAgIJAP/E5zTtSKQRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
 BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI3NDBaFw0yNTA1MDQy
 MDI3NDBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
@@ -103,13 +103,13 @@ IQOJxWPA3xS0JvEmdZRpcZzjo8quu4BM4J/FpBxCfLuEuNlhost8CuuYSphn10DQ
 b8J09UEArwi0vrZHClp0AanLon5PFgAkiXyT892CPD+Syo1ZFFMpB6JClp4Qh5cJ
 sQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC/TCCAeWgAwIBAgIJAIEHUdC/eXeBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
 BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI2MzBaFw0yNTA1MDQy
 MDI2MzBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
@@ -128,30 +128,30 @@ qC8+CU4C7E3PNpBU8tx3U3ZKwojStWpiiz82uoxewYxy1xla3hfVV7d0isR8YJhD
 O1GdrLusEqTXS0x86NfP8+J63P3Gd3iwpmHnFvuYu2OVDVeLas+nHQVkThNbnqN8
 cQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ICER - Mali</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-      <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ICER - Mali</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
+    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml b/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml
index 28f12bb7..660d50e6 100644
--- a/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.iceruganda.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.iceruganda.org/federation/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceruganda.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ICER - Uganda</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://login.iceruganda.org/federation/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://login.iceruganda.org/federation/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://login.iceruganda.org/federation/ui/logo/icerugandalogo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.iceruganda.org/federation/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceruganda.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ICER - Uganda</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://login.iceruganda.org/federation/info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://login.iceruganda.org/federation/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://login.iceruganda.org/federation/ui/logo/icerugandalogo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAMx+qfsrxTy3MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
 BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMDYzN1oXDTI1MDUw
 NDIwMDYzN1owHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
@@ -43,13 +43,13 @@ UA2aWOI0QLY0u9SzjDfLu/izfY31SBGFezTKoTJjFvp0ix4xhx0uDrkAhXOx/Ji7
 Btg/mqYjzfnR35ziLKAB7wcG7ldYEp7NOy2dMUk21w6x0HVVXbPtwO6Dl+9jf4tW
 nWg+uFqEKQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAOV+XCm7XZ1cMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
 BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMTM0MVoXDTI1MDUw
 NDIwMTM0MVowHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
@@ -68,23 +68,23 @@ rv+/S1JWmYL0m2zX26MZIGzkdiEEQ+E979NF2tENKRFQ4/tVBWieMgwDXj8ueshs
 XFFuLjqh9cAsGDHv3B+Elm2QjpsbKtq4Pa8jG322UixM3w5Y3t1KhP73BiWjUCYf
 xX3P5EdlXw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.iceruganda.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.iceruganda.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.iceruganda.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceruganda.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.iceruganda.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.iceruganda.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.iceruganda.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceruganda.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAMx+qfsrxTy3MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
 BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMDYzN1oXDTI1MDUw
 NDIwMDYzN1owHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
@@ -103,13 +103,13 @@ UA2aWOI0QLY0u9SzjDfLu/izfY31SBGFezTKoTJjFvp0ix4xhx0uDrkAhXOx/Ji7
 Btg/mqYjzfnR35ziLKAB7wcG7ldYEp7NOy2dMUk21w6x0HVVXbPtwO6Dl+9jf4tW
 nWg+uFqEKQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIJAOV+XCm7XZ1cMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
 BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMTM0MVoXDTI1MDUw
 NDIwMTM0MVowHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
@@ -128,30 +128,30 @@ rv+/S1JWmYL0m2zX26MZIGzkdiEEQ+E979NF2tENKRFQ4/tVBWieMgwDXj8ueshs
 XFFuLjqh9cAsGDHv3B+Elm2QjpsbKtq4Pa8jG322UixM3w5Y3t1KhP73BiWjUCYf
 xX3P5EdlXw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ICER - Uganda</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-      <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ICER - Uganda</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
+    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
index 64df53e5..66f5a9dc 100644
--- a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.idp.eduid.se/idp.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduid.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
+        <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduid.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
-          <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
 RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
 MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
 EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
@@ -52,13 +52,13 @@ eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
 FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
 iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
 RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
 MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
 EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
@@ -78,36 +78,36 @@ eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
 FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
 iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">eduID</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">eduID</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>eduID</md:Company>
-      <md:SurName>Valter Nordh</md:SurName>
-      <md:EmailAddress>mailto:valter@sunet.se</md:EmailAddress>
-      <md:TelephoneNumber>+46707884742</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>eduID</md:Company>
-      <md:SurName>SUNET eduID team</md:SurName>
-      <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>eduID</md:Company>
-      <md:SurName>eduID Support</md:SurName>
-      <md:EmailAddress>mailto:support@eduid.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduID</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>eduID</md:Company>
+    <md:SurName>Valter Nordh</md:SurName>
+    <md:EmailAddress>mailto:valter@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46707884742</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>eduID</md:Company>
+    <md:SurName>SUNET eduID team</md:SurName>
+    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>eduID</md:Company>
+    <md:SurName>eduID Support</md:SurName>
+    <md:EmailAddress>mailto:support@eduid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
index a5b9bdfa..b43ae321 100644
--- a/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.idp.hhs.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Stockholm School of Economics</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Handelshögskolan i Stockholm.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Economics.</mdui:Description>
+        <mdui:Logo height="82" width="82">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
+        <mdui:DomainHint>hhs.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Stockholm School of Economics</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Handelshögskolan i Stockholm.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Economics.</mdui:Description>
-          <mdui:Logo height="82" width="82">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
-          <mdui:DomainHint>hhs.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
 WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
@@ -41,27 +41,27 @@ sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
 Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
 Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
 UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
 WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
@@ -78,23 +78,23 @@ sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
 Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
 Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
 UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HHS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hhs.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Handelshögskolan i Stockholm</md:Company>
-      <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HHS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hhs.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Handelshögskolan i Stockholm</md:Company>
+    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
index f78b1726..7158b130 100644
--- a/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.insa-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-27T12:03:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-27T12:03:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA Lyon</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABeUlEQVQoz93SzyuDcRwH8M/n63m2pzYPYonNEjOSdlguLjgpSSNFSTn4NQ7+A+VAjshJoUgc5ELGhYz8Kg6TWhqG8utgvx7PtmfPs+/XhT9gFwfv8/t1eNcbGWOQSUhG7b8BkRpbcnMj2tQQqS4FSsMiKjvbiaWFT8QQorLnAQB5fCxcYVaXFlxdXRx9fwZKWShE/U/pWz+VgL6+xAeHDWur2tWl1NyiZ0yZnUCLjXgPqhwOArwAiEAI2q2K14tGAF4HAMm5aZ2rrYAxSCRYBIR+t7yyXud0/m5IJvQDI6nlRTAY0Jid+xhkd76v+sZYd6d67QMAoaeXAYhnJ9wP0DQsNgMwIFz6PgBcVo7/LT41mZqfUcrK0ZwXqTRBkVidn0/gXWKqyj6CIMt69yh7i6IgyO0dX0N92uE+Flu13S1SZBEvAiwcM95cY3LXw9nt6eADsZQQk0k9PeUcDuT51PERCoK+1aXseUhhIe+sVc/PqBTD/3CNTME3BUSfUsHufLQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDAgd+YlAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwUSpemQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-lyon.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">everyone at INSA Lyon</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">INSA Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">toutes population (etudiants/personnels) de l'INSA Lyon</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-lyon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSA Lyon</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABeUlEQVQoz93SzyuDcRwH8M/n63m2pzYPYonNEjOSdlguLjgpSSNFSTn4NQ7+A+VAjshJoUgc5ELGhYz8Kg6TWhqG8utgvx7PtmfPs+/XhT9gFwfv8/t1eNcbGWOQSUhG7b8BkRpbcnMj2tQQqS4FSsMiKjvbiaWFT8QQorLnAQB5fCxcYVaXFlxdXRx9fwZKWShE/U/pWz+VgL6+xAeHDWur2tWl1NyiZ0yZnUCLjXgPqhwOArwAiEAI2q2K14tGAF4HAMm5aZ2rrYAxSCRYBIR+t7yyXud0/m5IJvQDI6nlRTAY0Jid+xhkd76v+sZYd6d67QMAoaeXAYhnJ9wP0DQsNgMwIFz6PgBcVo7/LT41mZqfUcrK0ZwXqTRBkVidn0/gXWKqyj6CIMt69yh7i6IgyO0dX0N92uE+Flu13S1SZBEvAiwcM95cY3LXw9nt6eADsZQQk0k9PeUcDuT51PERCoK+1aXseUhhIe+sVc/PqBTD/3CNTME3BUSfUsHufLQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDAgd+YlAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwUSpemQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-lyon.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">everyone at INSA Lyon</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">INSA Lyon</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">toutes population (etudiants/personnels) de l'INSA Lyon</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUSMWboaAOUaXanB/KMcwBhD32kfYwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZyMB4XDTEyMDQyNTExNDMz
 NFoXDTMyMDQyNTExNDMzNFowHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZy
@@ -40,26 +40,26 @@ srGPvbAUqLsg9Z5kKNUQ8uTtXDpAVobHIh2p1/HBCm6DsJH3phk4U8khzzFcWrXg
 Hz6zqkIwcnbaal37SlVeiO+ZbBOxuxMRhqvg+jHw/G+35qj+MctKIfQ26mPLssmJ
 pWJ/IW9yrw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.insa-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.insa-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.insa-lyon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSA Lyon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSA Lyon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-lyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Olivier FRANCO</md:SurName>
-      <md:EmailAddress>olivier.franco@insa-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Damien BERJOAN</md:SurName>
-      <md:EmailAddress>damien.berjoan@insa-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.insa-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.insa-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.insa-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSA Lyon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA Lyon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-lyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Olivier FRANCO</md:SurName>
+    <md:EmailAddress>olivier.franco@insa-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Damien BERJOAN</md:SurName>
+    <md:EmailAddress>damien.berjoan@insa-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.justis.com.xml b/swamid-interfederations-2.0/login.justis.com.xml
index feb8c06b..f57c9589 100644
--- a/swamid-interfederations-2.0/login.justis.com.xml
+++ b/swamid-interfederations-2.0/login.justis.com.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.justis.com">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEADCCAuigAwIBAgIJAOUEkaPJ2Bd5MA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHjAcBgNV
 						BAoMFUp1c3RpcyBQdWJsaXNoaW5nIEx0ZDEUMBIGA1UECwwLRGV2ZWxvcG1lbnQx
@@ -31,42 +31,42 @@
 						NIvd6OcCOBRPMOvpQ4W5ZAMlO7++IzhzP7s2kHgb6yXBWvzJQx8aK8C1aE2eBBJK
 						+Y+kE//yTUdY4YMzolvRCyf44z8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/shibboleth/post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/shibboleth/artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/oa/auth/rcv/shib/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/oa/auth/rcv/shib/art" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.justis.com/oa/auth/rcv/saml2/post" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signin.justis.com/oa/auth/rcv/saml2/art" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/shibboleth/post" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/shibboleth/artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/oa/auth/rcv/shib/post" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/oa/auth/rcv/shib/art" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.justis.com/oa/auth/rcv/saml2/post" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.justis.com/oa/auth/rcv/saml2/art" index="12"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Justis Publishing</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Justis Publishing Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Justis Publishing</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.justispublishing.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@justis.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ravi</md:GivenName>
-      <md:SurName>Ganapathi</md:SurName>
-      <md:EmailAddress>mailto:ravi.ganapathi@justis.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/shibboleth/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/shibboleth/artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/oa/auth/rcv/shib/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/oa/auth/rcv/shib/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.justis.com/oa/auth/rcv/saml2/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signin.justis.com/oa/auth/rcv/saml2/art" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/shibboleth/post" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/shibboleth/artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/oa/auth/rcv/shib/post" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/oa/auth/rcv/shib/art" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.justis.com/oa/auth/rcv/saml2/post" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.justis.com/oa/auth/rcv/saml2/art" index="12"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Justis Publishing</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Justis Publishing Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Justis Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.justispublishing.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@justis.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ravi</md:GivenName>
+    <md:SurName>Ganapathi</md:SurName>
+    <md:EmailAddress>mailto:ravi.ganapathi@justis.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
index 1b998158..9e530e19 100644
--- a/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.jyu.fi-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.jyu.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Jyväskylän yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Jyväskylä universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Jyväskylä</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Jyväskylän yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Jyväskylä universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Jyväskylä</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
 VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
 biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
 LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
@@ -43,22 +43,22 @@ QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
 lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
 ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
 OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.jyu.fi/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.jyu.fi/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.jyu.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.jyu.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.jyu.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.jyu.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jyu.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyjCCArICCQC/3Ou0lsl3wzANBgkqhkiG9w0BAQUFADCBpjEgMB4GA1UEChMX
 VW5pdmVyc2l0eSBvZiBKeXZhc2t5bGExKTAnBgNVBAsTIEhha2EgZmVkZXJhdGlv
 biBzZWxmLXNpZ25lZCBjZXJ0MR8wHQYJKoZIhvcNAQkBFhB1c2VyYWRtaW5Aanl1
 LmZpMRIwEAYDVQQHEwlKeXZhc2t5bGExCzAJBgNVBAYTAkZJMRUwEwYDVQQDEwxs
@@ -79,27 +79,27 @@ QwNNrLA+WptOoM78cnMqm5EcPNAVr3JnxUQ7qUxU0pptTVc+R2Jqq26ASoMfoxDC
 lW022c90W26TOCwiKF0zlCi4pj3K9g1GR17bXoQYEsWw1TT34m5O9J8kQglBoqmP
 ZT98QsABBlU/uI3L0YRvitCKE7hgN4v5OMmlyGOiktQteV93hU+gWyP0gwjSsaT+
 OH7h/C8smWC5jlD+a/0=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.jyu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.jyu.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Jyväskyla</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Jyväskylä universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Jyväskyla</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Jyväskylä universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.jyu.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.jyu.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.jyu.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pasi</md:GivenName>
-      <md:SurName>Haapalo</md:SurName>
-      <md:EmailAddress>mailto:useradmin@jyu.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.jyu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.jyu.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Jyväskyla</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Jyväskylä universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Jyväskylän yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Jyväskyla</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Jyväskylä universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.jyu.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.jyu.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.jyu.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pasi</md:GivenName>
+    <md:SurName>Haapalo</md:SurName>
+    <md:EmailAddress>mailto:useradmin@jyu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
index 35cbb4ff..6746ccdc 100644
--- a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ktu.lt/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2010-07-13T06:33:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2010-07-13T06:33:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktu.lt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kaunas University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="lt">Kauno technologijos universitetas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">KTU Single Sign On</mdui:Description>
+        <mdui:Description xml:lang="lt">KTU vieningas prisijungimas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://ktu.edu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="lt">http://ktu.edu</mdui:InformationURL>
+        <mdui:Logo width="80" height="88">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
+        <mdui:Logo width="80" height="88">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.129.0.0/19</mdui:IPHint>
+        <mdui:IPHint>158.129.32.0/21</mdui:IPHint>
+        <mdui:IPHint>83.171.8.0/22</mdui:IPHint>
+        <mdui:IPHint>83.171.15.0/24</mdui:IPHint>
+        <mdui:IPHint>83.171.18.0/23</mdui:IPHint>
+        <mdui:IPHint>83.171.20.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.32.0/22</mdui:IPHint>
+        <mdui:IPHint>193.219.36.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.61.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.63.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.66.0/23</mdui:IPHint>
+        <mdui:IPHint>193.219.68.0/22</mdui:IPHint>
+        <mdui:IPHint>193.219.74.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.154.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.156.0/22</mdui:IPHint>
+        <mdui:IPHint>193.219.160.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.170.0/23</mdui:IPHint>
+        <mdui:IPHint>193.219.174.0/23</mdui:IPHint>
+        <mdui:IPHint>193.219.176.0/25</mdui:IPHint>
+        <mdui:IPHint>193.219.184.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:778:200::/48</mdui:IPHint>
+        <mdui:DomainHint>ktu.lt</mdui:DomainHint>
+        <mdui:DomainHint>ktu.edu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:54.898986,23.912564</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.899057,23.917424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.898912,23.921925</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.905337,23.951043</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.905435,23.956579</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.901102,23.960211</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktu.lt</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kaunas University of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="lt">Kauno technologijos universitetas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">KTU Single Sign On</mdui:Description>
-          <mdui:Description xml:lang="lt">KTU vieningas prisijungimas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://ktu.edu</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="lt">http://ktu.edu</mdui:InformationURL>
-          <mdui:Logo width="80" height="88">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-          <mdui:Logo width="80" height="88">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>158.129.0.0/19</mdui:IPHint>
-          <mdui:IPHint>158.129.32.0/21</mdui:IPHint>
-          <mdui:IPHint>83.171.8.0/22</mdui:IPHint>
-          <mdui:IPHint>83.171.15.0/24</mdui:IPHint>
-          <mdui:IPHint>83.171.18.0/23</mdui:IPHint>
-          <mdui:IPHint>83.171.20.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.32.0/22</mdui:IPHint>
-          <mdui:IPHint>193.219.36.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.61.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.63.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.66.0/23</mdui:IPHint>
-          <mdui:IPHint>193.219.68.0/22</mdui:IPHint>
-          <mdui:IPHint>193.219.74.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.154.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.156.0/22</mdui:IPHint>
-          <mdui:IPHint>193.219.160.0/24</mdui:IPHint>
-          <mdui:IPHint>193.219.170.0/23</mdui:IPHint>
-          <mdui:IPHint>193.219.174.0/23</mdui:IPHint>
-          <mdui:IPHint>193.219.176.0/25</mdui:IPHint>
-          <mdui:IPHint>193.219.184.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:778:200::/48</mdui:IPHint>
-          <mdui:DomainHint>ktu.lt</mdui:DomainHint>
-          <mdui:DomainHint>ktu.edu</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:54.898986,23.912564</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:54.899057,23.917424</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:54.898912,23.921925</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:54.905337,23.951043</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:54.905435,23.956579</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:54.901102,23.960211</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 VQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNV
 BAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMM
@@ -83,13 +83,13 @@ LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY
 9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffk
 J71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 VQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNV
 BAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMM
@@ -116,23 +116,23 @@ LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY
 9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffk
 J71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Kaunas University of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Kaunas University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="lt">http://ktu.edu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://ktu.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>KTU</md:GivenName>
-      <md:SurName>SSO</md:SurName>
-      <md:EmailAddress>mailto:sso@ktu.lt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Kaunas University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Kaunas University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="lt">http://ktu.edu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://ktu.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>KTU</md:GivenName>
+    <md:SurName>SSO</md:SurName>
+    <md:EmailAddress>mailto:sso@ktu.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml
index ac8cca45..a40f6f75 100644
--- a/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.library.dmu.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-06T16:42:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-06T16:42:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">De Montfort University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">De Montfort University (DMU) is a university situated in Leicester, UK.</mdui:Description>
+        <mdui:Logo height="60" width="141">https://www.dmu.ac.uk/SiteElements/Images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:52.631814,-1.139363</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">De Montfort University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">De Montfort University (DMU) is a university situated in Leicester, UK.</mdui:Description>
-          <mdui:Logo height="60" width="141">https://www.dmu.ac.uk/SiteElements/Images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:52.631814,-1.139363</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3DCCAsQCCQDPnZdVNsgAazANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
 						R0IxFzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIx
 						HzAdBgNVBAoMFkRlIE1vbnRmb3J0IFVuaXZlcnNpdHkxDTALBgNVBAsMBElUTVMx
@@ -43,25 +43,25 @@
 						GtbxWSSs57GryS38E6qbW9LLuee85nPgPhByaVmlCc95J455XtsRL8qef0okzUy+
 						UDaOzvftwWw1y2kSzIahwIBl2o81tOQhgCreQg6CKSc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.library.dmu.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.library.dmu.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">De Montfort University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">De Montfort University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.library.dmu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Pete</md:GivenName>
-      <md:SurName>Warrington</md:SurName>
-      <md:EmailAddress>mailto:pwarrington@dmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Adams</md:SurName>
-      <md:EmailAddress>mailto:pka@dmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.library.dmu.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.library.dmu.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">De Montfort University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">De Montfort University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.library.dmu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Pete</md:GivenName>
+    <md:SurName>Warrington</md:SurName>
+    <md:EmailAddress>mailto:pwarrington@dmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Adams</md:SurName>
+    <md:EmailAddress>mailto:pka@dmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml
index 0f06942f..33a93521 100644
--- a/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ligo.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.ligo.org/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ligo.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LIGO Scientific Collaboration</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Laser Interferometer Gravitational-Wave Observatory (LIGO)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89286</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.ligo.org/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ligo.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LIGO Scientific Collaboration</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Laser Interferometer Gravitational-Wave Observatory (LIGO)</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89286</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEljCCA36gAwIBAgICAJwwDQYJKoZIhvcNAQEFBQAwgYcxEzARBgoJkiaJk/Is
 ZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZFgRsaWdvMQ0wCwYDVQQKEwRMSUdPMSAw
 HgYDVQQLExdDZXJ0aWZpY2F0ZSBBdXRob3JpdGllczEVMBMGA1UECxMMV2ViIFNl
@@ -52,13 +52,13 @@ pFApwEgu91iPFEL5DU31dbf+tUFQglt1lofm2EiLAq6auTphsTs6nu5b8k+eh26y
 4f7CtSOMPJoOvBC7ZZj5spPMYP1nWcDsQIF6LylwyNI2XxBIll/FuM9mSBAZ6fSL
 QSLgCeM9S63LSKOHx0cXPde6ccFKoDtcNiY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEaTCCA1GgAwIBAgIBKTANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -84,23 +84,23 @@ AlKinu+VwG8lqcSRzrgDl40DGZbxYwcqaLqkY3DvJQphcL9+cMVNwixR+2ceACVU
 GKBexp0LpbBvqRLMito7jIbPE5NzCjw69NpcIE+COkQc+ifV8FbD0OQOin06/qDi
 0+fCAYmI2uE8jfuGOhKWTsSUWe35LFWIOuaIPZo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.ligo.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ligo.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ligo.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ligo.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ligo.org/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ligo.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.ligo.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ligo.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ligo.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ligo.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ligo.org/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ligo.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEljCCA36gAwIBAgICAJwwDQYJKoZIhvcNAQEFBQAwgYcxEzARBgoJkiaJk/Is
 ZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZFgRsaWdvMQ0wCwYDVQQKEwRMSUdPMSAw
 HgYDVQQLExdDZXJ0aWZpY2F0ZSBBdXRob3JpdGllczEVMBMGA1UECxMMV2ViIFNl
@@ -127,13 +127,13 @@ pFApwEgu91iPFEL5DU31dbf+tUFQglt1lofm2EiLAq6auTphsTs6nu5b8k+eh26y
 4f7CtSOMPJoOvBC7ZZj5spPMYP1nWcDsQIF6LylwyNI2XxBIll/FuM9mSBAZ6fSL
 QSLgCeM9S63LSKOHx0cXPde6ccFKoDtcNiY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEaTCCA1GgAwIBAgIBKTANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -159,30 +159,30 @@ AlKinu+VwG8lqcSRzrgDl40DGZbxYwcqaLqkY3DvJQphcL9+cMVNwixR+2ceACVU
 GKBexp0LpbBvqRLMito7jIbPE5NzCjw69NpcIE+COkQc+ifV8FbD0OQOin06/qDi
 0+fCAYmI2uE8jfuGOhKWTsSUWe35LFWIOuaIPZo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.ligo.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott Koranda</md:GivenName>
-      <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-      <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.ligo.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott Koranda</md:GivenName>
+    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
+    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
index c1dbc83e..87c9a454 100644
--- a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.liu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:Logo height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>liu.se</mdui:DomainHint>
+        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
-          <mdui:Logo height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="68" width="350">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>liu.se</mdui:DomainHint>
-          <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
 MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
@@ -51,26 +51,26 @@ zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
 dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
 MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
@@ -90,36 +90,36 @@ zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
 dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">LiU</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">LiU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Linköpings Universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Linköping University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.liu.se?l=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Linköping University</md:Company>
-      <md:SurName>LiU-IT SAML admins</md:SurName>
-      <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Linköping University</md:Company>
-      <md:SurName>LiU-IT SAML admins</md:SurName>
-      <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Linköping University</md:Company>
-      <md:SurName>LiU-IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">LiU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">LiU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Linköpings Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Linköping University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.liu.se?l=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT SAML admins</md:SurName>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Linköping University</md:Company>
+    <md:SurName>LiU-IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
index aba87f03..4d6683df 100644
--- a/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
+++ b/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.lstonline.ac.uk/idp/pingfederate">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T11:48:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T11:48:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFrTCCBJWgAwIBAgIDBoSbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
 						MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
 						NTYgQ0EgLSBHMzAeFw0xNTA4MjUwNjUyMTlaFw0xNjA4MjcwMDQ2MzVaMIGZMRMw
@@ -45,23 +45,23 @@
 						phaCPMAtesAXAd5ck0aKucQrgU+Oyag/hPpHaUBuz8Z5vYDCF7AkSTPQyK0zt4lR
 						qG9o247BAjLhNj6N/rlcE2w=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1" index="0"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lstonline.ac.uk/idp/isx.saml1"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1" index="0"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lstonline.ac.uk/idp/isx.saml1"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFrTCCBJWgAwIBAgIDBoSbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
 						MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
 						NTYgQ0EgLSBHMzAeFw0xNTA4MjUwNjUyMTlaFw0xNjA4MjcwMDQ2MzVaMIGZMRMw
@@ -94,25 +94,25 @@
 						phaCPMAtesAXAd5ck0aKucQrgU+Oyag/hPpHaUBuz8Z5vYDCF7AkSTPQyK0zt4lR
 						qG9o247BAjLhNj6N/rlcE2w=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk:8443/idp/attrsvc.ssaml2"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London School of Theology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Theology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lst.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk:8443/idp/attrsvc.ssaml2"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London School of Theology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Theology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lst.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:mike.taylor@lst.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.maastrichtuniversity.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.maastrichtuniversity.nl-adfs-services-trust.xml
index e46e4169..44e6c019 100644
--- a/swamid-interfederations-2.0/login.maastrichtuniversity.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.maastrichtuniversity.nl-adfs-services-trust.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.maastrichtuniversity.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-20T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-20T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maastrichtuniversity.nl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimaas.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit Maastricht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Maastricht University</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit Maastricht</mdui:Description>
+        <mdui:Description xml:lang="en">Maastricht University</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/unimaas.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Maastricht University  Universiteit unimaas Universiteit mu um</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Maastricht University  Universiteit unimaas Universiteit mu um</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">maastrichtuniversity.nl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimaas.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Universiteit Maastricht</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Maastricht University</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Universiteit Maastricht</mdui:Description>
-          <mdui:Description xml:lang="en">Maastricht University</mdui:Description>
-          <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/unimaas.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Maastricht University  Universiteit unimaas Universiteit mu um</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Maastricht University  Universiteit unimaas Universiteit mu um</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/cce637f0ae222246ad62a8590d25fa9d"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Universiteit Maastricht</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Universiteit Maastricht</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.maastrichtuniversity.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/cce637f0ae222246ad62a8590d25fa9d"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Universiteit Maastricht</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Universiteit Maastricht</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.maastrichtuniversity.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml
index 1a357b4d..e5f7634c 100644
--- a/swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.mayo.edu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mayo.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mayo Clinic</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mayo.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mayo Clinic</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGYjCCBUqgAwIBAgIQSYTipRaDfa4yYbpeDlGgmzANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -55,28 +55,28 @@ ej4QrTWGxIPnuFR+wOI6CI8IARqBQyYWTAwYnN6olUyjDPTdm+K1twuPfd9JpDoF
 D8G/mhghawndTf9Nf7K/h4ixhFTDFo/RIX6E9SmKrar8jbIGovc3XtZ0Y2TumYJZ
 NiV1gUes
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.mayo.edu/adfs/services/trust/artifactresolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.mayo.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.mayo.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mayo Clinic</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mayo Clinic</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mayo.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shawn Brandt</md:GivenName>
-      <md:EmailAddress>brandt.shawn@mayo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sandy Outcalt</md:GivenName>
-      <md:EmailAddress>Outcalt.Sandra@mayo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Troy Wirth</md:GivenName>
-      <md:EmailAddress>wirth.troy@mayo.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.mayo.edu/adfs/services/trust/artifactresolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.mayo.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.mayo.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mayo Clinic</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mayo Clinic</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mayo.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shawn Brandt</md:GivenName>
+    <md:EmailAddress>brandt.shawn@mayo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sandy Outcalt</md:GivenName>
+    <md:EmailAddress>Outcalt.Sandra@mayo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Troy Wirth</md:GivenName>
+    <md:EmailAddress>wirth.troy@mayo.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.mijnhelicon.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.mijnhelicon.nl-nidp-saml2-metadata.xml
index 2db1df2f..e350520f 100644
--- a/swamid-interfederations-2.0/login.mijnhelicon.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/login.mijnhelicon.nl-nidp-saml2-metadata.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.mijnhelicon.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-05T17:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-05T17:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Helicon Opleidingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Helicon Opleidingen</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Helicon Opleidingen</mdui:Description>
+        <mdui:Description xml:lang="en">Helicon Opleidingen</mdui:Description>
+        <mdui:Logo height="41" width="108">https://static.surfconext.nl/logos/idp/helicon.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Helicon Opleidingen MBO</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Helicon Opleidingen MBO</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Helicon Opleidingen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Helicon Opleidingen</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Helicon Opleidingen</mdui:Description>
-          <mdui:Description xml:lang="en">Helicon Opleidingen</mdui:Description>
-          <mdui:Logo height="41" width="108">https://static.surfconext.nl/logos/idp/helicon.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Helicon Opleidingen MBO</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Helicon Opleidingen MBO</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/c02b64fa6474d47f5e17609eefe9792d"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Helicon Opleidingen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Helicon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.helicon.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/c02b64fa6474d47f5e17609eefe9792d"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Helicon Opleidingen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Helicon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.helicon.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml
index 26eba907..06d37a91 100644
--- a/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.montana.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montana.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Montana State University - Bozeman</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Montana State University Bozeman's InCommon Identity provider.</mdui:Description>
+        <mdui:Logo height="163" width="648" xml:lang="en">https://login.montana.edu/cas/meta/img/MSU-horiz.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montana.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Montana State University - Bozeman</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Montana State University Bozeman's InCommon Identity provider.</mdui:Description>
-          <mdui:Logo height="163" width="648" xml:lang="en">https://login.montana.edu/cas/meta/img/MSU-horiz.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAOfP2IewNMJIbSjlEL1iQlgWdmoLMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWxvZ2luLm1vbnRhbmEuZWR1MB4XDTEyMTAyNTIxMjU0
 MVoXDTMyMTAyNTIxMjU0MVowHDEaMBgGA1UEAxMRbG9naW4ubW9udGFuYS5lZHUw
@@ -43,23 +43,23 @@ Sq2w5CreEH+cZsLdMWuLWC/NFkRVK2AcQXnmJIwoZBpAhY4Kn1Teq0YdT7JjUZZY
 MNukIl90N4nc/ghjESnGMHNVPlUL6z+11zc/02Uy9It+hLlylZrWbwnaAxZgyTSz
 8my2pg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.montana.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.montana.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.montana.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.montana.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.montana.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montana.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.montana.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.montana.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.montana.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.montana.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.montana.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montana.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAOfP2IewNMJIbSjlEL1iQlgWdmoLMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWxvZ2luLm1vbnRhbmEuZWR1MB4XDTEyMTAyNTIxMjU0
 MVoXDTMyMTAyNTIxMjU0MVowHDEaMBgGA1UEAxMRbG9naW4ubW9udGFuYS5lZHUw
@@ -79,26 +79,26 @@ Sq2w5CreEH+cZsLdMWuLWC/NFkRVK2AcQXnmJIwoZBpAhY4Kn1Teq0YdT7JjUZZY
 MNukIl90N4nc/ghjESnGMHNVPlUL6z+11zc/02Uy9It+hLlylZrWbwnaAxZgyTSz
 8my2pg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.montana.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Montana State University - Bozeman</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Montana State University - Bozeman</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.montana.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike Hall</md:GivenName>
-      <md:EmailAddress>mhall@montana.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Adam Edelman</md:GivenName>
-      <md:EmailAddress>aedelman@montana.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike Hall</md:GivenName>
-      <md:EmailAddress>mhall@montana.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.montana.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Montana State University - Bozeman</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Montana State University - Bozeman</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.montana.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike Hall</md:GivenName>
+    <md:EmailAddress>mhall@montana.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Adam Edelman</md:GivenName>
+    <md:EmailAddress>aedelman@montana.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike Hall</md:GivenName>
+    <md:EmailAddress>mhall@montana.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml
index 6d19edbe..4e1943a0 100644
--- a/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.nd.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Notre Dame</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Notre Dame</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUMLHjiLc33hXgOaCp5dmYfydyVWwwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMbG9naW4ubmQuZWR1MB4XDTExMDkyODE5MzYxMloXDTMx
 MDkyODE5MzYxMlowFzEVMBMGA1UEAxMMbG9naW4ubmQuZWR1MIIBIjANBgkqhkiG
@@ -37,26 +37,26 @@ lHQMS6hV3X3Vph7DTRtgtEPJUiqYBDj19JzUNwYABPXr55jMwlvAJ2W7pO6wLrdR
 /PXobsAeIT1+agr/JnymgxVsv6I2Ge780x6V9qQ71553X1mG+vtV/tJ3Y81tXL2/
 xc/kwwyNOzorxPvN9w6vSeQk6qtTmTPmOaCNIZkj1A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.nd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.nd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.nd.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.nd.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.nd.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Notre Dame</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Notre Dame</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OIT Identity Management</md:GivenName>
-      <md:EmailAddress>eds@nd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OIT Identity Management</md:GivenName>
-      <md:EmailAddress>eds@nd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.nd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.nd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.nd.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.nd.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.nd.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Notre Dame</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Notre Dame</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OIT Identity Management</md:GivenName>
+    <md:EmailAddress>eds@nd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OIT Identity Management</md:GivenName>
+    <md:EmailAddress>eds@nd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml
index a4139371..ade4a703 100644
--- a/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.nki.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-10-26T17:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-10-26T17:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:Description>
+        <mdui:Description xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:Description>
+        <mdui:Logo height="109" width="213">https://static.surfconext.nl/logos/idp/nki.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Netherlands Cancer Institute Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Nederlands Kanker Instituut Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:Description>
-          <mdui:Description xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:Description>
-          <mdui:Logo height="109" width="213">https://static.surfconext.nl/logos/idp/nki.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Netherlands Cancer Institute Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Nederlands Kanker Instituut Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/91bd4d327f9cc83bcac7882b9b69e26d"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.nki.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.nki.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/91bd4d327f9cc83bcac7882b9b69e26d"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.nki.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.nki.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml
index 8b1bc14a..4418ef1c 100644
--- a/swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.noa.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noa.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Observatory Athens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.noa.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.noa.gr/</mdui:InformationURL>
+        <mdui:Logo height="121" width="125">https://vmail.noa.gr/files/NOA_125x121.png</mdui:Logo>
+        <mdui:Logo height="97" width="100">https://vmail.noa.gr/files/NOA_100x97.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>noa.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.202.0/23</mdui:IPHint>
+        <mdui:IPHint>195.251.204.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.194.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:648:2011::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.9733880,23.7182430</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noa.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Observatory Athens</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.noa.gr/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">http://www.noa.gr/</mdui:InformationURL>
-          <mdui:Logo height="121" width="125">https://vmail.noa.gr/files/NOA_125x121.png</mdui:Logo>
-          <mdui:Logo height="97" width="100">https://vmail.noa.gr/files/NOA_100x97.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>noa.gr</mdui:DomainHint>
-          <mdui:IPHint>195.251.202.0/23</mdui:IPHint>
-          <mdui:IPHint>195.251.204.0/24</mdui:IPHint>
-          <mdui:IPHint>194.177.194.0/23</mdui:IPHint>
-          <mdui:IPHint>2001:648:2011::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:37.9733880,23.7182430</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDGzCCAgOgAwIBAgIUDd6yDm+fYXdw42k4SkEg6Xy0NPkwDQYJKoZIhvcNAQEF
                             BQAwFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMB4XDTEwMDYxMDA2NTQ0M1oXDTMw
                             MDYxMDA2NTQ0M1owFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMIIBIjANBgkqhkiG
@@ -49,26 +49,26 @@
                             7bb9KnqoLhbaLs1VJcsgsrJTO0WjH4L0SMLICgCuqA==
                             
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.noa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.noa.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.noa.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.noa.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.noa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.noa.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noa.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.noa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.noa.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.noa.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.noa.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.noa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.noa.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noa.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDGzCCAgOgAwIBAgIUDd6yDm+fYXdw42k4SkEg6Xy0NPkwDQYJKoZIhvcNAQEF
                             BQAwFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMB4XDTEwMDYxMDA2NTQ0M1oXDTMw
                             MDYxMDA2NTQ0M1owFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMIIBIjANBgkqhkiG
@@ -88,25 +88,25 @@
                             7bb9KnqoLhbaLs1VJcsgsrJTO0WjH4L0SMLICgCuqA==
                             
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.noa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Observatory of Athens</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Observatory of Athens</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.noa.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.noa.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Nikolaos Milas</md:Company>
-      <md:EmailAddress>nmilas@admin.noa.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>National Observatory of Athens</md:Company>
-      <md:EmailAddress>helpdesk@admin.noa.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.noa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Observatory of Athens</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Observatory of Athens</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.noa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.noa.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Nikolaos Milas</md:Company>
+    <md:EmailAddress>nmilas@admin.noa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>National Observatory of Athens</md:Company>
+    <md:EmailAddress>helpdesk@admin.noa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
index 451fe2d9..2ad89734 100644
--- a/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.northumbria.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-22T16:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-22T16:05:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Northumbria University</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://login.northumbria.ac.uk/idp/images/favicon.gif</mdui:Logo>
+        <mdui:Logo height="58" width="110">https://login.northumbria.ac.uk/idp/images/northumbria-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Northumbria University</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://login.northumbria.ac.uk/idp/images/favicon.gif</mdui:Logo>
-          <mdui:Logo height="58" width="110">https://login.northumbria.ac.uk/idp/images/northumbria-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEODCCAyCgAwIBAgIJAMiLIz7trK3/MA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
 						dGxlIHVwb24gVHluZTEfMB0GA1UECgwWTm9ydGh1bWJyaWEgVW5pdmVyc2l0eTEU
@@ -42,26 +42,26 @@
 						XfWC7iSUlskXezVj2v8H2lhUrDTra4v76z9Ssi+LX6ZdyMk3UqL9tWqjwTliLD4a
 						SoDqiIcSreJigbWSnrQkhl2xthJ3c+25U3G0QA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.northumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.northumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northumbria.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEODCCAyCgAwIBAgIJAMiLIz7trK3/MA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
 						dGxlIHVwb24gVHluZTEfMB0GA1UECgwWTm9ydGh1bWJyaWEgVW5pdmVyc2l0eTEU
@@ -86,26 +86,26 @@
 						XfWC7iSUlskXezVj2v8H2lhUrDTra4v76z9Ssi+LX6ZdyMk3UqL9tWqjwTliLD4a
 						SoDqiIcSreJigbWSnrQkhl2xthJ3c+25U3G0QA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Northumbria at Newcastle</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northumbria University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northumbria.ac.uk/sd/central/its/dept_structure_etc/?view=Standard</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpline</md:GivenName>
-      <md:EmailAddress>mailto:it.helpline@northumbria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Graham</md:SurName>
-      <md:EmailAddress>mailto:neil.graham@northumbria.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Northumbria at Newcastle</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northumbria University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northumbria.ac.uk/sd/central/its/dept_structure_etc/?view=Standard</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:it.helpline@northumbria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Graham</md:SurName>
+    <md:EmailAddress>mailto:neil.graham@northumbria.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
index bbcbdd8c..15c50f99 100644
--- a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.nrg.eu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-09-16T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-09-16T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Nuclear Research and Consultancy Group</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Nuclear Research and Consultancy Group</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Nuclear Research and Consultancy Group</mdui:Description>
+        <mdui:Description xml:lang="en">Nuclear Research and Consultancy Group</mdui:Description>
+        <mdui:Logo height="87" width="108">https://static.surfconext.nl/logos/idp/nrg.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Nuclear Research and Consultancy Group</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Nuclear Research and Consultancy Group</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Nuclear Research and Consultancy Group</mdui:Description>
-          <mdui:Description xml:lang="en">Nuclear Research and Consultancy Group</mdui:Description>
-          <mdui:Logo height="87" width="108">https://static.surfconext.nl/logos/idp/nrg.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/341307fa6d9114669c896af91f70bb61"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nrg.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/341307fa6d9114669c896af91f70bb61"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nrg.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
index 16104c3d..8f478f02 100644
--- a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ntua.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Technical University of Athens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
+        <mdui:Description xml:lang="en">National Technical University of Athens Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="el">Υπηρεσία Ταυτότητας του Εθνικού Μετσόβιου Πολυτεχνείου</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://login.ntua.gr</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">https://login.ntua.gr</mdui:InformationURL>
+        <mdui:Logo height="302" width="300">https://login.ntua.gr/images/pyrforos300.png</mdui:Logo>
+        <mdui:Logo height="151" width="150">https://login.ntua.gr/images/pyrforos150.png</mdui:Logo>
+        <mdui:Logo height="50" width="50">https://login.ntua.gr/images/pyrforos50.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ntua.gr</mdui:DomainHint>
+        <mdui:IPHint>147.102.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.977413,23.782694</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Technical University of Athens</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
-          <mdui:Description xml:lang="en">National Technical University of Athens Identity Provider</mdui:Description>
-          <mdui:Description xml:lang="el">Υπηρεσία Ταυτότητας του Εθνικού Μετσόβιου Πολυτεχνείου</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://login.ntua.gr</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">https://login.ntua.gr</mdui:InformationURL>
-          <mdui:Logo height="302" width="300">https://login.ntua.gr/images/pyrforos300.png</mdui:Logo>
-          <mdui:Logo height="151" width="150">https://login.ntua.gr/images/pyrforos150.png</mdui:Logo>
-          <mdui:Logo height="50" width="50">https://login.ntua.gr/images/pyrforos50.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>ntua.gr</mdui:DomainHint>
-          <mdui:IPHint>147.102.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:37.977413,23.782694</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
                             BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
                             WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -49,26 +49,26 @@
                             PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
                             1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ntua.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ntua.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ntua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ntua.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ntua.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ntua.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ntua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ntua.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
                             BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
                             WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -87,35 +87,35 @@
                             PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
                             1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NTUA</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">ΕΜΠ</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Technical University of Athens</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ntua.gr</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.ntua.gr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>National Technical University of Athens</md:Company>
-      <md:EmailAddress>mailto:noc@ntua.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>National Technical University of Athens</md:Company>
-      <md:GivenName>NOC Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:help-data@noc.ntua.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ourania Lambrou</md:GivenName>
-      <md:EmailAddress>mailto:rania@noc.ntua.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NTUA</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΕΜΠ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Technical University of Athens</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ntua.gr</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.ntua.gr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>National Technical University of Athens</md:Company>
+    <md:EmailAddress>mailto:noc@ntua.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>National Technical University of Athens</md:Company>
+    <md:GivenName>NOC Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:help-data@noc.ntua.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ourania Lambrou</md:GivenName>
+    <md:EmailAddress>mailto:rania@noc.ntua.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.offcampuspartners.com.xml b/swamid-interfederations-2.0/login.offcampuspartners.com.xml
index 6da71da5..47cd8c8e 100644
--- a/swamid-interfederations-2.0/login.offcampuspartners.com.xml
+++ b/swamid-interfederations-2.0/login.offcampuspartners.com.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.offcampuspartners.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2016-02-02T11:43:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2016-02-02T11:43:00Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Off Campus Partners</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Off Campus Partners simplifies the off-campus housing search process for universities, property managers, and students. Our software platform powers the off-campus housing listing service at the nation's leading universities.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.offcampuspartners.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://offcampuspartners.com/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Off Campus Partners</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Off Campus Partners simplifies the off-campus housing search process for universities, property managers, and students. Our software platform powers the off-campus housing listing service at the nation's leading universities.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.offcampuspartners.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://offcampuspartners.com/privacy-policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIERTCCAy2gAwIBAgIJALasKQVcSwJQMA0GCSqGSIb3DQEBCwUAMIG4MQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExGDAWBgNVBAcMD0NoYXJsb3R0ZXN2
 aWxsZTEcMBoGA1UECgwTT2ZmIENhbXB1cyBQYXJ0bmVyczEPMA0GA1UECwwGT0NQ
@@ -40,13 +40,13 @@ i8bpbTLCgWZ60R/n/7kdL0YDRRa8mrjoWyQ1r1ujZs1ejLTB+o5kMr6fwNFDkJgY
 kHb1//oUcwpUckqvdzloI50atQNjYm2pep/Dn/1PFQUPq7QdSkESirbZYdzERe04
 DiYzNSxGsC1x/m4WMxfvvGT39sh7OipUqSYS5MZ3miH8xatOrmvPPjA=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIERTCCAy2gAwIBAgIJALasKQVcSwJQMA0GCSqGSIb3DQEBCwUAMIG4MQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExGDAWBgNVBAcMD0NoYXJsb3R0ZXN2
 aWxsZTEcMBoGA1UECgwTT2ZmIENhbXB1cyBQYXJ0bmVyczEPMA0GA1UECwwGT0NQ
@@ -71,24 +71,24 @@ i8bpbTLCgWZ60R/n/7kdL0YDRRa8mrjoWyQ1r1ujZs1ejLTB+o5kMr6fwNFDkJgY
 kHb1//oUcwpUckqvdzloI50atQNjYm2pep/Dn/1PFQUPq7QdSkESirbZYdzERe04
 DiYzNSxGsC1x/m4WMxfvvGT39sh7OipUqSYS5MZ3miH8xatOrmvPPjA=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml2-logout.php/login.offcampuspartners.com"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml2-acs.php/login.offcampuspartners.com" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml1-acs.php/login.offcampuspartners.com" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml2-acs.php/login.offcampuspartners.com" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml1-acs.php/login.offcampuspartners.com/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Off Campus Partners</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Off Campus Partners</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.offcampuspartners.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Wilson</md:GivenName>
-      <md:SurName>Whitaker</md:SurName>
-      <md:EmailAddress>mailto:wilson@offcampuspartners.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml2-logout.php/login.offcampuspartners.com"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml2-acs.php/login.offcampuspartners.com" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml1-acs.php/login.offcampuspartners.com" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml2-acs.php/login.offcampuspartners.com" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.offcampuspartners.com/simplesaml/module.php/saml/sp/saml1-acs.php/login.offcampuspartners.com/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Off Campus Partners</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Off Campus Partners</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.offcampuspartners.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wilson</md:GivenName>
+    <md:SurName>Whitaker</md:SurName>
+    <md:EmailAddress>mailto:wilson@offcampuspartners.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml
index af6fa604..1db7b45c 100644
--- a/swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.oregonstate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oregonstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Oregon State University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://is.oregonstate.edu/it-infrastructure/iam/incommon-federation</mdui:InformationURL>
+        <mdui:Logo height="54" width="177" xml:lang="en">https://login.oregonstate.edu/images/osu-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oregonstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Oregon State University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://is.oregonstate.edu/it-infrastructure/iam/incommon-federation</mdui:InformationURL>
-          <mdui:Logo height="54" width="177" xml:lang="en">https://login.oregonstate.edu/images/osu-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUEfvjo0YbOpCuYoilEkORPgg2kOEwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVbG9naW4ub3JlZ29uc3RhdGUuZWR1MB4XDTEyMTAxMjE5
 NDk1NloXDTMyMTAxMjE5NDk1NlowIDEeMBwGA1UEAxMVbG9naW4ub3JlZ29uc3Rh
@@ -43,28 +43,28 @@ yfbBaXLdxVLWOh3nAAha2tXUr0FRbZU3rREOVBPKuamYWmGES7Q2WphbBwfOcghx
 CHcq133UmHyK8LQ6SbbyiTBBQuivbhPELucJzIeUoJ7U089J5huDBQendCNS534D
 HcsvwYzQX/yDdIlusEse97Zcnw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.oregonstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oregonstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.oregonstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Oregon State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oregon State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oregonstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IAM Team</md:GivenName>
-      <md:EmailAddress>iamteam@oregonstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IAM Team</md:GivenName>
-      <md:EmailAddress>iamteam@oregonstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Office of Information Security</md:GivenName>
-      <md:EmailAddress>Information.SecurityOffice@oregonstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.oregonstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oregonstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.oregonstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Oregon State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oregon State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oregonstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IAM Team</md:GivenName>
+    <md:EmailAddress>iamteam@oregonstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IAM Team</md:GivenName>
+    <md:EmailAddress>iamteam@oregonstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Office of Information Security</md:GivenName>
+    <md:EmailAddress>Information.SecurityOffice@oregonstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml
index aefc9a5e..1fbc750a 100644
--- a/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.otis.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">otis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Otis College of Art and Design</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">otis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Otis College of Art and Design</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUVXqq0XY3jJ8grlfflVWQPG0Cc/MwDQYJKoZIhvcNAQEL
 BQAwGTEXMBUGA1UEAwwObG9naW4ub3Rpcy5lZHUwHhcNMTUwNDA3MjE1MDAzWhcN
 MzUwNDA3MjE1MDAzWjAZMRcwFQYDVQQDDA5sb2dpbi5vdGlzLmVkdTCCASIwDQYJ
@@ -37,27 +37,27 @@ gPa8fFpVKv+RuAYme/2aKXvUCUFmS+uWGooyLOccEiNDnEg//EJVvf801ADphXQy
 hydbhC0HcRASYUtWo8iWcOKRPyOZBhEH/DUk+S1Qbfs1CaCO2pMotSOpYj+QRaYB
 M+XRD4iPNuUG2kP1xit9w/OQcemXfGBnGX505w+0MYUbA2Ppan9G
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.otis.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.otis.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Otis College of Art and Design</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Otis College of Art and Design</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.otis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Otis Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@otis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Matthew Ballard</md:GivenName>
-      <md:EmailAddress>mballard@otis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Otis Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@otis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.otis.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.otis.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Otis College of Art and Design</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Otis College of Art and Design</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.otis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Otis Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@otis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Matthew Ballard</md:GivenName>
+    <md:EmailAddress>mballard@otis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Otis Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@otis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml b/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
index f759f8a9..44cab915 100644
--- a/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
+++ b/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ou.nl/oam/fed">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T15:41:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T15:41:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enterprise.ou.nl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Open Universiteit</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Open Universiteit</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Open Universiteit</mdui:Description>
+        <mdui:Description xml:lang="en">Open Universiteit in the Netherlands</mdui:Description>
+        <mdui:Logo height="48" width="24">https://static.surfconext.nl/logos/idp/ou.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enterprise.ou.nl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Open Universiteit</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Open Universiteit</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Open Universiteit</mdui:Description>
-          <mdui:Description xml:lang="en">Open Universiteit in the Netherlands</mdui:Description>
-          <mdui:Logo height="48" width="24">https://static.surfconext.nl/logos/idp/ou.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9723a8fadcf112812d430766e7cedbb5"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Open Universiteit</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Open Universiteit</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ou.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9723a8fadcf112812d430766e7cedbb5"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Open Universiteit</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Open Universiteit</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ou.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
index 1c3bedc0..383eef4f 100644
--- a/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.oulu.fi-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.oulu.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Uleåborgs universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Oulu</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Oulun yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Uleåborgs universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Oulu</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAJBo2HnycBTUKKbocEpkkQ4wDQYJKoZIhvcNAQEFBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAJBo2HnycBTUKKbocEpkkQ4wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA3MTEyMzU5NTlaMDsxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNbG9naW4ub3Vs
@@ -46,22 +46,22 @@ cBJNr+p4XJsh7Ps95ImcAmrubBVxnk9Zk+sGHT7y31cxyuo4D98PA7icD7dMloe/
 bIGXij+jcAi960WSFbNgK5Jm3D4G00fNtg8MOQvpZWNtq8wvF01Iy//WW1tXY/df
 kTHGaVWDNaZW+4SyUjAT5eYB8DUq2v5ntP3E7i5g+X9letuBOzzRglJdrkjfGrrh
 BVDhfQ6xKx1/1Y5/Suthd1U3Tybz1r0WiFoF4Q==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.oulu.fi/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oulu.fi/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.oulu.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAJBo2HnycBTUKKbocEpkkQ4wDQYJKoZIhvcNAQEFBQAw
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.oulu.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oulu.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.oulu.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oulu.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEaDCCA1CgAwIBAgIRAJBo2HnycBTUKKbocEpkkQ4wDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA3MTEyMzU5NTlaMDsxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNbG9naW4ub3Vs
@@ -85,37 +85,37 @@ cBJNr+p4XJsh7Ps95ImcAmrubBVxnk9Zk+sGHT7y31cxyuo4D98PA7icD7dMloe/
 bIGXij+jcAi960WSFbNgK5Jm3D4G00fNtg8MOQvpZWNtq8wvF01Iy//WW1tXY/df
 kTHGaVWDNaZW+4SyUjAT5eYB8DUq2v5ntP3E7i5g+X9letuBOzzRglJdrkjfGrrh
 BVDhfQ6xKx1/1Y5/Suthd1U3Tybz1r0WiFoF4Q==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.oulu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.oulu.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Oulun yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Oulu</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Uleåborgs universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Oulun yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oulu</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Uleåborgs universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.oulu.fi/yliopisto</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.oulu.fi/yliopisto</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.oulu.fi/yliopisto</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jukka</md:GivenName>
-      <md:SurName>Hakosalo</md:SurName>
-      <md:EmailAddress>mailto:Jukka.Hakosalo@oulu.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jukka</md:GivenName>
-      <md:SurName>Hakosalo</md:SurName>
-      <md:EmailAddress>mailto:Jukka.Hakosalo@oulu.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jukka</md:GivenName>
-      <md:SurName>Hakosalo</md:SurName>
-      <md:EmailAddress>mailto:Jukka.Hakosalo@oulu.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.oulu.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.oulu.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Oulun yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Oulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Uleåborgs universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Oulun yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Uleåborgs universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.oulu.fi/yliopisto</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.oulu.fi/yliopisto</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.oulu.fi/yliopisto</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Hakosalo</md:SurName>
+    <md:EmailAddress>mailto:Jukka.Hakosalo@oulu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Hakosalo</md:SurName>
+    <md:EmailAddress>mailto:Jukka.Hakosalo@oulu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Hakosalo</md:SurName>
+    <md:EmailAddress>mailto:Jukka.Hakosalo@oulu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.regis.edu.xml b/swamid-interfederations-2.0/login.regis.edu.xml
index b6a69b93..06aa8446 100644
--- a/swamid-interfederations-2.0/login.regis.edu.xml
+++ b/swamid-interfederations-2.0/login.regis.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.regis.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Regis University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Regis University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWjCCAkKgAwIBAgIGASqgaBEhMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlVTMQswCQYD
 VQQIEwJDbzEPMA0GA1UEBxMGRGVudmVyMRkwFwYDVQQKExBSZWdpcyBVbml2ZXJzaXR5MQwwCgYD
 VQQLEwNJVFMxGDAWBgNVBAMTD2xvZ2luLnJlZ2lzLmVkdTAeFw0xMDA4MjMxOTIzNDhaFw0xMjA4
@@ -36,22 +36,22 @@ zRYY89D7K/WkbnW7gFRPZ8NTP+U5m2e+NP/+Xm0og9O2YhilNZH3Mn+NSZwNdbXJ5RXv4Wrq0F4e
 rEHhvsmbrjPpcG8BJ46pYReen2ZTZ1uEVmHsaAFD6Fz0nsWj7BwKPptmnkMPgxJ57Wod96ysgGjn
 zwa3cLKnmg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.regis.edu/idp/soap.ssaml1" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.regis.edu/idp/ARS.ssaml2" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.regis.edu/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.regis.edu/idp/SSO.saml2"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regis.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.regis.edu/idp/soap.ssaml1" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.regis.edu/idp/ARS.ssaml2" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.regis.edu/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.regis.edu/idp/SSO.saml2"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regis.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWjCCAkKgAwIBAgIGASqgaBEhMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlVTMQswCQYD
 VQQIEwJDbzEPMA0GA1UEBxMGRGVudmVyMRkwFwYDVQQKExBSZWdpcyBVbml2ZXJzaXR5MQwwCgYD
 VQQLEwNJVFMxGDAWBgNVBAMTD2xvZ2luLnJlZ2lzLmVkdTAeFw0xMDA4MjMxOTIzNDhaFw0xMjA4
@@ -69,26 +69,26 @@ zRYY89D7K/WkbnW7gFRPZ8NTP+U5m2e+NP/+Xm0og9O2YhilNZH3Mn+NSZwNdbXJ5RXv4Wrq0F4e
 rEHhvsmbrjPpcG8BJ46pYReen2ZTZ1uEVmHsaAFD6Fz0nsWj7BwKPptmnkMPgxJ57Wod96ysgGjn
 zwa3cLKnmg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.regis.edu/idp/attrsvc.ssaml2"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Regis University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Regis University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://regis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jerry Perez</md:GivenName>
-      <md:EmailAddress>jperez@regis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Erich Delcamp</md:GivenName>
-      <md:EmailAddress>edelcamp@regis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Greg Hatayama</md:GivenName>
-      <md:EmailAddress>ghatayam@regis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.regis.edu/idp/attrsvc.ssaml2"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Regis University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Regis University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://regis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jerry Perez</md:GivenName>
+    <md:EmailAddress>jperez@regis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Erich Delcamp</md:GivenName>
+    <md:EmailAddress>edelcamp@regis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Greg Hatayama</md:GivenName>
+    <md:EmailAddress>ghatayam@regis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
index 701e3361..7625e144 100644
--- a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.restena.lu/simplesamlphp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RESTENA Users</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">RESTENA Utilisateurs</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">RESTENA Benutzer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="lb">RESTENA Useren</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for end users with an account at RESTENA Foundation</mdui:Description>
+        <mdui:Description xml:lang="fr">Fournisseur d'Identité pour utilisateurs avec un compte de la Fondation RESTENA</mdui:Description>
+        <mdui:Description xml:lang="de">Identitätsprovider für Nutzer mit einem Benutzerkonto bei der Stiftung RESTENA</mdui:Description>
+        <mdui:Keywords xml:lang="en">RESTENA user users login education</mdui:Keywords>
+        <mdui:Logo width="78" height="100" xml:lang="en">http://login.restena.lu/restena.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
+        <mdui:DomainHint>education.lu</mdui:DomainHint>
+        <mdui:DomainHint>lu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:49.50,6.00</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RESTENA Users</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">RESTENA Utilisateurs</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="de">RESTENA Benutzer</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="lb">RESTENA Useren</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for end users with an account at RESTENA Foundation</mdui:Description>
-          <mdui:Description xml:lang="fr">Fournisseur d'Identité pour utilisateurs avec un compte de la Fondation RESTENA</mdui:Description>
-          <mdui:Description xml:lang="de">Identitätsprovider für Nutzer mit einem Benutzerkonto bei der Stiftung RESTENA</mdui:Description>
-          <mdui:Keywords xml:lang="en">RESTENA user users login education</mdui:Keywords>
-          <mdui:Logo width="78" height="100" xml:lang="en">http://login.restena.lu/restena.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
-          <mdui:DomainHint>education.lu</mdui:DomainHint>
-          <mdui:DomainHint>lu</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:49.50,6.00</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>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</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/simplesamlphp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RESTENA Foundation</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Fondation RESTENA</md:OrganizationName>
-      <md:OrganizationName xml:lang="de">Stiftung RESTENA</md:OrganizationName>
-      <md:OrganizationName xml:lang="lb">Steftung RESTENA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RESTENA Users</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>RESTENA</md:GivenName>
-      <md:SurName>NOC</md:SurName>
-      <md:EmailAddress>noc@restena.lu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/simplesamlphp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RESTENA Foundation</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Fondation RESTENA</md:OrganizationName>
+    <md:OrganizationName xml:lang="de">Stiftung RESTENA</md:OrganizationName>
+    <md:OrganizationName xml:lang="lb">Steftung RESTENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RESTENA Users</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>RESTENA</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@restena.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.smith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.smith.edu-idp-shibboleth.xml
index 0621783b..15b93bb8 100644
--- a/swamid-interfederations-2.0/login.smith.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.smith.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.smith.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.smith.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Smith College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Smith College Shibboleth users</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.smith.edu/its/about_its/cis_program.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="88" width="504" xml:lang="en">https://login.smith.edu/idp/images/logolargest.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.smith.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Smith College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Smith College Shibboleth users</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.smith.edu/its/about_its/cis_program.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="88" width="504" xml:lang="en">https://login.smith.edu/idp/images/logolargest.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAJUcoTPjMiZVD5qgW7N46h1T+VSnMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnNtaXRoLmVkdTAeFw0xNTA3MTUxNDI1NDla
 Fw0zNTA3MTUxNDI1NDlaMBoxGDAWBgNVBAMMD2xvZ2luLnNtaXRoLmVkdTCCASIw
@@ -40,24 +40,24 @@ CWZmVCwulGsRL8jBTK4Qn3Lq1cJvmfV0/eFSWaCM84kkWasxRLWSx3vNsGREi64V
 tdeBFoFgZ+bfMBEFO/y7WQSYjpw26V+BjIlpxaleQ+CTXL6ZRSvhazxLPr5jTX86
 bvJOdOqEZtsTyYApY9dJIj+3I/mrFf+lUoHyiQqghUBETLNksdsaD41RWbM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.smith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.smith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.smith.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.smith.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.smith.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.smith.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.smith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.smith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.smith.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.smith.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.smith.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.smith.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAJUcoTPjMiZVD5qgW7N46h1T+VSnMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnNtaXRoLmVkdTAeFw0xNTA3MTUxNDI1NDla
 Fw0zNTA3MTUxNDI1NDlaMBoxGDAWBgNVBAMMD2xvZ2luLnNtaXRoLmVkdTCCASIw
@@ -76,34 +76,34 @@ CWZmVCwulGsRL8jBTK4Qn3Lq1cJvmfV0/eFSWaCM84kkWasxRLWSx3vNsGREi64V
 tdeBFoFgZ+bfMBEFO/y7WQSYjpw26V+BjIlpxaleQ+CTXL6ZRSvhazxLPr5jTX86
 bvJOdOqEZtsTyYApY9dJIj+3I/mrFf+lUoHyiQqghUBETLNksdsaD41RWbM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.smith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Smith College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Smith College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.smith.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Karla Borecky</md:GivenName>
-      <md:EmailAddress>kborecky@smith.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Crowley</md:GivenName>
-      <md:EmailAddress>jcrowley@smith.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eric Brewer</md:GivenName>
-      <md:EmailAddress>ebrewer@smith.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Center</md:GivenName>
-      <md:EmailAddress>4its@smith.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Ben Marsden</md:GivenName>
-      <md:EmailAddress>bmarsden@smith.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.smith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Smith College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Smith College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.smith.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karla Borecky</md:GivenName>
+    <md:EmailAddress>kborecky@smith.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Crowley</md:GivenName>
+    <md:EmailAddress>jcrowley@smith.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eric Brewer</md:GivenName>
+    <md:EmailAddress>ebrewer@smith.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Center</md:GivenName>
+    <md:EmailAddress>4its@smith.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Ben Marsden</md:GivenName>
+    <md:EmailAddress>bmarsden@smith.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml b/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
index 4432edc5..be19206a 100644
--- a/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.sonoma.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.sonoma.edu/it/helpdesk/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sonoma.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sonoma State University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.sonoma.edu/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.sonoma.edu/ps/security/policies_standards.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="144" width="288" xml:lang="en">https://www.sonoma.edu/logos/web/primarybox-web143b87.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.sonoma.edu/it/helpdesk/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sonoma.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sonoma State University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.sonoma.edu/about/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.sonoma.edu/ps/security/policies_standards.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="144" width="288" xml:lang="en">https://www.sonoma.edu/logos/web/primarybox-web143b87.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDZjCCAs+gAwIBAgICAW4wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVT
 MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRUwEwYDVQQHEwxSb2huZXJ0IFBhcmsxIDAe
 BgNVBAoTF1Nvbm9tYSBTdGF0ZSBVbml2ZXJzaXR5MR8wHQYDVQQLExZJbmZvcm1h
@@ -42,33 +42,33 @@ xP0nUWQ+N+yU6ylsHDmeRlxPvtJNKW5N+OvX45ZsGKKtBi9KzOXWH61dZ7vZreTq
 8x65mJ4/TVV3m5eTZzPV57n9dEsqXJx+4kGCVMVc9Y3h5Mqh2CiALUi78OhW3LC6
 xAsmDU5SmtNXeA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.sonoma.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.sonoma.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.sonoma.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.sonoma.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sonoma State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sonoma State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sonoma.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Geoff Cirullo</md:GivenName>
-      <md:EmailAddress>cirullo@sonoma.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Andru Luvisi</md:GivenName>
-      <md:EmailAddress>andru.luvisi@sonoma.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@sonoma.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDP Administrator</md:GivenName>
-      <md:EmailAddress>idp-admin@sonoma.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.sonoma.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.sonoma.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.sonoma.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.sonoma.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sonoma State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sonoma State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sonoma.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Geoff Cirullo</md:GivenName>
+    <md:EmailAddress>cirullo@sonoma.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Andru Luvisi</md:GivenName>
+    <md:EmailAddress>andru.luvisi@sonoma.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@sonoma.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDP Administrator</md:GivenName>
+    <md:EmailAddress>idp-admin@sonoma.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml
index b67882f5..0a292a42 100644
--- a/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.stolaf.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.stolaf.edu/services/iit/shibboleth/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stolaf.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">St. Olaf College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.stolaf.edu/services/iit/shibboleth/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stolaf.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">St. Olaf College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEBTCCAu2gAwIBAgIJAIpCACOSmm5jMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 VQQGEwJVUzESMBAGA1UECAwJTWlubmVzb3RhMRMwEQYDVQQHDApOb3J0aGZpZWxk
 MRgwFgYDVQQKDA9TdCBPbGFmIENvbGxlZ2UxCzAJBgNVBAsMAklUMRkwFwYDVQQD
@@ -42,23 +42,23 @@ cYnf3BffmuLLX119fYL+023+7YDfXolEbyd0nYVeWV2e33xt6RJtmWuO1VbQsPQZ
 Gq8AofetoybsRS9b+CrRWiYzUvjZ0zkjDe9PMzvsXcS7xGD8/90X9damUttErlld
 Yj2frn/AgpSfFIR4btP5vc0jd8Qy85QoDg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.stolaf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.stolaf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.stolaf.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.stolaf.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.stolaf.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stolaf.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.stolaf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.stolaf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.stolaf.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.stolaf.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.stolaf.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stolaf.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEBTCCAu2gAwIBAgIJAIpCACOSmm5jMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 VQQGEwJVUzESMBAGA1UECAwJTWlubmVzb3RhMRMwEQYDVQQHDApOb3J0aGZpZWxk
 MRgwFgYDVQQKDA9TdCBPbGFmIENvbGxlZ2UxCzAJBgNVBAsMAklUMRkwFwYDVQQD
@@ -82,18 +82,18 @@ cYnf3BffmuLLX119fYL+023+7YDfXolEbyd0nYVeWV2e33xt6RJtmWuO1VbQsPQZ
 Gq8AofetoybsRS9b+CrRWiYzUvjZ0zkjDe9PMzvsXcS7xGD8/90X9damUttErlld
 Yj2frn/AgpSfFIR4btP5vc0jd8Qy85QoDg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.stolaf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St. Olaf College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St. Olaf College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stolaf.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>St. Olaf Systems Team</md:GivenName>
-      <md:EmailAddress>root@stolaf.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.stolaf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St. Olaf College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St. Olaf College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stolaf.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>St. Olaf Systems Team</md:GivenName>
+    <md:EmailAddress>root@stolaf.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.talisaspire.com-entity.xml b/swamid-interfederations-2.0/login.talisaspire.com-entity.xml
index 214da6e0..00705f35 100644
--- a/swamid-interfederations-2.0/login.talisaspire.com-entity.xml
+++ b/swamid-interfederations-2.0/login.talisaspire.com-entity.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.talisaspire.com/entity">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESjCCAzKgAwIBAgIJAMtZwUsUp4zOMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
 						VQQGEwJVSzEWMBQGA1UECAwNV2VzdCBNaWRsYW5kczETMBEGA1UEBwwKQmlybWlu
 						Z2hhbTEYMBYGA1UECgwPVGFsaXMgRWR1Y2F0aW9uMQ4wDAYDVQQLDAVUYWxpczEY
@@ -32,28 +32,28 @@
 						z1wvLSK2Ckd1wgZEUnFza58XZimpQq0KCyPMThwL/83iQ4V5qJilUpN+ogG9XGe4
 						g6HEwkRBtuhy/v1sVlpVJjib7O0duue06oed6ZCCXD0fem3zD8VZ8WORRE/rWA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.talisaspire.com/expire"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.talisaspire.com/expire"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.talisaspire.com/consume" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.talisaspire.com/consume" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.talisaspire.com/consume" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.talisaspire.com/consume" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Talis Group Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Talis Education Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.talisaspire.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Talis Aspire Support</md:GivenName>
-      <md:EmailAddress>mailto:support@talisaspire.zendesk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Clarke</md:SurName>
-      <md:EmailAddress>mailto:chris.clarke@talis.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.talisaspire.com/expire"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.talisaspire.com/expire"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.talisaspire.com/consume" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.talisaspire.com/consume" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.talisaspire.com/consume" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.talisaspire.com/consume" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Talis Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Talis Education Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.talisaspire.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Talis Aspire Support</md:GivenName>
+    <md:EmailAddress>mailto:support@talisaspire.zendesk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>mailto:chris.clarke@talis.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.teologialugano.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/login.teologialugano.ch-idp-shibboleth.xml
index 9e2d6e3a..a46c6614 100644
--- a/swamid-interfederations-2.0/login.teologialugano.ch-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.teologialugano.ch-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.teologialugano.ch/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-06-02T15:04:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-06-02T15:04:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teologialugano.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FTL - Facoltà di Teologia di Lugano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">FTL - Facoltà di Teologia di Lugano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Facoltà di Teologia di Lugano</mdui:Description>
+        <mdui:Description xml:lang="it">Facoltà di Teologia, Bachelor in Filosofia, Master in Diritto comparato delle religioni e Master in Scienza, filosofia e teologia delle religioni.</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAB40lEQVR4nHyT54pqQRCEfW5/+BoiKL6AqIgJIyZUxIQBFMWACQMGDBiwl6+5x7u67A4MJ3R3TVV1j+n5fJq+b/m3rternE4nOR6PcrvdjN/ymf+jmKJ6vS6RSETC4bAUCgVJp9PS6XQU7BPkDaDVamlyLpeT2WymQADM53NJJBJSLpdlMpm8gbxObjQaEovFZDweSyqVkvP5rGy2263KAXQ4HEo8Hlc2BogWL5dL8Xg80u/3tZBE3jkdFtPpVAaDgcZ6vZ74/X45HA4KogCgZ7NZ3avVSu73uxoXCAQkGAzK5XLRfxyExEwmo8AKQCKIBEmCMpo3m40Wk7xerzW+3+9VDv4kk0l5PB5i2u12enKxWFSaOA0Lr9crNptNHA6HetLtdl+xfD4vtVpNWZowqlQqaQB0kthOp1PMZrNYLBZxu91KGYawwHCY4YmJolAopLTYfHOa0RXa12631VgAAKeVMHi1EWeRQJ9ZyIKR1WoVu92uXaCQXOTSykql8r8LGBSNRjWJ9nACJuIDDDAWdsR4woy4AhiDVK1WdXSZRjYL3cbkIcOYzLdB+j7KzWZTfD6f6kcCycjjHcp4BeCfl2k0Gulg0WeeLpfr5Q9S/7xMn9cZTxaLhbbrt+v8BQAA//8DAOlyeh2ux7z8AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="61">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAA8CAYAAADVPrJMAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAOXUlEQVR4nOTb568VVRcGcP89Ej7zRQjSFSK9CCKh96ACQihSAiiEGgEh1NACaEQIxYgaSmihhBLRCMZtfjtZN5th5twiN/rm3clwzj1nZs961nrWs9bec3jrr7/+euv/7ejWyVPDiO/+/PPP/D5e47v/SdAB7sGDB+ngwYPpyZMn6erVq2nPnj3pzJkzGezJkyfTrVu30ujRo9OGDRvy+T/88EN68eJFevny5SsO+s+CLiN48+bN9PTp0/TFF1+ktWvXpgMHDqTvv/8+vfPOO2n48OH5+88//zyf7xxOuXz5curXr1+6e/dudtTEiRPT7du3X2HGfw70t99+m5YuXZoOHz6cD0BXrlyZjh07lkaMGJFBff3112n8+PHpxx9/zMAMn7l+wYIF2SnX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</mdui:Logo>
+        <mdui:InformationURL xml:lang="it">http://www.teologialugano.ch/presentazione.php</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>teologialugano.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.010731,8.958130</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teologialugano.ch</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">FTL - Facoltà di Teologia di Lugano</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">FTL - Facoltà di Teologia di Lugano</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Facoltà di Teologia di Lugano</mdui:Description>
-          <mdui:Description xml:lang="it">Facoltà di Teologia, Bachelor in Filosofia, Master in Diritto comparato delle religioni e Master in Scienza, filosofia e teologia delle religioni.</mdui:Description>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAB40lEQVR4nHyT54pqQRCEfW5/+BoiKL6AqIgJIyZUxIQBFMWACQMGDBiwl6+5x7u67A4MJ3R3TVV1j+n5fJq+b/m3rternE4nOR6PcrvdjN/ymf+jmKJ6vS6RSETC4bAUCgVJp9PS6XQU7BPkDaDVamlyLpeT2WymQADM53NJJBJSLpdlMpm8gbxObjQaEovFZDweSyqVkvP5rGy2263KAXQ4HEo8Hlc2BogWL5dL8Xg80u/3tZBE3jkdFtPpVAaDgcZ6vZ74/X45HA4KogCgZ7NZ3avVSu73uxoXCAQkGAzK5XLRfxyExEwmo8AKQCKIBEmCMpo3m40Wk7xerzW+3+9VDv4kk0l5PB5i2u12enKxWFSaOA0Lr9crNptNHA6HetLtdl+xfD4vtVpNWZowqlQqaQB0kthOp1PMZrNYLBZxu91KGYawwHCY4YmJolAopLTYfHOa0RXa12631VgAAKeVMHi1EWeRQJ9ZyIKR1WoVu92uXaCQXOTSykql8r8LGBSNRjWJ9nACJuIDDDAWdsR4woy4AhiDVK1WdXSZRjYL3cbkIcOYzLdB+j7KzWZTfD6f6kcCycjjHcp4BeCfl2k0Gulg0WeeLpfr5Q9S/7xMn9cZTxaLhbbrt+v8BQAA//8DAOlyeh2ux7z8AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:Logo height="60" width="61">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAA8CAYAAADVPrJMAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAOXUlEQVR4nOTb568VVRcGcP89Ej7zRQjSFSK9CCKh96ACQihSAiiEGgEh1NACaEQIxYgaSmihhBLRCMZtfjtZN5th5twiN/rm3clwzj1nZs961nrWs9bec3jrr7/+euv/7ejWyVPDiO/+/PPP/D5e47v/SdAB7sGDB+ngwYPpyZMn6erVq2nPnj3pzJkzGezJkyfTrVu30ujRo9OGDRvy+T/88EN68eJFevny5SsO+s+CLiN48+bN9PTp0/TFF1+ktWvXpgMHDqTvv/8+vfPOO2n48OH5+88//zyf7xxOuXz5curXr1+6e/dudtTEiRPT7du3X2HGfw70t99+m5YuXZoOHz6cD0BXrlyZjh07lkaMGJFBff3112n8+PHpxx9/zMAMn7l+wYIF2SnX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</mdui:Logo>
-          <mdui:InformationURL xml:lang="it">http://www.teologialugano.ch/presentazione.php</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>teologialugano.ch</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:46.010731,8.958130</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIJAI6kfzxIEpklMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF2xvZ2luLnRlb2xvZ2lhbHVnYW5vLmNoMB4XDTE0MDcxODEzMzkyNFoXDTE3
 MDcxODEzMzkyNFowIjEgMB4GA1UEAxMXbG9naW4udGVvbG9naWFsdWdhbm8uY2gw
@@ -51,22 +51,22 @@ YUVDvnCOHv9nw3zWMDik60hGwk40mUdWea9aI4yleS5HmDi17ohoM4ZbrlQ5xdq9
 z7SqljxFiV0Q7+8GLlDbqUNdpTytaEnvqrxqzyBCoURGLrEDF1Qp4+594M2HMMZ8
 akw7kiV3wwQFEl5tgt44Uw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.teologialugano.ch/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.teologialugano.ch/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teologialugano.ch</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.teologialugano.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.teologialugano.ch/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teologialugano.ch</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIJAI6kfzxIEpklMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF2xvZ2luLnRlb2xvZ2lhbHVnYW5vLmNoMB4XDTE0MDcxODEzMzkyNFoXDTE3
 MDcxODEzMzkyNFowIjEgMB4GA1UEAxMXbG9naW4udGVvbG9naWFsdWdhbm8uY2gw
@@ -86,28 +86,28 @@ YUVDvnCOHv9nw3zWMDik60hGwk40mUdWea9aI4yleS5HmDi17ohoM4ZbrlQ5xdq9
 z7SqljxFiV0Q7+8GLlDbqUNdpTytaEnvqrxqzyBCoURGLrEDF1Qp4+594M2HMMZ8
 akw7kiV3wwQFEl5tgt44Uw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.teologialugano.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">teologialugano.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">FTL - Facoltà di Teologia di Lugano</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">FTL - Facoltà di Teologia di Lugano</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teologialugano.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.teologialugano.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>AAI</md:SurName>
-      <md:EmailAddress>mailto:help-aai@ti-edu.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Damiano</md:GivenName>
-      <md:SurName>Bianchi</md:SurName>
-      <md:EmailAddress>mailto:dbianchi@ti-edu.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.teologialugano.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">teologialugano.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">FTL - Facoltà di Teologia di Lugano</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">FTL - Facoltà di Teologia di Lugano</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teologialugano.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.teologialugano.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>AAI</md:SurName>
+    <md:EmailAddress>mailto:help-aai@ti-edu.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Damiano</md:GivenName>
+    <md:SurName>Bianchi</md:SurName>
+    <md:EmailAddress>mailto:dbianchi@ti-edu.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
index 339c690b..4c487de1 100644
--- a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">TERENA Secretariat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
+        <mdui:Description xml:lang="en">TERENA</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/terena.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">terena secretariat trans-european research and education networking association</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">terena secretariat trans-european research and education networking association</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.org</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">TERENA Secretariat</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
-          <mdui:Description xml:lang="en">TERENA</mdui:Description>
-          <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/terena.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">terena secretariat trans-european research and education networking association</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">terena secretariat trans-european research and education networking association</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/add0aa33e5963c5406d2b82f6b1d9f58"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">TERENA Secretariat</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">TERENA Secretariat</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">TERENA Secretariat</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.terena.org</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.terena.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/add0aa33e5963c5406d2b82f6b1d9f58"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">TERENA Secretariat</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">TERENA Secretariat</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA Secretariat</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.terena.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml
index ae72b613..0380cba0 100644
--- a/swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.tu.kielce.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-03T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-03T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu.kielce.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.tu.kielce.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kielce University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Kielce University of Technology</mdui:Description>
+        <mdui:Description xml:lang="pl">Politechnika Świętokrzyska w Kielcach</mdui:Description>
+        <mdui:Logo height="148" width="320" xml:lang="pl">https://login.tu.kielce.pl/images/logo_psk.png</mdui:Logo>
+        <mdui:Logo height="148" width="320" xml:lang="en">https://login.tu.kielce.pl/images/logo_psk_en.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>tu.kielce.pl</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.87977018,20.64002469</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu.kielce.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.tu.kielce.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kielce University of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Kielce University of Technology</mdui:Description>
-          <mdui:Description xml:lang="pl">Politechnika Świętokrzyska w Kielcach</mdui:Description>
-          <mdui:Logo height="148" width="320" xml:lang="pl">https://login.tu.kielce.pl/images/logo_psk.png</mdui:Logo>
-          <mdui:Logo height="148" width="320" xml:lang="en">https://login.tu.kielce.pl/images/logo_psk_en.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>tu.kielce.pl</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:50.87977018,20.64002469</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUTnhw903+0k++Hg8EackOlKEfAxwwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUy
 MVoXDTM1MDMxODA3NTUyMVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
@@ -51,13 +51,13 @@ AGSEf4Xdi84EO2e0FiQisCNrlUoLiL0oiVPjgkj+hwIsbTALPJep1rDw2BlrPM4d
 VlxKUGvRiA1AWI+DU1F+gFIJRydswFRpiyCmOT/oNwoLP9Riyc80Yl2HQQzDUFGQ
 QPpRH2L9Ng==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUQI1UT8yWaPEUeqnPogykaWscIWAwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUx
 OVoXDTM1MDMxODA3NTUxOVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
@@ -77,13 +77,13 @@ fieSwxhrohauXd2lBBeqsRMSKZ3P7g/cE3ysfjh2OXDwR6XaWtfs38nTJ9oHqLAl
 wqFLNr25soXe5wmt6fmNTO8dLdmYZc5+XSZ6Krj41W4HQcC/Hdt0WG121cbnFjA/
 TgC1gDMXgA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVANLQD1ad89CG5sAEr5cGVT+qRS/PMA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5wbDAeFw0xNTAzMTgwNzU1
 MjBaFw0zNTAzMTgwNzU1MjBaMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5w
@@ -103,26 +103,26 @@ tjXHqCHmep+cu4P3hW1iH8ZniMgkEIERXgK02wkhtUqWlGjbN95wt0Ne4OIWcvDA
 y9oVPwWqhUruhW3E4EveGvDcY6qgm8h2B4X4LPWh3ZD9JqEqcYP9SEnbZqLPGkjM
 uquJMZZ4oj8=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tu.kielce.pl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tu.kielce.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.tu.kielce.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tu.kielce.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu.kielce.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tu.kielce.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tu.kielce.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.tu.kielce.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tu.kielce.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu.kielce.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUTnhw903+0k++Hg8EackOlKEfAxwwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUy
 MVoXDTM1MDMxODA3NTUyMVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
@@ -142,13 +142,13 @@ AGSEf4Xdi84EO2e0FiQisCNrlUoLiL0oiVPjgkj+hwIsbTALPJep1rDw2BlrPM4d
 VlxKUGvRiA1AWI+DU1F+gFIJRydswFRpiyCmOT/oNwoLP9Riyc80Yl2HQQzDUFGQ
 QPpRH2L9Ng==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUQI1UT8yWaPEUeqnPogykaWscIWAwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUx
 OVoXDTM1MDMxODA3NTUxOVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
@@ -168,13 +168,13 @@ fieSwxhrohauXd2lBBeqsRMSKZ3P7g/cE3ysfjh2OXDwR6XaWtfs38nTJ9oHqLAl
 wqFLNr25soXe5wmt6fmNTO8dLdmYZc5+XSZ6Krj41W4HQcC/Hdt0WG121cbnFjA/
 TgC1gDMXgA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVANLQD1ad89CG5sAEr5cGVT+qRS/PMA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5wbDAeFw0xNTAzMTgwNzU1
 MjBaFw0zNTAzMTgwNzU1MjBaMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5w
@@ -194,21 +194,21 @@ tjXHqCHmep+cu4P3hW1iH8ZniMgkEIERXgK02wkhtUqWlGjbN95wt0Ne4OIWcvDA
 y9oVPwWqhUruhW3E4EveGvDcY6qgm8h2B4X4LPWh3ZD9JqEqcYP9SEnbZqLPGkjM
 uquJMZZ4oj8=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kielce University of Technology</md:OrganizationName>
-      <md:OrganizationName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kielce University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tu.kielce.pl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>PSK IdP</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:administrator@tu.kielce.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kielce University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kielce University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tu.kielce.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>PSK IdP</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:administrator@tu.kielce.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
index 6aa7c61d..f880bb7f 100644
--- a/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.uat.ezproxy.library.qmul.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-07T08:33:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-07T08:33:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFPTCCBCWgAwIBAgIRAI29zjKzu326VLd+tAYO77UwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -43,24 +43,24 @@
 						hhhraoEgWp63qgLAS+jK7iUDzyY+dKS3pqTxsB0g7twOqb5QOJHGYnR2lg6qROOh
 						/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary, University of London UAT EZproxy Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS Library Systems Team</md:GivenName>
-      <md:EmailAddress>mailto:lib-systems-team@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jez</md:GivenName>
-      <md:SurName>Clark</md:SurName>
-      <md:EmailAddress>mailto:j.p.clark@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary, University of London UAT EZproxy Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Library Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:lib-systems-team@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jez</md:GivenName>
+    <md:SurName>Clark</md:SurName>
+    <md:EmailAddress>mailto:j.p.clark@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml
index df4489bb..76f381df 100644
--- a/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.uc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.uc.edu/ucit/helpdesk.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Cincinnati Main Campus</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.uc.edu/kb/display/IDM/Federated+Central+Login+Service</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uc.edu/content/dam/uc/trustees/docs/rules_10/10-43-11.pdf</mdui:PrivacyStatementURL>
+        <mdui:Logo height="153" width="270" xml:lang="en">https://login.uc.edu/idp/images/UC_logo-incommon-official.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.uc.edu/ucit/helpdesk.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Cincinnati Main Campus</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.uc.edu/kb/display/IDM/Federated+Central+Login+Service</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uc.edu/content/dam/uc/trustees/docs/rules_10/10-43-11.pdf</mdui:PrivacyStatementURL>
-          <mdui:Logo height="153" width="270" xml:lang="en">https://login.uc.edu/idp/images/UC_logo-incommon-official.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEKjCCAxKgAwIBAgIJAJxtmyIj3xhRMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYD
 VQQKExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVj
@@ -49,24 +49,24 @@ mNpv1J6ljYmNk1SPlcSItGCcOg2ylIvsOC+CnyTHWudNOudvXzB5jJSxX0ub8hso
 Sg4vYkZirCjQaD1elzGSCq8B6FsnILF3Y9Nx1ug9A8lwEySuE+JmE3bw/94jAoYS
 0UnF4sqtFZqr6SDxYQ4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.uc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.uc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEKjCCAxKgAwIBAgIJAJxtmyIj3xhRMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYD
 VQQKExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVj
@@ -91,27 +91,27 @@ mNpv1J6ljYmNk1SPlcSItGCcOg2ylIvsOC+CnyTHWudNOudvXzB5jJSxX0ub8hso
 Sg4vYkZirCjQaD1elzGSCq8B6FsnILF3Y9Nx1ug9A8lwEySuE+JmE3bw/94jAoYS
 0UnF4sqtFZqr6SDxYQ4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cincinnati Main Campus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cincinnati Main Campus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew Hartman</md:GivenName>
-      <md:EmailAddress>eaigroup@ucmail.uc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Gary Grafe</md:GivenName>
-      <md:EmailAddress>grafegw@ucmail.uc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UCIT Help Desk</md:GivenName>
-      <md:EmailAddress>HelpDesk@uc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cincinnati Main Campus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cincinnati Main Campus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew Hartman</md:GivenName>
+    <md:EmailAddress>eaigroup@ucmail.uc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gary Grafe</md:GivenName>
+    <md:EmailAddress>grafegw@ucmail.uc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UCIT Help Desk</md:GivenName>
+    <md:EmailAddress>HelpDesk@uc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml
index f02bf878..a9b19793 100644
--- a/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ucs.ac.uk/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-06T09:23:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-06T09:23:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Campus Suffolk (Test)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Campus Suffolk (Test)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIJAM1dFRKkRxYPMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
 						BAYTAlVLMQwwCgYDVQQKDANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azAeFw0xNTA5
 						MDgxMTUwNDVaFw0yNTA5MDcxMTUwNDVaMC8xCzAJBgNVBAYTAlVLMQwwCgYDVQQK
@@ -40,13 +40,13 @@
 						fm75tfGWz9Tsg9nNILbKPkiZTW1XE+CMKunVcCR3UuICNX+YUK6dCEAmQZIH4YUk
 						GHQqIQc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMTCCAhmgAwIBAgIJAM1dFRKkRxYPMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
 						BAYTAlVLMQwwCgYDVQQKDANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azAeFw0xNTA5
 						MDgxMTUwNDVaFw0yNTA5MDcxMTUwNDVaMC8xCzAJBgNVBAYTAlVLMQwwCgYDVQQK
@@ -66,25 +66,25 @@
 						fm75tfGWz9Tsg9nNILbKPkiZTW1XE+CMKunVcCR3UuICNX+YUK6dCEAmQZIH4YUk
 						GHQqIQc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University Campus Suffolk</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University Campus Suffolk (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ithelpdesk@ucs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Will</md:GivenName>
-      <md:SurName>Liebow</md:SurName>
-      <md:EmailAddress>mailto:w.liebow@ucs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University Campus Suffolk</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University Campus Suffolk (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ithelpdesk@ucs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Will</md:GivenName>
+    <md:SurName>Liebow</md:SurName>
+    <md:EmailAddress>mailto:w.liebow@ucs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml b/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml
index e32fd4f2..acd68f6f 100644
--- a/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.uea.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-01T10:16:25Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-01T10:16:25Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uea.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of East Anglia (UEA)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://login.uea.ac.uk/oala/uea-uk-fed-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://login.uea.ac.uk/oala/uea-uk-fed-icon-16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>139.222.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uea.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of East Anglia (UEA)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://login.uea.ac.uk/oala/uea-uk-fed-logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://login.uea.ac.uk/oala/uea-uk-fed-icon-16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>139.222.0.0/16</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDoDCCAoigAwIBAgIJAIuKNtoJUQjXMA0GCSqGSIb3DQEBBQUAMD4xIjAgBgNV
 						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
 						YS5hYy51azAeFw0xMDExMDkwNzU3NTJaFw0yMDExMDYwNzU3NTJaMD4xIjAgBgNV
@@ -40,13 +40,13 @@
 						NpCaUKSy/eK1MvlZph0VK6QY4P7xlZMvEnMQscrf/bEBblQ+dGyfM664mnPAvWgR
 						nIhXWvtGhtoIysHU01bNRSH11OA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDoDCCAoigAwIBAgIJAIuKNtoJUQjXMA0GCSqGSIb3DQEBBQUAMD4xIjAgBgNV
 						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
 						YS5hYy51azAeFw0xMDExMDkwNzU3NTJaFw0yMDExMDYwNzU3NTJaMD4xIjAgBgNV
@@ -68,23 +68,23 @@
 						NpCaUKSy/eK1MvlZph0VK6QY4P7xlZMvEnMQscrf/bEBblQ+dGyfM664mnPAvWgR
 						nIhXWvtGhtoIysHU01bNRSH11OA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uea.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uea.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of East Anglia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of East Anglia (UEA)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uea.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UEA Web Support</md:GivenName>
-      <md:EmailAddress>mailto:web@uea.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UEA Web Support</md:GivenName>
-      <md:EmailAddress>mailto:web@uea.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uea.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uea.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of East Anglia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of East Anglia (UEA)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uea.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UEA Web Support</md:GivenName>
+    <md:EmailAddress>mailto:web@uea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UEA Web Support</md:GivenName>
+    <md:EmailAddress>mailto:web@uea.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml
index 2d75a7db..eaadf34d 100644
--- a/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ufl.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.ufl.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufl.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Florida</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Florida - GatorLink Credentials</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.it.ufl.edu/identity/shibboleth/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://privacy.ufl.edu/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="38" width="135" xml:lang="en">https://images.webadmin.ufl.edu/signatures/wordmark.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.ufl.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufl.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Florida</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Florida - GatorLink Credentials</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.it.ufl.edu/identity/shibboleth/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://privacy.ufl.edu/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="38" width="135" xml:lang="en">https://images.webadmin.ufl.edu/signatures/wordmark.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAM6XTJCGu1xXMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWxvZ2luLnVmbC5lZHUwHhcNMTEwNjMwMTY1NDU5WhcNMjEwNjI3MTY1NDU5
 WjAYMRYwFAYDVQQDEw1sb2dpbi51ZmwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -44,23 +44,23 @@ pm+Rc95JoFHZz3tYflLU+3kOkEGHUCX08+BrQLc26BcdZokKySbKzXPUsBpmYUEY
 MStdDm/Po7ON4Shh1TpvMEFEofUNUIU5uY5oHLO8gFx+AWRG47URXfxgeyEf9+SB
 aFbDixFvCWbqDUiuKdivSWdqiPYSPiINYEAm3p46viJ4+6CBFELzDOTcZUrXZaSD
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufl.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufl.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufl.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufl.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufl.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufl.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufl.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufl.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufl.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufl.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAM6XTJCGu1xXMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDWxvZ2luLnVmbC5lZHUwHhcNMTEwNjMwMTY1NDU5WhcNMjEwNjI3MTY1NDU5
 WjAYMRYwFAYDVQQDEw1sb2dpbi51ZmwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -79,31 +79,31 @@ pm+Rc95JoFHZz3tYflLU+3kOkEGHUCX08+BrQLc26BcdZokKySbKzXPUsBpmYUEY
 MStdDm/Po7ON4Shh1TpvMEFEofUNUIU5uY5oHLO8gFx+AWRG47URXfxgeyEf9+SB
 aFbDixFvCWbqDUiuKdivSWdqiPYSPiINYEAm3p46viJ4+6CBFELzDOTcZUrXZaSD
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Florida</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Florida</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufl.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eli Ben-Shoshan</md:GivenName>
-      <md:EmailAddress>ebs@ufl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Curry</md:GivenName>
-      <md:EmailAddress>whcurry@ufl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rich Lowrey</md:GivenName>
-      <md:EmailAddress>ufrich@ufl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Charles Tompkins</md:GivenName>
-      <md:EmailAddress>crt@ufl.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Florida</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Florida</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufl.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eli Ben-Shoshan</md:GivenName>
+    <md:EmailAddress>ebs@ufl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Curry</md:GivenName>
+    <md:EmailAddress>whcurry@ufl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rich Lowrey</md:GivenName>
+    <md:EmailAddress>ufrich@ufl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Charles Tompkins</md:GivenName>
+    <md:EmailAddress>crt@ufl.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
index 02ba01d7..408b7859 100644
--- a/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ufrgs.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrgs.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrgs.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrgs.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrgs.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufrgs.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufrgs.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID/jCCAuYCAQAwDQYJKoZIhvcNAQEFBQAwgcQxMjAwBgNVBAoTKVVuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
 JzAlBgkqhkiG9w0BCQEWGHJ1aS5yaWJlaXJvQGNwZC51ZnJncy5icjEVMBMGA1UE
@@ -46,26 +46,26 @@ h6eGFBJcSELUyVd+D4NE5H0m7SkuOkSkqg+3XcljYfjJbMFNLqcTJdE77RKpKggW
 vRvJ63diY18yTbcJJbacsuwUnY8tgbnWaxgHtZzaHBiJqJIh7vZLAoQxyUMoENof
 d/IbBMgj8Fg+rkrDM0GRRlHh
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrgs.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrgs.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                  
 MIID/jCCAuYCAQAwDQYJKoZIhvcNAQEFBQAwgcQxMjAwBgNVBAoTKVVuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
@@ -91,24 +91,24 @@ vRvJ63diY18yTbcJJbacsuwUnY8tgbnWaxgHtZzaHBiJqJIh7vZLAoQxyUMoENof
 d/IbBMgj8Fg+rkrDM0GRRlHh
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufrgs.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Everton Foscarini</md:SurName>
-      <md:EmailAddress>foscarini@cpd.ufrgs.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufrgs.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Everton Foscarini</md:SurName>
+    <md:EmailAddress>foscarini@cpd.ufrgs.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml b/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
index 5248a2ff..dde0154a 100644
--- a/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.umcs.pl:9443/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-09-11T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-09-11T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Maria Curie-Sklodowska University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Maria Curie-Sklodowska University</mdui:Description>
+        <mdui:Description xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</mdui:Description>
+        <mdui:Logo height="92" width="300" xml:lang="en">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
+        <mdui:Logo height="92" width="300" xml:lang="pl">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>umcs.pl</mdui:DomainHint>
+        <mdui:IPHint>87.246.208.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:51.245915,22.541437</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Maria Curie-Sklodowska University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Maria Curie-Sklodowska University</mdui:Description>
-          <mdui:Description xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</mdui:Description>
-          <mdui:Logo height="92" width="300" xml:lang="en">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
-          <mdui:Logo height="92" width="300" xml:lang="pl">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>umcs.pl</mdui:DomainHint>
-          <mdui:IPHint>87.246.208.0/24</mdui:IPHint>
-          <mdui:GeolocationHint>geo:51.245915,22.541437</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJTCCAg2gAwIBAgIVAMVDBap8O1TOuLbc37xKkG0zsNfgMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
 MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
@@ -44,13 +44,13 @@ ZKCWYB8ZTWT85JkDw94OoGqCesAzoCVf525n0b4E/+ohHEYIEZdApcyRs9VmdccU
 H+ZUJFqCXtvqZss+o6bMuBSLMV8xOIbgFex8Pgl8NA01FizfKF8jR1iTQ9IKXecJ
 DZ4SNNLpb4ZEM+5HySt2wDlDsfdJcZdYYNV/Wi3xcv74WJzxCdHYoSo=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJTCCAg2gAwIBAgIVAOKw8Okl/Qs8gxrRP+Kih0g5ZVyDMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ3WhcN
 MzUwNTEzMTMxNDQ3WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
@@ -69,13 +69,13 @@ GdFdFcni64S3pY2CAWr9EVLajavDG70BEqnTk7JpdLeUb27cSDL4gLi04KiGEgr9
 DhuU+dHaoQHmSwsV7P/e21bXtaF9e2KSq3QH1Ar4sIIwanbzixYp6nqIhpEUgMqt
 FJK+09j1gXF3zoBqQBKiu6LPskGSdysF1HLImTOZKnqJWdagZBAzhPc=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJTCCAg2gAwIBAgIVAMov+qL27DY7b0GGhKB6cR5yAjjmMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
 MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
@@ -94,30 +94,30 @@ b2xldGgwDQYJKoZIhvcNAQELBQADggEBAB82Jxbep9eZZlmgX9ZrO8zOuL01VN8y
 4cAv8Lza2e17KmD/CYGncWc+L++kP40CW+kCierHubfe0BtCyq/e4NcONXGoLotB
 wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.umcs.pl:9443/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.umcs.pl:9443/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJTCCAg2gAwIBAgIVAMVDBap8O1TOuLbc37xKkG0zsNfgMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
 MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
@@ -136,13 +136,13 @@ ZKCWYB8ZTWT85JkDw94OoGqCesAzoCVf525n0b4E/+ohHEYIEZdApcyRs9VmdccU
 H+ZUJFqCXtvqZss+o6bMuBSLMV8xOIbgFex8Pgl8NA01FizfKF8jR1iTQ9IKXecJ
 DZ4SNNLpb4ZEM+5HySt2wDlDsfdJcZdYYNV/Wi3xcv74WJzxCdHYoSo=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJTCCAg2gAwIBAgIVAOKw8Okl/Qs8gxrRP+Kih0g5ZVyDMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ3WhcN
 MzUwNTEzMTMxNDQ3WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
@@ -161,13 +161,13 @@ GdFdFcni64S3pY2CAWr9EVLajavDG70BEqnTk7JpdLeUb27cSDL4gLi04KiGEgr9
 DhuU+dHaoQHmSwsV7P/e21bXtaF9e2KSq3QH1Ar4sIIwanbzixYp6nqIhpEUgMqt
 FJK+09j1gXF3zoBqQBKiu6LPskGSdysF1HLImTOZKnqJWdagZBAzhPc=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJTCCAg2gAwIBAgIVAMov+qL27DY7b0GGhKB6cR5yAjjmMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
 MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
@@ -186,23 +186,23 @@ b2xldGgwDQYJKoZIhvcNAQELBQADggEBAB82Jxbep9eZZlmgX9ZrO8zOuL01VN8y
 4cAv8Lza2e17KmD/CYGncWc+L++kP40CW+kCierHubfe0BtCyq/e4NcONXGoLotB
 wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="pl">http://www.umcs.pl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.umcs.pl/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sekcja Obsługi Informatycznej</md:GivenName>
-      <md:SurName>UMCS</md:SurName>
-      <md:EmailAddress>mailto:usosweb@umcs.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pl">http://www.umcs.pl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.umcs.pl/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sekcja Obsługi Informatycznej</md:GivenName>
+    <md:SurName>UMCS</md:SurName>
+    <md:EmailAddress>mailto:usosweb@umcs.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml
index 4e486412..4fb7be7b 100644
--- a/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.umt.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Montana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Montana federated identity provider via InCommon.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.umt.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.umt.edu/privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="30" width="163" xml:lang="en">https://www.umt.edu/_common/assets/imx/um_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The University of Montana</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Montana federated identity provider via InCommon.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.umt.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.umt.edu/privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="30" width="163" xml:lang="en">https://www.umt.edu/_common/assets/imx/um_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUNwdPADxM5zSBnh6CyfSZ8WK45hEwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNbG9naW4udW10LmVkdTAeFw0xNDA2MjMyMTE2MTFaFw0z
 NDA2MjMyMTE2MTFaMBgxFjAUBgNVBAMTDWxvZ2luLnVtdC5lZHUwggEiMA0GCSqG
@@ -41,23 +41,23 @@ gE5eqFpIj9joU0ElQotyVB4+3HSZnU9dHfTTQq4vrM0s92eLzyTNIiTic8htUc6L
 SEx2DQoFwQwLwdadb2CdhqB5mW/v4j9dO55gx5p7HgI6B2a2Zuh+imdyAWIvMw48
 A3X832P78ktaAO25Bspo0Oyk4aCo7Ge4xRrlgGhWll6rAL0=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.umt.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.umt.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umt.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUNwdPADxM5zSBnh6CyfSZ8WK45hEwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNbG9naW4udW10LmVkdTAeFw0xNDA2MjMyMTE2MTFaFw0z
 NDA2MjMyMTE2MTFaMBgxFjAUBgNVBAMTDWxvZ2luLnVtdC5lZHUwggEiMA0GCSqG
@@ -76,26 +76,26 @@ gE5eqFpIj9joU0ElQotyVB4+3HSZnU9dHfTTQq4vrM0s92eLzyTNIiTic8htUc6L
 SEx2DQoFwQwLwdadb2CdhqB5mW/v4j9dO55gx5p7HgI6B2a2Zuh+imdyAWIvMw48
 A3X832P78ktaAO25Bspo0Oyk4aCo7Ge4xRrlgGhWll6rAL0=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Montana</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Montana</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh O'Dowd</md:GivenName>
-      <md:EmailAddress>josh.odowd@umontana.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Gary Trethewey</md:GivenName>
-      <md:EmailAddress>gary.trethewey@umontana.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Adrian Irish</md:GivenName>
-      <md:EmailAddress>adrian.irish@umontana.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Montana</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Montana</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh O'Dowd</md:GivenName>
+    <md:EmailAddress>josh.odowd@umontana.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gary Trethewey</md:GivenName>
+    <md:EmailAddress>gary.trethewey@umontana.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Adrian Irish</md:GivenName>
+    <md:EmailAddress>adrian.irish@umontana.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml b/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml
index d58cafd8..2cb70ee4 100644
--- a/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml
+++ b/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.unlv.edu/FIM/sps/MyShib/saml20">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unlv.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nevada-Las Vegas</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://oit.unlv.edu/incommon/information</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unlv.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nevada-Las Vegas</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://oit.unlv.edu/incommon/information</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjqgAwIBAgIEVD3EHjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJVUzELMAkGA1UE
 CBMCTlYxEjAQBgNVBAcTCUxhcyBWZWdhczENMAsGA1UEChMEVU5MVjEMMAoGA1UECxMDT0lUMR4w
 HAYDVQQDExVzc28tZmltLXNoaWIudW5sdi5lZHUwHhcNMTQxMDE1MDA0NzI2WhcNMjMwMTAxMDE0
@@ -36,22 +36,22 @@ uEpSKrxb+HN2vO2hQ9SSFi6gxmkVWg1eK7c/JPh36vmX6dlGuhUBPnsr4wgpfC/ZFOGEAo1Vwpu7
 HVfcwNXQRj8KQswTahjDFSbPulp97SLNa5aMw3f1PRtnGGvb8HB7CSjGfzHouNqxTEPf3A0nqpdx
 9ec1L21OjIC/MXHxLYUfFJOldQNNCr5jHELdJU2xsuv3t7G8dNw/dwIjL3ItJgEYFeQNDUTIl78=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/slo"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/soap"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/login"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/login"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unlv.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/slo"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/soap"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/login"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/login"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unlv.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDUjCCAjqgAwIBAgIEVD3EHjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJVUzELMAkGA1UE
 CBMCTlYxEjAQBgNVBAcTCUxhcyBWZWdhczENMAsGA1UEChMEVU5MVjEMMAoGA1UECxMDT0lUMR4w
 HAYDVQQDExVzc28tZmltLXNoaWIudW5sdi5lZHUwHhcNMTQxMDE1MDA0NzI2WhcNMjMwMTAxMDE0
@@ -68,30 +68,30 @@ uEpSKrxb+HN2vO2hQ9SSFi6gxmkVWg1eK7c/JPh36vmX6dlGuhUBPnsr4wgpfC/ZFOGEAo1Vwpu7
 HVfcwNXQRj8KQswTahjDFSbPulp97SLNa5aMw3f1PRtnGGvb8HB7CSjGfzHouNqxTEPf3A0nqpdx
 9ec1L21OjIC/MXHxLYUfFJOldQNNCr5jHELdJU2xsuv3t7G8dNw/dwIjL3ItJgEYFeQNDUTIl78=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/soap"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nevada-Las Vegas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nevada-Las Vegas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unlv.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Don Diener</md:GivenName>
-      <md:EmailAddress>don.diener@unlv.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bob Fournier</md:GivenName>
-      <md:EmailAddress>bob.fournier@unlv.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT  Help Desk</md:GivenName>
-      <md:EmailAddress>ithelp@unlv.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>IT Security Office</md:GivenName>
-      <md:EmailAddress>informationsecurityoffice@unlv.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/soap"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nevada-Las Vegas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nevada-Las Vegas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unlv.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Don Diener</md:GivenName>
+    <md:EmailAddress>don.diener@unlv.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bob Fournier</md:GivenName>
+    <md:EmailAddress>bob.fournier@unlv.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT  Help Desk</md:GivenName>
+    <md:EmailAddress>ithelp@unlv.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>IT Security Office</md:GivenName>
+    <md:EmailAddress>informationsecurityoffice@unlv.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml
index dbd285fc..d1006d19 100644
--- a/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.uoc.gr/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucnet.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rector.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csd.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">physics.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.physics.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chemistry.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.chemistry.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biology.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.biology.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.med.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">materials.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.materials.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fks.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">philology.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ia.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.soc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.soc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">social.soc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psy.soc.uoc.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucnet.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rector.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csd.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">physics.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.physics.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chemistry.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.chemistry.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biology.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.biology.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.med.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">materials.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.materials.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fks.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">philology.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ia.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.soc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.soc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">social.soc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psy.soc.uoc.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEfjCCA2agAwIBAgIQeedqjtyFxtg1J78DPtZYdjANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTE0MTAwODAwMDAwMFoXDTE2MTIzMTIzNTk1OVowOjEhMB8GA1UE
@@ -70,51 +70,51 @@
                             tAOiVMATkXCl/nWUTGC1g/wlJBw5aL8k8wNkhuApDFIpXWh6LPvmlLYrnDNSarP8
                             l+c=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uoc.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uoc.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uoc.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uoc.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.uoc.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uoc.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucnet.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rector.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csd.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">physics.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.physics.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chemistry.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.chemistry.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biology.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.biology.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.med.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">materials.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.materials.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fks.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">philology.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ia.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.soc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.soc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">social.soc.uoc.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psy.soc.uoc.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uoc.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uoc.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uoc.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uoc.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.uoc.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uoc.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucnet.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rector.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csd.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">physics.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.physics.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chemistry.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.chemistry.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biology.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.biology.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.med.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">materials.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.materials.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fks.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">philology.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ia.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.soc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.soc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">social.soc.uoc.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psy.soc.uoc.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIEfjCCA2agAwIBAgIQeedqjtyFxtg1J78DPtZYdjANBgkqhkiG9w0BAQUFADA2
                             MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
                             U1NMIENBMB4XDTE0MTAwODAwMDAwMFoXDTE2MTIzMTIzNTk1OVowOjEhMB8GA1UE
@@ -141,29 +141,29 @@
                             tAOiVMATkXCl/nWUTGC1g/wlJBw5aL8k8wNkhuApDFIpXWh6LPvmlLYrnDNSarP8
                             l+c=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uoc.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uoc.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Crete</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Πανεπιστήμιο Κρήτης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Crete</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Κρήτης</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uoc.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.uoc.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michalis</md:GivenName>
-      <md:SurName>Kalogirou</md:SurName>
-      <md:EmailAddress>kalogirou@uoc.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>University of Crete</md:Company>
-      <md:EmailAddress>helpdesk@uoc.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uoc.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uoc.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Crete</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Κρήτης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Crete</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Κρήτης</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uoc.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.uoc.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michalis</md:GivenName>
+    <md:SurName>Kalogirou</md:SurName>
+    <md:EmailAddress>kalogirou@uoc.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Crete</md:Company>
+    <md:EmailAddress>helpdesk@uoc.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
index be54889f..07f1c8a9 100644
--- a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
+++ b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.utenos-kolegija.lt/SAML/IdP">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-10-09T07:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-10-09T07:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utenos-kolegija.lt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="lt">Utenos kolegija</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Utena University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="lt">Utenos kolegijos vieningas prisijungimas</mdui:Description>
+        <mdui:Description xml:lang="en">Single sign-on for Utena University of Applied Sciences</mdui:Description>
+        <mdui:InformationURL xml:lang="lt">https://login.utenos-kolegija.lt/?lang=lt</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://login.utenos-kolegija.lt/?lang=en</mdui:InformationURL>
+        <mdui:Logo width="100" height="100">https://login.utenos-kolegija.lt/static/logo_100.png</mdui:Logo>
+        <mdui:Logo width="256" height="256">https://login.utenos-kolegija.lt/static/logo_256.png</mdui:Logo>
+        <mdui:Logo width="512" height="512">https://login.utenos-kolegija.lt/static/logo_512.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:55.499166,25.601316</mdui:GeolocationHint>
+        <mdui:IPHint>193.219.181.176/28</mdui:IPHint>
+        <mdui:IPHint>193.219.181.192/26</mdui:IPHint>
+        <mdui:IPHint>2001:778:e27f::/48</mdui:IPHint>
+        <mdui:DomainHint>utenos-kolegija.lt</mdui:DomainHint>
+        <mdui:DomainHint>ukolegija.lt</mdui:DomainHint>
+        <mdui:DomainHint>utenacollege.eu</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utenos-kolegija.lt</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="lt">Utenos kolegija</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Utena University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="lt">Utenos kolegijos vieningas prisijungimas</mdui:Description>
-          <mdui:Description xml:lang="en">Single sign-on for Utena University of Applied Sciences</mdui:Description>
-          <mdui:InformationURL xml:lang="lt">https://login.utenos-kolegija.lt/?lang=lt</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://login.utenos-kolegija.lt/?lang=en</mdui:InformationURL>
-          <mdui:Logo width="100" height="100">https://login.utenos-kolegija.lt/static/logo_100.png</mdui:Logo>
-          <mdui:Logo width="256" height="256">https://login.utenos-kolegija.lt/static/logo_256.png</mdui:Logo>
-          <mdui:Logo width="512" height="512">https://login.utenos-kolegija.lt/static/logo_512.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:55.499166,25.601316</mdui:GeolocationHint>
-          <mdui:IPHint>193.219.181.176/28</mdui:IPHint>
-          <mdui:IPHint>193.219.181.192/26</mdui:IPHint>
-          <mdui:IPHint>2001:778:e27f::/48</mdui:IPHint>
-          <mdui:DomainHint>utenos-kolegija.lt</mdui:DomainHint>
-          <mdui:DomainHint>ukolegija.lt</mdui:DomainHint>
-          <mdui:DomainHint>utenacollege.eu</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQx
 GDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVn
 aWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMC
@@ -68,13 +68,13 @@ tIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZe
 BV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTl
 EKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQx
 GDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVn
 aWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMC
@@ -109,27 +109,27 @@ tIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZe
 BV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTl
 EKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="lt">Utenos kolegija</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Utena University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="lt">Utenos kolegija</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Utena University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="lt">http://www.utenos-kolegija.lt/?lang=lt</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.utenos-kolegija.lt/?lang=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mantas</md:GivenName>
-      <md:SurName>Mikulėnas</md:SurName>
-      <md:EmailAddress>mailto:sso@utenos-kolegija.lt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="lt">Utenos kolegija</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Utena University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="lt">Utenos kolegija</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Utena University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="lt">http://www.utenos-kolegija.lt/?lang=lt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utenos-kolegija.lt/?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mantas</md:GivenName>
+    <md:SurName>Mikulėnas</md:SurName>
+    <md:EmailAddress>mailto:sso@utenos-kolegija.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml
index d4cfee45..24c6f190 100644
--- a/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.utp.edu.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-23T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-23T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utp.edu.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Science and Technology in Bydgoszcz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Science and Technology in Bydgoszcz</mdui:Description>
+        <mdui:DisplayName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</mdui:DisplayName>
+        <mdui:Description xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</mdui:Description>
+        <mdui:Logo height="100" width="411">https://login.utp.edu.pl/idp/images/logo_org.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utp.edu.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Science and Technology in Bydgoszcz</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Science and Technology in Bydgoszcz</mdui:Description>
-          <mdui:DisplayName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</mdui:DisplayName>
-          <mdui:Description xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</mdui:Description>
-          <mdui:Logo height="100" width="411">https://login.utp.edu.pl/idp/images/logo_org.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANTZhzBBbVG3A5ID/bB5iH95qTPMMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwHhcNMTUwNDE2MTA1OTI0
 WhcNMzUwNDE2MTA1OTI0WjAbMRkwFwYDVQQDDBBsb2dpbi51dHAuZWR1LnBsMIIB
@@ -44,13 +44,13 @@ QST+t+jRw2fQIn/Dg54oXjZ1GcWc5/erSPO0CgtWgm20iJmeoDbinaosNg01pzLb
 /2Zkwu9baimGvvwuRioCWrv8eZwyeNDZTJht/KXlOdP3o46c6qqqO74unu4KjFmo
 M3XxZC+dPpFfVbMXN5To7yCoUzwi5rpQt6yjQJ17oa6ZsVMco6fNSBiAxum02hV8
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUfpqpOEPSJsl5JtwBlfItUOO3fCUwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjNa
 Fw0zNTA0MTYxMDU5MjNaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
@@ -69,13 +69,13 @@ xdFkJE+nnSXHB+kFTzsbwLy6+S7opofS61dIAxdh3vwja0a8fnQre/yHVTD3j7Pe
 r5pBrBBCUKf4CkNizS2sz5W0ikv9W0f8fehSVr33mABcJewP4lUkcM5Zxs2Ktost
 iOsudRJYzu9b82Hc5lqvq6cG2xODy3YxKEAqMOQfUYZzpiyJsI6gj4iGEr+yI7o=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUbBTB/3SY7nD+jXiZK9grzmv42cswDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjRa
 Fw0zNTA0MTYxMDU5MjRaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
@@ -94,26 +94,26 @@ GT2KjwWOBkOKov1SWYU9Dio5ixbwqEj6Yk01avNO3H+ccIptZ1MNVX04uLnV0+J/
 Mo5hv2+kVOVeoXhmkJNo7867iIY9vU87JL5T1YS2l/LxlhsDU5gHQWNesfwgxHsY
 l8pnSfcxhoDEKU6WG6KnFdf+SfFtdg2ktYT8adwxpf31LacR/ZoNfem086a6kN0=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.utp.edu.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.utp.edu.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.utp.edu.pl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utp.edu.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.utp.edu.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utp.edu.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utp.edu.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.utp.edu.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.utp.edu.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.utp.edu.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utp.edu.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.utp.edu.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utp.edu.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utp.edu.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANTZhzBBbVG3A5ID/bB5iH95qTPMMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwHhcNMTUwNDE2MTA1OTI0
 WhcNMzUwNDE2MTA1OTI0WjAbMRkwFwYDVQQDDBBsb2dpbi51dHAuZWR1LnBsMIIB
@@ -132,13 +132,13 @@ QST+t+jRw2fQIn/Dg54oXjZ1GcWc5/erSPO0CgtWgm20iJmeoDbinaosNg01pzLb
 /2Zkwu9baimGvvwuRioCWrv8eZwyeNDZTJht/KXlOdP3o46c6qqqO74unu4KjFmo
 M3XxZC+dPpFfVbMXN5To7yCoUzwi5rpQt6yjQJ17oa6ZsVMco6fNSBiAxum02hV8
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUfpqpOEPSJsl5JtwBlfItUOO3fCUwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjNa
 Fw0zNTA0MTYxMDU5MjNaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
@@ -157,13 +157,13 @@ xdFkJE+nnSXHB+kFTzsbwLy6+S7opofS61dIAxdh3vwja0a8fnQre/yHVTD3j7Pe
 r5pBrBBCUKf4CkNizS2sz5W0ikv9W0f8fehSVr33mABcJewP4lUkcM5Zxs2Ktost
 iOsudRJYzu9b82Hc5lqvq6cG2xODy3YxKEAqMOQfUYZzpiyJsI6gj4iGEr+yI7o=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUbBTB/3SY7nD+jXiZK9grzmv42cswDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjRa
 Fw0zNTA0MTYxMDU5MjRaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
@@ -182,21 +182,21 @@ GT2KjwWOBkOKov1SWYU9Dio5ixbwqEj6Yk01avNO3H+ccIptZ1MNVX04uLnV0+J/
 Mo5hv2+kVOVeoXhmkJNo7867iIY9vU87JL5T1YS2l/LxlhsDU5gHQWNesfwgxHsY
 l8pnSfcxhoDEKU6WG6KnFdf+SfFtdg2ktYT8adwxpf31LacR/ZoNfem086a6kN0=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.utp.edu.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Science and Technology in Bydgoszcz</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Science and Technology in Bydgoszcz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="pl">http://www.utp.edu.pl</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.utp.edu.pl/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DMASK</md:GivenName>
-      <md:EmailAddress>admin@utp.edu.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.utp.edu.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Science and Technology in Bydgoszcz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Science and Technology in Bydgoszcz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pl">http://www.utp.edu.pl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utp.edu.pl/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DMASK</md:GivenName>
+    <md:EmailAddress>admin@utp.edu.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
index ea530c34..a4408eb5 100644
--- a/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.vu.lt/SSO/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2010-09-27T06:35:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2010-09-27T06:35:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vu.lt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vilnius University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="lt">Vilniaus universitetas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">VU Single Sign On</mdui:Description>
+        <mdui:Description xml:lang="lt">VU Vieningo prisijungimo sistema</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vu.lt</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="lt">http://www.vu.lt</mdui:InformationURL>
+        <mdui:Logo width="66" height="73">https://www.ittc.vu.lt/images/vu_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vu.lt</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Vilnius University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="lt">Vilniaus universitetas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">VU Single Sign On</mdui:Description>
-          <mdui:Description xml:lang="lt">VU Vieningo prisijungimo sistema</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vu.lt</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="lt">http://www.vu.lt</mdui:InformationURL>
-          <mdui:Logo width="66" height="73">https://www.ittc.vu.lt/images/vu_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID5zCCAs+gAwIBAgIJAOXB1LH43Dw1MA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 VQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czEkMCIG
 A1UECgwbVmlsbml1cyBVbml2ZXJzaXR5IC8gTElUTkVUMRAwDgYDVQQDDAdBcm1p
@@ -45,13 +45,13 @@ Wne/3BTt+8SGDEaWlMl7G5fYtNc++U7lCzg+8HPTo4lBwMP4f+mbf5uYxwQXCoLs
 JOz7+J41MHf7QuwLCUdx66rbegfSV7t1QaTvgtGTFnl2hInXtrRmgC/tkmo4hiLx
 ypUW4JChUxDyAuRqBVkP2pGiL6cf3vru8eEPdS+3QTBqmmbEZ1uVqw8VjQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID5zCCAs+gAwIBAgIJAOXB1LH43Dw1MA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 VQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czEkMCIG
 A1UECgwbVmlsbml1cyBVbml2ZXJzaXR5IC8gTElUTkVUMRAwDgYDVQQDDAdBcm1p
@@ -74,23 +74,23 @@ Wne/3BTt+8SGDEaWlMl7G5fYtNc++U7lCzg+8HPTo4lBwMP4f+mbf5uYxwQXCoLs
 JOz7+J41MHf7QuwLCUdx66rbegfSV7t1QaTvgtGTFnl2hInXtrRmgC/tkmo4hiLx
 ypUW4JChUxDyAuRqBVkP2pGiL6cf3vru8eEPdS+3QTBqmmbEZ1uVqw8VjQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vu.lt/SSO/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vu.lt/SSO/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="lt">Vilniaus universitetas</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Vilnius University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="lt">Vilniaus universitetas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Vilnius University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="lt">http://www.vu.lt</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.vu.lt</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>VU</md:GivenName>
-      <md:SurName>SSO Admin</md:SurName>
-      <md:EmailAddress>mailto:sso-admin@vu.lt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vu.lt/SSO/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vu.lt/SSO/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="lt">Vilniaus universitetas</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vilnius University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="lt">Vilniaus universitetas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vilnius University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="lt">http://www.vu.lt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vu.lt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>VU</md:GivenName>
+    <md:SurName>SSO Admin</md:SurName>
+    <md:EmailAddress>mailto:sso-admin@vu.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml b/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml
index e8fc7c36..5cefbe34 100644
--- a/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.w-hs.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-04-27T14:44:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-04-27T14:44:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">w-hs.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Westfälische Hochschule</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Westfälische Hochschule, University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Westfälische Hochschule Gelsenkirchen Bocholt Recklinghausen</mdui:Description>
+        <mdui:Description xml:lang="en">Westfälische Hochschule, University of Applied Sciences Gelsenkirchen Bocholt Recklinghausen</mdui:Description>
+        <mdui:Logo height="16" width="16">https://login.w-hs.de/idp/images/favicon.png</mdui:Logo>
+        <mdui:Logo height="103" width="393">https://login.w-hs.de/idp/images/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.w-hs.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.en.w-hs.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">w-hs.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Westfälische Hochschule</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Westfälische Hochschule, University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Westfälische Hochschule Gelsenkirchen Bocholt Recklinghausen</mdui:Description>
-          <mdui:Description xml:lang="en">Westfälische Hochschule, University of Applied Sciences Gelsenkirchen Bocholt Recklinghausen</mdui:Description>
-          <mdui:Logo height="16" width="16">https://login.w-hs.de/idp/images/favicon.png</mdui:Logo>
-          <mdui:Logo height="103" width="393">https://login.w-hs.de/idp/images/logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.w-hs.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.en.w-hs.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>login.w-hs.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=login.w-hs.de,OU=ZIM-IT,O=Westfaelische Hochschule Gelsenkirchen\, Bocholt\, Recklinghausen,L=Gelsenkirchen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHCzCCBfOgAwIBAgIHGI6IZfmuSjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>login.w-hs.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=login.w-hs.de,OU=ZIM-IT,O=Westfaelische Hochschule Gelsenkirchen\, Bocholt\, Recklinghausen,L=Gelsenkirchen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHCzCCBfOgAwIBAgIHGI6IZfmuSjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
 BhMCREUxSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNjaHVsZSBHZWxzZW5r
 aXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEvMC0GA1UEAxMmQ0EgZGVy
 IFdlc3RmYWVsaXNjaGVuIEhvY2hzY2h1bGUgLSBHMDExGTAXBgkqhkiG9w0BCQEW
@@ -64,33 +64,33 @@ ffKu8gIH14ELKwoqElGCcLTNjyUli6gJNGt283bQKQvaPBch/VjBSR0jsN6drwh/
 rG6E1/n5PC2dad/xREhU4fKhz4zPbdb6pq583GPz/pOTItpZ1iEcFJO43UIO8s7p
 1flnDftTm/jsXvc+lc5/qA60dRU52CfJhDfc0kVY6g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.w-hs.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.w-hs.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.w-hs.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.w-hs.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.w-hs.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.w-hs.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.w-hs.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">w-hs.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>login.w-hs.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=login.w-hs.de,OU=ZIM-IT,O=Westfaelische Hochschule Gelsenkirchen\, Bocholt\, Recklinghausen,L=Gelsenkirchen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHCzCCBfOgAwIBAgIHGI6IZfmuSjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.w-hs.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.w-hs.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.w-hs.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.w-hs.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.w-hs.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.w-hs.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.w-hs.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">w-hs.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>login.w-hs.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=login.w-hs.de,OU=ZIM-IT,O=Westfaelische Hochschule Gelsenkirchen\, Bocholt\, Recklinghausen,L=Gelsenkirchen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHCzCCBfOgAwIBAgIHGI6IZfmuSjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
 BhMCREUxSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNjaHVsZSBHZWxzZW5r
 aXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEvMC0GA1UEAxMmQ0EgZGVy
 IFdlc3RmYWVsaXNjaGVuIEhvY2hzY2h1bGUgLSBHMDExGTAXBgkqhkiG9w0BCQEW
@@ -129,31 +129,31 @@ ffKu8gIH14ELKwoqElGCcLTNjyUli6gJNGt283bQKQvaPBch/VjBSR0jsN6drwh/
 rG6E1/n5PC2dad/xREhU4fKhz4zPbdb6pq583GPz/pOTItpZ1iEcFJO43UIO8s7p
 1flnDftTm/jsXvc+lc5/qA60dRU52CfJhDfc0kVY6g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.w-hs.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e441</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e441</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Westfälische Hochschule</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Westfälische Hochschule, University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.w-hs.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.en.w-hs.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DFN-AAI</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.w-hs.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e441</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e441</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Westfälische Hochschule</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Westfälische Hochschule, University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.w-hs.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.en.w-hs.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DFN-AAI</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml
index e864c2bd..d170ffb9 100644
--- a/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.wisc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.wisc.edu/redirect/support" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wisc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin-Madison</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://login.wisc.edu/docs</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.cio.wisc.edu/policies.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="224" xml:lang="en">https://login.wisc.edu/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.wisc.edu/redirect/support" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wisc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin-Madison</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://login.wisc.edu/docs</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.cio.wisc.edu/policies.aspx</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="224" xml:lang="en">https://login.wisc.edu/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUEaB9lRXzHbDuhaiZVdnMYbZJAPwwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMObG9naW4ud2lzYy5lZHUwHhcNMTAwMTE4MDIwNzQxWhcN
 MzAwMTE4MDIwNzQxWjAZMRcwFQYDVQQDEw5sb2dpbi53aXNjLmVkdTCCASIwDQYJ
@@ -43,26 +43,26 @@ Na165r+kVLYSZDAQYPkB0/e6STvqf7L+NBewj4X+vsQy7ABpZAZI0cdJV0xmHzru
 U3y0KYm2vqpBEqkASp0sQSsFxpw9ogQPY/EFAMN+Nui5kzvCWNRkuF6KEJm32iP9
 i5LcnTHCgUUFH7J7EyAEl002xfE9jD8pK/2vObhH81f39z6ANpYw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wisc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wisc.edu/logout"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.wisc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wisc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.wisc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.wisc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wisc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wisc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wisc.edu/logout"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.wisc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wisc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.wisc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.wisc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wisc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUEaB9lRXzHbDuhaiZVdnMYbZJAPwwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMObG9naW4ud2lzYy5lZHUwHhcNMTAwMTE4MDIwNzQxWhcN
 MzAwMTE4MDIwNzQxWjAZMRcwFQYDVQQDEw5sb2dpbi53aXNjLmVkdTCCASIwDQYJ
@@ -81,39 +81,39 @@ Na165r+kVLYSZDAQYPkB0/e6STvqf7L+NBewj4X+vsQy7ABpZAZI0cdJV0xmHzru
 U3y0KYm2vqpBEqkASp0sQSsFxpw9ogQPY/EFAMN+Nui5kzvCWNRkuF6KEJm32iP9
 i5LcnTHCgUUFH7J7EyAEl002xfE9jD8pK/2vObhH81f39z6ANpYw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wisc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin-Madison</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Madison</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wisc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chris Holsman</md:GivenName>
-      <md:EmailAddress>cholsman@doit.wisc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Keith Hazelton</md:GivenName>
-      <md:EmailAddress>hazelton@wisc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NetID Login Service</md:GivenName>
-      <md:EmailAddress>help@login.wisc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NetID Login Service</md:GivenName>
-      <md:EmailAddress>tech@login.wisc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NetID Login Service</md:GivenName>
-      <md:EmailAddress>admin@login.wisc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NetID Login Service</md:GivenName>
-      <md:EmailAddress>security@login.wisc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wisc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin-Madison</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Madison</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wisc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Holsman</md:GivenName>
+    <md:EmailAddress>cholsman@doit.wisc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Keith Hazelton</md:GivenName>
+    <md:EmailAddress>hazelton@wisc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NetID Login Service</md:GivenName>
+    <md:EmailAddress>help@login.wisc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NetID Login Service</md:GivenName>
+    <md:EmailAddress>tech@login.wisc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NetID Login Service</md:GivenName>
+    <md:EmailAddress>admin@login.wisc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NetID Login Service</md:GivenName>
+    <md:EmailAddress>security@login.wisc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml
index 223bed9a..43b98df6 100644
--- a/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.wustl.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://connect.wustl.edu/selfservice/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Washington University in St. Louis</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Enterprise SSO authentication system for WUSTLKey Connect services.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://wustlkey.wustl.edu/Pages/default.aspx</mdui:InformationURL>
+        <mdui:Logo height="70" width="330" xml:lang="en">https://connect.wustl.edu/selfservice/images/ConnectLogoTransparent.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://connect.wustl.edu/selfservice/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Washington University in St. Louis</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Enterprise SSO authentication system for WUSTLKey Connect services.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://wustlkey.wustl.edu/Pages/default.aspx</mdui:InformationURL>
-          <mdui:Logo height="70" width="330" xml:lang="en">https://connect.wustl.edu/selfservice/images/ConnectLogoTransparent.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEvTCCA6WgAwIBAgIJANIsbvIwqI2gMA0GCSqGSIb3DQEBBAUAMIGaMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
 MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAW
@@ -49,23 +49,23 @@ kOKyozRXtPhOKHBctcp4memj4k0BRkygfdvyAPpjhs6qgewN5IQJk8uReeg6NGQ0
 AmVxjqj/wlJcr+p9+kkvQMDxf/3SOfbwLe/Zcz1w27q380QvJ4EXxIIbqddRydK5
 +Nnat0cI4/1oOiINZSFUkdU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wustl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wustl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.wustl.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.wustl.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wustl.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wustl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wustl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.wustl.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.wustl.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wustl.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEvTCCA6WgAwIBAgIJANIsbvIwqI2gMA0GCSqGSIb3DQEBBAUAMIGaMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
 MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAW
@@ -93,23 +93,23 @@ kOKyozRXtPhOKHBctcp4memj4k0BRkygfdvyAPpjhs6qgewN5IQJk8uReeg6NGQ0
 AmVxjqj/wlJcr+p9+kkvQMDxf/3SOfbwLe/Zcz1w27q380QvJ4EXxIIbqddRydK5
 +Nnat0cI4/1oOiINZSFUkdU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wustl.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wustl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Washington University in St. Louis</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Washington University in St. Louis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wustl.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ken Koch</md:GivenName>
-      <md:EmailAddress>Ken.Koch@wustl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Daniel Zweifel</md:GivenName>
-      <md:EmailAddress>danz@wustl.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wustl.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wustl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Washington University in St. Louis</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Washington University in St. Louis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wustl.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ken Koch</md:GivenName>
+    <md:EmailAddress>Ken.Koch@wustl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daniel Zweifel</md:GivenName>
+    <md:EmailAddress>danz@wustl.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml
index 793c33de..5284d9b4 100644
--- a/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://logintest.wustl.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">zTest_Washington University in St. Louis</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test environment IDP for Washington University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">zTest_Washington University in St. Louis</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test environment IDP for Washington University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE6DCCA9CgAwIBAgIJANEio5/rU1dtMA0GCSqGSIb3DQEBBAUAMIGoMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
 MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxJjAk
@@ -49,24 +49,24 @@ MpS8JkB0Ya1fK+alfHdLIBVEYo4WrEJ5vEpdUwjS0WPTX6GlvFWGmjUh0eIEvik6
 S6hoVdGAhggRbs+PbFPZGqD9AtjzDruexxC1e1xFomynQrdZ+c1JnEwEk1x/sVhz
 giNZUjdTENUIEg/R
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logintest.wustl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logintest.wustl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logintest.wustl.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logintest.wustl.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logintest.wustl.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://logintest.wustl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logintest.wustl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logintest.wustl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logintest.wustl.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logintest.wustl.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logintest.wustl.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://logintest.wustl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wustl.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE6DCCA9CgAwIBAgIJANEio5/rU1dtMA0GCSqGSIb3DQEBBAUAMIGoMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
 MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxJjAk
@@ -95,23 +95,23 @@ MpS8JkB0Ya1fK+alfHdLIBVEYo4WrEJ5vEpdUwjS0WPTX6GlvFWGmjUh0eIEvik6
 S6hoVdGAhggRbs+PbFPZGqD9AtjzDruexxC1e1xFomynQrdZ+c1JnEwEk1x/sVhz
 giNZUjdTENUIEg/R
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logintest.wustl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logintest.wustl.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Washington University in St. Louis</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">zTest_Washington University in St. Louis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wustl.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ken Koch</md:GivenName>
-      <md:EmailAddress>ken.koch@wustl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Daniel Zweifel</md:GivenName>
-      <md:EmailAddress>DanZ@wustl.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logintest.wustl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logintest.wustl.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Washington University in St. Louis</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">zTest_Washington University in St. Louis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wustl.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ken Koch</md:GivenName>
+    <md:EmailAddress>ken.koch@wustl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daniel Zweifel</md:GivenName>
+    <md:EmailAddress>DanZ@wustl.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
index 2db5d514..b456acd7 100644
--- a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://logout.uwasa.fi/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwasa.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uwasa.fi</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwasa.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
@@ -51,31 +51,31 @@ StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
 6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
 ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
 yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sami</md:GivenName>
-      <md:SurName>Kinnunen</md:SurName>
-      <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sami</md:GivenName>
-      <md:SurName>Kinnunen</md:SurName>
-      <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml
index 2edba1d7..67413dcf 100644
--- a/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://los.scran.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:36:30Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:36:30Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Languages on Screen</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An educational resource that puts modern language short films online for free download and use in schools across Scotland.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-los.png</mdui:Logo>
+        <mdui:Logo height="100" width="138">https://shib.scran.ac.uk/images/logo-sos.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://languagesonscreen.org.uk/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/los/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/los/Shibboleth.sso/glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/glow"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Languages on Screen</mdui:DisplayName>
-          <mdui:Description xml:lang="en">An educational resource that puts modern language short films online for free download and use in schools across Scotland.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-los.png</mdui:Logo>
-          <mdui:Logo height="100" width="138">https://shib.scran.ac.uk/images/logo-sos.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://languagesonscreen.org.uk/</mdui:InformationURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/los/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/los/Shibboleth.sso/glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/DS/UKFederation" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/glow"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 					VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
 					MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
@@ -62,57 +62,57 @@
 					LTUxK70J8DSNHEuzC8s+rTfXhsn01ZUKGDQqeFDO3TccF/x8iespeHPJO7uD/klz
 					bjQPf6gJKSkRW/uiwoDLkt/CChMGLGbYpQcx/7RpyzUpN4u4PHLduf03kQ==
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Languages On Screen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.languagesonscreen.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Languages On Screen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.languagesonscreen.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml
index aab26d62..5f66eb3d 100644
--- a/swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lse-shibb.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T10:49:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T10:49:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London School of Economics and Political Science - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of London School of Economics and Political Science</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London School of Economics and Political Science - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of London School of Economics and Political Science</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJANZWvgeNKZZGMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
 						BAMTJWRjMDNrZzAzNTRldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
 						MzMxMjIyODEzWhcNMjQwMzI4MjIyODEzWjAwMS4wLAYDVQQDEyVkYzAza2cwMzU0
@@ -48,40 +48,40 @@
 						0centIzlPGZ0sekO+eA7oTDQ5UxH/NFqnRqV1YqvPc9wijh+Ql4F3NAxIAuTSJox
 						9SPk0adJyrhbZw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for London School of Economics and Political Science</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for London School of Economics and Political Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lse.ac.uk-idp.xml b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
index 09e9b41a..1d2c485a 100644
--- a/swamid-interfederations-2.0/lse.ac.uk-idp.xml
+++ b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lse.ac.uk/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-11-16T17:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-11-16T17:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
 						b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
@@ -36,26 +36,26 @@
 						4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
 						mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gate.library.lse.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://gate.library.lse.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lse.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
 						b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
@@ -79,27 +79,27 @@
 						4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
 						mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London School of Economics and Political Science</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Economics and Political Science</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lse.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>McFarlane</md:SurName>
-      <md:EmailAddress>mailto:m.d.mcfarlane@lse.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Prockter</md:SurName>
-      <md:EmailAddress>mailto:n.prockter@lse.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London School of Economics and Political Science</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Economics and Political Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lse.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>McFarlane</md:SurName>
+    <md:EmailAddress>mailto:m.d.mcfarlane@lse.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Prockter</md:SurName>
+    <md:EmailAddress>mailto:n.prockter@lse.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
index da37e0ce..63354a07 100644
--- a/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lshtm-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-05T10:01:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-05T10:01:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London School of Hygiene and Tropical Medicine - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the London School of Hygiene and Tropical Medicine</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London School of Hygiene and Tropical Medicine - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the London School of Hygiene and Tropical Medicine</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIJAJzvYQ51LpPDMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
 						BAMTI2xzaHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB4XDTE1MDYz
 						MDA4MTQzMFoXDTI1MDYyNzA4MTQzMFowLjEsMCoGA1UEAxMjbHNodG0tc2hpYi5o
@@ -52,43 +52,43 @@
 						D6odUzgJfKEHsWMNdAdH6tlCC59+9aNixr+u3G6PkxJFHnboW6EQ1eTFnJnwmsXy
 						qrSsCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at London School of Hygiene and Tropical Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at London School of Hygiene and Tropical Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp.lu.lv.xml b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
index 761b8a24..b7e93eb5 100644
--- a/swamid-interfederations-2.0/lu-idp.lu.lv.xml
+++ b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp.lu.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.lv</shibmd:Scope>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Latvia</mdui:DisplayName>
+        <mdui:Logo height="64" width="64">https://lu-idp.lu.lv/icons/icon-lu.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu.lv</shibmd:Scope>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Latvia</mdui:DisplayName>
-          <mdui:Logo height="64" width="64">https://lu-idp.lu.lv/icons/icon-lu.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - LU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Latvia - LU IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Latvia - LU IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml b/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
index c238183a..42224c6f 100644
--- a/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lumii-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lumii.lv</shibmd:Scope>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</mdui:DisplayName>
+        <mdui:Logo height="64" width="64">https://lumii-idp.lanet.lv/icons/lumii-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lumii.lv</shibmd:Scope>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</mdui:DisplayName>
-          <mdui:Logo height="64" width="64">https://lumii-idp.lanet.lv/icons/lumii-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lumii-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lumii-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - LUMII</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lumii.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lumii-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lumii-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - LUMII</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lumii.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml b/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml
index 613f10f8..8223c2a4 100644
--- a/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mail.secure.easymail.rm.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsagAwIBAgIQCHWvfofj36Opnfb9g9MhATANBgkqhkiG9w0BAQUFADA8
 						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 						aGF3dGUgU1NMIENBMB4XDTEwMTExNzAwMDAwMFoXDTEzMTExNjIzNTk1OVowdzEL
@@ -33,13 +33,13 @@
 						a5sAMLunClU0MAevk4snV/XHaflhiqqo8d0TyVr1iTdnKeeMZ0fMrnkofgxgWZlZ
 						sgYiyxUXXQpFchCiEG4CZT/smudL3jtVErHuYySHJVlkdA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsagAwIBAgIQCHWvfofj36Opnfb9g9MhATANBgkqhkiG9w0BAQUFADA8
 						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 						aGF3dGUgU1NMIENBMB4XDTEwMTExNzAwMDAwMFoXDTEzMTExNjIzNTk1OVowdzEL
@@ -62,36 +62,36 @@
 						a5sAMLunClU0MAevk4snV/XHaflhiqqo8d0TyVr1iTdnKeeMZ0fMrnkofgxgWZlZ
 						sgYiyxUXXQpFchCiEG4CZT/smudL3jtVErHuYySHJVlkdA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RM Education plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RM Education plc: RM Easymail Plus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rm.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support Contact</md:GivenName>
-      <md:EmailAddress>mailto:shibsupport@ifl.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Technical Contact</md:GivenName>
-      <md:EmailAddress>mailto:shibtechcontact@ifl.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RM Education plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RM Education plc: RM Easymail Plus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rm.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support Contact</md:GivenName>
+    <md:EmailAddress>mailto:shibsupport@ifl.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Technical Contact</md:GivenName>
+    <md:EmailAddress>mailto:shibtechcontact@ifl.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml
index 04afd159..82138ae0 100644
--- a/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://man-fe.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-21T13:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-21T13:40:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAIbeMpWWYVSeMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCXByaW1vMDV2MTAeFw0xMTEyMjAxMzUyMzJaFw0yMTEyMTcxMzUyMzJaMBQx
 						EjAQBgNVBAMTCXByaW1vMDV2MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -42,44 +42,44 @@
 						xu+sfXm5Vz/xJCu3Nv3uhHzNTFCBcy2GKUQtjMF0urKfflleQNKKAmD3mEi7msCS
 						/gNJ6QmwQgxVykU77MUZfn6sO6YmDg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ex Libris: Primo ASP Service on behalf of The University of Manchester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alessandro</md:GivenName>
-      <md:SurName>Fasoli</md:SurName>
-      <md:EmailAddress>mailto:Alessandro.Fasoli@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alessandro</md:GivenName>
-      <md:SurName>Fasoli</md:SurName>
-      <md:EmailAddress>mailto:Alessandro.Fasoli@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ex Libris: Primo ASP Service on behalf of The University of Manchester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alessandro</md:GivenName>
+    <md:SurName>Fasoli</md:SurName>
+    <md:EmailAddress>mailto:Alessandro.Fasoli@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alessandro</md:GivenName>
+    <md:SurName>Fasoli</md:SurName>
+    <md:EmailAddress>mailto:Alessandro.Fasoli@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/manage.federations.renam.md.xml b/swamid-interfederations-2.0/manage.federations.renam.md.xml
index 90ceaa83..ddbe696c 100644
--- a/swamid-interfederations-2.0/manage.federations.renam.md.xml
+++ b/swamid-interfederations-2.0/manage.federations.renam.md.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://manage.federations.renam.md">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Federation Management Board</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ro">Sistem de Management al Federatiei</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ru">Приложение для менеджмента Федерации</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</mdui:Description>
+        <mdui:Description xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</mdui:Description>
+        <mdui:Description xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://manage.federations.renam.md</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="ro">https://manage.federations.renam.md</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="ru">https://manage.federations.renam.md</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Federation Management Board</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ro">Sistem de Management al Federatiei</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ru">Приложение для менеджмента Федерации</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</mdui:Description>
-          <mdui:Description xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</mdui:Description>
-          <mdui:Description xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://manage.federations.renam.md</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="ro">https://manage.federations.renam.md</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="ru">https://manage.federations.renam.md</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE6zCCA9OgAwIBAgICANMwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
 ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
 IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
@@ -51,13 +51,13 @@ DOFfR5TiqEahO0z7zUInQbg7LEgwDazK7BuDbirKdQhncGYCVG1dg3Qq09vJdSS4
 UgVNSVjlMzKBjhjGa9KhyOQZozleonKnk1o/cblzPGClGgcZeqElC6YXDpJzlSqt
 QDG9g0AnMyza3V7kLiDz
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE6zCCA9OgAwIBAgICANMwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
 ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
 IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
@@ -86,43 +86,43 @@ DOFfR5TiqEahO0z7zUInQbg7LEgwDazK7BuDbirKdQhncGYCVG1dg3Qq09vJdSS4
 UgVNSVjlMzKBjhjGa9KhyOQZozleonKnk1o/cblzPGClGgcZeqElC6YXDpJzlSqt
 QDG9g0AnMyza3V7kLiDz
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Federation Management Board</md:ServiceName>
-        <md:ServiceName xml:lang="ro">Sistem de Management al Federatiei</md:ServiceName>
-        <md:ServiceName xml:lang="ru">Приложение для менеджмента Федерации</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
-      <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Valentin</md:GivenName>
-      <md:SurName>Pocotilenco</md:SurName>
-      <md:EmailAddress>mailto:leaf@renam.md</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Federation Management Board</md:ServiceName>
+      <md:ServiceName xml:lang="ro">Sistem de Management al Federatiei</md:ServiceName>
+      <md:ServiceName xml:lang="ru">Приложение для менеджмента Федерации</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
+    <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Valentin</md:GivenName>
+    <md:SurName>Pocotilenco</md:SurName>
+    <md:EmailAddress>mailto:leaf@renam.md</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/manchester.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/manchester.idm.oclc.org-shibboleth.xml
index 93953be4..fca8b369 100644
--- a/swamid-interfederations-2.0/manchester.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/manchester.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://manchester.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-20T09:23:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-20T09:23:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.manchester.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.manchester.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBjMSIwIAYDVQQDFBkqLm1h
 						bmNoZXN0ZXIuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NM
 						QzEhMB8GCSqGSIb3DQEJARYSaG9zdGVkZXpwQG9jbGMub3JnMB4XDTE2MDUxNjE1
@@ -36,23 +36,23 @@
 						J1MqcppWwhSwc/5RoL8gZ2ZHRA3Ln4f2U1zcOd5sXZwPFftH/oqv64n3GvlkKJ6X
 						2s5xLLQYJUZQMXBq9FqfJgV965JaEQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.manchester.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.manchester.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Manchester Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.manchester.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.manchester.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Manchester Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
index 12faf77e..368ae369 100644
--- a/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://marreco.ifsuldeminas.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxFTATBgNVBAoTDElGU1VMREVN
 SU5BUzENMAsGA1UECxMERFRJQzExMC8GCSqGSIb3DQEJARYib3BlcmFjb2VzLmR0
 aWNAaWZzdWxkZW1pbmFzLmVkdS5icjEVMBMGA1UEBxMMUG91c28gQWxlZ3JlMQsw
@@ -45,26 +45,26 @@ FEPhPKdBx2sjDxoOGD+TILY16UUtUg1j7u8BV4tyhRqLdalxF9S3RKpB3hjgpUtO
 rYaW1gyFJ/L/9GVXMbjV9hlfaH49U24liwM47yjtyw/Gi66/hXIhDe6KrT52zc7+
 UVh/hdNR32L/riyKh4hp+saz+b8DYMMV/pw=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxFTATBgNVBAoTDElGU1VMREVN
 SU5BUzENMAsGA1UECxMERFRJQzExMC8GCSqGSIb3DQEJARYib3BlcmFjb2VzLmR0
@@ -89,24 +89,24 @@ rYaW1gyFJ/L/9GVXMbjV9hlfaH49U24liwM47yjtyw/Gi66/hXIhDe6KrT52zc7+
 UVh/hdNR32L/riyKh4hp+saz+b8DYMMV/pw=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifsuldeminas.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Marcio Prado</md:SurName>
-      <md:EmailAddress>redes@ifsuldeminas.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsuldeminas.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marcio Prado</md:SurName>
+    <md:EmailAddress>redes@ifsuldeminas.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
index 43402c2d..52274e00 100644
--- a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://marte.ifsertao-pe.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsertao-pe.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifsertao-pe.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEEDCCAvgCAQAwDQYJKoZIhvcNAQEFBQAwgc0xLTArBgNVBAoTJEludGl0dXRv
 IEZlZGVyYWwgU2VydGFvIFBlcm5hbWJ1Y2FubzENMAsGA1UECxMEREdUSTE0MDIG
 CSqGSIb3DQEJARYlZnJhbmNpc2NvLmhhbWlsdG9uQGlmc2VydGFvLXBlLmVkdS5i
@@ -46,26 +46,26 @@ rqVrF8jQOoSg/RD9q4csLNH9ihSDiLM00xXuZbu/2+aUp9FLBPBIEthFy8KrtBI8
 JeRAZFiNM4Ewj+LQygeVJAWRU91zx7y3XvfUxWK+kLMWMlLt+bVi7bsRxhrxXKgL
 5JYstueDHvUmZuFhvgjXAp8m07ul4W/BFt0DMU842+HOTOkH
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEEDCCAvgCAQAwDQYJKoZIhvcNAQEFBQAwgc0xLTArBgNVBAoTJEludGl0dXRv
 IEZlZGVyYWwgU2VydGFvIFBlcm5hbWJ1Y2FubzENMAsGA1UECxMEREdUSTE0MDIG
@@ -91,24 +91,24 @@ JeRAZFiNM4Ewj+LQygeVJAWRU91zx7y3XvfUxWK+kLMWMlLt+bVi7bsRxhrxXKgL
 5JYstueDHvUmZuFhvgjXAp8m07ul4W/BFt0DMU842+HOTOkH
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Francisco Hamilton de Freitas Junior</md:SurName>
-      <md:EmailAddress>francisco.hamilton@ifsertao-pe.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Francisco Hamilton de Freitas Junior</md:SurName>
+    <md:EmailAddress>francisco.hamilton@ifsertao-pe.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
index 973ce0a1..1a2d7abb 100644
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
+++ b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mayumba.msh-paris.fr/shibauth.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T15:31:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T15:31:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EHESS - FMSH - Eduspot France site</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://mayumba.msh-paris.fr/shibauth.php</mdui:InformationURL>
+        <mdui:Description xml:lang="en">EHESS - FMSH - Eduspot site France</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EHESS - FMSH - Eduspot France site</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://mayumba.msh-paris.fr/shibauth.php</mdui:InformationURL>
-          <mdui:Description xml:lang="en">EHESS - FMSH - Eduspot site France</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
@@ -50,13 +50,13 @@ cVqbNIBZdu0wxYugtmy1GSK0DCp69G277EX+67jjIwLfUhFfFOxk6URmwj4VLDVO
 oBsYkAumOdtWk+4OHxczuEfrFW2QK5HJn8lpHWduwxNdYfgSl2ibdLwLSOQf+LT9
 Or49ZS1V+M3QMurHd0GkuHUbNeScR/FOOF4Nj4MCVfOgl31SfR0MDp5i
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
@@ -82,13 +82,13 @@ cVqbNIBZdu0wxYugtmy1GSK0DCp69G277EX+67jjIwLfUhFfFOxk6URmwj4VLDVO
 oBsYkAumOdtWk+4OHxczuEfrFW2QK5HJn8lpHWduwxNdYfgSl2ibdLwLSOQf+LT9
 Or49ZS1V+M3QMurHd0GkuHUbNeScR/FOOF4Nj4MCVfOgl31SfR0MDp5i
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC5TCCAc2gAwIBAgIJAPzxQDl/0G/mMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 BAMTCnVjb3BpYS5jb20wHhcNMTQwNjA2MTMwMTAyWhcNMjQwNjAzMTMwMTAyWjAV
 MRMwEQYDVQQDEwp1Y29waWEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -106,33 +106,29 @@ ecFyneuv9tuhQrjCrFufI+fjFijTmN8gBK2SyiHERlP3IDrrwz033mQRRLasjazA
 ZUhgs9OPjysee18xEBIstkff54Mlz6IKUzpjhorRIR335+M63Qk7WkwGFt3CAW5C
 89fZI6z4GQLZqtZNECfC4/uTQNXzZ3L1Hg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceName>
-        <md:ServiceName xml:lang="en">EHESS - FMSH - Eduspot France site</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Laurent Henry</md:SurName>
-      <md:EmailAddress>laurent.henry@ehess.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceName>
+      <md:ServiceName xml:lang="en">EHESS - FMSH - Eduspot France site</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Laurent Henry</md:SurName>
+    <md:EmailAddress>laurent.henry@ehess.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml
index 0f4d260a..93931b54 100644
--- a/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mccall.henley-cov.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">henley-cov.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">henley-cov.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAMs1hpx5cLrrnqC1wRQthWwwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA5MTIwMDAwMDBaFw0xNjA5MTEyMzU5NTlaMEUxITAfBgNV
@@ -36,26 +36,26 @@
 						6GAWgZoqoIrF6FQX6E032WNWyzV4thdB93S9CK2bvsq+yQwWWCZHqAT3fY7Peyrj
 						fJtg6uLXHqJiAjTaAhXMEIB5Fk9lQIqXLXJg/2RCGMHw654O8j0K65JS1yQ4T4db
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mccall.henley-cov.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">henley-cov.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mccall.henley-cov.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">henley-cov.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAMs1hpx5cLrrnqC1wRQthWwwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA5MTIwMDAwMDBaFw0xNjA5MTEyMzU5NTlaMEUxITAfBgNV
@@ -81,27 +81,27 @@
 						6GAWgZoqoIrF6FQX6E032WNWyzV4thdB93S9CK2bvsq+yQwWWCZHqAT3fY7Peyrj
 						fJtg6uLXHqJiAjTaAhXMEIB5Fk9lQIqXLXJg/2RCGMHw654O8j0K65JS1yQ4T4db
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Henley College Coventry</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Henley College Coventry</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.henley-cov.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>McAll</md:SurName>
-      <md:EmailAddress>mailto:imcall@henley-cov.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>McAll</md:SurName>
-      <md:EmailAddress>mailto:imcall@henley-cov.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Henley College Coventry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Henley College Coventry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.henley-cov.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>McAll</md:SurName>
+    <md:EmailAddress>mailto:imcall@henley-cov.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>McAll</md:SurName>
+    <md:EmailAddress>mailto:imcall@henley-cov.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml
index 7e8e29ff..f0eed568 100644
--- a/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mckinley.csuci.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuci.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Channel Islands</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuci.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Channel Islands</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUHk9QotPMplSUhYpSvuYG29XyhAcwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1MB4XDTA5MTIxNTE0MzU0
 MloXDTI5MTIxNTE0MzU0MlowHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1
@@ -38,22 +38,22 @@ ZVhecPvNBMDCBul++UU34rYeovvJQ29UDocwicHEn5n9f3G9rUs4xM9k3DucsZz9
 yvIPFDYPMKI9Z5ZyyInFao5y7ZRI0Odmn24AZkBPzTT2pczIP+JVC/k1e+1sDGbW
 mzdNnyU+tA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mckinley.csuci.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mckinley.csuci.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mckinley.csuci.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuci.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mckinley.csuci.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mckinley.csuci.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mckinley.csuci.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuci.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUHk9QotPMplSUhYpSvuYG29XyhAcwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1MB4XDTA5MTIxNTE0MzU0
 MloXDTI5MTIxNTE0MzU0MlowHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1
@@ -73,19 +73,19 @@ ZVhecPvNBMDCBul++UU34rYeovvJQ29UDocwicHEn5n9f3G9rUs4xM9k3DucsZz9
 yvIPFDYPMKI9Z5ZyyInFao5y7ZRI0Odmn24AZkBPzTT2pczIP+JVC/k1e+1sDGbW
 mzdNnyU+tA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Channel Islands</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Channel Islands</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csuci.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter Scamardo</md:GivenName>
-      <md:EmailAddress>peter.scamardo@csuci.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Channel Islands</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Channel Islands</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csuci.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter Scamardo</md:GivenName>
+    <md:EmailAddress>peter.scamardo@csuci.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
index b1e77199..3a77ae5b 100644
--- a/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://mdb-vw-adfs.zebi.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Zeeuwse Bibliotheek</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Zeeuwse Bibliotheek</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Zeeuwse Bibliotheek</mdui:Description>
+        <mdui:Description xml:lang="en">Zeeuwse Bibliotheek</mdui:Description>
+        <mdui:Logo height="48" width="76">https://static.surfconext.nl/logos/idp/zeeuwsebibliotheek.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Zeeuwse Bibliotheek</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Zeeuwse Bibliotheek</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Zeeuwse Bibliotheek</mdui:Description>
-          <mdui:Description xml:lang="en">Zeeuwse Bibliotheek</mdui:Description>
-          <mdui:Logo height="48" width="76">https://static.surfconext.nl/logos/idp/zeeuwsebibliotheek.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/eb19a62f8228f1b9265d9166a9180a73"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Zeeuwse Bibliotheek</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Zeeuwse Bibliotheek</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.zeeuwsebibliotheek.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/eb19a62f8228f1b9265d9166a9180a73"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Zeeuwse Bibliotheek</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Zeeuwse Bibliotheek</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.zeeuwsebibliotheek.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.st-annes.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.st-annes.ox.ac.uk-shibboleth.xml
index 26d3104c..727f7826 100644
--- a/swamid-interfederations-2.0/meals.st-annes.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/meals.st-annes.ox.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meals.st-annes.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-17T12:11:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-17T12:11:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIJANnoZzkReWmMMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF21lYWxzLnN0LWFubmVzLm94LmFjLnVrMB4XDTE2MDIxNTEwMzk0N1oXDTI2
 						MDIxMjEwMzk0N1owIjEgMB4GA1UEAxMXbWVhbHMuc3QtYW5uZXMub3guYWMudWsw
@@ -48,41 +48,41 @@
 						xaT+oU99+9miYEx5nhl/x6DeOO1y7q0LxVSORUF/IQWs4SkAVcysWi/Md4a2y547
 						7jdTc8yMtlEy+bEY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Anne's College Meal Booking System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.st-annes.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@st-annes.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@st-annes.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.st-annes.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Anne's College Meal Booking System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.st-annes.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@st-annes.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@st-annes.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mediathek.hgk.fhnw.ch-shibboleth.xml b/swamid-interfederations-2.0/mediathek.hgk.fhnw.ch-shibboleth.xml
index 6b8f7827..633bd8f8 100644
--- a/swamid-interfederations-2.0/mediathek.hgk.fhnw.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/mediathek.hgk.fhnw.ch-shibboleth.xml
@@ -1,31 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mediathek.hgk.fhnw.ch/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2005-09-01T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>fhnw.ch</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>uas</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2005-09-01T14:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-				</saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>fhnw.ch</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>uas</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HGK Mediathek (FHNW)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Die Mediathek HGK (FHNW) des Campus der Künste stellt wissenschaftliche Informationsmedien und Literatur der Bereiche Kunst, Design und Medien zur Verfügung.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">HGK Mediathek (FHNW)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Die Mediathek HGK (FHNW) des Campus der Künste stellt wissenschaftliche Informationsmedien und Literatur der Bereiche Kunst, Design und Medien zur Verfügung.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIJANfXgWgpNjC7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFW1lZGlhdGhlay5oZ2suZmhudy5jaDAeFw0xNjA1MTExMTM2NTRaFw0xOTA1
 MTExMTM2NTRaMCAxHjAcBgNVBAMTFW1lZGlhdGhlay5oZ2suZmhudy5jaDCCASIw
@@ -45,42 +44,42 @@ lGJ2DWiRH4t9F7KoNK45FX0TV01YseP+yp21+tAfA1tgIqini4eYimH5yt+55ATZ
 CcJFNXEsiypo6j++TYAr7hDGHSXYz2OGdZ+b4SGaAxE4JoQlWSXGrCNh+r6fTWHO
 X3tkeA==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mediathek.hgk.fhnw.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mediathek.hgk.fhnw.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mediathek.hgk.fhnw.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">HGK Mediathek (FHNW)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Die Mediathek HGK (FHNW) des Campus der Künste stellt wissenschaftliche Informationsmedien und Literatur der Bereiche Kunst, Design und Medien zur Verfügung.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">fhnw.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">FHNW - Fachhochschule Nordwestschweiz</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fhnw.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fhnw.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tabea</md:GivenName>
-      <md:SurName>Lurk</md:SurName>
-      <md:EmailAddress>mailto:tabea.lurk@fhnw.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Juergen</md:GivenName>
-      <md:SurName>Enge</md:SurName>
-      <md:EmailAddress>mailto:juergen.enge@fhnw.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mediathek.hgk.fhnw.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mediathek.hgk.fhnw.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mediathek.hgk.fhnw.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">HGK Mediathek (FHNW)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Die Mediathek HGK (FHNW) des Campus der Künste stellt wissenschaftliche Informationsmedien und Literatur der Bereiche Kunst, Design und Medien zur Verfügung.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">fhnw.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">FHNW - Fachhochschule Nordwestschweiz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhnw.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhnw.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tabea</md:GivenName>
+    <md:SurName>Lurk</md:SurName>
+    <md:EmailAddress>mailto:tabea.lurk@fhnw.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Juergen</md:GivenName>
+    <md:SurName>Enge</md:SurName>
+    <md:EmailAddress>mailto:juergen.enge@fhnw.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
index ba8ad60d..639bd383 100644
--- a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://megsvle.lboro.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-14T09:37:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-14T09:37:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAKmQG07LbtaqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
 						BAMTE21lZ3N2bGUubGJvcm8uYWMudWswHhcNMTYwNDA0MTExNTUyWhcNMzYwMzMw
 						MTExNTUyWjAeMRwwGgYDVQQDExNtZWdzdmxlLmxib3JvLmFjLnVrMIIBIjANBgkq
@@ -42,32 +42,32 @@
 						e6RNURI8NnCwzWQ39rJfK3ylKKvFkCKgdFqu1PgQ+Y6XaWM9lqM2EYfi3HYUVMbf
 						iqd+jw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MEGS VLE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://megs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>E-Learning Systems Team</md:GivenName>
-      <md:EmailAddress>mailto:learn@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>E-Learning Systems Team</md:GivenName>
-      <md:EmailAddress>mailto:learn@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MEGS VLE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://megs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Learning Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:learn@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>E-Learning Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:learn@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml b/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml
index 4828ac02..5cac1dc7 100644
--- a/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://member.goodpractice.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://member.goodpractice.net/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://member.goodpractice.net/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC2TCCAcGgAwIBAgIJANAQiZL85UcxMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 						BAMTBmdwd2ViMTAeFw0wOTEwMjkwOTQyMDhaFw0xOTEwMjcwOTQyMDhaMBExDzAN
 						BgNVBAMTBmdwd2ViMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo3
@@ -44,13 +44,13 @@
 						hgAqoNDf0vZ9o4I+/6GGvgcEbYv7mKbt3TUuccRc5lIFVpggzB037hyw4n055xO+
 						1GNLhUn46SUcF9uHqw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC2TCCAcGgAwIBAgIJANAQiZL85UcxMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 						BAMTBmdwd2ViMTAeFw0wOTEwMjkwOTQyMDhaFw0xOTEwMjcwOTQyMDhaMBExDzAN
 						BgNVBAMTBmdwd2ViMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo3
@@ -68,52 +68,52 @@
 						hgAqoNDf0vZ9o4I+/6GGvgcEbYv7mKbt3TUuccRc5lIFVpggzB037hyw4n055xO+
 						1GNLhUn46SUcF9uHqw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://member.goodpractice.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://member.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="12"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Good Practice Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Good Practice</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.goodpractice.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Owen</md:GivenName>
-      <md:SurName>Ferguson</md:SurName>
-      <md:EmailAddress>mailto:oferguson@goodpractice.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonny</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:janderson@goodpractice.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://member.goodpractice.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://member.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Good Practice Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Good Practice</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goodpractice.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Owen</md:GivenName>
+    <md:SurName>Ferguson</md:SurName>
+    <md:EmailAddress>mailto:oferguson@goodpractice.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonny</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:janderson@goodpractice.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml b/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml
index 85d9e376..fa4b3d92 100644
--- a/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://member.staging.goodpractice.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-17T16:43:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-17T16:43:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://member.staging.goodpractice.net/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://member.staging.goodpractice.net/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://member.staging.goodpractice.net/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://member.staging.goodpractice.net/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDITCCAgmgAwIBAgIJAJy/kkU0owaoMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHmphcnZpNzdyLmRjMS5pb21hcnRob3N0aW5nLmNvbTAeFw0xMjA2MjcxMzE2
 						MzVaFw0yMjA2MjUxMzE2MzVaMCkxJzAlBgNVBAMTHmphcnZpNzdyLmRjMS5pb21h
@@ -48,53 +48,53 @@
 						KULkafBZ1w0flcIDYXPGZ5yUAZ5CqNvngRk2eXfCx0Sd1xmXOiGxZw/Tok1DjIm0
 						0qqTdaZlBtbfqT/WNg1eTd6gOUqbJuNDRUO+ozHfOSsoRzZ1Yw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Good Practice Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GoodPractice Staging</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.goodpractice.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Owen</md:GivenName>
-      <md:SurName>Ferguson</md:SurName>
-      <md:EmailAddress>mailto:oferguson@goodpractice.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonny</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:janderson@goodpractice.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Good Practice Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GoodPractice Staging</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goodpractice.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Owen</md:GivenName>
+    <md:SurName>Ferguson</md:SurName>
+    <md:EmailAddress>mailto:oferguson@goodpractice.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonny</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:janderson@goodpractice.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
index 1a6ff6ac..08c14088 100644
--- a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://memso.tannerritchie.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tannerritchie.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TannerRitchie Publishing</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Medieval and Early Modern Sources Online (MEMSO) is an essential resource for the study of Britain and its place in the world during the medieval and early modern period (c. 1100-1800)</mdui:Description>
+        <mdui:Logo height="116" width="491">https://tannerritchie.com/img/logo-blackonwhite-master.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tannerritchie.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">TannerRitchie Publishing</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Medieval and Early Modern Sources Online (MEMSO) is an essential resource for the study of Britain and its place in the world during the medieval and early modern period (c. 1100-1800)</mdui:Description>
-          <mdui:Logo height="116" width="491">https://tannerritchie.com/img/logo-blackonwhite-master.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKTCCAhGgAwIBAgIJAJuTjrsyhFeQMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDcyMjE4NDMxOFoXDTIxMDcxOTE4
 						NDMxOFowHDEaMBgGA1UEAxMRdGFubmVycml0Y2hpZS5jb20wggEiMA0GCSqGSIb3
@@ -50,13 +50,13 @@
 						mXSnza8yA2NPDhefbmxqxbVeU+1Qu1PyHQaUX/mdzAXVOXgaM0F72BimTAXQ4Zxr
 						/1WxEAHX32o1DtTZC+Pspbm0oN2KG0dyUSoFR2R8XYShQowVVtr7glWJTcdo
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKTCCAhGgAwIBAgIJAJuTjrsyhFeQMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDcyMjE4NDMxOFoXDTIxMDcxOTE4
 						NDMxOFowHDEaMBgGA1UEAxMRdGFubmVycml0Y2hpZS5jb20wggEiMA0GCSqGSIb3
@@ -75,47 +75,47 @@
 						mXSnza8yA2NPDhefbmxqxbVeU+1Qu1PyHQaUX/mdzAXVOXgaM0F72BimTAXQ4Zxr
 						/1WxEAHX32o1DtTZC+Pspbm0oN2KG0dyUSoFR2R8XYShQowVVtr7glWJTcdo
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tannerritchie.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tannerritchie.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tannerritchie.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tannerritchie.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TannerRitchie Publishing</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TannerRitchie Publishing: Medieval and Early Modern Sources Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tannerritchie.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Roland</md:GivenName>
-      <md:SurName>Tanner</md:SurName>
-      <md:EmailAddress>mailto:roland@tannerritchie.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roland</md:GivenName>
-      <md:SurName>Tanner</md:SurName>
-      <md:EmailAddress>mailto:roland@tannerritchie.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tannerritchie.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tannerritchie.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tannerritchie.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tannerritchie.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TannerRitchie Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TannerRitchie Publishing: Medieval and Early Modern Sources Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tannerritchie.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Roland</md:GivenName>
+    <md:SurName>Tanner</md:SurName>
+    <md:EmailAddress>mailto:roland@tannerritchie.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roland</md:GivenName>
+    <md:SurName>Tanner</md:SurName>
+    <md:EmailAddress>mailto:roland@tannerritchie.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml b/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
index 96931229..1b002d7b 100644
--- a/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
+++ b/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://met.refeds.org/saml2/metadata/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-30T13:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-30T13:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Metadata Explorer Tool</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Metadata Explorer Tool</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Metadata Explorer Tool is a fast way to find federations, entities and his relations through entity/federation metadata file information.</mdui:Description>
+        <mdui:Description xml:lang="it">Il Metadata Explorer Tool permette rapidamente di trovare le federazioni, le entità e le relazioni tra di esse nei metadati che le descrivono.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://met.refeds.org/static/info_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://met.refeds.org/static/info_it.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://met.refeds.org/static/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://met.refeds.org/static/privacy_it.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="120" width="160" xml:lang="en">https://met.refeds.org/static/logoMET_160x120.png</mdui:Logo>
+        <mdui:Logo height="120" width="160" xml:lang="it">https://met.refeds.org/static/logoMET_160x120.png</mdui:Logo>
+        <mdui:Logo height="12" width="16" xml:lang="en">https://met.refeds.org/static/logoMET_16x12.png</mdui:Logo>
+        <mdui:Logo height="12" width="16" xml:lang="it">https://met.refeds.org/static/logoMET_16x12.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Metadata Explorer Tool</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Metadata Explorer Tool</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Metadata Explorer Tool is a fast way to find federations, entities and his relations through entity/federation metadata file information.</mdui:Description>
-          <mdui:Description xml:lang="it">Il Metadata Explorer Tool permette rapidamente di trovare le federazioni, le entità e le relazioni tra di esse nei metadati che le descrivono.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://met.refeds.org/static/info_en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://met.refeds.org/static/info_it.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://met.refeds.org/static/privacy_en.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://met.refeds.org/static/privacy_it.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="120" width="160" xml:lang="en">https://met.refeds.org/static/logoMET_160x120.png</mdui:Logo>
-          <mdui:Logo height="120" width="160" xml:lang="it">https://met.refeds.org/static/logoMET_160x120.png</mdui:Logo>
-          <mdui:Logo height="12" width="16" xml:lang="en">https://met.refeds.org/static/logoMET_16x12.png</mdui:Logo>
-          <mdui:Logo height="12" width="16" xml:lang="it">https://met.refeds.org/static/logoMET_16x12.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBTCCAe2gAwIBAgIJAJrz91xEwT1DMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
 BAMMDm1ldC5yZWZlZHMub3JnMB4XDTE1MDQyMDEwMDkzN1oXDTI1MDQxOTEwMDkz
 N1owGTEXMBUGA1UEAwwObWV0LnJlZmVkcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
@@ -49,13 +49,13 @@ w53UzzO6s6cSqo2rzA7QKuEUvsUnrB7NYy818riZ0ufFcZfWz6ApPLffVJa3M7tw
 OKtWkwuFNtGa6miYdAng9t0snIrLFqMYSooFliWMpFMiapQecEHhu8lwF9Xlrh5p
 BAK+sbIfUHvh
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBTCCAe2gAwIBAgIJAJrz91xEwT1DMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
 BAMMDm1ldC5yZWZlZHMub3JnMB4XDTE1MDQyMDEwMDkzN1oXDTI1MDQxOTEwMDkz
 N1owGTEXMBUGA1UEAwwObWV0LnJlZmVkcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
@@ -74,53 +74,53 @@ w53UzzO6s6cSqo2rzA7QKuEUvsUnrB7NYy818riZ0ufFcZfWz6ApPLffVJa3M7tw
 OKtWkwuFNtGa6miYdAng9t0snIrLFqMYSooFliWMpFMiapQecEHhu8lwF9Xlrh5p
 BAK+sbIfUHvh
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://met.refeds.org/saml2/ls/"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://met.refeds.org/saml2/acs/" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Metadata Explorer Tool</md:ServiceName>
-        <md:ServiceName xml:lang="it">Metadata Explorer Tool</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Metadata Explorer Tool is a fast way to find federations, entities and his relations through entity/federation metadata file information.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Il Metadata Explorer Tool permette rapidamente di trovare le federazioni, le entità e le relazioni tra di esse nei metadati che le descrivono.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Géant Association</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Géant Association</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Metadata Explorer Tool erogato da Géant Association</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Metadata Explorer Tool provided by Géant Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.geant.net</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrea</md:GivenName>
-      <md:SurName>Biancini</md:SurName>
-      <md:EmailAddress>mailto:andrea.biancini@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Malavolti</md:SurName>
-      <md:EmailAddress>mailto:marco.malavolti@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Licia</md:GivenName>
-      <md:SurName>Florio</md:SurName>
-      <md:EmailAddress>mailto:licia.florio@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Nicole</md:GivenName>
-      <md:SurName>Harris</md:SurName>
-      <md:EmailAddress>mailto:nicole.harris@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDEM</md:GivenName>
-      <md:SurName>Help</md:SurName>
-      <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://met.refeds.org/saml2/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://met.refeds.org/saml2/acs/" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Metadata Explorer Tool</md:ServiceName>
+      <md:ServiceName xml:lang="it">Metadata Explorer Tool</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Metadata Explorer Tool is a fast way to find federations, entities and his relations through entity/federation metadata file information.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Il Metadata Explorer Tool permette rapidamente di trovare le federazioni, le entità e le relazioni tra di esse nei metadati che le descrivono.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Géant Association</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Géant Association</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Metadata Explorer Tool erogato da Géant Association</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Metadata Explorer Tool provided by Géant Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.geant.net</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrea</md:GivenName>
+    <md:SurName>Biancini</md:SurName>
+    <md:EmailAddress>mailto:andrea.biancini@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Malavolti</md:SurName>
+    <md:EmailAddress>mailto:marco.malavolti@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Licia</md:GivenName>
+    <md:SurName>Florio</md:SurName>
+    <md:EmailAddress>mailto:licia.florio@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Nicole</md:GivenName>
+    <md:SurName>Harris</md:SurName>
+    <md:EmailAddress>mailto:nicole.harris@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Help</md:SurName>
+    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
index b423663f..954b02f4 100644
--- a/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
+++ b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.cesnet.cz/sp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T11:47:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T11:47:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Perun</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Perun</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Perun is a system for managing user accounts, user groups and access to computational resources and services in cloud, grid and other e-infrastructures. This Perun instance manages e-infrastructure of CESNET, which is an association of Czech public universities and the Czech Academy of Sciences.</mdui:Description>
+        <mdui:Description xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. Tato instance Peruna spravuje e-infrastrukturu organizace CESNET, která je sdružením českých veřejných vysokých škol a ústavů Akademie věd.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/</mdui:InformationURL>
+        <mdui:Logo height="145" width="327">https://meta.cesnet.cz/cesnet_logo_327x145.png</mdui:Logo>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF/eduid" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Perun</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Perun</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Perun is a system for managing user accounts, user groups and access to computational resources and services in cloud, grid and other e-infrastructures. This Perun instance manages e-infrastructure of CESNET, which is an association of Czech public universities and the Czech Academy of Sciences.</mdui:Description>
-          <mdui:Description xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. Tato instance Peruna spravuje e-infrastrukturu organizace CESNET, která je sdružením českých veřejných vysokých škol a ústavů Akademie věd.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/</mdui:InformationURL>
-          <mdui:Logo height="145" width="327">https://meta.cesnet.cz/cesnet_logo_327x145.png</mdui:Logo>
-        </mdui:UIInfo>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF/eduid" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>_meta_2015-12-07</ds:KeyName>
-          <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
-          <ds:KeyName>meta.cesnet.cz</ds:KeyName>
-          <ds:KeyName>metacentrum.cz</ds:KeyName>
-          <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
-          <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>www.metacentrum.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-            <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>_meta_2015-12-07</ds:KeyName>
+        <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
 BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
@@ -71,24 +71,24 @@ WLSQJQxpF1h5oVM5OW/V0h+R3/RC7xnirr4Y5M476wwC24FdrtMeZ6F7nGsIGJdI
 +SgNReiXBL/pow3YapcrTCoWJuUvq2mmpn3FQEA6ofbv6wMemIwB92cVuoo4/fU6
 XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>_meta_2015-12-07</ds:KeyName>
-          <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
-          <ds:KeyName>meta.cesnet.cz</ds:KeyName>
-          <ds:KeyName>metacentrum.cz</ds:KeyName>
-          <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
-          <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
-          <ds:KeyName>www.metacentrum.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-            <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>_meta_2015-12-07</ds:KeyName>
+        <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
 BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
@@ -116,55 +116,55 @@ WLSQJQxpF1h5oVM5OW/V0h+R3/RC7xnirr4Y5M476wwC24FdrtMeZ6F7nGsIGJdI
 +SgNReiXBL/pow3YapcrTCoWJuUvq2mmpn3FQEA6ofbv6wMemIwB92cVuoo4/fU6
 XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metacentrum.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metavo.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.cesnet.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://einfra.cesnet.cz/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.cesnet.cz/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alcor.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/Artifact" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/ECP" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/Artifact" index="14"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Perun</md:ServiceName>
-        <md:ServiceName xml:lang="cs">Perun</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Perun is a system for managing user accounts, user groups and access to the computational resources and services in cloud, grid and other e-infrastructures.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://perun.cesnet.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://perun.cesnet.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Kuba</md:SurName>
-      <md:EmailAddress>makub@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metacentrum.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metavo.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.cesnet.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://einfra.cesnet.cz/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.cesnet.cz/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alcor.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/Artifact" index="14"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Perun</md:ServiceName>
+      <md:ServiceName xml:lang="cs">Perun</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Perun is a system for managing user accounts, user groups and access to the computational resources and services in cloud, grid and other e-infrastructures.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://perun.cesnet.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://perun.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Kuba</md:SurName>
+    <md:EmailAddress>makub@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/metadata.pingdemo.com.xml b/swamid-interfederations-2.0/metadata.pingdemo.com.xml
index 637baef9..017a4363 100644
--- a/swamid-interfederations-2.0/metadata.pingdemo.com.xml
+++ b/swamid-interfederations-2.0/metadata.pingdemo.com.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://metadata.pingdemo.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pingdemo.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ping Identity Corporation</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.pingidentity.com</mdui:InformationURL>
+        <mdui:Logo height="99" width="99" xml:lang="en">https://www.pingidentity.com/etc/designs/pic/clientlibs-all/logos/PingIdentity_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pingdemo.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ping Identity Corporation</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.pingidentity.com</mdui:InformationURL>
-          <mdui:Logo height="99" width="99" xml:lang="en">https://www.pingidentity.com/etc/designs/pic/clientlibs-all/logos/PingIdentity_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFjCCAf6gAwIBAgIGAVCAYYkWMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNVBAYTAlVTMRYwFAYD
 VQQKEw1QaW5nIElkZW50aXR5MSUwIwYDVQQDExxQaW5nIElkZW50aXR5IE1ldGFkYXRhIFBpbG90
 MB4XDTE1MTAxOTEzNTQ0N1oXDTI1MTAxNjEzNTQ0N1owTDELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
@@ -37,27 +37,27 @@ eYNazEwRpMQAZ10VxBToY0YylgegkPIEQSStqzfMzVcVL1fV/XOjpuadgNrOVkyBPJ5GUgqo6nWl
 G2k/kI222PlclPxNtmEmBze4XrOlYSWRlSbPUt/n/7NzOPjQiXnQ8/JpxGytVI4luNVr+UkU5cna
 KIiTffUkLMQHZLglzpvThH4G3l36TaVyJPEblSU1LINR9w0gc+y73yL0qDXGDeYdWTYbDuE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metadata.pingdemo.com/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metadata.pingdemo.com/idp/SSO.saml2"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ping Identity Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ping Identity Corporation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pingid.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hans Zandbelt</md:GivenName>
-      <md:EmailAddress>hzandbelt@pingidentity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Hans Zandbelt</md:GivenName>
-      <md:EmailAddress>hzandbelt@pingidentity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Bradley</md:GivenName>
-      <md:EmailAddress>jbradley@pingidentity.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metadata.pingdemo.com/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metadata.pingdemo.com/idp/SSO.saml2"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ping Identity Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ping Identity Corporation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pingid.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hans Zandbelt</md:GivenName>
+    <md:EmailAddress>hzandbelt@pingidentity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Hans Zandbelt</md:GivenName>
+    <md:EmailAddress>hzandbelt@pingidentity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Bradley</md:GivenName>
+    <md:EmailAddress>jbradley@pingidentity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml
index 5f90e42e..b94d82b2 100644
--- a/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://metalib01vapp2.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-09T15:08:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-09T15:08:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Glamorgan - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Glamorgan</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Glamorgan - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Glamorgan</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAJPmUlsftXVuMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDm1ldGFsaWIwMXZhcHAyMB4XDTExMTAwNTEzNTc1N1oXDTIxMTAwMjEzNTc1
 						N1owGTEXMBUGA1UEAxMObWV0YWxpYjAxdmFwcDIwggEiMA0GCSqGSIb3DQEBAQUA
@@ -46,42 +46,42 @@
 						ea43LctyMF5lQyiiWorRb5x+uZNVl27vCwqJH/fLER4YVCe4t1Z9wjBIofK4o0Cu
 						aOUf5tN8OEv4dwRswRCl3hq7U1tERypMyPrXR1mrhlYfQutm+Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Glamorgan - Primo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Bieber</md:SurName>
-      <md:EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Bieber</md:SurName>
-      <md:EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Glamorgan - Primo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Bieber</md:SurName>
+    <md:EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Bieber</md:SurName>
+    <md:EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
index 73370af5..56ebc74a 100644
--- a/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minosse.unime.it/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-25T10:40:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-25T10:40:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unime.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.unime.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospiti.unime.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IDP University of Messina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IDP Università degli Studi di Messina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Messina users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Messina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unime.it/ciam_a_villari/_servizi/-27798.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unime.it/ciam_a_villari/_servizi/-27798.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unime.it/ciam_a_villari/_servizi/-27792.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unime.it/ciam_a_villari/_servizi/-27792.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="61" width="61" xml:lang="it">https://minosse.unime.it/logo2.png</mdui:Logo>
+        <mdui:Logo height="61" width="61" xml:lang="en">https://minosse.unime.it/logo2.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://minosse.unime.it/logo1.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://minosse.unime.it/logo1.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:36.597889,16.875000</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unime.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.unime.it</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospiti.unime.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IDP University of Messina</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IDP Università degli Studi di Messina</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for University of Messina users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Messina</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unime.it/ciam_a_villari/_servizi/-27798.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unime.it/ciam_a_villari/_servizi/-27798.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unime.it/ciam_a_villari/_servizi/-27792.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unime.it/ciam_a_villari/_servizi/-27792.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="61" width="61" xml:lang="it">https://minosse.unime.it/logo2.png</mdui:Logo>
-          <mdui:Logo height="61" width="61" xml:lang="en">https://minosse.unime.it/logo2.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://minosse.unime.it/logo1.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://minosse.unime.it/logo1.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:36.597889,16.875000</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEETCCAvmgAwIBAgIJAJv/7OTrVdPFMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxEDAOBgNVBAcMB01lc3NpbmExHjAcBgNV
 BAoMFVVuaXZlcnNpdHkgb2YgTWVzc2luYTENMAsGA1UECwwEQ0lBTTEZMBcGA1UE
@@ -55,13 +55,13 @@ wCu9/tEnLXz2Kf120i17a67NwuN19QH8+wFVJYNPAlzK7dMZcvzWXVK5jxNNdZ0U
 9Mr3Wb/FYQcDOucIrYdThh9//RbRTH0JMmbYhOiYXteJKOYreSwqGlZJLmfOExYx
 EXjRmsJ4xyedzAlUmmUj0WNkBA1fYmVhJ1JZqU+uRTgvL2QcPQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEETCCAvmgAwIBAgIJAJv/7OTrVdPFMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
 VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxEDAOBgNVBAcMB01lc3NpbmExHjAcBgNV
 BAoMFVVuaXZlcnNpdHkgb2YgTWVzc2luYTENMAsGA1UECwwEQ0lBTTEZMBcGA1UE
@@ -85,24 +85,24 @@ wCu9/tEnLXz2Kf120i17a67NwuN19QH8+wFVJYNPAlzK7dMZcvzWXVK5jxNNdZ0U
 9Mr3Wb/FYQcDOucIrYdThh9//RbRTH0JMmbYhOiYXteJKOYreSwqGlZJLmfOExYx
 EXjRmsJ4xyedzAlUmmUj0WNkBA1fYmVhJ1JZqU+uRTgvL2QcPQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minosse.unime.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minosse.unime.it/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Messina</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Messina</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Messina</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Messina</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unime.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unime.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDP</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:idp@unime.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minosse.unime.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minosse.unime.it/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Messina</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Messina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Messina</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Messina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unime.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unime.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDP</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:idp@unime.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml
index 099a36c4..9296c571 100644
--- a/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mira.fapesp.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fapesp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fapesp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fapesp.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:Description>
-          <mdui:Description xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fapesp.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xPjA8BgNVBAoTNTpGdW5kYWNh
 byBkZSBBbXBhcm8gYSBQZXNxdWlzYSBkbyBFc3RhZG8gZGUgU2FvIFBhdWxvMQww
 CgYDVQQLEwNDUEQxHzAdBgkqhkiG9w0BCQEWEGdlcmNwZEBmYXBlc3AuYnIxEjAQ
@@ -46,26 +46,26 @@ anpkHfy+Gb5Z+cMWuI3zCoFMjorqwYPc8H1TqojQZUUhuG+mW9jeaFGS0Tnqe2gF
 CwBrpuADDIIcUgwCpkg1wrBcjFhGHSuUTCMoBOfnVky6LlFn1lSSw7cLiU9/hSlB
 W0oZpQ==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mira.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mira.fapesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mira.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mira.fapesp.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mira.fapesp.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mira.fapesp.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fapesp.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mira.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mira.fapesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mira.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mira.fapesp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mira.fapesp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mira.fapesp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fapesp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xPjA8BgNVBAoTNTpGdW5kYWNh
 byBkZSBBbXBhcm8gYSBQZXNxdWlzYSBkbyBFc3RhZG8gZGUgU2FvIFBhdWxvMQww
@@ -92,24 +92,24 @@ W0oZpQ==
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mira.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mira.fapesp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fapesp.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.fapesp.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Gerencia de Informatica</md:SurName>
-      <md:EmailAddress>gercpd@fapesp.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mira.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mira.fapesp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fapesp.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.fapesp.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gerencia de Informatica</md:SurName>
+    <md:EmailAddress>gercpd@fapesp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/missouri.nupark.com-sp.xml b/swamid-interfederations-2.0/missouri.nupark.com-sp.xml
index 06769dfe..ec983215 100644
--- a/swamid-interfederations-2.0/missouri.nupark.com-sp.xml
+++ b/swamid-interfederations-2.0/missouri.nupark.com-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://missouri.nupark.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NuPark Inc</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NuPark Inc</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFqTCCBJGgAwIBAgIRANyV4qxFIn2HIWhpS2CN6I4wDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 BAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAY
 BgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYDVQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlv
@@ -45,40 +45,40 @@ tQLTtnHsObba27af6XF6l4dASmJc97csHrXCdx4xiqedPnLuAemgnQqOfMzieXt0Zmxyxl2GTU95
 l0IIEvGH8twjVy00jBgrTJZiz8LiTN958X/dWQDubmFhr27S66R3/9wyGqGnEIvY+6gsWvitoX2L
 QzkVTGIslCDUoFF35o+DrDRHpQNl3C2PSLgXrQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://missouri.nupark.com/portal/authservices/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://missouri.nupark.com/portal/authservices/acs" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://missouri.nupark.com/portal/authservices/acs" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://missouri.nupark.com/portal/authservices/acs" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NuPark Inc</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NuPark LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NuPark LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nupark.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephen Lambert</md:GivenName>
-      <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ron Frick</md:GivenName>
-      <md:EmailAddress>ron.frick@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Stephen Lambert</md:GivenName>
-      <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Stephen Lambert</md:GivenName>
-      <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://missouri.nupark.com/portal/authservices/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://missouri.nupark.com/portal/authservices/acs" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://missouri.nupark.com/portal/authservices/acs" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://missouri.nupark.com/portal/authservices/acs" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NuPark Inc</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NuPark LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NuPark LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nupark.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen Lambert</md:GivenName>
+    <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ron Frick</md:GivenName>
+    <md:EmailAddress>ron.frick@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Stephen Lambert</md:GivenName>
+    <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Stephen Lambert</md:GivenName>
+    <md:EmailAddress>stephen.lambert@nupark.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml
index 28ac1334..0fce2461 100644
--- a/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mnementh.csi.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAOVxp6HWm9xkMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCG1uZW1lbnRoMB4XDTA5MDIxODE3MjYzOFoXDTE5MDIxNjE3MjYzOFowEzER
 						MA8GA1UEAxMIbW5lbWVudGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -28,13 +28,13 @@
 						m2tWL3l+kX0MHJVAQ7i6iSXhiXCX1/ATGEPniV71u9gRMd/FQBJo9D5jTOHUpNzA
 						dvLRXByBJtURFonOb55G90gyqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAOVxp6HWm9xkMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCG1uZW1lbnRoMB4XDTA5MDIxODE3MjYzOFoXDTE5MDIxNjE3MjYzOFowEzER
 						MA8GA1UEAxMIbW5lbWVudGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -52,37 +52,37 @@
 						m2tWL3l+kX0MHJVAQ7i6iSXhiXCX1/ATGEPniV71u9gRMd/FQBJo9D5jTOHUpNzA
 						dvLRXByBJtURFonOb55G90gyqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Test SP on mnementh.csi</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Warbrick</md:SurName>
-      <md:EmailAddress>mailto:jw35@cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Warbrick</md:SurName>
-      <md:EmailAddress>mailto:jw35@cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Test SP on mnementh.csi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Warbrick</md:SurName>
+    <md:EmailAddress>mailto:jw35@cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Warbrick</md:SurName>
+    <md:EmailAddress>mailto:jw35@cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
index 0f746a78..b61a0ee4 100644
--- a/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,63 +1,63 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduroam supporting services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://monitor.eduroam.org/sp/CoC/privacystatement_en.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">eduroam supporting services</mdui:DisplayName>
-          <mdui:Description xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://monitor.eduroam.org/sp/CoC/privacystatement_en.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">eduroam supporting services</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">eduroam</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">eduroam</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eduroam.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dubravko</md:GivenName>
-      <md:SurName>Voncina</md:SurName>
-      <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>eduroam operations team</md:Company>
-      <md:EmailAddress>eduroam-ot@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">eduroam supporting services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduroam</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduroam</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduroam.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dubravko</md:GivenName>
+    <md:SurName>Voncina</md:SurName>
+    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>eduroam operations team</md:Company>
+    <md:EmailAddress>eduroam-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
index 053109c9..b2352a66 100644
--- a/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
+++ b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mp.uu.se/Shibboleth.sso">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <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://mp.uu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare</mdui:Description>
+        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://mp.uu.se/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare</mdui:Description>
-          <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC3zCCAcegAwIBAgIJAKpDmQ/flLdVMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 BAMTCG1wLnV1LnNlMB4XDTEyMTAxMTE0NTAyOFoXDTIyMTAwOTE0NTAyOFowEzER
 MA8GA1UEAxMIbXAudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -45,26 +45,26 @@ xHXT67mQsDSoiBiExsGPjtqxbrVy2v9WV1Oup6UjXIgOacpaDNErD1XzAkQP6LD4
 t9uEzq8Qiu8ImRG9SyPDd76umF5tLtg53EHaK1o2LnSU4CyjsnUX5Np1l13rMKaR
 Ohr8KLKt6tC/JZ059e8ENxrN7g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</md:ServiceName>
-        <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:ContactPerson contactType="support">
-      <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</md:ServiceName>
+      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml b/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
index 8dab38a3..dad54c07 100644
--- a/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://muse.jhu.edu/shibboleth">
-    <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-24T14:57:13Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-24T14:57:13Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDtTCCAp2gAwIBAgIJAJsinS4vDTq8MA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
 						BAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDESMBAGA1UEBwwJQmFsdGltb3JlMQ0w
 						CwYDVQQKDARKSFVQMRUwEwYDVQQLDAxQcm9qZWN0IE1VU0UxFTATBgNVBAMMDG11
@@ -45,46 +45,46 @@
 						oHZUC5SuhcR2dJp7Ot3j1UHJB8ZQk3128v33S2ConZWqkw1WvXiav1kuocWsv0Lk
 						sDIRUBUgNv1n6knfP5PLUiQlE5tt4yG1ZbXdDhCJ4Qho8vNNZkTx00c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://muse.jhu.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://muse.jhu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Johns Hopkins University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Project MUSE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://muse.jhu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Project MUSE</md:GivenName>
-      <md:EmailAddress>mailto:muse@press.jhu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Malloy</md:SurName>
-      <md:EmailAddress>mailto:malloy@jhu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://muse.jhu.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://muse.jhu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Johns Hopkins University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Project MUSE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://muse.jhu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Project MUSE</md:GivenName>
+    <md:EmailAddress>mailto:muse@press.jhu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Malloy</md:SurName>
+    <md:EmailAddress>mailto:malloy@jhu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml b/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml
index c5c51bd6..f96e84a6 100644
--- a/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://myconcern.thinkiteducation.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-12T09:37:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-12T09:37:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MyConcern ThinkIT Integrated Demo Site</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The MyConcern ThinkIT Integrated Demo Site is used for demonstrating the joined up ThinkIT solution</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MyConcern ThinkIT Integrated Demo Site</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The MyConcern ThinkIT Integrated Demo Site is used for demonstrating the joined up ThinkIT solution</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAKF0PyvuaE7mMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHRoaW5rLW15Yy0wMS5zZXJlbi5sb2NhbDAeFw0xNDEyMDkxMTQwMTJaFw0y
 						NDEyMDYxMTQwMTJaMCMxITAfBgNVBAMTGHRoaW5rLW15Yy0wMS5zZXJlbi5sb2Nh
@@ -51,43 +51,43 @@
 						2RMdnVWWAjZaLLMOTVmBF8ndB3CUurWfisv2GBVTHsmgKVtbUdHIS6o8NlQdnPk3
 						9AfqjY3J5+HrbC8v/CbVhkudJw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">One Team Logic Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MyConcern ThinkIT Integrated Demo Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Tucker</md:SurName>
-      <md:EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">One Team Logic Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MyConcern ThinkIT Integrated Demo Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Tucker</md:SurName>
+    <md:EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml
index c33c5fd8..9e68f8d4 100644
--- a/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://myid.vsc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vermont State Colleges</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Vermont State Colleges</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUD6kNBlkvLeU+Ol2757c+7bZtM+owDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMbXlpZC52c2MuZWR1MB4XDTExMDMwODE4Mzk0NFoXDTMx
 MDMwODE4Mzk0NFowFzEVMBMGA1UEAxMMbXlpZC52c2MuZWR1MIIBIjANBgkqhkiG
@@ -37,25 +37,25 @@ jC2Adkr9u5/y7vPDSH2padWGJP93Lk47t4/Wm0jHiBfEbzyx1F7UyLBaHm8Loqg9
 RyWSF4HaRliCJYEx5UlVZInGVkbyfqqZ0CSuABmOQ9qRwMnChkZEmIDZXqKk+N3f
 zaSlyhw6JsSB9BNAjScXmtSxUEZPmEmocxbfadzWAw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myid.vsc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myid.vsc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myid.vsc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myid.vsc.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Vermont State Colleges</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Vermont State Colleges</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vsc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Richard Blood</md:GivenName>
-      <md:EmailAddress>rick.blood@vsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Schrader</md:GivenName>
-      <md:EmailAddress>john.schrader@vsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myid.vsc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myid.vsc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myid.vsc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myid.vsc.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vermont State Colleges</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vermont State Colleges</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vsc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Richard Blood</md:GivenName>
+    <md:EmailAddress>rick.blood@vsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Schrader</md:GivenName>
+    <md:EmailAddress>john.schrader@vsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml b/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
index 8ecdd920..0e9e5be9 100644
--- a/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mylogin.uni-freiburg.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Die Universität Freiburg bietet mit myLogin einen zentralen Authentifizierung- und Autorisierungsdienst an. Technische Basis ist ein Shibboleth Identity-Provider. &lt;a href="https://mylogin.uni-freiburg.de/" target="_blank"&gt;Weitere Informationen...&lt;/a&gt;</mdui:Description>
+        <mdui:Description xml:lang="en">Die Universität Freiburg bietet mit myLogin einen zentralen Authentifizierung- und Autorisierungsdienst an. Technische Basis ist ein Shibboleth Identity-Provider. &lt;a href="https://mylogin.uni-freiburg.de/" target="_blank"&gt;Weitere Informationen...&lt;/a&gt;</mdui:Description>
+        <mdui:Logo height="16" width="16">https://mylogin.ub.uni-freiburg.de/themes/freiburg/icons/unilogo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="42">https://mylogin.ub.uni-freiburg.de/themes/freiburg/icons/unilogo-42x60.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-freiburg.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-freiburg.de/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Die Universität Freiburg bietet mit myLogin einen zentralen Authentifizierung- und Autorisierungsdienst an. Technische Basis ist ein Shibboleth Identity-Provider. &lt;a href="https://mylogin.uni-freiburg.de/" target="_blank"&gt;Weitere Informationen...&lt;/a&gt;</mdui:Description>
-          <mdui:Description xml:lang="en">Die Universität Freiburg bietet mit myLogin einen zentralen Authentifizierung- und Autorisierungsdienst an. Technische Basis ist ein Shibboleth Identity-Provider. &lt;a href="https://mylogin.uni-freiburg.de/" target="_blank"&gt;Weitere Informationen...&lt;/a&gt;</mdui:Description>
-          <mdui:Logo height="16" width="16">https://mylogin.ub.uni-freiburg.de/themes/freiburg/icons/unilogo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="42">https://mylogin.ub.uni-freiburg.de/themes/freiburg/icons/unilogo-42x60.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-freiburg.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-freiburg.de/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGcTCCBVmgAwIBAgIHGHFzy9wsiTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGcTCCBVmgAwIBAgIHGHFzy9wsiTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
 UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
 hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTAzMDA4MjYzNVoX
@@ -66,30 +66,30 @@ qXz4mnXddU62dCd7gK51BrBKiKybynvkPqHKpzsQuqJkvUor0akWs/sNC4JPTVge
 OiaMHLVeayf2tdRhxKcvVr7cAQpfwYM36BpAYn2bl7CXiyrHT79ZbYWu9UJnUE0j
 BvSLKfixDbm6WbObPgh+5qnIJT3Y
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGcTCCBVmgAwIBAgIHGHFzy9wsiTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGcTCCBVmgAwIBAgIHGHFzy9wsiTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
 UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
 hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTAzMDA4MjYzNVoX
@@ -125,36 +125,36 @@ qXz4mnXddU62dCd7gK51BrBKiKybynvkPqHKpzsQuqJkvUor0akWs/sNC4JPTVge
 OiaMHLVeayf2tdRhxKcvVr7cAQpfwYM36BpAYn2bl7CXiyrHT79ZbYWu9UJnUE0j
 BvSLKfixDbm6WbObPgh+5qnIJT3Y
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e14</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e14</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-freiburg.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>myLogin</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:mylogin@uni-freiburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>myLogin</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:mylogin@uni-freiburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Bernd</md:GivenName>
-      <md:SurName>Oberknapp</md:SurName>
-      <md:EmailAddress>mailto:bo@ub.uni-freiburg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e14</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e14</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-freiburg.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>myLogin</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:mylogin@uni-freiburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>myLogin</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:mylogin@uni-freiburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Bernd</md:GivenName>
+    <md:SurName>Oberknapp</md:SurName>
+    <md:EmailAddress>mailto:bo@ub.uni-freiburg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
index 6b392e57..d5bf895d 100644
--- a/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://namidp.services.uu.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-01T16:50:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-01T16:50:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soliscom.uu.nl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uu.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit Utrecht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
+        <mdui:Description xml:lang="en">Universiteit Utrecht (NetIQ)</mdui:Description>
+        <mdui:Logo height="36" width="108">https://static.surfconext.nl/logos/idp/uu.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">utrecht university uu</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">utrecht university uu</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soliscom.uu.nl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uu.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Universiteit Utrecht</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
-          <mdui:Description xml:lang="en">Universiteit Utrecht (NetIQ)</mdui:Description>
-          <mdui:Logo height="36" width="108">https://static.surfconext.nl/logos/idp/uu.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">utrecht university uu</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">utrecht university uu</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/dd83d3078a00c0103c00102b7d61c479"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Universiteit Utrecht</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Universiteit Utrecht</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.uu.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uu.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/dd83d3078a00c0103c00102b7d61c479"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Universiteit Utrecht</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Universiteit Utrecht</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.uu.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
index c19e814b..93fd93cd 100644
--- a/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
+++ b/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naming.ja.net/bcp-dns/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-11T14:10:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-11T14:10:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bcp-naming.ja.net/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bcp-naming.ja.net/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAKvL1FR4I0BGMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWJjcDAwNDI3OTAeFw0xMTEyMDcxMjE3MzBaFw0yMTEyMDQxMjE3MzBaMBQx
 						EjAQBgNVBAMTCWJjcDAwNDI3OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -50,51 +50,51 @@
 						gvNqP58O7WCznLitHB+FV1vK1NNKTN5uCD1Uohm/vE3kGTb009KkzLMSnmArOiM8
 						61C72Um8LiBt1IJwhXSvB7eOST78dw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Janet Naming Service (BCP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Janet Corporate Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:corporate.servicedesk@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janet Corporate Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:corporate.servicedesk@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Janet Naming Service (BCP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Janet Corporate Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:corporate.servicedesk@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janet Corporate Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:corporate.servicedesk@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
index aec8ea85..67076d8c 100644
--- a/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
+++ b/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naming.ja.net/dns/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-16T16:13:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-16T16:13:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://naming.ja.net/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Domain Registration Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Jisc Domain Registration Service</mdui:Description>
+        <mdui:Logo height="72" width="350">https://domainregistry.jisc.ac.uk/dns/Images/federation-sp-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://naming.ja.net/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Domain Registration Service</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Jisc Domain Registration Service</mdui:Description>
-          <mdui:Logo height="72" width="350">https://domainregistry.jisc.ac.uk/dns/Images/federation-sp-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
 						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -55,51 +55,51 @@
 						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
 						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Janet Naming Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JANET NAMING</md:GivenName>
-      <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>JANET NAMING</md:GivenName>
-      <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Janet Naming Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JANET NAMING</md:GivenName>
+    <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>JANET NAMING</md:GivenName>
+    <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
index 12518c47..615f8f75 100644
--- a/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
+++ b/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://naming.ja.net/dns-test/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-16T16:13:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-16T16:13:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="72" width="350">https://domainregistry-test.jisc.ac.uk/dns-test/Images/federation-sp-logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">JISC Domain Registration Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">JISC Domain Registration Service</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming-test.ja.net/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming-test.ja.net/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://naming-test.ja.net/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="72" width="350">https://domainregistry-test.jisc.ac.uk/dns-test/Images/federation-sp-logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">JISC Domain Registration Service</mdui:DisplayName>
-          <mdui:Description xml:lang="en">JISC Domain Registration Service</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming-test.ja.net/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming-test.ja.net/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://naming-test.ja.net/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
 						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -55,51 +55,51 @@
 						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
 						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Janet Naming Service (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JANET NAMING</md:GivenName>
-      <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>JANET NAMING</md:GivenName>
-      <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Janet Naming Service (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JANET NAMING</md:GivenName>
+    <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>JANET NAMING</md:GivenName>
+    <md:EmailAddress>mailto:naming@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml
index c4d6e565..4a2ed521 100644
--- a/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://napier-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-25T10:14:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-25T10:14:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Edinburgh Napier University - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Edinburgh Napier University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Edinburgh Napier University - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Edinburgh Napier University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJALjiKNTZ3VmHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMDIwHhcNMTQwNjI0MTcxNjM0WhcNMjQwNjIxMTcxNjM0WjASMRAw
 						DgYDVQQDEwdhaW8wMDAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -45,40 +45,40 @@
 						rPegVeBmWMHONjT6JVorvLFa37FCt7QvpZFLX5D2uv46b118DT1WCVayN1MBBqb2
 						cIIz4hKEyHd/FjV5wSc0dw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edinburgh Napier University - Primo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edinburgh Napier University - Primo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nbcol.ac.uk-openathens.xml b/swamid-interfederations-2.0/nbcol.ac.uk-openathens.xml
index ce22d60c..5fef8d70 100644
--- a/swamid-interfederations-2.0/nbcol.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/nbcol.ac.uk-openathens.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nbcol.ac.uk/openathens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nbcol.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nbcol.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nbcol.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nbcol.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northbrook College Sussex</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nbcol.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nbcol.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nbcol.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northbrook College Sussex</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nbcol.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml b/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
index 69510ccf..e92d333d 100644
--- a/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ncidp.northamptoncollege.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T16:40:47Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T16:40:47Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northamptoncollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northamptoncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEoDCCA4igAwIBAgIJAOT4d4eEJbV+MA0GCSqGSIb3DQEBCwUAMIHQMQswCQYD
 						VQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxMLTm9y
 						dGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNVBAsT
@@ -37,26 +37,26 @@
 						vwbKJVEkvsYuI45d1pFmPe1x/UVFTl5EmqFEVkU8S+bpv3vM6WiY/UGkT+9IeFhV
 						hhpHWzv4wbV80Eh9ixIti4pfMo8IxIQReLGddhW/H9A7dwK5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northamptoncollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northamptoncollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEoDCCA4igAwIBAgIJAOT4d4eEJbV+MA0GCSqGSIb3DQEBCwUAMIHQMQswCQYD
 						VQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxMLTm9y
 						dGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNVBAsT
@@ -83,27 +83,27 @@
 						vwbKJVEkvsYuI45d1pFmPe1x/UVFTl5EmqFEVkU8S+bpv3vM6WiY/UGkT+9IeFhV
 						hhpHWzv4wbV80Eh9ixIti4pfMo8IxIQReLGddhW/H9A7dwK5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northampton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northampton College IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northamptoncollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Masniza</md:GivenName>
-      <md:SurName>Sore</md:SurName>
-      <md:EmailAddress>mailto:Masniza.Sore@northamptoncollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Putt</md:SurName>
-      <md:EmailAddress>mailto:James.Putt@northamptoncollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northampton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northampton College IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northamptoncollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Masniza</md:GivenName>
+    <md:SurName>Sore</md:SurName>
+    <md:EmailAddress>mailto:Masniza.Sore@northamptoncollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Putt</md:SurName>
+    <md:EmailAddress>mailto:James.Putt@northamptoncollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml
index d372ef54..b8254e1b 100644
--- a/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ncnidp2.ncn.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-04T10:36:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-04T10:36:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncn.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVALRppuv8S4ANdlBHMhXkfMZDERBpMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51azAeFw0xMzEwMDgxMzIz
 						MDNaFw0zMzEwMDgxMzIzMDNaMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51
@@ -32,26 +32,26 @@
 						pra6VEmKTwxJPyFY5D9627VwJmrePAUZsozY3mIE5oibbq3U92VpvsTb7EQFlKMj
 						Lh83rrpEo40=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nca-idp1.ncn.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nca-idp1.ncn.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncn.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVALRppuv8S4ANdlBHMhXkfMZDERBpMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51azAeFw0xMzEwMDgxMzIz
 						MDNaFw0zMzEwMDgxMzIzMDNaMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51
@@ -71,27 +71,27 @@
 						pra6VEmKTwxJPyFY5D9627VwJmrePAUZsozY3mIE5oibbq3U92VpvsTb7EQFlKMj
 						Lh83rrpEo40=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New College Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New College Nottingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncn.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Cook</md:SurName>
-      <md:EmailAddress>mailto:matthew.cook@ncn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Cook</md:SurName>
-      <md:EmailAddress>mailto:matthew.cook@ncn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New College Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New College Nottingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncn.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Cook</md:SurName>
+    <md:EmailAddress>mailto:matthew.cook@ncn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Cook</md:SurName>
+    <md:EmailAddress>mailto:matthew.cook@ncn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nd.onecampus.com.xml b/swamid-interfederations-2.0/nd.onecampus.com.xml
index 566d9987..137c9d6c 100644
--- a/swamid-interfederations-2.0/nd.onecampus.com.xml
+++ b/swamid-interfederations-2.0/nd.onecampus.com.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nd.onecampus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ND OneCampus</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ND OneCampus</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIF4jCCBMqgAwIBAgIIGDXYkef9MTEwDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
 BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
 GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
@@ -53,21 +53,21 @@ D6poAwUTzyTxJWFhLRIRRMwriI7jJv397rRbQCxl48a57Fnby61sVH5HAu/fxQYP
 b9lqIDeybtp3R8/9ESFMjEKs+PRHXFWqWMyqeVF2i10omeJ1g/oBc9yQQBdwaMLg
 t+jAm0TyfZSJbeqoNJrVOYxd/djzcg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cloud Ops Support</md:GivenName>
-      <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://inside-qa.nd.edu/saml/SSO/alias/nd" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cloud Ops Support</md:GivenName>
+    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ndsandbox.onecampus.com.xml b/swamid-interfederations-2.0/ndsandbox.onecampus.com.xml
index 70ac71b1..7d4fe30f 100644
--- a/swamid-interfederations-2.0/ndsandbox.onecampus.com.xml
+++ b/swamid-interfederations-2.0/ndsandbox.onecampus.com.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ndsandbox.onecampus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ND OneCampus Sandbox</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ND OneCampus Sandbox</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIF4jCCBMqgAwIBAgIIGDXYkef9MTEwDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
 BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
 GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
@@ -53,21 +53,21 @@ D6poAwUTzyTxJWFhLRIRRMwriI7jJv397rRbQCxl48a57Fnby61sVH5HAu/fxQYP
 b9lqIDeybtp3R8/9ESFMjEKs+PRHXFWqWMyqeVF2i10omeJ1g/oBc9yQQBdwaMLg
 t+jAm0TyfZSJbeqoNJrVOYxd/djzcg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cloud Ops Support</md:GivenName>
-      <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://inside-test.nd.edu/saml/SSO/alias/ndsandbox" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cloud Ops Support</md:GivenName>
+    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml b/swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml
index a81883ab..9c494dda 100644
--- a/swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml
+++ b/swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neo236.neocase-software.net/connexion_neocase">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PennStateBackoffice</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PennStateBackoffice</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID2TCCAsGgAwIBAgIJAPfTg+MQTPE0MA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBk5ld3RvbjEZMBcGA1UECgwQ
 TmVvY2FzZSBTb2Z0d2FyZTEcMBoGA1UECwwTU2FhUyBBZG1pbmlzdHJhdGlvbjEc
@@ -40,22 +40,22 @@ PsyFdVd0AeqkvbUZkZhNlax0u0AJv2oircEYNiZllrvDOraTBJkfI8fEyEEdYe18
 ciAugVZ5HD8JlVy+ARFOaQiqh2UmipYv+T2sFWOaXilbIkL8aPPPsM18xL6/ZE3Y
 g5bEi3lvWxUKBMOgNB+BW/+09dAvBdLuR2JSlaU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neo236.neocase-software.net/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eileen Szczesuil</md:GivenName>
-      <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicoleta Petcu</md:GivenName>
-      <md:EmailAddress>npetcu@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neo236.neocase-software.net/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eileen Szczesuil</md:GivenName>
+    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicoleta Petcu</md:GivenName>
+    <md:EmailAddress>npetcu@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nerckwshibb1.nerc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/nerckwshibb1.nerc.ac.uk-idp-shibboleth.xml
index 03c4e151..553c06bc 100644
--- a/swamid-interfederations-2.0/nerckwshibb1.nerc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/nerckwshibb1.nerc.ac.uk-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nerckwshibb1.nerc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-10T10:16:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-10T10:16:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NERC Test IdP (nerckwshibb1)</mdui:DisplayName>
+        <mdui:Logo height="41" width="200">https://nerckwshibb1.nerc.ac.uk/nerc-long-logo-200.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://nerckwshibb1.nerc.ac.uk/favicon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NERC Test IdP (nerckwshibb1)</mdui:DisplayName>
-          <mdui:Logo height="41" width="200">https://nerckwshibb1.nerc.ac.uk/nerc-long-logo-200.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://nerckwshibb1.nerc.ac.uk/favicon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGTCCAwGgAwIBAgIEbmt9cjANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxLTArBgNVBAoTJE5hdHVyYWwgRW52aXJvbm1l
 						bnQgUmVzZWFyY2ggQ291bmNpbDElMCMGA1UECxMcUmVzZWFyY2ggVGVjaG5vbG9n
@@ -51,31 +51,31 @@
 						HmxUvhyuXX8HMOJxt1xP3nn2nY6G6+UkZaZDDJIKVpjVeoo1/YNhJxrh0AqCV69n
 						m+TZ4zduFA9ZuDCEG5i8bjCFex7i7srkRGOpC01XvOUs0eebmzh+9Kcp82UI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nerckwshibb1.nerc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGTCCAwGgAwIBAgIEbmt9cjANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxLTArBgNVBAoTJE5hdHVyYWwgRW52aXJvbm1l
 						bnQgUmVzZWFyY2ggQ291bmNpbDElMCMGA1UECxMcUmVzZWFyY2ggVGVjaG5vbG9n
@@ -99,25 +99,25 @@
 						HmxUvhyuXX8HMOJxt1xP3nn2nY6G6+UkZaZDDJIKVpjVeoo1/YNhJxrh0AqCV69n
 						m+TZ4zduFA9ZuDCEG5i8bjCFex7i7srkRGOpC01XvOUs0eebmzh+9Kcp82UI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Natural Environment Research Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NERC Test IdP (nerckwshibb1)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nerc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>RTS ID Support</md:GivenName>
-      <md:EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>RTS ID Support</md:GivenName>
-      <md:EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibb1.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Natural Environment Research Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NERC Test IdP (nerckwshibb1)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nerc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>RTS ID Support</md:GivenName>
+    <md:EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>RTS ID Support</md:GivenName>
+    <md:EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
index 7adf6490..8b03f912 100644
--- a/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
@@ -1,108 +1,108 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nerckwshibba.nerc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T15:50:25Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T15:50:25Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antarctic.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birdisland.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridge.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ernestshackleton.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halley.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclark.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclarkross.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medicalunit.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">portlockroy.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rothera.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">signy.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southgeorgia.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfast.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eskdalemuir.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exhibitionroad.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gilmerton.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartland.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loanhead.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montserrat.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccms.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ccms.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dorset.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merlewood.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxford.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polaris.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">windermere.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbride.cs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oban.dml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.essc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.faam.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ios.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.ios.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sscnorthstarhouse.ios.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ite.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ite.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ite.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.mba.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsumariners.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsunationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southamptonuniversity.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nocentre.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xx.nocentre.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrcl.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nercradiocarbonlaboratory.nrcl.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.pml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liverpool.pol.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcuk.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">researchcouncils.rcuk.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saphos.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.saphos.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smru.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">standrews.smru.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfieldfaam.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbridercl.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herstmonceuxnsgf.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsskeyworth.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsspolarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsswallingford.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidlingtonarsf.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxfordgecafsipo.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universityofeastanglia.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.so.idp.nerc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antarctic.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birdisland.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridge.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ernestshackleton.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halley.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclark.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclarkross.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medicalunit.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">portlockroy.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rothera.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">signy.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southgeorgia.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfast.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eskdalemuir.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exhibitionroad.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gilmerton.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartland.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loanhead.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montserrat.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccms.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ccms.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dorset.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merlewood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polaris.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">windermere.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbride.cs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oban.dml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.essc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.faam.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ios.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.ios.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sscnorthstarhouse.ios.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ite.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ite.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ite.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.mba.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsumariners.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsunationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southamptonuniversity.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nocentre.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xx.nocentre.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrcl.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nercradiocarbonlaboratory.nrcl.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.pml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liverpool.pol.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcuk.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">researchcouncils.rcuk.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saphos.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.saphos.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smru.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">standrews.smru.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfieldfaam.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbridercl.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herstmonceuxnsgf.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsskeyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsspolarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsswallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidlingtonarsf.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxfordgecafsipo.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universityofeastanglia.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEQDCCAyigAwIBAgIJAPRnCt9s8k0UMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
 						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGluZ2hh
 						bTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJja3dz
@@ -127,118 +127,118 @@
 						MNCj7q1pYJzzTNe0WDOQWGm2/4DpepjWguQSsSuxWieHjJGqkrEsM9HHjd+UtXed
 						bvci5wxhP0WyevQbQynrHliiIuFQdbG3GK+/VGF4S2r5wA3I
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antarctic.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birdisland.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridge.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ernestshackleton.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halley.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclark.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclarkross.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medicalunit.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">portlockroy.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rothera.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">signy.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southgeorgia.bas.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfast.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eskdalemuir.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exhibitionroad.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gilmerton.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartland.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loanhead.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montserrat.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.bgs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccms.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ccms.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dorset.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merlewood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polaris.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">windermere.ceh.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbride.cs.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oban.dml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.essc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.faam.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ios.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.ios.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sscnorthstarhouse.ios.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ite.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ite.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ite.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.mba.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsumariners.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsunationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southamptonuniversity.noc.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nocentre.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xx.nocentre.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrcl.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nercradiocarbonlaboratory.nrcl.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.pml.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liverpool.pol.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcuk.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">researchcouncils.rcuk.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saphos.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.saphos.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smru.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">standrews.smru.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfieldfaam.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbridercl.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herstmonceuxnsgf.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsskeyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsspolarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsswallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidlingtonarsf.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxfordgecafsipo.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universityofeastanglia.so.idp.nerc.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antarctic.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birdisland.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridge.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ernestshackleton.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halley.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclark.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclarkross.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medicalunit.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">portlockroy.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rothera.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">signy.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southgeorgia.bas.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfast.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eskdalemuir.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exhibitionroad.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gilmerton.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartland.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loanhead.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montserrat.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.bgs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccms.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ccms.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dorset.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merlewood.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxford.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polaris.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">windermere.ceh.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbride.cs.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oban.dml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.essc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.faam.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ios.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.ios.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sscnorthstarhouse.ios.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ite.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ite.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ite.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.mba.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsumariners.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsunationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southamptonuniversity.noc.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nocentre.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xx.nocentre.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrcl.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nercradiocarbonlaboratory.nrcl.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.pml.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liverpool.pol.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcuk.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">researchcouncils.rcuk.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saphos.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.saphos.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smru.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">standrews.smru.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfieldfaam.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbridercl.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herstmonceuxnsgf.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsskeyworth.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsspolarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsswallingford.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidlingtonarsf.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxfordgecafsipo.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universityofeastanglia.so.idp.nerc.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.so.idp.nerc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEQDCCAyigAwIBAgIJAPRnCt9s8k0UMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
 						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGluZ2hh
 						bTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJja3dz
@@ -263,25 +263,25 @@
 						MNCj7q1pYJzzTNe0WDOQWGm2/4DpepjWguQSsSuxWieHjJGqkrEsM9HHjd+UtXed
 						bvci5wxhP0WyevQbQynrHliiIuFQdbG3GK+/VGF4S2r5wA3I
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Natural Environment Research Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NERC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nerc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library</md:GivenName>
-      <md:EmailAddress>mailto:library@nerc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IST ID Support</md:GivenName>
-      <md:EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Natural Environment Research Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NERC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nerc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library</md:GivenName>
+    <md:EmailAddress>mailto:library@nerc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IST ID Support</md:GivenName>
+    <md:EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml
index 72d2bbca..decd4445 100644
--- a/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://netid.uwosh.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwosh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin Oshkosh</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwosh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin Oshkosh</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIULwlDAyJjd+iv5pE4sKwmYC6QFRowDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MB4XDTEyMDcyNDE2MDcxNloX
 DTMyMDcyNDE2MDcxNlowGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MIIBIjAN
@@ -37,23 +37,23 @@ gC0g3MzPK5R+HPqWcI6KGlpP1+duGlfNNQkIPJC6llGoYHfVRiqrQtHJrTO8yvUE
 M6rR70BZ0LFlKPcyYyn6ir0XzDTbfyewJMNmN/GOGLKYv4eW5ZLff8FP2gelndmP
 +PK5PPnwOFJqlAwQR+IYBwL1nWdsoRzCn/o7Da9j6fVvpHB7YjlOfM7Y5g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netid.uwosh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netid.uwosh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netid.uwosh.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netid.uwosh.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netid.uwosh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwosh.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netid.uwosh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netid.uwosh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netid.uwosh.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netid.uwosh.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netid.uwosh.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwosh.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIULwlDAyJjd+iv5pE4sKwmYC6QFRowDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MB4XDTEyMDcyNDE2MDcxNloX
 DTMyMDcyNDE2MDcxNlowGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MIIBIjAN
@@ -72,18 +72,18 @@ gC0g3MzPK5R+HPqWcI6KGlpP1+duGlfNNQkIPJC6llGoYHfVRiqrQtHJrTO8yvUE
 M6rR70BZ0LFlKPcyYyn6ir0XzDTbfyewJMNmN/GOGLKYv4eW5ZLff8FP2gelndmP
 +PK5PPnwOFJqlAwQR+IYBwL1nWdsoRzCn/o7Da9j6fVvpHB7YjlOfM7Y5g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netid.uwosh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin Oshkosh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin Oshkosh</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwosh.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Academic Computing</md:GivenName>
-      <md:EmailAddress>acshelp@uwosh.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netid.uwosh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin Oshkosh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin Oshkosh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwosh.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Academic Computing</md:GivenName>
+    <md:EmailAddress>acshelp@uwosh.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml
index 6729388d..9c964d33 100644
--- a/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://netlogin.strath.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Strathclyde</mdui:DisplayName>
+        <mdui:Logo height="60" width="82">https://netlogin.strath.ac.uk/img/strath_logo_82x60.png</mdui:Logo>
+        <mdui:Logo height="12" width="16">https://netlogin.strath.ac.uk/img/strath_logo_16x12.png</mdui:Logo>
+        <mdui:Logo height="16" width="22">https://netlogin.strath.ac.uk/img/strath_logo_22x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Strathclyde</mdui:DisplayName>
-          <mdui:Logo height="60" width="82">https://netlogin.strath.ac.uk/img/strath_logo_82x60.png</mdui:Logo>
-          <mdui:Logo height="12" width="16">https://netlogin.strath.ac.uk/img/strath_logo_16x12.png</mdui:Logo>
-          <mdui:Logo height="16" width="22">https://netlogin.strath.ac.uk/img/strath_logo_22x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
 						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
@@ -38,29 +38,29 @@
 						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
 						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
 						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
@@ -80,25 +80,25 @@
 						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
 						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Strathclyde</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Strathclyde</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.strath.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:ukfed-support@strath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical</md:GivenName>
-      <md:EmailAddress>mailto:ukfed-tech@strath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Strathclyde</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Strathclyde</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.strath.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:ukfed-support@strath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:EmailAddress>mailto:ukfed-tech@strath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml b/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
index 3d7611b0..dcb11d3f 100644
--- a/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
+++ b/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neugrid4you.eu/saml/metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-22T09:21:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-22T09:21:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">neuGRID for you</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://neugrid4you.eu/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">neuGRID for you</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">neuGRID for you</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://neugrid4you.eu/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">neuGRID for you</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
 CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
 CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
@@ -42,13 +42,13 @@ XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
 6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
 avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
 CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
 CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
@@ -66,25 +66,24 @@ XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
 6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
 avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neugrid4you.eu/saml/assertion_consumer_service" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">neuGRID for you</md:ServiceName>
-        <md:ServiceName xml:lang="en">neuGRID for you</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MAAT FRANCE GNUBILA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MAAT FRANCE GNUBILA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gnubila.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin_france@lists.maatg.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neugrid4you.eu/saml/assertion_consumer_service" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">neuGRID for you</md:ServiceName>
+      <md:ServiceName xml:lang="en">neuGRID for you</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MAAT FRANCE GNUBILA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MAAT FRANCE GNUBILA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gnubila.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin_france@lists.maatg.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml
index fa766c18..1f619c54 100644
--- a/swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neuidmsso.neu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://neuidmsso.neu.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">neu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Northeastern University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Founded in Boston, Massachusetts in 1898, Northeastern is a global, experiential research university. Grounded in its signature co-op program, Northeastern today provides unprecedented experiential learning opportunities around the world. The university’s rapidly growing research enterprise is strategically aligned with three national imperatives: health, security, and sustainability.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.northeastern.edu/securenu/?page_id=128</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://neuidmsso.neu.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">neu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Northeastern University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Founded in Boston, Massachusetts in 1898, Northeastern is a global, experiential research university. Grounded in its signature co-op program, Northeastern today provides unprecedented experiential learning opportunities around the world. The university’s rapidly growing research enterprise is strategically aligned with three national imperatives: health, security, and sustainability.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.northeastern.edu/securenu/?page_id=128</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVANTzW0s51U8NUal56O40vpIuoFzIMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEW5ldWlkbXNzby5uZXUuZWR1MB4XDTEyMDYxNDEzNDIz
 NFoXDTMyMDYxNDEzNDIzNFowHDEaMBgGA1UEAxMRbmV1aWRtc3NvLm5ldS5lZHUw
@@ -40,23 +40,23 @@ GGRfnaRfaP589L91N2+gvO264AzfuqSmkJTsbgqWbUsxSJQIz1rq0laA7NdciWds
 bUXwlCdjyQmlHbPyAQ0Ooc+zPZqDSEYbhYbaUEnp+fpZUlB/RwuOcKSUxoEm3Mre
 wFUo0A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://neuidmsso.neu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neuidmsso.neu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neuidmsso.neu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">neu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://neuidmsso.neu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neuidmsso.neu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neuidmsso.neu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">neu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVANTzW0s51U8NUal56O40vpIuoFzIMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEW5ldWlkbXNzby5uZXUuZWR1MB4XDTEyMDYxNDEzNDIz
 NFoXDTMyMDYxNDEzNDIzNFowHDEaMBgGA1UEAxMRbmV1aWRtc3NvLm5ldS5lZHUw
@@ -76,30 +76,30 @@ GGRfnaRfaP589L91N2+gvO264AzfuqSmkJTsbgqWbUsxSJQIz1rq0laA7NdciWds
 bUXwlCdjyQmlHbPyAQ0Ooc+zPZqDSEYbhYbaUEnp+fpZUlB/RwuOcKSUxoEm3Mre
 wFUo0A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northeastern University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northeastern University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northeastern.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Samuel Abromowitz</md:GivenName>
-      <md:EmailAddress>is-isos-idm@neu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kevin Legget</md:GivenName>
-      <md:EmailAddress>k.legget@neu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Samuel Abromowitz</md:GivenName>
-      <md:EmailAddress>is-isos-idm@neu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Kevin Legget</md:GivenName>
-      <md:EmailAddress>k.legget@neu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northeastern University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northeastern University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northeastern.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Samuel Abromowitz</md:GivenName>
+    <md:EmailAddress>is-isos-idm@neu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kevin Legget</md:GivenName>
+    <md:EmailAddress>k.legget@neu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Samuel Abromowitz</md:GivenName>
+    <md:EmailAddress>is-isos-idm@neu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Kevin Legget</md:GivenName>
+    <md:EmailAddress>k.legget@neu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml b/swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml
index 6ec8084e..2ddf2766 100644
--- a/swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neuresmail.sclintra.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://neuresmail.sclintra.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Northeastern ResMail Student Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Northeastern Resident Mail Services Student Portal</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://neuresmail.sclintra.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Northeastern ResMail Student Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Northeastern Resident Mail Services Student Portal</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC5TCCAc2gAwIBAgIJAIR74j0ayvKFMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 BAMTClNoaWJib2xldGgwHhcNMTUwOTEwMTQzOTIwWhcNMjUwOTA3MTQzOTIwWjAV
 MRMwEQYDVQQDEwpTaGliYm9sZXRoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -37,30 +37,30 @@ mDP3++DpOQcHpcGplHu75Ebr8freUMjzu2ut/fekP7sfrRe4uQhqJlC48lfm+f30
 qyCycAczHbvz3DXbqt4xsXtPAOfzdsTjDgI1uF4Vqo4Pgr0G05SnX8wg06A47A6t
 7LfGF7pjIcw52rCXI3f337AqLrkbL7Ft1Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Northeastern ResMail Student Portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Northeastern Resident Mail Services Student Portal</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SCLogic</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SCLogic</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sclogic.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Sullivan</md:GivenName>
-      <md:EmailAddress>jsullivan@sclogic.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Warren Evans</md:GivenName>
-      <md:EmailAddress>wevans@sclogic.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Northeastern ResMail Student Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Northeastern Resident Mail Services Student Portal</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SCLogic</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SCLogic</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sclogic.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Sullivan</md:GivenName>
+    <md:EmailAddress>jsullivan@sclogic.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Warren Evans</md:GivenName>
+    <md:EmailAddress>wevans@sclogic.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml
index 7ff56c21..604b9a8a 100644
--- a/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://new-primo.hosted.exlibrisgroup.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-11T09:54:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-11T09:54:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJAIdGru6Iz9m0MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
 						BAMTJWRjMDN2ZzAwMjJldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
 						OTAxMTIyMTEzWhcNMjEwODI5MTIyMTEzWjAwMS4wLAYDVQQDEyVkYzAzdmcwMDIy
@@ -47,44 +47,44 @@
 						1k3+idQuyryJBp0mPLCliosixjLmjXoRRDUJT8uu6J1kDnzQj3Hiub7Ag5Noo05F
 						IRUjVAaivivDPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml
index 7c84e652..9bbcb774 100644
--- a/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://newcastle-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-16T08:24:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-16T08:24:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAM3G3V6n3/DyMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjMwHhcNMTUwNDAyMTkxODQzWhcNMjUwMzMwMTkxODQzWjASMRAw
 						DgYDVQQDEwdhaW8wMDIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -50,43 +50,43 @@
 						t3U+rPWHlfQEglmjad1ZKJfL5+Xn7BgKtbOyKXmVp+p5Nz9rqz67e232JHg1x/bx
 						yYEgCW+gFHaAf9GfC646YQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml b/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml
index 26bf87bf..cdb6976d 100644
--- a/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://newcastle.kit-catalogue.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-18T16:26:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-18T16:26:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIG4TCCBcmgAwIBAgIQHCGC1CK9V9XFPYeyU9ZeCTANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMTAwMjAwMDAwMFoXDTE2MTAwMTIzNTk1OVowPzEhMB8GA1UE
@@ -62,40 +62,40 @@
 						omplw+7n6grAbJxkfMhJUGL1ehSy1a2t3sR5vV6SF60Kamr6qKq0tjEdIJ6A3URM
 						lXYQBVAJVzJxMOn+iIg4UvQj9d5mJrhijCShO3MoY1gSyzA9Lg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kit-Catalogue hosted service for Newcastle University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kit-catalogue.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kit-Catalogue</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:kit-catalogue@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kit-Catalogue</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:kit-catalogue@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kit-Catalogue hosted service for Newcastle University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kit-catalogue.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kit-Catalogue</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:kit-catalogue@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kit-Catalogue</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:kit-catalogue@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml
index 5fbc3f43..2d001676 100644
--- a/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/nhs-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nhs-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T14:40:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T14:40:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff - NHS - Primo</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cardiff - NHS - Primo</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAKcM8Bu1ZURlMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjkwHhcNMTUwNDAyMTkyMzI3WhcNMjUwMzMwMTkyMzI3WjASMRAw
 						DgYDVQQDEwdhaW8wMDI5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -49,43 +49,43 @@
 						OqPrbuYFYgPfLjGriXZYQRplICtMyCzzOMhYCdfJ1ic5/HOBikOTFjMgPHht3Mq+
 						dyeKZ7Et4QKnh9FjfMCOCg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff - NHS - Primo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff - NHS - Primo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml
index c29b9216..508e0b19 100644
--- a/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nlw-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-02T11:38:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-02T11:38:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Wales - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of National Library of Wales</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Library of Wales - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of National Library of Wales</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAJtjN/Sjy8NPMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjYwHhcNMTUwNDAyMTkyMDQ1WhcNMjUwMzMwMTkyMDQ1WjASMRAw
 						DgYDVQQDEwdhaW8wMDI2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -51,43 +51,43 @@
 						vOdVbh1NvO7LYzioXPk7URk1vst4P9pQbmcUFNRrd+WjfzOUjiAJYGm43DNqQEqC
 						XfBl+0BWyo22ZUbTodVKFw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for National Library of Wales</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for National Library of Wales</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
index c6a62c01..78169d3e 100644
--- a/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://noec.aai.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href-test</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href-test</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - no encat</mdui:Description>
+        <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - no encat</mdui:Description>
-          <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIICwjCCAiugAwIBAgIJAPqTsvGnOWExMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGTAXBgNVBAMTEG5vZWMuYWFpLm5paWYuaHUwHhcNMTUxMTAzMTkwODIwWhcNMjUxMDMxMTkwODIwWjBLMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxDjAMBgNVBAoTBU5JSUZJMRkwFwYDVQQDExBub2VjLmFhaS5uaWlmLmh1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnlBput7ADIvXu+WzjxmkUKzi8fYXwkBY9pziZ0Ah+JG8sHhe31F8wd5NKPESARoW9SzNjaxttsLKnaWFZ5Ter8zD6eAzKDUWUOlEnADL2J+xvxXhfzdkY8Z/o/pFK8o64RJ5gcS25g0a/3GVlwFuo/YZRKm2yy0arjSWvZkI1swIDAQABo4GtMIGqMB0GA1UdDgQWBBT2E4QkQqkl8IyD5KnL3qSx1PPTjjB7BgNVHSMEdDBygBT2E4QkQqkl8IyD5KnL3qSx1PPTjqFPpE0wSzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MQ4wDAYDVQQKEwVOSUlGSTEZMBcGA1UEAxMQbm9lYy5hYWkubmlpZi5odYIJAPqTsvGnOWExMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAiD3Gv7yUgsTLa87IAUT1XcvoSK2ez4FJ9C6jD57MZIeZx++SkpoRLrU2/zDYqlF+7Qp1wkO+6qssTOYI/sD8Njy75A4bAlbu79T4PzaoBJx0okhc7svi382hSv4Qyg+Na0wOOFKZ/rEfBK4T+Sgk3PI0ZjM5PlJwj8r6OaC4WRA=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>noec.aai.niif.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
-        <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwjCCAiugAwIBAgIJAPqTsvGnOWExMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGTAXBgNVBAMTEG5vZWMuYWFpLm5paWYuaHUwHhcNMTUxMTAzMTkwODIwWhcNMjUxMDMxMTkwODIwWjBLMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxDjAMBgNVBAoTBU5JSUZJMRkwFwYDVQQDExBub2VjLmFhaS5uaWlmLmh1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnlBput7ADIvXu+WzjxmkUKzi8fYXwkBY9pziZ0Ah+JG8sHhe31F8wd5NKPESARoW9SzNjaxttsLKnaWFZ5Ter8zD6eAzKDUWUOlEnADL2J+xvxXhfzdkY8Z/o/pFK8o64RJ5gcS25g0a/3GVlwFuo/YZRKm2yy0arjSWvZkI1swIDAQABo4GtMIGqMB0GA1UdDgQWBBT2E4QkQqkl8IyD5KnL3qSx1PPTjjB7BgNVHSMEdDBygBT2E4QkQqkl8IyD5KnL3qSx1PPTjqFPpE0wSzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MQ4wDAYDVQQKEwVOSUlGSTEZMBcGA1UEAxMQbm9lYy5hYWkubmlpZi5odYIJAPqTsvGnOWExMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAiD3Gv7yUgsTLa87IAUT1XcvoSK2ez4FJ9C6jD57MZIeZx++SkpoRLrU2/zDYqlF+7Qp1wkO+6qssTOYI/sD8Njy75A4bAlbu79T4PzaoBJx0okhc7svi382hSv4Qyg+Na0wOOFKZ/rEfBK4T+Sgk3PI0ZjM5PlJwj8r6OaC4WRA=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>noec.aai.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
+      <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml
index 6313560e..6afe1408 100644
--- a/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://notify.ncl.ac.uk/shibboleth/metadata">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-05T11:05:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-05T11:05:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://notify.ncl.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://notify.ncl.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJAMJRPlnJoPNzMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG2x0c2FsZXJ0MDEuY2FtcHVzLm5jbC5hYy51azAeFw0xNjAxMDQxMDA0MjJa
 						Fw0yNjAxMDExMDA0MjJaMCYxJDAiBgNVBAMTG2x0c2FsZXJ0MDEuY2FtcHVzLm5j
@@ -47,43 +47,43 @@
 						p8EpFlUZK2rYtwRforxMLa4QiMeeW9C7tFO9K5C7cRbUpDiZKUiDQlAUzBEWg8kR
 						hwibfza/3X5Qgg0cxnSxzS1NtJOl0ORjRjfMyA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://notify.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle University Notification SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Franks</md:SurName>
-      <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Franks</md:SurName>
-      <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://notify.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle University Notification SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Franks</md:SurName>
+    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Franks</md:SurName>
+    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
index 4a4c48bf..1845b75c 100644
--- a/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
+++ b/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nrc-test.literatumonline.com/action/samlACS/shibboleth/testshib/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-14T10:59:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-14T10:59:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NRC Research Press Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NRC Research Press Test SP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://nrc-test.literatumonline.com/page/about</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NRC Research Press Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">NRC Research Press Test SP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://nrc-test.literatumonline.com/page/about</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDtTCCAp2gAwIBAgIJALKKItp/j602MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -38,24 +38,24 @@
 						vMIejpaSZn0yf3ZFn8eebCpLnlVN0FLNCgel39FLMGqNbey0wpFbzocv4fvX6pmi
 						Bz9FTGLHvLqpoRV/zghBPM32BhT8U6PJfC56HlfNfbRtx9nHZK2GfJw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nrc-test.literatumonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrc-test.literatumonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nrc-test.literatumonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NRC Research Press Test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://nrc-test.literatumonline.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nrc-test.literatumonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrc-test.literatumonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nrc-test.literatumonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NRC Research Press Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://nrc-test.literatumonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 75c980ec..2970a327 100644
--- a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
 http://cofre.reuna.cl/index.php/es/reglas-federacion
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NRENAdmin - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">NRENAdmin - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's NREN Administration Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Administración para RNEI de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NRENAdmin - RedCLARA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">NRENAdmin - RedCLARA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RedCLARA's NREN Administration Service</mdui:Description>
-          <mdui:Description xml:lang="es">Servicio de Administración para RNEI de RedCLARA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Nrenadmin - RedCLARA</md:ServiceName>
-        <md:ServiceName xml:lang="es">Nrenadmin - RedCLARA</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">RedCLARA Nrenadmin Service</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="es">Servicio Nrenadmin de RedCLARA</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.37" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SEG</md:GivenName>
-      <md:SurName>RedCLARA</md:SurName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Nrenadmin - RedCLARA</md:ServiceName>
+      <md:ServiceName xml:lang="es">Nrenadmin - RedCLARA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">RedCLARA Nrenadmin Service</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="es">Servicio Nrenadmin de RedCLARA</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.37" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SEG</md:GivenName>
+    <md:SurName>RedCLARA</md:SurName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml b/swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml
index 43cab8cc..46140feb 100644
--- a/swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml
+++ b/swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nsf236.neocase-software.net/connexion_neocase">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PennStatePortal</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PennStatePortal</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID2TCCAsGgAwIBAgIJAPfTg+MQTPE0MA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBk5ld3RvbjEZMBcGA1UECgwQ
 TmVvY2FzZSBTb2Z0d2FyZTEcMBoGA1UECwwTU2FhUyBBZG1pbmlzdHJhdGlvbjEc
@@ -40,22 +40,22 @@ PsyFdVd0AeqkvbUZkZhNlax0u0AJv2oircEYNiZllrvDOraTBJkfI8fEyEEdYe18
 ciAugVZ5HD8JlVy+ARFOaQiqh2UmipYv+T2sFWOaXilbIkL8aPPPsM18xL6/ZE3Y
 g5bEi3lvWxUKBMOgNB+BW/+09dAvBdLuR2JSlaU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nsf236.neocase-software.net/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eileen Szczesuil</md:GivenName>
-      <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicoleta Petcu</md:GivenName>
-      <md:EmailAddress>npetcu@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nsf236.neocase-software.net/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eileen Szczesuil</md:GivenName>
+    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicoleta Petcu</md:GivenName>
+    <md:EmailAddress>npetcu@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
index c3f78318..12454a55 100644
--- a/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nte.gemtech.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-27T18:55:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-27T18:55:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emn.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole des Mines de Nantes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAYklEQVQ4y62QsQ2AMAwEzyj7UDMAHXPATgzhNaiZyFTpCCL+fGvrdP8gxgDm5YzWw33tBjTvk2rwCogIDWBmGqAn5c/Tsa3jDepOaUDPTt+gapQFFAB3H6OTruDu6QryBnIeqYcTIbO1P1EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDBA9ekLAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwMahRtwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.emn.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Nantes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emn.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole des Mines de Nantes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAYklEQVQ4y62QsQ2AMAwEzyj7UDMAHXPATgzhNaiZyFTpCCL+fGvrdP8gxgDm5YzWw33tBjTvk2rwCogIDWBmGqAn5c/Tsa3jDepOaUDPTt+gapQFFAB3H6OTruDu6QryBnIeqYcTIbO1P1EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDBA9ekLAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwMahRtwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.emn.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole des Mines de Nantes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
 DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
@@ -37,23 +37,23 @@ xuxFuAJhtGsxX+IKX7q9UQtmWodSeKZq09RjkIN5nEaJnBz3EKiriRxilPtlCjHS
 WXvTzCxC7xk1+kCao131/bzEtbti5aXRVPrO0Z61nXwQPsxds+6PNaRmx27CLb0P
 IPUU8qHH25+VWAP/+xbiYvjkfnKh31IHhDHHM47hBpibHchhCe680w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nte.gemtech.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nte.gemtech.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nte.gemtech.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emn.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nte.gemtech.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nte.gemtech.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nte.gemtech.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emn.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
 DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
@@ -72,24 +72,24 @@ xuxFuAJhtGsxX+IKX7q9UQtmWodSeKZq09RjkIN5nEaJnBz3EKiriRxilPtlCjHS
 WXvTzCxC7xk1+kCao131/bzEtbti5aXRVPrO0Z61nXwQPsxds+6PNaRmx27CLb0P
 IPUU8qHH25+VWAP/+xbiYvjkfnKh31IHhDHHM47hBpibHchhCe680w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nte.gemtech.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole des Mines de Nantes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole des Mines de Nantes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.emn.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christian Janin</md:SurName>
-      <md:EmailAddress>Christian.Janin@emn.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alain  Bouyahyiaoui</md:SurName>
-      <md:EmailAddress>Alain.Bouyahyiaoui@emn.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nte.gemtech.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole des Mines de Nantes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines de Nantes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emn.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christian Janin</md:SurName>
+    <md:EmailAddress>Christian.Janin@emn.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alain  Bouyahyiaoui</md:SurName>
+    <md:EmailAddress>Alain.Bouyahyiaoui@emn.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nyu.reclaimhosting.com.xml b/swamid-interfederations-2.0/nyu.reclaimhosting.com.xml
index d6935e0c..696e05f5 100644
--- a/swamid-interfederations-2.0/nyu.reclaimhosting.com.xml
+++ b/swamid-interfederations-2.0/nyu.reclaimhosting.com.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nyu.reclaimhosting.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NYU Domains</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://hosting.nyu.edu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NYU Domains</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://hosting.nyu.edu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCTCCAfGgAwIBAgIJAJPEuYz0OXIoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFm55dS5yZWNsYWltaG9zdGluZy5jb20wHhcNMTYwMTA0MTMyNDIyWhcNMjYw
 MTAxMTMyNDIyWjAhMR8wHQYDVQQDExZueXUucmVjbGFpbWhvc3RpbmcuY29tMIIB
@@ -37,38 +37,38 @@ TFZtretB5/VzPuQVXtW+vJFruW0d9E118qiALqOOzza6wSnRQaM0N3S2QJ0alEYC
 aZk9fzZpu0dOU8vlpWhAra6IebMahNUamuaNfjAVcTQ8OdaEmhQyeZrrjIyu3mzx
 22R32vEVA6N+Z5b/8g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/POST"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NYU Domains</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reclaim Hosting, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reclaim Hosting, LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://reclaimhosting.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim Owens</md:GivenName>
-      <md:EmailAddress>tim@reclaimhosting.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jim Groom</md:GivenName>
-      <md:EmailAddress>jim@reclaimhosting.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NYU Domains</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reclaim Hosting, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reclaim Hosting, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://reclaimhosting.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim Owens</md:GivenName>
+    <md:EmailAddress>tim@reclaimhosting.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jim Groom</md:GivenName>
+    <md:EmailAddress>jim@reclaimhosting.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml b/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml
index c1deadbd..a88dabbe 100644
--- a/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nyusteinhardttickets.universitytickets.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NYU Steinhardt Commencement Tickets</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NYU Steinhardt Commencement Tickets</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEFzCCAv+gAwIBAgIJAOKNYZKTkGOxMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMSAwHgYDVQQK
 DBdVbml2ZXJzaXR5VGlja2V0cywgSW5jLjEiMCAGA1UEAwwZVW5pdmVyc2l0eVRp
@@ -42,28 +42,28 @@ rcx+OJkf4WTNRm6t2+LOFcOZ1VV4C3DnPbd0nCJlJSzHYUKGfeoJJJ7ew4KZF4le
 2fdSm7mihM6r2O047IbPr9qkVRDXfaIkXfFvCBPKogZ0pv41ctocTbVvTKoAbe6i
 npy6/mAHObt21m69If4I8DgLUvCuVIIbt/4TZVqeiN7mHIPk2XtftnMpSw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NYU Steinhardt Commencement Tickets</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UniversityTickets</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UniversityTickets</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://universitytickets.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>UniversityTickets Support</md:GivenName>
-      <md:EmailAddress>support@universitytickets.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NYU Steinhardt Commencement Tickets</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UniversityTickets</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UniversityTickets</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://universitytickets.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>UniversityTickets Support</md:GivenName>
+    <md:EmailAddress>support@universitytickets.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/o-las.net-simplesaml.xml b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
index f97ac3c3..1d48f1ce 100644
--- a/swamid-interfederations-2.0/o-las.net-simplesaml.xml
+++ b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://o-las.net/simplesaml">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T15:01:20Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T15:01:20Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEjDCCA3SgAwIBAgIJAOlTCyllHsJlMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
 						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
 						BAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8tbGFzLm5ldDEqMCgGCSqG
@@ -34,13 +34,13 @@
 						YbpAsVOhDShM+eAqbrq+C3FwyX8CUJOg98Nx5B9dKaywc5KWhvCjyeEr1sNF9YGk
 						3w5WoLhEjWbRMnhM//Ygow==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEjDCCA3SgAwIBAgIJAOlTCyllHsJlMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
 						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
 						BAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8tbGFzLm5ldDEqMCgGCSqG
@@ -67,28 +67,28 @@
 						YbpAsVOhDShM+eAqbrq+C3FwyX8CUJOg98Nx5B9dKaywc5KWhvCjyeEr1sNF9YGk
 						3w5WoLhEjWbRMnhM//Ygow==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RiskWize Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">O-LAS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essentialskillz.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marek</md:GivenName>
-      <md:SurName>Zapach</md:SurName>
-      <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marek</md:GivenName>
-      <md:SurName>Zapach</md:SurName>
-      <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RiskWize Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">O-LAS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essentialskillz.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marek</md:GivenName>
+    <md:SurName>Zapach</md:SurName>
+    <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marek</md:GivenName>
+    <md:SurName>Zapach</md:SurName>
+    <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml
index f5cd868e..bcddc37f 100644
--- a/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa-idp.wlv.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wolverhampton</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo_icon.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://oa-idp.wlv.ac.uk/oala/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wolverhampton</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo_icon.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://oa-idp.wlv.ac.uk/oala/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbTCCA1WgAwIBAgIQRbWDhc0R8UaLGXPl9rxLvTANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMDgwNTAwMDAwMFoXDTE2MDgwNDIzNTk1OVowPjEhMB8GA1UE
@@ -42,13 +42,13 @@
 						mxe5u4LWv6BalcaFhiHO2DSnBdsWYvdF0ZsBSD/d2TYgEy+I2TeYC/fcV7q0SBCs
 						ViCbPGRw3GAmsUqKKMdmEIQnf6zW3//bxcIOUg7QSfTl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbTCCA1WgAwIBAgIQRbWDhc0R8UaLGXPl9rxLvTANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMDgwNTAwMDAwMFoXDTE2MDgwNDIzNTk1OVowPjEhMB8GA1UE
@@ -74,25 +74,25 @@
 						mxe5u4LWv6BalcaFhiHO2DSnBdsWYvdF0ZsBSD/d2TYgEy+I2TeYC/fcV7q0SBCs
 						ViCbPGRw3GAmsUqKKMdmEIQnf6zW3//bxcIOUg7QSfTl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp.wlv.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp.wlv.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wolverhampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Henderson</md:SurName>
-      <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Henderson</md:SurName>
-      <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp.wlv.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp.wlv.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wolverhampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
index 66ba6c6c..6136af7b 100644
--- a/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa-idp22.wlv.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T16:25:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T16:25:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIICo+mehMlNtowDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
 						CgwbVW5pdmVyc2l0eSBvZiBXb2x2ZXJoYW1wdG9uMRswGQYDVQQDDBJvYS1pZHAy
 						Mi53bHYuYWMudWswHhcNMTUwMTIwMTI1ODE5WhcNMjUwMTIwMTI1ODE5WjBDMSQw
@@ -37,25 +37,25 @@
 						Yfu47aQJpYnVshufazOye5broAdudUUnilRdcrQpIRWOCBRVD4FhKP2c6RfQY3dl
 						xxc2jE/LIUkl6G9Kezhlig7zn3EuOjuClGhY1kfMQY48P2Cula64ZZ5Y9Vo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wolverhampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Henderson</md:SurName>
-      <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Henderson</md:SurName>
-      <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wolverhampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Henderson</md:SurName>
+    <md:EmailAddress>mailto:d.henderson@wlv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.globaldata.com-oa-metadata.xml b/swamid-interfederations-2.0/oa.globaldata.com-oa-metadata.xml
index da81052d..0f0cebae 100644
--- a/swamid-interfederations-2.0/oa.globaldata.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/oa.globaldata.com-oa-metadata.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa.globaldata.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-25T15:44:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-25T15:44:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Marketline Advantage</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Marketline Advantage</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDoDCCAoigAwIBAgIJAISMDAVITeK2MA0GCSqGSIb3DQEBBQUAMD4xIDAeBgNV
 						BAoTF1Byb2dyZXNzaXZlIE1lZGlhIEdyb3VwMRowGAYDVQQDExFvYS5nbG9iYWxk
 						YXRhLmNvbTAeFw0xNjAyMTkxNDE1MjBaFw0yNjAyMTYxNDE1MjBaMD4xIDAeBgNV
@@ -36,13 +36,13 @@
 						Tyiagqhj/avcrpYCeYxnKYmp7TQwPU0eq2HCpwtEuMceqfGRNug21kq7My5PSXWc
 						EvdqICU/AKM0Q4zExpC0dXX01Ic=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDoDCCAoigAwIBAgIJAISMDAVITeK2MA0GCSqGSIb3DQEBBQUAMD4xIDAeBgNV
 						BAoTF1Byb2dyZXNzaXZlIE1lZGlhIEdyb3VwMRowGAYDVQQDExFvYS5nbG9iYWxk
 						YXRhLmNvbTAeFw0xNjAyMTkxNDE1MjBaFw0yNjAyMTYxNDE1MjBaMD4xIDAeBgNV
@@ -64,45 +64,45 @@
 						Tyiagqhj/avcrpYCeYxnKYmp7TQwPU0eq2HCpwtEuMceqfGRNug21kq7My5PSXWc
 						EvdqICU/AKM0Q4zExpC0dXX01Ic=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.globaldata.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.globaldata.com/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Marketline Advantage</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://progressivemediagroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Geoffrey</md:GivenName>
-      <md:SurName>Hogg</md:SurName>
-      <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Geoffrey</md:GivenName>
-      <md:SurName>Hogg</md:SurName>
-      <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.globaldata.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.globaldata.com/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Marketline Advantage</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://progressivemediagroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Geoffrey</md:GivenName>
+    <md:SurName>Hogg</md:SurName>
+    <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoffrey</md:GivenName>
+    <md:SurName>Hogg</md:SurName>
+    <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml b/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml
index c9e8f474..904b6a3c 100644
--- a/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/oa.kluwerlawonline.com-oa-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa.kluwerlawonline.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-23T10:48:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-23T10:48:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">KluwerLawOnline</mdui:DisplayName>
-          <mdui:Description xml:lang="en">With an online subscription to Kluwer Law Online, 
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KluwerLawOnline</mdui:DisplayName>
+        <mdui:Description xml:lang="en">With an online subscription to Kluwer Law Online, 
 		you gain access to the pdfs and bibliographical information of any of the journals and manuals.
 		</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 			MIIDnTCCAoWgAwIBAgIJAJYLHg2fH267MA0GCSqGSIb3DQEBBQUAMD0xGjAYBgNV
 			BAoTEUtsdXdlciBMYXcgT25saW5lMR8wHQYDVQQDExZvYS5rbHV3ZXJsYXdvbmxp
 			bmUuY29tMB4XDTE1MDczMTE2NDkwNloXDTI1MDcyODE2NDkwNlowPTEaMBgGA1UE
@@ -39,13 +39,13 @@
 			S4Xmt02YQb+KgWfOlxUJYTdPVwTWgl1mG+bJtMGhm+Fhvbe6XsE9OTkR3JukWM09
 			EdleBJR5tYeTchiSmuPV+fU=
 		</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 			MIIDnTCCAoWgAwIBAgIJAJYLHg2fH267MA0GCSqGSIb3DQEBBQUAMD0xGjAYBgNV
 			BAoTEUtsdXdlciBMYXcgT25saW5lMR8wHQYDVQQDExZvYS5rbHV3ZXJsYXdvbmxp
 			bmUuY29tMB4XDTE1MDczMTE2NDkwNloXDTI1MDcyODE2NDkwNlowPTEaMBgGA1UE
@@ -67,25 +67,25 @@
 			S4Xmt02YQb+KgWfOlxUJYTdPVwTWgl1mG+bJtMGhm+Fhvbe6XsE9OTkR3JukWM09
 			EdleBJR5tYeTchiSmuPV+fU=
 		</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.kluwerlawonline.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.kluwerlawonline.com/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kluwer Law International BV</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KluwerLawOnline</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kluwerlawonline.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kirsten</md:GivenName>
-      <md:SurName>van Engelenburg</md:SurName>
-      <md:EmailAddress>mailto:kirsten.vanengelenburg@wolterskluwer.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kirsten</md:GivenName>
-      <md:SurName>van Engelenburg</md:SurName>
-      <md:EmailAddress>mailto:kirsten.vanengelenburg@wolterskluwer.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.kluwerlawonline.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.kluwerlawonline.com/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kluwer Law International BV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KluwerLawOnline</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kluwerlawonline.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kirsten</md:GivenName>
+    <md:SurName>van Engelenburg</md:SurName>
+    <md:EmailAddress>mailto:kirsten.vanengelenburg@wolterskluwer.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kirsten</md:GivenName>
+    <md:SurName>van Engelenburg</md:SurName>
+    <md:EmailAddress>mailto:kirsten.vanengelenburg@wolterskluwer.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml b/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml
index d9d03322..8850a138 100644
--- a/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml
+++ b/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa.pep-web.org/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T14:56:21Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T14:56:21Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0DCCArigAwIBAgIJAKHVd8LSwH+3MA0GCSqGSIb3DQEBBQUAME4xMzAxBgNV
 						BAoTKlBzeWNob2FuYWx5dGljIEVsZWN0cm9uaWMgUHVibGlzaGluZywgSW5jLjEX
 						MBUGA1UEAxMOb2EucGVwLXdlYi5vcmcwHhcNMTIxMjEwMTUwNjI5WhcNMjIxMjA4
@@ -30,13 +30,13 @@
 						fanT1syz+jLydfNwAmqKcs/VNut1JcwYN70lwRGAcjBZHRj6rIzKOMuv9btlx+OB
 						sRYctPwxod3YO1J6Qb4Pac00EJE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0DCCArigAwIBAgIJAKHVd8LSwH+3MA0GCSqGSIb3DQEBBQUAME4xMzAxBgNV
 						BAoTKlBzeWNob2FuYWx5dGljIEVsZWN0cm9uaWMgUHVibGlzaGluZywgSW5jLjEX
 						MBUGA1UEAxMOb2EucGVwLXdlYi5vcmcwHhcNMTIxMjEwMTUwNjI5WhcNMjIxMjA4
@@ -59,27 +59,27 @@
 						fanT1syz+jLydfNwAmqKcs/VNut1JcwYN70lwRGAcjBZHRj6rIzKOMuv9btlx+OB
 						sRYctPwxod3YO1J6Qb4Pac00EJE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.pep-web.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oa.pep-web.org/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.pep-web.org/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oa.pep-web.org/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Psychoanalytic Electronic Publishing</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PEP Web</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.p-e-p.org/about.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rhiannon</md:GivenName>
-      <md:SurName>Pilkington</md:SurName>
-      <md:EmailAddress>mailto:r.pilkington@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Shapiro</md:SurName>
-      <md:EmailAddress>mailto:neil@scilab-inc.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.pep-web.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oa.pep-web.org/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.pep-web.org/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oa.pep-web.org/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Psychoanalytic Electronic Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PEP Web</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.p-e-p.org/about.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rhiannon</md:GivenName>
+    <md:SurName>Pilkington</md:SurName>
+    <md:EmailAddress>mailto:r.pilkington@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Shapiro</md:SurName>
+    <md:EmailAddress>mailto:neil@scilab-inc.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml
index 1f9b099c..12d36320 100644
--- a/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa.sagepub.com/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-19T14:51:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-19T14:51:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXjCCAkagAwIBAgIJAKTvdWWaACO4MA0GCSqGSIb3DQEBBQUAMCgxDTALBgNV
 						BAoTBFNBR0UxFzAVBgNVBAMTDm9hLnNhZ2VwdWIuY29tMB4XDTE1MDgwNTE0MTky
 						OFoXDTI1MDgwMjE0MTkyOFowKDENMAsGA1UEChMEU0FHRTEXMBUGA1UEAxMOb2Eu
@@ -30,13 +30,13 @@
 						n7j4j4bQS1X8DYoCc9SbL/1ZC258jwnZ2LZir9DtEBNf4PjsvGQKpe2x5TZlv9Vx
 						dgc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXjCCAkagAwIBAgIJAKTvdWWaACO4MA0GCSqGSIb3DQEBBQUAMCgxDTALBgNV
 						BAoTBFNBR0UxFzAVBgNVBAMTDm9hLnNhZ2VwdWIuY29tMB4XDTE1MDgwNTE0MTky
 						OFoXDTI1MDgwMjE0MTkyOFowKDENMAsGA1UEChMEU0FHRTEXMBUGA1UEAxMOb2Eu
@@ -57,24 +57,24 @@
 						n7j4j4bQS1X8DYoCc9SbL/1ZC258jwnZ2LZir9DtEBNf4PjsvGQKpe2x5TZlv9Vx
 						dgc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.sagepub.com/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SAGE Publications Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SAGE Knowledge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sagepublications.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Online Support</md:GivenName>
-      <md:EmailAddress>mailto:onlinesupport@sagepub.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Sisolak</md:SurName>
-      <md:EmailAddress>mailto:msisolak@gvpi.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.sagepub.com/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SAGE Publications Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SAGE Knowledge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sagepublications.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Online Support</md:GivenName>
+    <md:EmailAddress>mailto:onlinesupport@sagepub.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Sisolak</md:SurName>
+    <md:EmailAddress>mailto:msisolak@gvpi.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml b/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml
index 7cd03473..39f9146d 100644
--- a/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml
+++ b/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala-dev.leedsbeckett.ac.uk/oala">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-17T09:27:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-17T09:27:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedsbeckett.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedsbeckett.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkygAwIBAgIICY7brWx6wwgwDQYJKoZIhvcNAQEFBQAwSTEhMB8GA1UE
 						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSQwIgYDVQQDDBtvYWxhLWRldi5s
 						ZWVkc2JlY2tldHQuYWMudWswHhcNMTUwNzEzMTcwODU1WhcNMjUwNzEzMTcwODU1
@@ -38,13 +38,13 @@
 						00OrkNXmwj/zp+J7ytw55N5v7ZImISb2jhaZ1r1iP7sH1dqcsjgWgVnajThtvRwN
 						11uM54JtSeI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkygAwIBAgIICY7brWx6wwgwDQYJKoZIhvcNAQEFBQAwSTEhMB8GA1UE
 						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSQwIgYDVQQDDBtvYWxhLWRldi5s
 						ZWVkc2JlY2tldHQuYWMudWswHhcNMTUwNzEzMTcwODU1WhcNMjUwNzEzMTcwODU1
@@ -65,24 +65,24 @@
 						00OrkNXmwj/zp+J7ytw55N5v7ZImISb2jhaZ1r1iP7sH1dqcsjgWgVnajThtvRwN
 						11uM54JtSeI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala-dev.leedsbeckett.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala-dev.leedsbeckett.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Leeds Beckett University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds Beckett University (Development)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala-dev.leedsbeckett.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala-dev.leedsbeckett.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leeds Beckett University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds Beckett University (Development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml
index c2a97414..9e0fdaaf 100644
--- a/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala-runtime.eastleigh.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-29T10:34:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-29T10:34:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastleigh.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastleigh.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIIFsnOesAaesswDQYJKoZIhvcNAQEFBQAwQzEaMBgGA1UE
 						CgwRRWFzdGxlaWdoIENvbGxlZ2UxJTAjBgNVBAMMHG9hbGEtcnVudGltZS5lYXN0
 						bGVpZ2guYWMudWswHhcNMTIwMjI0MTYxMzQ2WhcNMjIwMjI0MTYxMzQ2WjBDMRow
@@ -30,13 +30,13 @@
 						LF7eq7Pbu0wySSUW9TyRqC5YHK1CFsrNr3+7Cwtj+A+UWPs0JmNoCyYUr41R+Xic
 						l43JJ3g6lAOr8U1MkvjzwnA93CFJC1S1PSxJq8j7OXwCunqqpFrME8sqrcw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIIFsnOesAaesswDQYJKoZIhvcNAQEFBQAwQzEaMBgGA1UE
 						CgwRRWFzdGxlaWdoIENvbGxlZ2UxJTAjBgNVBAMMHG9hbGEtcnVudGltZS5lYXN0
 						bGVpZ2guYWMudWswHhcNMTIwMjI0MTYxMzQ2WhcNMjIwMjI0MTYxMzQ2WjBDMRow
@@ -56,24 +56,24 @@
 						LF7eq7Pbu0wySSUW9TyRqC5YHK1CFsrNr3+7Cwtj+A+UWPs0JmNoCyYUr41R+Xic
 						l43JJ3g6lAOr8U1MkvjzwnA93CFJC1S1PSxJq8j7OXwCunqqpFrME8sqrcw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala-runtime.eastleigh.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala-runtime.eastleigh.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eastleigh College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Eastleigh College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eastleigh.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Eastleigh College Learning Centre</md:GivenName>
-      <md:EmailAddress>mailto:lc@eastleigh.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Kennedy</md:SurName>
-      <md:EmailAddress>mailto:ikennedy@eastleigh.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala-runtime.eastleigh.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala-runtime.eastleigh.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eastleigh College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eastleigh College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eastleigh.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Eastleigh College Learning Centre</md:GivenName>
+    <md:EmailAddress>mailto:lc@eastleigh.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Kennedy</md:SurName>
+    <md:EmailAddress>mailto:ikennedy@eastleigh.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
index 22adfcee..4bb22d8a 100644
--- a/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.aaschool.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-19T11:56:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-19T11:56:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aaschool.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aaschool.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
 						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
 						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
@@ -32,13 +32,13 @@
 						N+Fr1zIKaChdHOdfBVIuG8o9SL5GeLuHOSUwKtYngivsmk73rRvQxJHYwuRstWlV
 						O6NtqBZn2l5WgFXs6cNoPTwZCFrlNTiQIVXgZnWaTdXzei52kRX/5v/X
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
 						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
 						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
@@ -58,30 +58,30 @@
 						N+Fr1zIKaChdHOdfBVIuG8o9SL5GeLuHOSUwKtYngivsmk73rRvQxJHYwuRstWlV
 						O6NtqBZn2l5WgFXs6cNoPTwZCFrlNTiQIVXgZnWaTdXzei52kRX/5v/X
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.aaschool.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.aaschool.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Architectural Association (Incorporated)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Architectural Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aaschool.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simine</md:GivenName>
-      <md:SurName>Marine</md:SurName>
-      <md:EmailAddress>mailto:simine.marine@aaschool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:itdept@aaschool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mathew</md:GivenName>
-      <md:SurName>Bielecki</md:SurName>
-      <md:EmailAddress>mailto:itdept@aaschool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.aaschool.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.aaschool.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Architectural Association (Incorporated)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Architectural Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aaschool.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simine</md:GivenName>
+    <md:SurName>Marine</md:SurName>
+    <md:EmailAddress>mailto:simine.marine@aaschool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:itdept@aaschool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mathew</md:GivenName>
+    <md:SurName>Bielecki</md:SurName>
+    <md:EmailAddress>mailto:itdept@aaschool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml b/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml
index 6c136e87..edd12fd7 100644
--- a/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml
+++ b/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.leedsbeckett.ac.uk/oala">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T09:51:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T09:51:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedsbeckett.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leedsbeckett.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIIY3NQ4sTPsKQwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
 						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSAwHgYDVQQDDBdvYWxhLmxlZWRz
 						YmVja2V0dC5hYy51azAeFw0xNTEwMjcxNzA1MzBaFw0yNTEwMjcxNzA1MzBaMEUx
@@ -37,13 +37,13 @@
 						eYX1IgrdpIyr2KogrjxVzojw1sfFR+z4YTm2vt9G1wkQAaXb7GJIWbJDmEtmowWx
 						oJOY4tpZB0ZjsOTUNnvwopX3H3B8ZSvgjmh3YMVvVrUEi+hcmpa3pmK3ZyNcojea
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIIY3NQ4sTPsKQwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
 						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSAwHgYDVQQDDBdvYWxhLmxlZWRz
 						YmVja2V0dC5hYy51azAeFw0xNTEwMjcxNzA1MzBaFw0yNTEwMjcxNzA1MzBaMEUx
@@ -63,24 +63,24 @@
 						eYX1IgrdpIyr2KogrjxVzojw1sfFR+z4YTm2vt9G1wkQAaXb7GJIWbJDmEtmowWx
 						oJOY4tpZB0ZjsOTUNnvwopX3H3B8ZSvgjmh3YMVvVrUEi+hcmpa3pmK3ZyNcojea
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Leeds Beckett University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds Beckett University (New)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leeds Beckett University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds Beckett University (New)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
index 38a8e598..27200256 100644
--- a/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.surrey.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T14:53:23Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T14:53:23Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surrey.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surrey.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIITOCMDokwhbkwDQYJKoZIhvcNAQEFBQAwOzEdMBsGA1UE
 						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFj
 						LnVrMB4XDTEyMDMyOTExMjUyM1oXDTIyMDMyOTExMjUyM1owOzEdMBsGA1UECgwU
@@ -30,13 +30,13 @@
 						pcWxqlhKnQawqVRhixnxUXrSAcFCW3t6PV1Y7abxl17ux5qZxRVPa0KTr4nZioQZ
 						7f8wd1sz16xoVOAfi93qMNDb+ha44YQFQKHoPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIITOCMDokwhbkwDQYJKoZIhvcNAQEFBQAwOzEdMBsGA1UE
 						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFj
 						LnVrMB4XDTEyMDMyOTExMjUyM1oXDTIyMDMyOTExMjUyM1owOzEdMBsGA1UECgwU
@@ -56,25 +56,25 @@
 						pcWxqlhKnQawqVRhixnxUXrSAcFCW3t6PV1Y7abxl17ux5qZxRVPa0KTr4nZioQZ
 						7f8wd1sz16xoVOAfi93qMNDb+ha44YQFQKHoPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.surrey.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.surrey.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Surrey</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Surrey (Institutional Login)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Claire</md:GivenName>
-      <md:SurName>Gill</md:SurName>
-      <md:EmailAddress>mailto:c.j.gill@surrey.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Abdul</md:GivenName>
-      <md:SurName>Minhas</md:SurName>
-      <md:EmailAddress>mailto:a.minhas@surrey.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.surrey.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.surrey.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Surrey</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Surrey (Institutional Login)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Claire</md:GivenName>
+    <md:SurName>Gill</md:SurName>
+    <md:EmailAddress>mailto:c.j.gill@surrey.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Abdul</md:GivenName>
+    <md:SurName>Minhas</md:SurName>
+    <md:EmailAddress>mailto:a.minhas@surrey.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml
index 7809aa42..2dba4c3a 100644
--- a/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.trinitylaban.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-05T18:33:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-05T18:33:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcc.tcm.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Trinity Laban</mdui:DisplayName>
+        <mdui:Logo height="60" width="60">https://oala.trinitylaban.ac.uk/oala/images/tlsqtr60px.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://oala.trinitylaban.ac.uk/oala/images/tlfavicon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcc.tcm.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Trinity Laban</mdui:DisplayName>
-          <mdui:Logo height="60" width="60">https://oala.trinitylaban.ac.uk/oala/images/tlsqtr60px.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://oala.trinitylaban.ac.uk/oala/images/tlfavicon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAOP4a2rGltT7syLTMWMP0yMwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xNDAzMTEwMDAwMDBaFw0xNzAzMTAyMzU5NTlaMEUxITAfBgNV
@@ -43,25 +43,25 @@
 						m7UM5Kv5sjA8xs+7duWvSyTsalpM5+GchHQhurcdqlagdHiN5zRpCGXKAs0nWuFc
 						pbL9oxrAy7Tm9MbUIs951lYcX+K93CT+CTeDBMeulw5d8x1buwmZS5Axsig7jO2g
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.trinitylaban.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.trinitylaban.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Trinity Laban Conservatoire Of Music And Dance Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Trinity Laban</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.trinitylaban.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Edith</md:GivenName>
-      <md:SurName>Speller</md:SurName>
-      <md:EmailAddress>mailto:e.speller@trinitylaban.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT</md:GivenName>
-      <md:SurName>Department</md:SurName>
-      <md:EmailAddress>mailto:it@trinitylaban.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.trinitylaban.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.trinitylaban.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Trinity Laban Conservatoire Of Music And Dance Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Trinity Laban</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.trinitylaban.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Edith</md:GivenName>
+    <md:SurName>Speller</md:SurName>
+    <md:EmailAddress>mailto:e.speller@trinitylaban.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Department</md:SurName>
+    <md:EmailAddress>mailto:it@trinitylaban.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml
index 816368a5..7f00a264 100644
--- a/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.uws.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-20T18:17:50Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-20T18:17:50Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uws.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uws.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIIbQnNE5dUfa4wDQYJKoZIhvcNAQEFBQAwMzEYMBYGA1UE
 						CgwPVVdTX0RldmVsb3BtZW50MRcwFQYDVQQDDA5vYWxhLnV3cy5hYy51azAeFw0x
 						MjEyMTgxNTE5MDZaFw0yMjEyMTgxNTE5MDZaMDMxGDAWBgNVBAoMD1VXU19EZXZl
@@ -35,13 +35,13 @@
 						Sg4ZQsDNqOTbhHKbYdD2iJq03fcfH3AySZLSXrbgfpqlOEwTiX/nAQT7jJjVJ3Wk
 						khuKC+d+27DnjjLI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIIbQnNE5dUfa4wDQYJKoZIhvcNAQEFBQAwMzEYMBYGA1UE
 						CgwPVVdTX0RldmVsb3BtZW50MRcwFQYDVQQDDA5vYWxhLnV3cy5hYy51azAeFw0x
 						MjEyMTgxNTE5MDZaFw0yMjEyMTgxNTE5MDZaMDMxGDAWBgNVBAoMD1VXU19EZXZl
@@ -61,25 +61,25 @@
 						Sg4ZQsDNqOTbhHKbYdD2iJq03fcfH3AySZLSXrbgfpqlOEwTiX/nAQT7jJjVJ3Wk
 						khuKC+d+27DnjjLI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.uws.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.uws.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the West of Scotland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the West of Scotland - ICT Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uws.ac.uk/ictservices/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Pavel</md:GivenName>
-      <md:SurName>Jiracek</md:SurName>
-      <md:EmailAddress>mailto:pavel.jiracek@uws.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pavel</md:GivenName>
-      <md:SurName>Jiracek</md:SurName>
-      <md:EmailAddress>mailto:pavel.jiracek@uws.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.uws.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.uws.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the West of Scotland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the West of Scotland - ICT Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uws.ac.uk/ictservices/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Jiracek</md:SurName>
+    <md:EmailAddress>mailto:pavel.jiracek@uws.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Jiracek</md:SurName>
+    <md:EmailAddress>mailto:pavel.jiracek@uws.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
index 4e0a71a5..211e4c10 100644
--- a/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oar.sci-gaia.eu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-23T10:56:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-23T10:56:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sci-GaIA project Open Access Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Sci-GaIA project Open Access Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Sci-GaIA project Open Access Repository</mdui:Description>
+        <mdui:Description xml:lang="it">Sci-GaIA project Open Access Repository</mdui:Description>
+        <mdui:Description xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://oar.sci-gaia.eu/?ln=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">https://oar.sci-gaia.eu/ln=fr</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://oar.sci-gaia.eu/help/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sci-GaIA project Open Access Repository</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Sci-GaIA project Open Access Repository</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Sci-GaIA project Open Access Repository</mdui:Description>
-          <mdui:Description xml:lang="it">Sci-GaIA project Open Access Repository</mdui:Description>
-          <mdui:Description xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://oar.sci-gaia.eu/?ln=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fr">https://oar.sci-gaia.eu/ln=fr</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://oar.sci-gaia.eu/help/privacy-policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFnjCCBIagAwIBAgIRAM3ckvEIEzZuZULXK4R98qkwDQYJKoZIhvcNAQELBQAw
 gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
@@ -63,59 +63,59 @@ sKwrSiI3l4S1BlRq1GQJElZl9/oKpBYQ8UzjOXuTgDN6U6lwyj/uSj75BQ3jwbCF
 VDSqlLDi9y84jexFwiY+/ulPUc7WQPtD8QxeemcFbLvP/gnosW9YxY3/TZvQQ68y
 InI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceName>
-        <md:ServiceName xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceName>
-        <md:ServiceName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Università degli Studi Catania</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Open Access Repository del progetto Sci-GaIA erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA délivré par l'Università degli Studi di Catania</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Sci-GaIA Open Access Repository provided by the University of Catania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.unict.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceName>
+      <md:ServiceName xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceName>
+      <md:ServiceName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Università degli Studi Catania</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Open Access Repository del progetto Sci-GaIA erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA délivré par l'Università degli Studi di Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Sci-GaIA Open Access Repository provided by the University of Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.unict.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml b/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml
index 4e3dcc02..be26f1b3 100644
--- a/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml
+++ b/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oasp-omicron.athensams.net/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T13:21:33Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T13:21:33Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDsjCCApqgAwIBAgIJALsMSAHJEd0ZMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
 						BAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9taWNyb24u
 						YXRoZW5zYW1zLm5ldDAeFw0xMzAzMTMxMjIyMDdaFw0yMzAzMTExMjIyMDdaMEQx
@@ -29,13 +29,13 @@
 						n/NLzmIyzzJsNc0+CG8ULhNdLnM1zshlivat03y/RtDu3fesGctpLgcXzmLUsc2I
 						LKPqIv8PhWTiwsTIa42GCb27MgMP3GWFFiIUqRxO2R3g2On+xb0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDsjCCApqgAwIBAgIJALsMSAHJEd0ZMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
 						BAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9taWNyb24u
 						YXRoZW5zYW1zLm5ldDAeFw0xMzAzMTMxMjIyMDdaFw0yMzAzMTExMjIyMDdaMEQx
@@ -57,27 +57,27 @@
 						n/NLzmIyzzJsNc0+CG8ULhNdLnM1zshlivat03y/RtDu3fesGctpLgcXzmLUsc2I
 						LKPqIv8PhWTiwsTIa42GCb27MgMP3GWFFiIUqRxO2R3g2On+xb0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Eduserv Omicron Test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eduserv.org.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:andy.anderson@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Anderson</md:SurName>
-      <md:EmailAddress>mailto:andy.anderson@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv Omicron Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduserv.org.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:andy.anderson@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Anderson</md:SurName>
+    <md:EmailAddress>mailto:andy.anderson@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
index 4c72fa7e..84e0191f 100644
--- a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
+++ b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://oasp.beta.athensams.net/OaspMetadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">openathens.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">openathens.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
 						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
 						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
@@ -43,17 +43,17 @@
 						0YGxOwt3hjmCenx6jVu/4RF5tN8GLvq5dcU1o0M6b8bDf70Htq2WS+4RIAsO+NHd
 						7HIXRm4dVYw+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oasp-beta.athensams.net/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oasp-beta.athensams.net/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oasp-beta.athensams.net/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oasp-beta.athensams.net/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
 						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
 						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
@@ -81,13 +81,13 @@
 						0YGxOwt3hjmCenx6jVu/4RF5tN8GLvq5dcU1o0M6b8bDf70Htq2WS+4RIAsO+NHd
 						7HIXRm4dVYw+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
 						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
 						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
@@ -115,39 +115,39 @@
 						0YGxOwt3hjmCenx6jVu/4RF5tN8GLvq5dcU1o0M6b8bDf70Htq2WS+4RIAsO+NHd
 						7HIXRm4dVYw+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/post" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/art" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/post" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/art" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/authrev.aspx" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/authrev.aspx" index="18"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Eduserv Beta</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.athensams.net/dsp/openathens_sp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/art" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/post" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/art" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/authrev.aspx" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/authrev.aspx" index="18"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Eduserv Beta</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.athensams.net/dsp/openathens_sp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml
index 217d1081..dcefbf5b 100644
--- a/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oba.coppin.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coppin.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Coppin State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coppin.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Coppin State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUM+YnW+6Qcco4W7bnmL64pyaxlZMwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOb2JhLmNvcHBpbi5lZHUwHhcNMTQwMjA1MjE1NTI2WhcN
 MzQwMjA1MjE1NTI2WjAZMRcwFQYDVQQDEw5vYmEuY29wcGluLmVkdTCCASIwDQYJ
@@ -37,23 +37,23 @@ B/RK5gLO5wMAQNywsguqKxVWqqv+pSzN6X8NW7z0SwBP4SAcK0gD5LLcMIIV0eyS
 pbe3tUvx4hVxod9fgPO1iBs38OweAif/Y3/T0Vn3gCPhSs4hYwu0dtXeYthcdTwe
 PBpVV8y+Fk1DknVpIx9v4ZbVQptzbTL3tmH9D1JpaV7BrrtW7wHc
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://oba.coppin.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oba.coppin.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oba.coppin.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oba.coppin.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oba.coppin.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coppin.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://oba.coppin.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oba.coppin.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oba.coppin.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oba.coppin.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oba.coppin.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coppin.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUM+YnW+6Qcco4W7bnmL64pyaxlZMwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOb2JhLmNvcHBpbi5lZHUwHhcNMTQwMjA1MjE1NTI2WhcN
 MzQwMjA1MjE1NTI2WjAZMRcwFQYDVQQDEw5vYmEuY29wcGluLmVkdTCCASIwDQYJ
@@ -72,18 +72,18 @@ B/RK5gLO5wMAQNywsguqKxVWqqv+pSzN6X8NW7z0SwBP4SAcK0gD5LLcMIIV0eyS
 pbe3tUvx4hVxod9fgPO1iBs38OweAif/Y3/T0Vn3gCPhSs4hYwu0dtXeYthcdTwe
 PBpVV8y+Fk1DknVpIx9v4ZbVQptzbTL3tmH9D1JpaV7BrrtW7wHc
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://oba.coppin.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coppin State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coppin State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://coppin.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas R. Smith, III</md:GivenName>
-      <md:EmailAddress>trsmith@coppin.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://oba.coppin.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coppin State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coppin State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://coppin.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas R. Smith, III</md:GivenName>
+    <md:EmailAddress>trsmith@coppin.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml
index 1ea2b022..4cf85daf 100644
--- a/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://obu-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-22T11:25:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-22T11:25:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Oxford Brookes University - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Oxford Brookes University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Oxford Brookes University - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Oxford Brookes University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAPFOgb8PLs1hMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMDYwHhcNMTQwNzE4MDk0MTQ2WhcNMjQwNzE1MDk0MTQ2WjASMRAw
 						DgYDVQQDEwdhaW8wMDA2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -46,40 +46,40 @@
 						IdXPA4yyw+Wx0924IrrLTUoa5TT/emmXyNZVo+3KMwWaJcNI1sxHEPVKqE3VFJ7h
 						zyozG62Vmd+kHrx8S35yvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oxford Brookes University - Primo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Bieber</md:SurName>
-      <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Bieber</md:SurName>
-      <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford Brookes University - Primo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Bieber</md:SurName>
+    <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Bieber</md:SurName>
+    <md:EmailAddress>mailto:frank.bieber@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml b/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml
index 6efc0b71..e3fbedf8 100644
--- a/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml
+++ b/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://olasdev.e-skillz.com/simplesaml">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-31T16:42:19Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-31T16:42:19Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEmDCCA4CgAwIBAgIJAMNMayaHMlLmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
 						BAoTEFJpc2tXaXplIExpbWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHou
@@ -34,13 +34,13 @@
 						4Bjggok16kpBQTeLiIJ47y5Pewwb+j0S7JBOzOLChw/DTqOvDc4nGx8mM/5GhoK9
 						tSahXw+2MVUhFiDSlyV7CzHI0IJJWXRH98lXdA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEmDCCA4CgAwIBAgIJAMNMayaHMlLmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
 						BAoTEFJpc2tXaXplIExpbWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHou
@@ -67,28 +67,28 @@
 						4Bjggok16kpBQTeLiIJ47y5Pewwb+j0S7JBOzOLChw/DTqOvDc4nGx8mM/5GhoK9
 						tSahXw+2MVUhFiDSlyV7CzHI0IJJWXRH98lXdA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RiskWize Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">O-LAS LMS (staging)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essentialskillz.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marek</md:GivenName>
-      <md:SurName>Zapach</md:SurName>
-      <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marek</md:GivenName>
-      <md:SurName>Zapach</md:SurName>
-      <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RiskWize Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">O-LAS LMS (staging)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essentialskillz.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marek</md:GivenName>
+    <md:SurName>Zapach</md:SurName>
+    <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marek</md:GivenName>
+    <md:SurName>Zapach</md:SurName>
+    <md:EmailAddress>mailto:marek@essentialskillz.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/olympic.accessiblelearning.com-sp.xml b/swamid-interfederations-2.0/olympic.accessiblelearning.com-sp.xml
index d90678c1..390c3d73 100644
--- a/swamid-interfederations-2.0/olympic.accessiblelearning.com-sp.xml
+++ b/swamid-interfederations-2.0/olympic.accessiblelearning.com-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://olympic.accessiblelearning.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Accessible Information Management, LLC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.accessiblelearning.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.accessiblelearning.com/Policies.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://www.accessiblelearning.com/Shibboleth/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Accessible Information Management, LLC</mdui:DisplayName>
-          <mdui:Description xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.accessiblelearning.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.accessiblelearning.com/Policies.aspx</mdui:PrivacyStatementURL>
-          <mdui:Logo height="64" width="350" xml:lang="en">https://www.accessiblelearning.com/Shibboleth/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFmzCCBIOgAwIBAgIIang7fvWm6cUwDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
 BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
 GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
@@ -54,37 +54,37 @@ Yv0j4HAOC5mtGSsARIrEMEcZ3195tmfXjal/vOob5X2DUuQdM4G4UTycOEWqRw+v
 V8BA9lC21vPvfvBS7wquQHL3vwzA+3/W11zkga2n0qM0CSp8arQGhV5Fv0APILWr
 Tuiqrppx8t9NqEKbMEo+iVcP7OaX8vzauvn56EWDrhe9mHZZ3FBMc1MTAtVuIu8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Accessible Information Management, LLC</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Accessible Information Management, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Accessible Information Management, LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://accessiblelearning.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert Armas</md:GivenName>
-      <md:EmailAddress>rob.armas@dsaim.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Haris Gunadi</md:GivenName>
-      <md:EmailAddress>haris.gunadi@dsaim.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://olympic.accessiblelearning.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Accessible Information Management, LLC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Accessible Information Management, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Accessible Information Management, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://accessiblelearning.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert Armas</md:GivenName>
+    <md:EmailAddress>rob.armas@dsaim.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Haris Gunadi</md:GivenName>
+    <md:EmailAddress>haris.gunadi@dsaim.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml b/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml
index 46a36b72..c90335d4 100644
--- a/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml
+++ b/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://onepass.thomsonreuters.com/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-18T11:51:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-18T11:51:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Thomson Reuters OnePass</mdui:DisplayName>
+        <mdui:Logo height="85" width="430">https://signon.thomsonreuters.com/images/thomsonreuters_brandlogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Thomson Reuters OnePass</mdui:DisplayName>
-          <mdui:Logo height="85" width="430">https://signon.thomsonreuters.com/images/thomsonreuters_brandlogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMjCCAh6gAwIBAgIQysj9nv1xAJxKptR/g2E8bjAJBgUrDgMCHQUAMCIxIDAe
 						BgNVBAMTF1Rob21zb24gUmV1dGVycyBPbmVQYXNzMB4XDTE2MDEwMTA2MDAwMFoX
 						DTI2MDEwMTA2MDAwMFowIjEgMB4GA1UEAxMXVGhvbXNvbiBSZXV0ZXJzIE9uZVBh
@@ -35,13 +35,13 @@
 						3cTE4YMDvBysBlov5z35Nwk9iHO+9s7+DVFrtWXnlO2/lqWQl7J/yGLGusaga2rf
 						/coV7R+t
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMjCCAh6gAwIBAgIQysj9nv1xAJxKptR/g2E8bjAJBgUrDgMCHQUAMCIxIDAe
 						BgNVBAMTF1Rob21zb24gUmV1dGVycyBPbmVQYXNzMB4XDTE2MDEwMTA2MDAwMFoX
 						DTI2MDEwMTA2MDAwMFowIjEgMB4GA1UEAxMXVGhvbXNvbiBSZXV0ZXJzIE9uZVBh
@@ -61,37 +61,37 @@
 						3cTE4YMDvBysBlov5z35Nwk9iHO+9s7+DVFrtWXnlO2/lqWQl7J/yGLGusaga2rf
 						/coV7R+t
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.thomsonreuters.com/saml" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.qa.thomsonreuters.com/saml" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.test.thomsonreuters.com/saml" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.dev.thomsonreuters.com/saml" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Thomson Reuters OnePass</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://thomsonreuters.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nicholas</md:GivenName>
-      <md:SurName>Remarke</md:SurName>
-      <md:EmailAddress>mailto:nicholas.remarke@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Madigan</md:SurName>
-      <md:EmailAddress>mailto:andrew.madigan@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicholas</md:GivenName>
-      <md:SurName>Remarke</md:SurName>
-      <md:EmailAddress>mailto:nicholas.remarke@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Madigan</md:SurName>
-      <md:EmailAddress>mailto:andrew.madigan@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.thomsonreuters.com/saml" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.qa.thomsonreuters.com/saml" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.test.thomsonreuters.com/saml" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.dev.thomsonreuters.com/saml" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Thomson Reuters OnePass</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://thomsonreuters.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nicholas</md:GivenName>
+    <md:SurName>Remarke</md:SurName>
+    <md:EmailAddress>mailto:nicholas.remarke@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Madigan</md:SurName>
+    <md:EmailAddress>mailto:andrew.madigan@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicholas</md:GivenName>
+    <md:SurName>Remarke</md:SurName>
+    <md:EmailAddress>mailto:nicholas.remarke@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Madigan</md:SurName>
+    <md:EmailAddress>mailto:andrew.madigan@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml b/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml
index d9776755..86bba318 100644
--- a/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.sagepub.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T12:36:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T12:36:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SAGE Journals Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://online.sagepub.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SAGE Journals Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://online.sagepub.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.statref.com-shibboleth.xml b/swamid-interfederations-2.0/online.statref.com-shibboleth.xml
index 23a42863..a0eda62d 100644
--- a/swamid-interfederations-2.0/online.statref.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/online.statref.com-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.statref.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-12-05T15:23:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-12-05T15:23:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onlinebeta.statref.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://onlinebeta.statref.com/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://online.statref.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://online.statref.com/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onlinebeta.statref.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://onlinebeta.statref.com/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://online.statref.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://online.statref.com/Shibboleth.sso/Login" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+TCCAuGgAwIBAgIJAJwEXu6tonahMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
 						VQQGEwJVUzEQMA4GA1UECAwHV3lvbWluZzEQMA4GA1UEBwwHSmFja3NvbjEbMBkG
 						A1UECgwSVGV0b24gRGF0YSBTeXN0ZW1zMRswGQYDVQQDDBJvbmxpbmUuc3RhdHJl
@@ -55,54 +55,54 @@
 						fV8vvSNyvTmWbK+/nHcVDJiqmb81XOuXy/NJDOZQpcK8Rx8vc6eAlgNTbLj6iTAJ
 						ZHzp7ICc2EW3RkJNUQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinebeta.statref.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.statref.com/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.statref.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://online.statref.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.statref.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.statref.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/ECP" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.statref.com/Shibboleth.sso/SAML2/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.statref.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.statref.com/Shibboleth.sso/SAML2/Artifact" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.statref.com/Shibboleth.sso/SAML2/ECP" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.statref.com/Shibboleth.sso/SAML/POST" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.statref.com/Shibboleth.sso/SAML/Artifact" index="13"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Teton Data Systems</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stat!Ref</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.statref.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Pearce</md:SurName>
-      <md:EmailAddress>mailto:ppearce@tetondata.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Pearce</md:SurName>
-      <md:EmailAddress>mailto:ppearce@tetondata.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinebeta.statref.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.statref.com/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.statref.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://online.statref.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.statref.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.statref.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/ECP" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.statref.com/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.statref.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.statref.com/Shibboleth.sso/SAML2/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.statref.com/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.statref.com/Shibboleth.sso/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.statref.com/Shibboleth.sso/SAML/Artifact" index="13"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Teton Data Systems</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stat!Ref</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.statref.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Pearce</md:SurName>
+    <md:EmailAddress>mailto:ppearce@tetondata.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Pearce</md:SurName>
+    <md:EmailAddress>mailto:ppearce@tetondata.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml
index 595fde7c..4a6d1240 100644
--- a/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.adults.ccinform.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-10T13:27:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-10T13:27:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CCInform Adults (Shib Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
+        <mdui:Logo height="82" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/sites/3/2014/07/Adults-logo300.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CCInform Adults (Shib Test)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
-          <mdui:Logo height="82" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/sites/3/2014/07/Adults-logo300.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -40,13 +40,13 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -70,43 +70,43 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/saml2/art" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">CCInform Adults (Shib Test)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Vital information for professionals working with disabled and older people.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CCInform Adults (Shib Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://adults.ccinform.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shane</md:GivenName>
-      <md:SurName>Yin</md:SurName>
-      <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CCInform Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CCInform Adults (Shib Test)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Vital information for professionals working with disabled and older people.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CCInform Adults (Shib Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://adults.ccinform.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shane</md:GivenName>
+    <md:SurName>Yin</md:SurName>
+    <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CCInform Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml
index 09a6be41..46760542 100644
--- a/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.aston.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T16:14:48Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T16:14:48Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aston.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSjCCAjKgAwIBAgIIeTpa4BHO1jIwDQYJKoZIhvcNAQEFBQAwPDEZMBcGA1UE
 						CgwQQXN0b24gVW5pdmVyc2l0eTEfMB0GA1UEAwwWb3BlbmF0aGVucy5hc3Rvbi5h
 						Yy51azAeFw0xMjA2MjUxNTAxMzNaFw0yMjA2MjUxNTAxMzNaMDwxGTAXBgNVBAoM
@@ -30,13 +30,13 @@
 						EEFJkraetkDgv0vtW68UBadRK51sYcS2m/WBe7jtynskjvRaqwX+Ui8kCFkbMcEC
 						Y2CHAtp5TNRdXvcrmNE/yyOdqVfCJk0D7WJjCp8w
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSjCCAjKgAwIBAgIIeTpa4BHO1jIwDQYJKoZIhvcNAQEFBQAwPDEZMBcGA1UE
 						CgwQQXN0b24gVW5pdmVyc2l0eTEfMB0GA1UEAwwWb3BlbmF0aGVucy5hc3Rvbi5h
 						Yy51azAeFw0xMjA2MjUxNTAxMzNaFw0yMjA2MjUxNTAxMzNaMDwxGTAXBgNVBAoM
@@ -56,33 +56,33 @@
 						EEFJkraetkDgv0vtW68UBadRK51sYcS2m/WBe7jtynskjvRaqwX+Ui8kCFkbMcEC
 						Y2CHAtp5TNRdXvcrmNE/yyOdqVfCJk0D7WJjCp8w
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.aston.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.aston.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aston University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aston University OpenAthens</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aston.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Team Mailbox</md:GivenName>
-      <md:EmailAddress>mailto:isa_sysadm@aston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Hunt</md:SurName>
-      <md:EmailAddress>mailto:t.d.hunt@aston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Team Mailbox</md:GivenName>
-      <md:EmailAddress>mailto:isa_sysadm@aston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Hunt</md:SurName>
-      <md:EmailAddress>mailto:t.d.hunt@aston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.aston.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.aston.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aston University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aston University OpenAthens</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aston.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Team Mailbox</md:GivenName>
+    <md:EmailAddress>mailto:isa_sysadm@aston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Hunt</md:SurName>
+    <md:EmailAddress>mailto:t.d.hunt@aston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Team Mailbox</md:GivenName>
+    <md:EmailAddress>mailto:isa_sysadm@aston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Hunt</md:SurName>
+    <md:EmailAddress>mailto:t.d.hunt@aston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml
index ac5ff0ef..3e6e5262 100644
--- a/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.blackpoolsixth.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T09:47:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T09:47:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">openathens.blackpoolsixth.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Blackpool Sixth Form College</mdui:DisplayName>
+        <mdui:Logo height="138" width="138">https://drive.google.com/file/d/0B0EYs7-1W-QLS0FHamZQOVJsNjQ/view?usp=sharing</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">openathens.blackpoolsixth.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Blackpool Sixth Form College</mdui:DisplayName>
-          <mdui:Logo height="138" width="138">https://drive.google.com/file/d/0B0EYs7-1W-QLS0FHamZQOVJsNjQ/view?usp=sharing</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfDCCAmSgAwIBAgIIZ5b5ek0HMy0wDQYJKoZIhvcNAQEFBQAwVTEpMCcGA1UE
 						CgwgVGhlIEJsYWNrcG9vbCBTaXh0aCBGb3JtIENvbGxlZ2UxKDAmBgNVBAMMH29w
 						ZW5hdGhlbnMuYmxhY2twb29sc2l4dGguYWMudWswHhcNMTUwNzMwMDgwMDU3WhcN
@@ -37,13 +37,13 @@
 						CU7f5enOAZT5n9W8CFI5xNcpbazKoUzjTt15yoEOsD7vYNhJnS1EFClDBmM/ERxP
 						2l6IdVWB/SVkgM6+P3kLtIZ/j4HLSsJ6GEIbJGI00UE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfDCCAmSgAwIBAgIIZ5b5ek0HMy0wDQYJKoZIhvcNAQEFBQAwVTEpMCcGA1UE
 						CgwgVGhlIEJsYWNrcG9vbCBTaXh0aCBGb3JtIENvbGxlZ2UxKDAmBgNVBAMMH29w
 						ZW5hdGhlbnMuYmxhY2twb29sc2l4dGguYWMudWswHhcNMTUwNzMwMDgwMDU3WhcN
@@ -64,25 +64,25 @@
 						CU7f5enOAZT5n9W8CFI5xNcpbazKoUzjTt15yoEOsD7vYNhJnS1EFClDBmM/ERxP
 						2l6IdVWB/SVkgM6+P3kLtIZ/j4HLSsJ6GEIbJGI00UE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Blackpool Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Blackpool Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.blackpoolsixth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alison</md:GivenName>
-      <md:SurName>Miller</md:SurName>
-      <md:EmailAddress>mailto:alison.miller@blackpoolsixth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Hopwood</md:SurName>
-      <md:EmailAddress>mailto:lee.hopwood@blackpoolsixth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Blackpool Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Blackpool Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.blackpoolsixth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alison</md:GivenName>
+    <md:SurName>Miller</md:SurName>
+    <md:EmailAddress>mailto:alison.miller@blackpoolsixth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Hopwood</md:SurName>
+    <md:EmailAddress>mailto:lee.hopwood@blackpoolsixth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
index 3e934857..9d0f6414 100644
--- a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.ccinform.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-25T12:05:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-25T12:05:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CCInform (Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
+        <mdui:Logo height="72" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/2014/01/CHildren-logo300.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CCInform (Test)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
-          <mdui:Logo height="72" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/2014/01/CHildren-logo300.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -40,30 +40,30 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CCInform (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shane</md:GivenName>
-      <md:SurName>Yin</md:SurName>
-      <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CCInform Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CCInform (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shane</md:GivenName>
+    <md:SurName>Yin</md:SurName>
+    <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CCInform Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml
index 38423728..c3d219a9 100644
--- a/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.keele.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-23T16:46:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-23T16:46:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keele.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keele.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5zCCAs+gAwIBAgIJAJYE6X8FdcoOMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECAwNU3RhZmZvcmRzaGlyZTEOMAwGA1UEBwwFS2VlbGUx
 						HDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgS2VlbGUxEzARBgNVBAsMCm9wZW5hdGhl
@@ -35,25 +35,25 @@
 						hwcXwYvkeiw1BrLJj80Qw1LvBn1M6oqZ6TfYLrX8ub2JdhGudeFY8K2XZS2p0oEu
 						dfpSmtW4JDyR0X8mLpFU61SdoVKWIZ+1UOtRO1YbGVbeQntrmy3E5LGStw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.keele.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.keele.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Keele</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Keele University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.keele.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Carter</md:SurName>
-      <md:EmailAddress>mailto:n.carter@keele.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Norman</md:GivenName>
-      <md:SurName>Bridges</md:SurName>
-      <md:EmailAddress>mailto:n.w.bridges@keele.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.keele.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.keele.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Keele</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Keele University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.keele.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Carter</md:SurName>
+    <md:EmailAddress>mailto:n.carter@keele.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Norman</md:GivenName>
+    <md:SurName>Bridges</md:SurName>
+    <md:EmailAddress>mailto:n.w.bridges@keele.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml
index 8f2542f9..1750c2d7 100644
--- a/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.rave.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-16T14:03:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-16T14:03:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rave.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rave.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIIGb+QLd2Xcf4wDQYJKoZIhvcNAQEFBQAwNzEVMBMGA1UE
 						CgwMUmF2ZW5zYm91cm5lMR4wHAYDVQQDDBVvcGVuYXRoZW5zLnJhdmUuYWMudWsw
 						HhcNMTMwNzIyMTYxMzA5WhcNMjMwNzIyMTYxMzA5WjA3MRUwEwYDVQQKDAxSYXZl
@@ -32,13 +32,13 @@
 						8e1dIz+XZxix7ez2AMOrvFWbbKWn2XHfcNxnML9J7yu65sjsNrlGahBitwhyrCNE
 						8Toby2o89ob4jbDqMjyd5yapsXs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIIGb+QLd2Xcf4wDQYJKoZIhvcNAQEFBQAwNzEVMBMGA1UE
 						CgwMUmF2ZW5zYm91cm5lMR4wHAYDVQQDDBVvcGVuYXRoZW5zLnJhdmUuYWMudWsw
 						HhcNMTMwNzIyMTYxMzA5WhcNMjMwNzIyMTYxMzA5WjA3MRUwEwYDVQQKDAxSYXZl
@@ -58,25 +58,25 @@
 						8e1dIz+XZxix7ez2AMOrvFWbbKWn2XHfcNxnML9J7yu65sjsNrlGahBitwhyrCNE
 						8Toby2o89ob4jbDqMjyd5yapsXs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.rave.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.rave.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ravensbourne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ravensbourne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ravensbourne.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ann</md:GivenName>
-      <md:SurName>Pho</md:SurName>
-      <md:EmailAddress>mailto:a.pho@rave.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mario</md:GivenName>
-      <md:SurName>Ahmad</md:SurName>
-      <md:EmailAddress>mailto:m.ahmad@rave.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.rave.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.rave.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ravensbourne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ravensbourne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ravensbourne.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ann</md:GivenName>
+    <md:SurName>Pho</md:SurName>
+    <md:EmailAddress>mailto:a.pho@rave.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mario</md:GivenName>
+    <md:SurName>Ahmad</md:SurName>
+    <md:EmailAddress>mailto:m.ahmad@rave.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
index b478eec7..8442ee55 100644
--- a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.warc.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T09:05:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T09:05:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Warc.com</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The largest single source of intelligence for marketing, advertising, media and research communities</mdui:Description>
+        <mdui:Logo height="128" width="237">https://www.warc.com/images/WarcSiteContent/WARCAthens.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Warc.com</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The largest single source of intelligence for marketing, advertising, media and research communities</mdui:Description>
-          <mdui:Logo height="128" width="237">https://www.warc.com/images/WarcSiteContent/WARCAthens.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 			MIIDeTCCAmGgAwIBAgIJALAX8VOBhTIkMA0GCSqGSIb3DQEBBQUAMDExETAPBgNV
 			BAoTCFdhcmMgTHRkMRwwGgYDVQQDExNvcGVuYXRoZW5zLndhcmMuY29tMB4XDTE1
 			MDUyMzEwNTAxN1oXDTI1MDUyMDEwNTAxN1owMTERMA8GA1UEChMIV2FyYyBMdGQx
@@ -37,13 +37,13 @@
 			0bupxzSmUCOeItj/V0hOlgT1SEnSviMB3rSQJU6luZ13VkPjL0N5h6C8RXnegngJ
 			G7IhNFU840UuC06AYA5AB6KHGl3ijvAla11Fk6E=
 		</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 			MIIDeTCCAmGgAwIBAgIJALAX8VOBhTIkMA0GCSqGSIb3DQEBBQUAMDExETAPBgNV
 			BAoTCFdhcmMgTHRkMRwwGgYDVQQDExNvcGVuYXRoZW5zLndhcmMuY29tMB4XDTE1
 			MDUyMzEwNTAxN1oXDTI1MDUyMDEwNTAxN1owMTERMA8GA1UEChMIV2FyYyBMdGQx
@@ -64,33 +64,33 @@
 			0bupxzSmUCOeItj/V0hOlgT1SEnSviMB3rSQJU6luZ13VkPjL0N5h6C8RXnegngJ
 			G7IhNFU840UuC06AYA5AB6KHGl3ijvAla11Fk6E=
 		</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.warc.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.warc.com/oa/auth/rcv/saml2/post" index="2"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Warc.com</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.warc.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.warc.com/oa/auth/rcv/saml2/post" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Warc.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 			The largest single source of intelligence for marketing, advertising, media and research communities
 		</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">WARC Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Warc.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warc.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Denham</md:SurName>
-      <md:EmailAddress>mailto:andrew.denham@warc.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Denham</md:SurName>
-      <md:EmailAddress>mailto:andrew.denham@warc.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">WARC Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Warc.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warc.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Denham</md:SurName>
+    <md:EmailAddress>mailto:andrew.denham@warc.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Denham</md:SurName>
+    <md:EmailAddress>mailto:andrew.denham@warc.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml
index 7a394cd1..43cad8f8 100644
--- a/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.xperthr.co.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-08T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-08T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0zCCArugAwIBAgIJAKdy83q7VjjVMA0GCSqGSIb3DQEBBQUAME8xKjAoBgNV
 						BAoTIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEhMB8GA1UEAxMY
 						b3BlbmF0aGVucy54cGVydGhyLmNvLnVrMB4XDTEzMDIyMDA5MDM0MVoXDTIzMDIx
@@ -32,13 +32,13 @@
 						G00MtLi3tY1/2X6iice+w3Jc5sQ7pDpiK6XkjmDlHeVhzu9iP1cdF/r3tD06iFoj
 						jHeoqxMNf447T2ASpYbVkR+zuL9RA8I=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -62,25 +62,25 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xperthruk.sso2-beta.awsviper.reedbusiness.net/sites/xperthruk/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://xperthruk.sso2-beta.awsviper.reedbusiness.net/sites/xperthruk/oa/auth/rcv/saml2/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.xperthr.co.uk/openathens/shibauthassert.aspx" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathens.xperthr.co.uk/openathens/shibauthassert.aspx" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reed Business Information Limited: XpertHR - Online HR Intelligence Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.xperthr.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@xperthr.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xperthruk.sso2-beta.awsviper.reedbusiness.net/sites/xperthruk/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://xperthruk.sso2-beta.awsviper.reedbusiness.net/sites/xperthruk/oa/auth/rcv/saml2/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.xperthr.co.uk/openathens/shibauthassert.aspx" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathens.xperthr.co.uk/openathens/shibauthassert.aspx" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reed Business Information Limited: XpertHR - Online HR Intelligence Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.xperthr.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@xperthr.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml
index 4f13bd06..2ffd841d 100644
--- a/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathensr.guildford.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-22T11:30:09Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-22T11:30:09Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guildford.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guildford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIIe3m5sSwnVj4wDQYJKoZIhvcNAQEFBQAwQjEaMBgGA1UE
 						CgwRR3VpbGRmb3JkIENvbGxlZ2UxJDAiBgNVBAMMG29wZW5hdGhlbnNyLmd1aWxk
 						Zm9yZC5hYy51azAeFw0xMjA2MTgwOTU0MDhaFw0yMjA2MTgwOTU0MDhaMEIxGjAY
@@ -30,13 +30,13 @@
 						MfNnu1LliAg8Qfmdm1sbMMrnouVuGHIbkDW3FqWMbicC7j7SGEiTjH96jhDEA/2u
 						DcpYU47hTFotoLC3G834xdmNGHL9v+rdRsnSVaZ0eGmXA+MS+2QQDO60
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIIe3m5sSwnVj4wDQYJKoZIhvcNAQEFBQAwQjEaMBgGA1UE
 						CgwRR3VpbGRmb3JkIENvbGxlZ2UxJDAiBgNVBAMMG29wZW5hdGhlbnNyLmd1aWxk
 						Zm9yZC5hYy51azAeFw0xMjA2MTgwOTU0MDhaFw0yMjA2MTgwOTU0MDhaMEIxGjAY
@@ -56,25 +56,25 @@
 						MfNnu1LliAg8Qfmdm1sbMMrnouVuGHIbkDW3FqWMbicC7j7SGEiTjH96jhDEA/2u
 						DcpYU47hTFotoLC3G834xdmNGHL9v+rdRsnSVaZ0eGmXA+MS+2QQDO60
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathensr.guildford.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathensr.guildford.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Guildford College of Further and Higher Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Guildford College Open Athens Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.guildford.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Charlie</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:cbennett@guildford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Charlie</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:cbennett@guildford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathensr.guildford.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathensr.guildford.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Guildford College of Further and Higher Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Guildford College Open Athens Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.guildford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Charlie</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:cbennett@guildford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Charlie</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:cbennett@guildford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
index 3b29693a..39b4325c 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openskos.meertens.knaw.nl/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">OpenSKOS | Meertens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
+        <mdui:Logo height="44" width="64">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">OpenSKOS | Meertens</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</mdui:Description>
-          <mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
-          <mdui:Logo height="44" width="64">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>twww11</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=twww11</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>twww11</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=twww11</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN
 BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a
 E7gfLARdAbSMy3ntWsCqI0M4uXkeN8vZe2aiBUGi0hN9TuN9DO8mr4P8EXjhT0qQ
@@ -48,51 +48,51 @@ M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
 5D7JsQ/vElBegBrNmdrIoZyI+ezREelVATJURfgJu+47mmhVWIK0St6S1y+pgPQ4
 1bxBV69YDJSB5BjVPA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">OpenSKOS | Meertens</md:ServiceName>
-        <md:ServiceName xml:lang="en">OpenSKOS | Meertens</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>KNAW</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marc</md:GivenName>
-      <md:SurName>Kemps-Snijders</md:SurName>
-      <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marc</md:GivenName>
-      <md:SurName>Kemps-Snijders</md:SurName>
-      <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">OpenSKOS | Meertens</md:ServiceName>
+      <md:ServiceName xml:lang="en">OpenSKOS | Meertens</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml b/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
index 528df3bf..457df5e7 100644
--- a/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openstack.hbit.sztaki.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>sztaki</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>hexaa</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>sztaki</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>hexaa</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Sztaki HBIT OpenStack</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sztaki HBIT OpenStack</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Sztaki HBIT OpenStack</mdui:Description>
+        <mdui:Description xml:lang="en">Sztaki HBIT OpenStack</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyEN.pdf</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="hu">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyHU.pdf</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyEN.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyHU.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">Sztaki HBIT OpenStack</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Sztaki HBIT OpenStack</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Sztaki HBIT OpenStack</mdui:Description>
-          <mdui:Description xml:lang="en">Sztaki HBIT OpenStack</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyEN.pdf</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="hu">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyHU.pdf</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyEN.pdf</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyHU.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEqjCCA5KgAwIBAgIQOoNAp28e/QT7WsMXO8WAQjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMjAeFw0xNTAyMTcwMDAwMDBaFw0xODAyMTYyMzU5NTlaMEYxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UEAxMYb3BlbnN0YWNrLmhiaXQuc3p0YWtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnjR3LGJnAdpidGeUAZiNeuByViXAI1WUW5zwYafogLT1ndujF4++tqcu2eJaT0GeD6Gkli3UViCrYU5jlEJqavGSrxkAwqTi0jmOHOMKCh2mE2Wx/RYQF2jPnaoNARqYP/8A7K7peVPAaXtPivYbGHYHRk+u1OQoTn61djsgOi4ltVn2q+zgtigJkDFVAosctTxTVr39cZ+3On2TjTMTYmkK/hZc9EUA8e2n/7gemL463e1YmVEkMCsZuUkX5TTfMEroS+scfl5cSiAJnpf+FfilrkMvxLQ1EvnPX74Gk5yI+uP38qHVxeL0UQW4OOB3YHWGZj1oGlzXvfUrS/cnXwIDAQABo4IBdDCCAXAwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFGAP6Chp954Jr4v5NsPyhWRy8AF5MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCMGA1UdEQQcMBqCGG9wZW5zdGFjay5oYml0LnN6dGFraS5odTANBgkqhkiG9w0BAQsFAAOCAQEAG65QxzPckZ3a1fQIgUZ92KCeprkaWYEidRpc8QvmosJsChsN6Vg/Do7ZE7RhAjf/5igAOWQUVZY/nyhpYKX0DWvPd9FxxwaThobMtniYw2g77tq+37Z3+UsdcFjPQhtrtjL06W5phs9kgql8mf5IipULrcbS+JFT17OFXod1TrajLByouBe3NRE5+7u1tfBiRJEymtdYd38ZARVNGCF1EL7nE9gAiKm11EVKNJgWl0ERtCtkzhJ7OB+irsja9G12gBPL2BFlW/+d7PgrpnZXrhvAagULQj6KPE/Ti8n+L8bv2SOVhQ4zdJmFwiFo0FCVY/qIKJUVQXnah9j9e/HCdA==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>openstack.hbit.sztaki.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">Sztaki HBIT OpenStack</md:ServiceName>
-        <md:ServiceName xml:lang="en">Sztaki HBIT OpenStack</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Héder Mihály</md:SurName>
-      <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Héder Mihály</md:SurName>
-      <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Héder Mihály</md:SurName>
-      <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEqjCCA5KgAwIBAgIQOoNAp28e/QT7WsMXO8WAQjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMjAeFw0xNTAyMTcwMDAwMDBaFw0xODAyMTYyMzU5NTlaMEYxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UEAxMYb3BlbnN0YWNrLmhiaXQuc3p0YWtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnjR3LGJnAdpidGeUAZiNeuByViXAI1WUW5zwYafogLT1ndujF4++tqcu2eJaT0GeD6Gkli3UViCrYU5jlEJqavGSrxkAwqTi0jmOHOMKCh2mE2Wx/RYQF2jPnaoNARqYP/8A7K7peVPAaXtPivYbGHYHRk+u1OQoTn61djsgOi4ltVn2q+zgtigJkDFVAosctTxTVr39cZ+3On2TjTMTYmkK/hZc9EUA8e2n/7gemL463e1YmVEkMCsZuUkX5TTfMEroS+scfl5cSiAJnpf+FfilrkMvxLQ1EvnPX74Gk5yI+uP38qHVxeL0UQW4OOB3YHWGZj1oGlzXvfUrS/cnXwIDAQABo4IBdDCCAXAwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFGAP6Chp954Jr4v5NsPyhWRy8AF5MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCMGA1UdEQQcMBqCGG9wZW5zdGFjay5oYml0LnN6dGFraS5odTANBgkqhkiG9w0BAQsFAAOCAQEAG65QxzPckZ3a1fQIgUZ92KCeprkaWYEidRpc8QvmosJsChsN6Vg/Do7ZE7RhAjf/5igAOWQUVZY/nyhpYKX0DWvPd9FxxwaThobMtniYw2g77tq+37Z3+UsdcFjPQhtrtjL06W5phs9kgql8mf5IipULrcbS+JFT17OFXod1TrajLByouBe3NRE5+7u1tfBiRJEymtdYd38ZARVNGCF1EL7nE9gAiKm11EVKNJgWl0ERtCtkzhJ7OB+irsja9G12gBPL2BFlW/+d7PgrpnZXrhvAagULQj6KPE/Ti8n+L8bv2SOVhQ4zdJmFwiFo0FCVY/qIKJUVQXnah9j9e/HCdA==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>openstack.hbit.sztaki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">Sztaki HBIT OpenStack</md:ServiceName>
+      <md:ServiceName xml:lang="en">Sztaki HBIT OpenStack</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Héder Mihály</md:SurName>
+    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Héder Mihály</md:SurName>
+    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Héder Mihály</md:SurName>
+    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d38c21c7..ce97a6fe 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
-          <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-      <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Feide Support</md:GivenName>
-      <md:EmailAddress>support@feide.no</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml
index 60f29a4f..128dde33 100644
--- a/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://opn-shibb.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-16T12:23:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-16T12:23:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Open University - Primo Production</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Open University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Open University - Primo Production</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Open University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAN/TZ90ziE5NMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMTEwHhcNMTQxMTAzMDg1NDE2WhcNMjQxMDMxMDg1NDE2WjASMRAw
 						DgYDVQQDEwdhaW8wMDExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -45,40 +45,40 @@
 						3uWpg4tWuMrZ4NMjURafjthODllX0DUfx6IoE/jm5zrASucS3YGtZwLUCz6/Tls3
 						P6vTQuQBvTVROWTP/epCTQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is Shibboleth SP for Primo Resource Discovery at Open University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is Shibboleth SP for Primo Resource Discovery at Open University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml b/swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml
index 66b0eb29..d03e3ca9 100644
--- a/swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml
+++ b/swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://orcid.org/saml2/sp/1">
-    <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-02-01T09:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-02-01T09:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://orcid.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://orcid.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ORCID</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ORCID provides a persistent digital identifier that distinguishes you from every other researcher and, through integration in key research workflows such as manuscript and grant submission, supports automated linkages between you and your professional activities ensuring that your work is recognized.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://orcid.org/content/about-orcid</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://orcid.org/content/orcid-privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://orcid.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://orcid.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ORCID</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ORCID provides a persistent digital identifier that distinguishes you from every other researcher and, through integration in key research workflows such as manuscript and grant submission, supports automated linkages between you and your professional activities ensuring that your work is recognized.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://orcid.org/content/about-orcid</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://orcid.org/content/orcid-privacy-policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>web-6.orcid.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=web-6.orcid.org</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO0CR1JgdYxIMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>web-6.orcid.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=web-6.orcid.org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO0CR1JgdYxIMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3dlYi02Lm9yY2lkLm9yZzAeFw0xNTA5MDkxNzMwNTBaFw0yNTA5MDYxNzMw
 NTBaMBoxGDAWBgNVBAMTD3dlYi02Lm9yY2lkLm9yZzCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALHNI6am/ncDdsQcdraUa6C5MSTCJ+xEmJqIv+LOssnZ
@@ -59,54 +59,54 @@ klQkGM9mMIOLWJMv7P6FJmMWooa3gyOwgTxAnOlmxgWCzS+mgjDDtLnpQhbnX+T3
 te/OkSSYJpEuzeIrdfyHcsf9dHj+wE1MORUFfbx0FsGx2majBhOeRBSM5bjT1yQe
 2FMwFHw/KlhkjPs28rCyeaAccxJSX3SaEh/RQYZJA3QVBkWiqkc6JA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://orcid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://orcid.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://orcid.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://orcid.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://orcid.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://orcid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://orcid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://orcid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://orcid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">ORCID</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">ORCID provides a persistent digital identifier that distinguishes you from every other researcher and, through integration in key research workflows such as manuscript and grant submission, supports automated linkages between you and your professional activities ensuring that your work is recognized.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ORCID, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ORCID</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://orcid.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ORCID Support</md:GivenName>
-      <md:EmailAddress>support@orcid.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>ORCID Team</md:GivenName>
-      <md:EmailAddress>info@orcid.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ORCID Development Team</md:GivenName>
-      <md:EmailAddress>support@orcid.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://orcid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://orcid.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://orcid.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://orcid.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://orcid.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://orcid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://orcid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://orcid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://orcid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">ORCID</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">ORCID provides a persistent digital identifier that distinguishes you from every other researcher and, through integration in key research workflows such as manuscript and grant submission, supports automated linkages between you and your professional activities ensuring that your work is recognized.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ORCID, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ORCID</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://orcid.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ORCID Support</md:GivenName>
+    <md:EmailAddress>support@orcid.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>ORCID Team</md:GivenName>
+    <md:EmailAddress>info@orcid.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ORCID Development Team</md:GivenName>
+    <md:EmailAddress>support@orcid.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/osms.maps-ict.com.xml b/swamid-interfederations-2.0/osms.maps-ict.com.xml
index 98e4a3d6..e1c330e9 100644
--- a/swamid-interfederations-2.0/osms.maps-ict.com.xml
+++ b/swamid-interfederations-2.0/osms.maps-ict.com.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://osms.maps-ict.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-02T15:37:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-02T15:37:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sherston Subscription Service</mdui:DisplayName>
+        <mdui:Logo height="170" width="289">https://osms.maps-ict.com/sherston_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://osms.maps-ict.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://osms.maps-ict.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sherston Subscription Service</mdui:DisplayName>
-          <mdui:Logo height="170" width="289">https://osms.maps-ict.com/sherston_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://osms.maps-ict.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://osms.maps-ict.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAJyVBMODdwzEMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD2lwLTEwLTMyLTE5LTEwNjAeFw0xMzExMjgxNjQ3NDZaFw0yMzExMjYxNjQ3
 						NDZaMBoxGDAWBgNVBAMTD2lwLTEwLTMyLTE5LTEwNjCCASIwDQYJKoZIhvcNAQEB
@@ -51,43 +51,43 @@
 						B3tRPkqeEqxBP0OMhXB4BU8EohPtO02B6PDd632lslHonLb/NXlmSzMAprmsxToO
 						LdmvhFHg3oy+klnOhP9enbBVBy75/UO4+mJ0gfHhoQjjKw4/CmdTWQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://osms.maps-ict.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sherston Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sherston Subscription Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tagassessment.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Declan</md:GivenName>
-      <md:SurName>Lynch</md:SurName>
-      <md:EmailAddress>mailto:declan.lynch@sherston.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Declan</md:GivenName>
-      <md:SurName>Lynch</md:SurName>
-      <md:EmailAddress>mailto:declan.lynch@sherston.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://osms.maps-ict.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sherston Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sherston Subscription Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tagassessment.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Declan</md:GivenName>
+    <md:SurName>Lynch</md:SurName>
+    <md:EmailAddress>mailto:declan.lynch@sherston.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Declan</md:GivenName>
+    <md:SurName>Lynch</md:SurName>
+    <md:EmailAddress>mailto:declan.lynch@sherston.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml
index 36ed4577..2f5545ff 100644
--- a/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ota.oerc.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+jCCAeKgAwIBAgIJAKV6Q72EmGfrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEW90YS5vZXJjLm94LmFjLnVrMB4XDTEwMDgwMzEzNTQ0M1oXDTIwMDczMTEz
 						NTQ0M1owHDEaMBgGA1UEAxMRb3RhLm9lcmMub3guYWMudWswggEiMA0GCSqGSIb3
@@ -28,13 +28,13 @@
 						jh2UK7AES6qP6jfUh5jo0xJVS6yYvoJqmk1dVDyaEKqltEQ7SbRPUZb7Yrsjt2Uy
 						y9r3YHinwQik+xzWbfy2QcrJg/kf7fPzmZpZciKgj6f/XMAkZc/kBnZ2BSOUTg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+jCCAeKgAwIBAgIJAKV6Q72EmGfrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEW90YS5vZXJjLm94LmFjLnVrMB4XDTEwMDgwMzEzNTQ0M1oXDTIwMDczMTEz
 						NTQ0M1owHDEaMBgGA1UEAxMRb3RhLm9lcmMub3guYWMudWswggEiMA0GCSqGSIb3
@@ -52,38 +52,38 @@
 						jh2UK7AES6qP6jfUh5jo0xJVS6yYvoJqmk1dVDyaEKqltEQ7SbRPUZb7Yrsjt2Uy
 						y9r3YHinwQik+xzWbfy2QcrJg/kf7fPzmZpZciKgj6f/XMAkZc/kBnZ2BSOUTg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford: Oxford Text Archive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ota.oucs.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Wynne</md:SurName>
-      <md:EmailAddress>mailto:martin.wynne@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Wynne</md:SurName>
-      <md:EmailAddress>mailto:martin.wynne@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Oxford Text Archive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ota.oucs.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Wynne</md:SurName>
+    <md:EmailAddress>mailto:martin.wynne@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Wynne</md:SurName>
+    <md:EmailAddress>mailto:martin.wynne@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ousu.org-shibboleth.xml b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
index 75ba4fee..aaf335b2 100644
--- a/swamid-interfederations-2.0/ousu.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ousu.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-07T13:39:32Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-07T13:39:32Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ousu.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ousu.org/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ousu.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ousu.org/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ousu.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ousu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ousu.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ousu.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ousu.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oxford University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ousu.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ousu.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ousu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ousu.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ousu.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ousu.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ousu.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
index aa0056bb..ece4af53 100644
--- a/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.gwdg.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-07-23T08:14:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-07-23T08:14:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">GWDG ownCloud</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">GWDG ownCloud</mdui:DisplayName>
+        <mdui:Description xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</mdui:Description>
+        <mdui:Description xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</mdui:Description>
+        <mdui:Logo height="34" width="86">https://owncloud.gwdg.de/themes/gwdg/core/img/logo-icon.png</mdui:Logo>
+        <mdui:Logo height="121" width="250">https://owncloud.gwdg.de/themes/gwdg/core/img/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.gwdg.de/storage-services/gwdg-owncloud</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.gwdg.de/en/storage-services/gwdg-owncloud</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">GWDG ownCloud</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">GWDG ownCloud</mdui:DisplayName>
-          <mdui:Description xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</mdui:Description>
-          <mdui:Description xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</mdui:Description>
-          <mdui:Logo height="34" width="86">https://owncloud.gwdg.de/themes/gwdg/core/img/logo-icon.png</mdui:Logo>
-          <mdui:Logo height="121" width="250">https://owncloud.gwdg.de/themes/gwdg/core/img/logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://www.gwdg.de/storage-services/gwdg-owncloud</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.gwdg.de/en/storage-services/gwdg-owncloud</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>owncloud.gwdg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=owncloud.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGBTCCBO2gAwIBAgIHGZYpoiZt7zANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>owncloud.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=owncloud.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGBTCCBO2gAwIBAgIHGZYpoiZt7zANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
 RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
 IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
@@ -65,51 +65,51 @@ sX53TC6M6wRu6yWfA4TDxy1hQcAfLZ2wPZqE+ymMpFd/uLFvK0gdSYFWr9A2+Nnx
 Rb/ka7SePtjY0euaMALaPR9W7IjIuhMt94Z9HqdfqXIeT2YYW1AA5PEdMJKAi5Sc
 OaPal0OnuJy7
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">GWDG ownCloud</md:ServiceName>
-        <md:ServiceName xml:lang="en">GWDG ownCloud</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ralph</md:GivenName>
-      <md:SurName>Krimmel</md:SurName>
-      <md:EmailAddress>mailto:ralph.krimmel@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Adler</md:SurName>
-      <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Adler</md:SurName>
-      <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">GWDG ownCloud</md:ServiceName>
+      <md:ServiceName xml:lang="en">GWDG ownCloud</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ralph</md:GivenName>
+    <md:SurName>Krimmel</md:SurName>
+    <md:EmailAddress>mailto:ralph.krimmel@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Adler</md:SurName>
+    <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Adler</md:SurName>
+    <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml b/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml
index 17f73aa0..f8981c01 100644
--- a/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml
+++ b/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford.corefacilities.org/account/saml/oxford">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-12T15:11:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-12T15:11:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDezCCAmOgAwIBAgIJAJ2ckmy8lsPeMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
 						BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
 						HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMwHhcNMTMxMjExMTUyNTA3WhcN
@@ -30,22 +30,22 @@
 						YVcHQX0UCb4Iw4FoEKIzAsQW2aIQnE39DD7410/7YUzwCGVn6F6TGQuglZjGrTWe
 						ITzWFNwFKHtFqy1whxR7MarmC24an1bJCi/yQDHxDQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.corefacilities.org/account/saml/oxford" index="1" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">iLab Solutions, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">iLab Solutions</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ilabsolutions.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ID Integration support</md:GivenName>
-      <md:EmailAddress>mailto:integrations_id@ilabsolutions.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.corefacilities.org/account/saml/oxford" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">iLab Solutions, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">iLab Solutions</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ilabsolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ID Integration support</md:GivenName>
+    <md:EmailAddress>mailto:integrations_id@ilabsolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml
index cf85b21c..4c90aadb 100644
--- a/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxfordbrookes.idm.oclc.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-15T15:57:54Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-15T15:57:54Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEIDCCAwigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBtMSUwIwYDVQQDFBwqLm94
 						Zm9yZGJyb29rZXMuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChME
 						T0NMQzEoMCYGCSqGSIb3DQEJARYZamFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzAe
@@ -32,25 +32,25 @@
 						tJol7RM0jtXXFrnpQdLWdsPTV6GFZcUmaTv0sY8m7BY5VGz8mhXAEc9lOuWGbNvy
 						GoyFwA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oxford Brookes University online resources</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford Brookes University online resources</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml b/swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml
index 40b3deb1..c905776f 100644
--- a/swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml
+++ b/swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxfordideas.wazoku.com/">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-12T10:20:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-12T10:20:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnzCCAoegAwIBAgIJALt69IM1gEANMA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UE
 						CgwGV2F6b2t1MQswCQYDVQQLDAJJVDEXMBUGA1UEAwwOd3d3Lndhem9rdS5jb20w
@@ -31,13 +31,13 @@
 						b4HAD/AIOYY597wwV/+3Jt5yTzHMrVoDiJiGGfqKXoWdLU2HQvcKN4NmsK5Ow92P
 						GmO3ftyUNMBb/z18IS+jWiKzMQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnzCCAoegAwIBAgIJALt69IM1gEANMA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UE
 						CgwGV2F6b2t1MQswCQYDVQQLDAJJVDEXMBUGA1UEAwwOd3d3Lndhem9rdS5jb20w
@@ -59,25 +59,25 @@
 						b4HAD/AIOYY597wwV/+3Jt5yTzHMrVoDiJiGGfqKXoWdLU2HQvcKN4NmsK5Ow92P
 						GmO3ftyUNMBb/z18IS+jWiKzMQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordideas.wazoku.com/saml_ol/login" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en-GB">Wazoku Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en-GB">oxfordideas.wazoku.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wazoku.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nicola</md:GivenName>
-      <md:SurName>Darke</md:SurName>
-      <md:EmailAddress>mailto:nicola.darke@wazoku.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Bailey</md:SurName>
-      <md:EmailAddress>mailto:chris.bailey@wazoku.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordideas.wazoku.com/saml_ol/login" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en-GB">Wazoku Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en-GB">oxfordideas.wazoku.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wazoku.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nicola</md:GivenName>
+    <md:SurName>Darke</md:SurName>
+    <md:EmailAddress>mailto:nicola.darke@wazoku.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Bailey</md:SurName>
+    <md:EmailAddress>mailto:chris.bailey@wazoku.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml b/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml
index acf270be..175a22f5 100644
--- a/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pa2836.peopleadmin.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PeopleAdmin 7 Baylor University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PeopleAdmin 7 Baylor University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC9DCCAdygAwIBAgIJAK9qYIpSXmuLMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3Blb3BsZWFkbWluLmNvbTAeFw0xMzA4MDYwNDExMjJaFw0yMzA4MDQwNDEx
 MjJaMBoxGDAWBgNVBAMTD3Blb3BsZWFkbWluLmNvbTCCASIwDQYJKoZIhvcNAQEB
@@ -35,24 +35,24 @@ XkMvb1xhaOLox1HGhENf99ka10jWMdMt2bj1lT8WM/Qg+XgOnoQvTyjOtELM/QuA
 OVuT1bTdGg4K398O7jlTzoo7LFhPBl99HDx3cDhhhX9NdWyFyQ32MhYa6361v+eG
 DvoszRsTTKZLYbNvWoo8BZMCxK5tQ6EqNyQTmekHxw+peNCaQ+nDKw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jobs.baylor.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor-training.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor-sb.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PeopleAdmin, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PeopleAdmin, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.peopleadmin.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Praveen Pinto</md:GivenName>
-      <md:EmailAddress>praveen.pinto@peopleadmin.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Amanda Merritt</md:GivenName>
-      <md:EmailAddress>amanda.merritt@peopleadmin.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jobs.baylor.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor-training.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor-sb.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PeopleAdmin, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PeopleAdmin, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.peopleadmin.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Praveen Pinto</md:GivenName>
+    <md:EmailAddress>praveen.pinto@peopleadmin.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Amanda Merritt</md:GivenName>
+    <md:EmailAddress>amanda.merritt@peopleadmin.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
index 89ae779d..cb196c0b 100644
--- a/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pan.unifei.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKTAnBgNVBAoUIFVuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kxIDAeBgkqhkiG
 9w0BCQEWEWRzaUB1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMG
@@ -45,26 +45,26 @@ JTNyehL8YKvoYOOcL8ISIrvMhXuGKFDjadKblevs1pari0G7RPdSzzjm0kdQpneJ
 Y+MQCYkcwgEL36lQq4zTxnOMWAk8kKs4cSrLhLB/VajAFrmfZST3YRKd9ySd6Erg
 sMiNc61dD6n6xKPqOEktccFKcLCaMg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pan.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pan.unifei.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pan.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pan.unifei.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKTAnBgNVBAoUIFVuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kxIDAeBgkqhkiG
@@ -89,24 +89,24 @@ Y+MQCYkcwgEL36lQq4zTxnOMWAk8kKs4cSrLhLB/VajAFrmfZST3YRKd9ySd6Erg
 sMiNc61dD6n6xKPqOEktccFKcLCaMg==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unifei.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Everaldo Campos</md:SurName>
-      <md:EmailAddress>everaldo@unifei.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifei.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Everaldo Campos</md:SurName>
+    <md:EmailAddress>everaldo@unifei.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
index a823704a..9bc4684b 100644
--- a/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
@@ -1,108 +1,108 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://papi.kfki.hu/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>kfki</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>href-idps</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>kfki</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>href-idps</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>148.6.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:738:5001::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.48945,18.9497</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WIGNER Research Centre for Physics</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:Description>
+        <mdui:Description xml:lang="en">WIGNER Research Centre for Physics</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mail.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunserv.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rmki.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aeki.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iki.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfa.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wigner.mta.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">energia.mta.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>148.6.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:738:5001::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:47.48945,18.9497</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">WIGNER Research Centre for Physics</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:Description>
-          <mdui:Description xml:lang="en">WIGNER Research Centre for Physics</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mail.kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunserv.kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rmki.kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aeki.kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iki.kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfa.kfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szfki.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wigner.mta.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">energia.mta.hu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>papi.kfki.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>papi.kfki.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papi.kfki.hu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papi.kfki.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>papi.kfki.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>papi.kfki.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.kfki.hu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.kfki.hu/indexeng.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>KFKI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>KFKI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>KFKI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papi.kfki.hu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papi.kfki.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.kfki.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kfki.hu/indexeng.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>KFKI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>KFKI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>KFKI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/passport-dev.pitt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/passport-dev.pitt.edu-idp-shibboleth.xml
index 9c9d2e11..beb0d9f8 100644
--- a/swamid-interfederations-2.0/passport-dev.pitt.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/passport-dev.pitt.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passport-dev.pitt.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://passport-dev.pitt.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">zTest_University of Pittsburgh Test IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Welcome to the Development Pitt Passport Single Sign-On Experience. DEVELOPMENT ONLY. Please do not select!</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://technology.pitt.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://technology.pitt.edu/research-computing/rc-incommon-shibboleth/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="400" width="400" xml:lang="en">https://www.pitt.edu/seal/seal-400x400-72rgb.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://passport-dev.pitt.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">zTest_University of Pittsburgh Test IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Welcome to the Development Pitt Passport Single Sign-On Experience. DEVELOPMENT ONLY. Please do not select!</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://technology.pitt.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://technology.pitt.edu/research-computing/rc-incommon-shibboleth/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="400" width="400" xml:lang="en">https://www.pitt.edu/seal/seal-400x400-72rgb.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUW3H3++dvCkid4KuYM8tuNdSy644wDQYJKoZIhvcNAQEL
 BQAwIDEeMBwGA1UEAwwVcGFzc3BvcnQtZGV2LnBpdHQuZWR1MB4XDTE1MDUxNDEz
 NTgzOVoXDTM1MDUxNDEzNTgzOVowIDEeMBwGA1UEAwwVcGFzc3BvcnQtZGV2LnBp
@@ -43,22 +43,22 @@ tUhwsASnCj55/LOmNrb3mNlvKug7FO306ryFsy+1BtqxkmDIegVC0/gjtmDU/bMl
 Y3dPQyC2sK2rC6bIcNi3gt3xqFVlGxug48xOsz1sT7o4JgH1vHahzcdJ8FFnnSop
 aq2AatC3YrkSrAwHUjOBIFVpYA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport-dev.pitt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport-dev.pitt.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport-dev.pitt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport-dev.pitt.edu/idp/profile/Shibboleth/SS"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport-dev.pitt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport-dev.pitt.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport-dev.pitt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport-dev.pitt.edu/idp/profile/Shibboleth/SS"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pitt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUW3H3++dvCkid4KuYM8tuNdSy644wDQYJKoZIhvcNAQEL
 BQAwIDEeMBwGA1UEAwwVcGFzc3BvcnQtZGV2LnBpdHQuZWR1MB4XDTE1MDUxNDEz
 NTgzOVoXDTM1MDUxNDEzNTgzOVowIDEeMBwGA1UEAwwVcGFzc3BvcnQtZGV2LnBp
@@ -78,31 +78,31 @@ tUhwsASnCj55/LOmNrb3mNlvKug7FO306ryFsy+1BtqxkmDIegVC0/gjtmDU/bMl
 Y3dPQyC2sK2rC6bIcNi3gt3xqFVlGxug48xOsz1sT7o4JgH1vHahzcdJ8FFnnSop
 aq2AatC3YrkSrAwHUjOBIFVpYA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport-dev.pitt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport-dev.pitt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Pittsburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">zTest_University of Pittsburgh Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pitt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anthony Jones</md:GivenName>
-      <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Anthony Jones</md:GivenName>
-      <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Anthony Jones</md:GivenName>
-      <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Anthony Jones</md:GivenName>
-      <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport-dev.pitt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport-dev.pitt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Pittsburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">zTest_University of Pittsburgh Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pitt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anthony Jones</md:GivenName>
+    <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anthony Jones</md:GivenName>
+    <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anthony Jones</md:GivenName>
+    <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Anthony Jones</md:GivenName>
+    <md:EmailAddress>abj@pitt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/passport.ucdenver.edu-oam-fed.xml b/swamid-interfederations-2.0/passport.ucdenver.edu-oam-fed.xml
index c2218093..4d92a5ed 100644
--- a/swamid-interfederations-2.0/passport.ucdenver.edu-oam-fed.xml
+++ b/swamid-interfederations-2.0/passport.ucdenver.edu-oam-fed.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passport.ucdenver.edu/oam/fed">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://passport.ucdenver.edu/error.php" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdenver.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Colorado Denver</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://passport.ucdenver.edu/error.php" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdenver.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Colorado Denver</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGTjCCBTagAwIBAgIQcrf03lov/4nHFrqxlUMn1jANBgkqhkiG9w0BAQsFADCB
 ljELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxPDA6BgNV
@@ -54,21 +54,21 @@ XqGHQFotSPzEuPClDrJDfVbCZ+0D7po+s6WveLmVshCIjDdbqBzBzlOnRO8yVnJ+
 zrNaYdps+5ZOgm3Ws7GGpjCOMN6vkcVih6znI9tLYNXw3s32N59YDe4Pd0MZrj0H
 sMz5wmNXniVnvA5jnYyWF3knHFo7bfjSLupE/pBX1lHmNA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.ucdenver.edu/oamfed/idp/soap" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.ucdenver.edu/logout.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport.ucdenver.edu/oamfed/idp/samlv20"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.ucdenver.edu/oamfed/idp/samlv20"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Colorado Denver</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Colorado Denver</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucdenver.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Edmundson</md:GivenName>
-      <md:EmailAddress>chris.edmundson@ucdenver.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.ucdenver.edu/oamfed/idp/soap" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.ucdenver.edu/logout.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport.ucdenver.edu/oamfed/idp/samlv20"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.ucdenver.edu/oamfed/idp/samlv20"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Colorado Denver</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Colorado Denver</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucdenver.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Edmundson</md:GivenName>
+    <md:EmailAddress>chris.edmundson@ucdenver.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
index 984f262c..a904c594 100644
--- a/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passport01.leeds.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-24T17:29:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-24T17:29:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Leeds</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://strategy.leeds.ac.uk/logo/uol16px.gif</mdui:Logo>
+        <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>129.11.0.0/16</mdui:IPHint>
+        <mdui:IPHint>194.80.232.0/22</mdui:IPHint>
+        <mdui:IPHint>194.82.12.0/22</mdui:IPHint>
+        <mdui:DomainHint>leeds.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.845917,-1.586838</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.818458,-1.565294</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.803158,-1.556153</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.803280,-1.558857</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.807892,-1.561518</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.810021,-1.557140</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.809185,-1.554394</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.805434,-1.550274</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.803939,-1.553707</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.806803,-1.555767</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.807948,-1.520169</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Leeds</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://strategy.leeds.ac.uk/logo/uol16px.gif</mdui:Logo>
-          <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>129.11.0.0/16</mdui:IPHint>
-          <mdui:IPHint>194.80.232.0/22</mdui:IPHint>
-          <mdui:IPHint>194.82.12.0/22</mdui:IPHint>
-          <mdui:DomainHint>leeds.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:53.845917,-1.586838</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.818458,-1.565294</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.803158,-1.556153</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.803280,-1.558857</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.807892,-1.561518</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.810021,-1.557140</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.809185,-1.554394</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.805434,-1.550274</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.803939,-1.553707</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.806803,-1.555767</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.807948,-1.520169</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpjCCA46gAwIBAgIQT0wPwUIkM3fyO2zwaKh1JzANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -61,26 +61,26 @@
 						8Q1QOJsAhskPhMelJA1Gg+U12l0Dg4IBAP7zfadWEpWuqdcvwH8JU0iEHYALiPFs
 						4pRCR0n/jBWInxzYIPiHaPiAKBbyhqEqv7HpuaYNQPRdYjmi5CnNv461
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport01.leeds.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport01.leeds.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpjCCA46gAwIBAgIQT0wPwUIkM3fyO2zwaKh1JzANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -107,26 +107,26 @@
 						8Q1QOJsAhskPhMelJA1Gg+U12l0Dg4IBAP7zfadWEpWuqdcvwH8JU0iEHYALiPFs
 						4pRCR0n/jBWInxzYIPiHaPiAKBbyhqEqv7HpuaYNQPRdYjmi5CnNv461
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Leeds</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Leeds</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://iss.leeds.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ISS Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@leeds.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Powell</md:SurName>
-      <md:EmailAddress>mailto:R.G.Powell@leeds.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Leeds</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Leeds</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://iss.leeds.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ISS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@leeds.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Powell</md:SurName>
+    <md:EmailAddress>mailto:R.G.Powell@leeds.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml b/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml
index df12c797..48d125bd 100644
--- a/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://penn.reunioniq.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://penn.reunioniq.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Penn Alumni Weekend</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Alumni weekend registration service</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://penn.reunioniq.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Penn Alumni Weekend</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Alumni weekend registration service</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDTCCAfWgAwIBAgIJAO7DzRSF699YMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMMEnBlbm4ucmV1bmlvbmlxLmNvbTAeFw0xNjAyMDIwMzA0NTNaFw0yNjAxMzAw
 MzA0NTNaMB0xGzAZBgNVBAMMEnBlbm4ucmV1bmlvbmlxLmNvbTCCASIwDQYJKoZI
@@ -38,34 +38,34 @@ GS3cV0xclj1qfl3yzQ6+NBqE1e5HA7zK6oeTCTOKpQ1rVuOE/JtCSU0VdDlWgGAH
 aZA2oIDGIZ8tHiskhBWwlaWTR3Z3t+TZKm5cKTCtSV1AgJ0vDiOU/6AVxVD3TOKx
 2Xj5hsW27PR5iSGrVcghwg0=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Penn Alumni Weekend</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Alumni weekend registration service</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CounterMarch Systems LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CounterMarch Systems LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.countermarch.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AlumnIQ Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@alumniq.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Steve Rittler</md:GivenName>
-      <md:EmailAddress>steve@alumniq.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Penn Alumni Weekend</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Alumni weekend registration service</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CounterMarch Systems LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CounterMarch Systems LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.countermarch.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AlumnIQ Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@alumniq.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Steve Rittler</md:GivenName>
+    <md:EmailAddress>steve@alumniq.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/perfsonarui.geant.org.xml b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
index 542fa47c..7a72306f 100644
--- a/swamid-interfederations-2.0/perfsonarui.geant.org.xml
+++ b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://perfsonarui.geant.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T12:03:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T12:03:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - Operations instance</mdui:Description>
+        <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GÉANT perfSONAR UI - Operations instance</mdui:Description>
-          <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFdTCCBF2gAwIBAgIQBruZHycalTIckX3CWVlozDANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -48,13 +48,13 @@
 						ESh9mXQAx0OxLyzZVgxntpNQ2qVirQ0TJhTPBY4RDC5xw56vwB18W79l1Ic13noD
 						Yn/y2E+4DRWc
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFdTCCBF2gAwIBAgIQBruZHycalTIckX3CWVlozDANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -86,36 +86,36 @@
 						ESh9mXQAx0OxLyzZVgxntpNQ2qVirQ0TJhTPBY4RDC5xw56vwB18W79l1Ic13noD
 						Yn/y2E+4DRWc
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceSOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">GÉANT perfSONAR UI</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - Operations instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ivan</md:GivenName>
-      <md:SurName>Garnizov</md:SurName>
-      <md:EmailAddress>mailto:ivan.garnizov@fau.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ivan</md:GivenName>
-      <md:SurName>Garnizov</md:SurName>
-      <md:EmailAddress>mailto:ivan.garnizov@fau.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceSOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GÉANT perfSONAR UI</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - Operations instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Garnizov</md:SurName>
+    <md:EmailAddress>mailto:ivan.garnizov@fau.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Garnizov</md:SurName>
+    <md:EmailAddress>mailto:ivan.garnizov@fau.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml
index 8d2d3617..dc0906bf 100644
--- a/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://peterborough.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-26T15:19:53Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-26T15:19:53Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">peterborough.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">peterborough.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkygAwIBAgIINjMwhVf3jFkwDQYJKoZIhvcNAQEFBQAwSTEmMCQGA1UE
 						CgwdUGV0ZXJib3JvdWdoIFJlZ2lvbmFsIENvbGxlZ2UxHzAdBgNVBAMMFmFhcy5w
 						ZXRlcmJvcm91Z2guYWMudWswHhcNMTIxMDE3MTMzODAwWhcNMjIxMDE3MTMzODAw
@@ -31,13 +31,13 @@
 						/HItds1Wpk/aLQjt2/wnywHR3yWeBQN4B4QqN5TrzkN5OdZZsFHyWIzTmeXTwJtM
 						8OV0uQf2TwU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkygAwIBAgIINjMwhVf3jFkwDQYJKoZIhvcNAQEFBQAwSTEmMCQGA1UE
 						CgwdUGV0ZXJib3JvdWdoIFJlZ2lvbmFsIENvbGxlZ2UxHzAdBgNVBAMMFmFhcy5w
 						ZXRlcmJvcm91Z2guYWMudWswHhcNMTIxMDE3MTMzODAwWhcNMjIxMDE3MTMzODAw
@@ -58,30 +58,30 @@
 						/HItds1Wpk/aLQjt2/wnywHR3yWeBQN4B4QqN5TrzkN5OdZZsFHyWIzTmeXTwJtM
 						8OV0uQf2TwU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aas.peterborough.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aas.peterborough.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Peterborough Regional College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Peterborough Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.peterborough.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Wildman</md:SurName>
-      <md:EmailAddress>mailto:Richard.wildman@peterborough.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lynton</md:GivenName>
-      <md:SurName>Towler</md:SurName>
-      <md:EmailAddress>mailto:Lynton.towler@peterborough.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Wildman</md:SurName>
-      <md:EmailAddress>mailto:Richard.wildman@peterborough.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aas.peterborough.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aas.peterborough.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Peterborough Regional College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Peterborough Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.peterborough.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Wildman</md:SurName>
+    <md:EmailAddress>mailto:Richard.wildman@peterborough.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lynton</md:GivenName>
+    <md:SurName>Towler</md:SurName>
+    <md:EmailAddress>mailto:Lynton.towler@peterborough.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Wildman</md:SurName>
+    <md:EmailAddress>mailto:Richard.wildman@peterborough.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml
index 4d4027c8..167ca3eb 100644
--- a/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://platformdev-secure.nature.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbzCCAlegAwIBAgIEL+I9azANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQGEwJVSzEPMA0GA1UE
 						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEmMCQGA1UEAxMdcGxh
 						dGZvcm1kZXYtc2VjdXJlLm5hdHVyZS5jb20wHhcNMTUwMzEzMDQyNjA1WhcNMjUwMzEwMDQyNjA1
@@ -25,27 +25,27 @@
 						0D1XRieehGxNVTw8Wq2T6JnEMBILq0j7AneiDr3X1i7U/XjKjNGf6e7Plh0qWbf3MVQKdJcS39Y+
 						Ji+ncYi6N+RRa5z+89CVTAeLRdCUhwYunfZh4A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (platformdev)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (platformdev)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml
index 43d1243e..a5f60c49 100644
--- a/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://platformdev-secure.palgrave-journals.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDhTCCAm2gAwIBAgIERl2PeTANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJVSzEPMA0GA1UE
 						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzExMC8GA1UEAxMocGxh
 						dGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTAeFw0xNTAzMTMwNDI4MTFaFw0y
@@ -25,27 +25,27 @@
 						9LGuGp9pdnxbTWnqvF+9f0WkWrq4h4H72+oYq997Kn9orv53qILaBnI+W5Y8dNmVAT+87IH3Lz4+
 						ZvLN9fSxfYhe2e8ffmz9+xWLV2K2pLPT/hfVr0OTRg3v+pJ3aB0obsBmkzluIZSMRIU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Palgrave Journals (platformdev)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Palgrave Journals (platformdev)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/play.smdb.kb.se.xml b/swamid-interfederations-2.0/play.smdb.kb.se.xml
index 20e4faaa..6072acbb 100644
--- a/swamid-interfederations-2.0/play.smdb.kb.se.xml
+++ b/swamid-interfederations-2.0/play.smdb.kb.se.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.smdb.kb.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Kungliga biblioteket play</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
-          <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.smdb.kb.se/user/logout"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.smdb.kb.se/user/authenticate" index="0"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SMDB Play</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SMDB Play</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://play.smdb.kb.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Administrator</md:SurName>
-      <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.smdb.kb.se/user/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.smdb.kb.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SMDB Play</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SMDB Play</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.smdb.kb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
index 6959625f..4d66a5c6 100644
--- a/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://playgen.a-n.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-17T15:04:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-17T15:04:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">a-n Resource</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Resource for visual artists: news, reviews, debate, research, publications, guides, toolkits....</mdui:Description>
+        <mdui:Logo height="100" width="197">https://www.a-n.co.uk/wp-content/themes/a-n/img/a-nlogoforfederation.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">a-n Resource</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Resource for visual artists: news, reviews, debate, research, publications, guides, toolkits....</mdui:Description>
-          <mdui:Logo height="100" width="197">https://www.a-n.co.uk/wp-content/themes/a-n/img/a-nlogoforfederation.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIJALZ0HnVpTZsXMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXBsYXlnZW4uYS1uLmNvLnVrMB4XDTEzMTAxODExMTYwMloXDTE2MTAxNzEx
 						MTYwMlowHDEaMBgGA1UEAxMRcGxheWdlbi5hLW4uY28udWswggEiMA0GCSqGSIb3
@@ -52,39 +52,39 @@
 						YfJHyQM480FeByWQGkzZyPOhIWIfrC0ynOBhkzKrPvjaLp+M4BHnixlVSBvjsRjH
 						8CVDPzFaPDFn3WDvQFi2bmBYvnIG3ULMJIcdjIVIoIOhe3Sz
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">An:Artists Information Company</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">a-n Resource</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.a-n.co.uk/about_an/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Eleonora</md:GivenName>
-      <md:SurName>Schinella</md:SurName>
-      <md:EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eleonora</md:GivenName>
-      <md:SurName>Schinella</md:SurName>
-      <md:EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">An:Artists Information Company</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">a-n Resource</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.a-n.co.uk/about_an/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Eleonora</md:GivenName>
+    <md:SurName>Schinella</md:SurName>
+    <md:EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eleonora</md:GivenName>
+    <md:SurName>Schinella</md:SurName>
+    <md:EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml
index 2686947e..dc346d40 100644
--- a/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pleiades.lesoco.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-27T15:24:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-27T15:24:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesoco.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesoco.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAKbHiecwCXwEW8jzRANDUcHw0nS3MA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29jby5hYy51azAeFw0xMzA5MDQx
 						NDQ5MjBaFw0zMzA5MDQxNDQ5MjBaMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29j
@@ -32,26 +32,26 @@
 						MlS0EzvvZ6OgubfsZWeevOMHj5lPtwQGVrxtssl9uWEeA7ca7ZJq8J57Bk6IJIwc
 						TtsUWjpvdWLpLWoB34gTflTw080=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pleiades.lesoco.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesoco.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pleiades.lesoco.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesoco.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAKbHiecwCXwEW8jzRANDUcHw0nS3MA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29jby5hYy51azAeFw0xMzA5MDQx
 						NDQ5MjBaFw0zMzA5MDQxNDQ5MjBaMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29j
@@ -71,27 +71,27 @@
 						MlS0EzvvZ6OgubfsZWeevOMHj5lPtwQGVrxtssl9uWEeA7ca7ZJq8J57Bk6IJIwc
 						TtsUWjpvdWLpLWoB34gTflTw080=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LeSoCo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LeSoCo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lesoco.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Humphries</md:SurName>
-      <md:EmailAddress>mailto:dan.humphries@lesoco.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>West</md:SurName>
-      <md:EmailAddress>mailto:John.West@lesoco.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LeSoCo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LeSoCo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lesoco.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Humphries</md:SurName>
+    <md:EmailAddress>mailto:dan.humphries@lesoco.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>West</md:SurName>
+    <md:EmailAddress>mailto:John.West@lesoco.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml
index deda7c35..06bf28f4 100644
--- a/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://plymouth.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-10T08:10:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-10T08:10:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEETCCAvmgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBoMSAwHgYDVQQDFBcqLnBs
 						eW1vdXRoLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMx
 						KDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmcwHhcNMTQx
@@ -36,25 +36,25 @@
 						7VL9EoyXOzN2+FHbYqklWkem9aYNyz3fhoaydMwyaYL5bNySawbe4G6Fpk3GggWX
 						fVux9oGcU7F9DO1KMou6PeO1G44DB8z6KE6KxwE2WSzQ21eAxA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Plymouth University Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Plymouth University Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portail.u-picardie.fr.xml b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
index 891f2f05..a8a1b5f9 100644
--- a/swamid-interfederations-2.0/portail.u-picardie.fr.xml
+++ b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portail.u-picardie.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-02T16:43:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-02T16:43:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Captive Portal UPJV</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://portail.u-picardie.fr/shibauth.php</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Eduspot</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Portail Captif UPJV</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Eduspot</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Captive Portal UPJV</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://portail.u-picardie.fr/shibauth.php</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Eduspot</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Portail Captif UPJV</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Eduspot</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
@@ -50,13 +50,13 @@ Fw5YllIUfrdyDXq8Y11DJ/vvZ8fezanidQX1QOtf3YqB6E6XB0iDebyaw92FMe2K
 CWc9pJ6KeATZnLv6m4m3+cfGRD9Oczou7iHD6nt2Cc2NMlfKJXBy8l1FlLMJgzAF
 Jeo/JF+pa6rXH5QzpgLaL56jnm2C62ghYn4OMZlD1hzzTRGsoq2qWguZnyk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
@@ -82,27 +82,26 @@ Fw5YllIUfrdyDXq8Y11DJ/vvZ8fezanidQX1QOtf3YqB6E6XB0iDebyaw92FMe2K
 CWc9pJ6KeATZnLv6m4m3+cfGRD9Oczou7iHD6nt2Cc2NMlfKJXBy8l1FlLMJgzAF
 Jeo/JF+pa6rXH5QzpgLaL56jnm2C62ghYn4OMZlD1hzzTRGsoq2qWguZnyk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Portail Captif UPJV</md:ServiceName>
-        <md:ServiceName xml:lang="en">Captive Portal UPJV</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Eduspot</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Eduspot</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-picardie.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Christophe Dupreuil</md:SurName>
-      <md:EmailAddress>christophe.dupreuil@u-picardie.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Portail Captif UPJV</md:ServiceName>
+      <md:ServiceName xml:lang="en">Captive Portal UPJV</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Eduspot</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Eduspot</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-picardie.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Christophe Dupreuil</md:SurName>
+    <md:EmailAddress>christophe.dupreuil@u-picardie.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
index bd224242..ec17a904 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">INL Portal - CLARIN Dienste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">INL portal - CLARIN services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</mdui:Description>
+        <mdui:Description xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</mdui:Description>
+        <mdui:Logo height="9" width="16">https://portal.clarin.inl.nl/images/logo_portal_verysmall.jpg</mdui:Logo>
+        <mdui:Logo height="281" width="500">https://portal.clarin.inl.nl/images/logo_portal.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">INL Portal - CLARIN Dienste</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">INL portal - CLARIN services</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</mdui:Description>
-          <mdui:Description xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</mdui:Description>
-          <mdui:Logo height="9" width="16">https://portal.clarin.inl.nl/images/logo_portal_verysmall.jpg</mdui:Logo>
-          <mdui:Logo height="281" width="500">https://portal.clarin.inl.nl/images/logo_portal.jpg</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
 BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
@@ -64,44 +64,44 @@ JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
 EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
 zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">INL Portal - CLARIN Dienste</md:ServiceName>
-        <md:ServiceName xml:lang="en">INL portal - CLARIN services</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>servicedesk@inl.nl</md:GivenName>
-      <md:SurName>INL</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>servicedesk@inl.nl</md:GivenName>
-      <md:SurName>INL</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>systeembeheer@inl.nl</md:GivenName>
-      <md:SurName>INL</md:SurName>
-      <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">INL Portal - CLARIN Dienste</md:ServiceName>
+      <md:ServiceName xml:lang="en">INL portal - CLARIN services</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml b/swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml
index c4498179..8886d4b9 100644
--- a/swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.edu-host.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-12T11:03:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-12T11:03:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://portal.edu-host.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.edu-host.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Edu-Host.com</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Free web hosting for education.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://portal.edu-host.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.edu-host.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Edu-Host.com</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Free web hosting for education.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJjCCAg4CCQCJr4zArRpCITANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJH
 						QjEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MREwDwYDVQQKDAhFZHUgSG9zdDEcMBoG
 						A1UEAwwTcG9ydGFsLmVkdS1ob3N0LmNvbTAeFw0xNjAyMTAxMjI4NThaFw0zNjAy
@@ -52,50 +52,50 @@
 						BPFO5kpcHn/8Q16JLAruj6hUpCV1ka/jQYXjV+uSVGPT5O+gq88VkY/HQv3FOyCe
 						cjzHoNHRTx4a/SCLa9INKR2MWmInkTVjx2ThTM0ld2Pzig+SgSXY5q9N
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.edu-host.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.edu-host.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.edu-host.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Edu-Host.com</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Free web hosting for education.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edu-Host.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edu-host.com/about-us/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@edu-host.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@edu-host.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.edu-host.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.edu-host.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.edu-host.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Edu-Host.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Free web hosting for education.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Overt Software Solutions Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edu-Host.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edu-host.com/about-us/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@edu-host.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@edu-host.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml b/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
index 395f9a50..1e0f2a7a 100644
--- a/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.moonshot.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-04T09:59:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-04T09:59:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moonshot Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</mdui:Description>
+        <mdui:Logo height="400" width="400">https://wiki.moonshot.ja.net/download/attachments/360449/global.logo?version=2&amp;modificationDate=1390577635000&amp;api=v2</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://assent.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://assent.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Moonshot Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</mdui:Description>
-          <mdui:Logo height="400" width="400">https://wiki.moonshot.ja.net/download/attachments/360449/global.logo?version=2&amp;modificationDate=1390577635000&amp;api=v2</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://assent.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://assent.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/TCCAeWgAwIBAgIJAPSyqGhwjBRoMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEnAxLm1vb25zaG90LmphLm5ldDAeFw0xNDA2MDMxNTE5MzVaFw0yNDA1MzEx
 						NTE5MzVaMB0xGzAZBgNVBAMTEnAxLm1vb25zaG90LmphLm5ldDCCASIwDQYJKoZI
@@ -48,47 +48,47 @@
 						XbypI2H0IHybvdGVRRGXWQpkPrjUXnu4D5m5jc+C+/XqzIiaN3/FEAG0fKdIHHDt
 						HQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assent.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">Moonshot Portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Moonshot Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://assent.jisc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Bishop</md:SurName>
-      <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Bishop</md:SurName>
-      <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assent.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">Moonshot Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moonshot Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://assent.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Bishop</md:SurName>
+    <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Bishop</md:SurName>
+    <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
index 3732ddc2..5a1535d7 100644
--- a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portofranco.ufma.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufma.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufma.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufma.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufma.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufma.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufma.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAoTJ1VGTUEgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmhhbzEMMAoGA1UECxMDTlRJMSEw
 HwYJKoZIhvcNAQkBFhJkaWVnby5sdWlzQHVmbWEuYnIxETAPBgNVBAcTCFNhbyBM
@@ -45,26 +45,26 @@ WskJDJaGkQHHnzgWFBByR/hnx2+78lh0b65fN71yNvIurLmyCU5pPktvBpCIGB6e
 q75Pgfria4aDAF9QLVPkjsGH9v67hyUm6UVG3wWVQIPDr8yPJuyjpBQMsQjh0joV
 KppwAy5eNWAi4mWRFM4cGIz4BEG+BogTKBTVyF1/sNjC6Q==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://portofranco.ufma.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portofranco.ufma.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufma.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://portofranco.ufma.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portofranco.ufma.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufma.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAoTJ1VGTUEgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmhhbzEMMAoGA1UECxMDTlRJMSEw
@@ -89,24 +89,24 @@ q75Pgfria4aDAF9QLVPkjsGH9v67hyUm6UVG3wWVQIPDr8yPJuyjpBQMsQjh0joV
 KppwAy5eNWAi4mWRFM4cGIz4BEG+BogTKBTVyF1/sNjC6Q==
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFMA - Universidade Federal do Maranhao</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufma.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufma.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Diego Figueiredo</md:SurName>
-      <md:EmailAddress>diego.luis@ufma.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFMA - Universidade Federal do Maranhao</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufma.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufma.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Diego Figueiredo</md:SurName>
+    <md:EmailAddress>diego.luis@ufma.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml
index e7254353..7d86d02d 100644
--- a/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pp.webauth.soton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-02T14:13:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-02T14:13:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAKwAy5Y30bYosT2rmKq0Nj3qJE+DMA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFnBwLndlYmF1dGguc290b24uYWMudWswHhcNMTEwNDA1
 						MTYxNTA5WhcNMzEwNDA1MTYxNTA5WjAhMR8wHQYDVQQDExZwcC53ZWJhdXRoLnNv
@@ -37,26 +37,26 @@
 						EddY9+fUrCdg5phPGLs5NLiYi7mTepVcUKkO07jjxON2mLDiRsVQpzMRoo7hscag
 						zdj3Io3snavfZFcTxv/baypmvAmZ0ymK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVAKwAy5Y30bYosT2rmKq0Nj3qJE+DMA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFnBwLndlYmF1dGguc290b24uYWMudWswHhcNMTEwNDA1
 						MTYxNTA5WhcNMzEwNDA1MTYxNTA5WjAhMR8wHQYDVQQDExZwcC53ZWJhdXRoLnNv
@@ -76,26 +76,26 @@
 						EddY9+fUrCdg5phPGLs5NLiYi7mTepVcUKkO07jjxON2mLDiRsVQpzMRoo7hscag
 						zdj3Io3snavfZFcTxv/baypmvAmZ0ymK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Southampton (Testing)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.soton.ac.uk/iss/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serviceline</md:GivenName>
-      <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Clayton</md:GivenName>
-      <md:SurName>Peters</md:SurName>
-      <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Southampton (Testing)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.soton.ac.uk/iss/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serviceline</md:GivenName>
+    <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clayton</md:GivenName>
+    <md:SurName>Peters</md:SurName>
+    <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
index 7e27ecfe..032e9d93 100644
--- a/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
+++ b/swamid-interfederations-2.0/ppms.eu-manchester-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppms.eu/manchester/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-07T12:23:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-07T12:23:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution for the University of Manchester</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution for the University of Manchester</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAPz0WtwkZDRdMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmV1MS1zdHJhdG9jb3JlMB4XDTEzMDIyMDAyMTc0M1oXDTIzMDIxODAyMTc0
 						M1owGTEXMBUGA1UEAxMOZXUxLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -51,42 +51,42 @@
 						q6YQKBzEpgV9ERLVaa1gEA1qYZaKrxjHp8G3T6wLpeKEiufCb59CPEbJkGOrXlWO
 						7Qc3nJyR1cdsp5K2qqW6f14n97mp7yfKldJJX6NQJ7dUQ4TD/A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stratocore</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stratocore.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stratocore Support</md:GivenName>
-      <md:EmailAddress>mailto:support@stratocore.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mathieu</md:GivenName>
-      <md:SurName>Marchand</md:SurName>
-      <md:EmailAddress>mailto:hosting@stratocore.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corefacilities.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stratocore</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stratocore PPMS for the University of Manchester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stratocore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stratocore Support</md:GivenName>
+    <md:EmailAddress>mailto:support@stratocore.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mathieu</md:GivenName>
+    <md:SurName>Marchand</md:SurName>
+    <md:EmailAddress>mailto:hosting@stratocore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppms.eu-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-shibboleth.xml
index 12798535..e312be9c 100644
--- a/swamid-interfederations-2.0/ppms.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/ppms.eu-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppms.eu/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:57:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:57:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ppms.eu/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">PPMS core facility management solution</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PPMS is a powerful, feature rich core facility resource management solution</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ppms.eu/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">PPMS core facility management solution</mdui:DisplayName>
-          <mdui:Description xml:lang="en">PPMS is a powerful, feature rich core facility resource management solution</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAPz0WtwkZDRdMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmV1MS1zdHJhdG9jb3JlMB4XDTEzMDIyMDAyMTc0M1oXDTIzMDIxODAyMTc0
 						M1owGTEXMBUGA1UEAxMOZXUxLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -51,42 +51,42 @@
 						q6YQKBzEpgV9ERLVaa1gEA1qYZaKrxjHp8G3T6wLpeKEiufCb59CPEbJkGOrXlWO
 						7Qc3nJyR1cdsp5K2qqW6f14n97mp7yfKldJJX6NQJ7dUQ4TD/A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.eu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ppms.eu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.eu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.eu/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ppms.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ppms.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ppms.eu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ppms.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stratocore</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PPMS core facility management solution</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stratocore.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stratocore Support</md:GivenName>
-      <md:EmailAddress>mailto:support@stratocore.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mathieu</md:GivenName>
-      <md:SurName>Marchand</md:SurName>
-      <md:EmailAddress>mailto:hosting@stratocore.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ppms.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ppms.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ppms.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ppms.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ppms.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stratocore</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PPMS core facility management solution</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stratocore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stratocore Support</md:GivenName>
+    <md:EmailAddress>mailto:support@stratocore.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mathieu</md:GivenName>
+    <md:SurName>Marchand</md:SurName>
+    <md:EmailAddress>mailto:hosting@stratocore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppms.us-shibboleth.xml b/swamid-interfederations-2.0/ppms.us-shibboleth.xml
index f655b398..e77ac8e0 100644
--- a/swamid-interfederations-2.0/ppms.us-shibboleth.xml
+++ b/swamid-interfederations-2.0/ppms.us-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ppms.us/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-27T09:54:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-27T09:54:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ppms.us/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stratocore PPMS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution</mdui:Description>
+        <mdui:Logo height="59" width="143">https://ppms.us/stratocore.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ppms.us/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stratocore PPMS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Stratocore's PPMS core facility management solution</mdui:Description>
-          <mdui:Logo height="59" width="143">https://ppms.us/stratocore.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAOEhYhSD/dsnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDnVzMy1zdHJhdG9jb3JlMB4XDTEzMDIyMDEyNDgzMFoXDTIzMDIxODEyNDgz
 						MFowGTEXMBUGA1UEAxMOdXMzLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
@@ -51,42 +51,42 @@
 						+q4KpBIKomdlCVpcWwk9CKsCXU7jyB/dUhTzxC2nYAwcAaLGzUU5d+G0AiT3+MC9
 						N6uWyTkqpWnubodtg4vrzhLTbSWl9Sr5Ai90hk3BdIGl/GKM7Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.us/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.us/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ppms.us/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.us/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.us/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.us/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ppms.us/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.us/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ppms.us/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ppms.us/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ppms.us/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stratocore</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stratocore PPMS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stratocore.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stratocore Support</md:GivenName>
-      <md:EmailAddress>mailto:support@stratocore.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mathieu</md:GivenName>
-      <md:SurName>Marchand</md:SurName>
-      <md:EmailAddress>mailto:hosting@stratocore.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.us/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.us/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ppms.us/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.us/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.us/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.us/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ppms.us/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.us/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ppms.us/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ppms.us/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ppms.us/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stratocore</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stratocore PPMS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stratocore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stratocore Support</md:GivenName>
+    <md:EmailAddress>mailto:support@stratocore.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mathieu</md:GivenName>
+    <md:SurName>Marchand</md:SurName>
+    <md:EmailAddress>mailto:hosting@stratocore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml b/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml
index a89f780d..caa5d9fa 100644
--- a/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://prd.thieme.de/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-01T13:14:11Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-01T13:14:11Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC1zCCAb+gAwIBAgIEb/5NzDANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExFwcm9maWxlLnRo
 						aWVtZS5kZTAeFw0xNjAzMjMwODQwMTNaFw0xOTAzMjMwODQwMTNaMBwxGjAYBgNVBAMTEXByb2Zp
 						bGUudGhpZW1lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhW+zMHny/PSoDPO2
@@ -22,26 +22,26 @@
 						ZF4z4EWGSDbVSoeBRTJugA1vZ/BotKKjG+3KGD+xHss+Djz4jQW8r4gXAdtYrXk6uOuBPlTcVCoV
 						1LFEbdHoKfit9gY40t2n5rT+9z+eIJqLxco9rZvsy8DLTpRFOosRxo3ruCn0uNs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Georg Thieme Verlag KG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Georg Thieme Verlag KG</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.thieme.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shib-support@thieme.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shib-support@thieme.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Georg Thieme Verlag KG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Georg Thieme Verlag KG</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.thieme.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shib-support@thieme.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shib-support@thieme.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml
index f96433f2..a5ef7bed 100644
--- a/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://prdidp.uncg.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.uncg.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncg.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of North Carolina at Greensboro</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNCG is a public liberal arts and research university in Greensboro, North Carolina and constituent institution of the UNC system.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uncg.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://policy.uncg.edu/acceptable_use/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="96" width="101" xml:lang="en">https://uncgcdn.blob.core.windows.net/inc/formatted-uncg-incommon.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.uncg.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncg.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of North Carolina at Greensboro</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNCG is a public liberal arts and research university in Greensboro, North Carolina and constituent institution of the UNC system.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uncg.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://policy.uncg.edu/acceptable_use/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="96" width="101" xml:lang="en">https://uncgcdn.blob.core.windows.net/inc/formatted-uncg-incommon.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIJAMqxN/v9QtC8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3ByZGlkcC51bmNnLmVkdTAeFw0xMTA2MTMxNTI3MzdaFw0yMTA2MTMxNTI3
 MzdaMBoxGDAWBgNVBAMTD3ByZGlkcC51bmNnLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -45,24 +45,24 @@ Bu22LQTtR6UgA6NvQR7Znv/XrtHKCzkcEwKWTuZjiZQqjpItTjYl3Fz/BOITT+57
 +lxD/J8U1TYtgs0D5Im9Ttt09xRzeXB0+gHWUIV7oM/KURL8RO6fPxj1gE5wcQrt
 9C/plVjK
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uncg.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uncg.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uncg.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uncg.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uncg.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncg.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uncg.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uncg.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uncg.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uncg.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uncg.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncg.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIJAMqxN/v9QtC8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3ByZGlkcC51bmNnLmVkdTAeFw0xMTA2MTMxNTI3MzdaFw0yMTA2MTMxNTI3
 MzdaMBoxGDAWBgNVBAMTD3ByZGlkcC51bmNnLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -82,27 +82,27 @@ Bu22LQTtR6UgA6NvQR7Znv/XrtHKCzkcEwKWTuZjiZQqjpItTjYl3Fz/BOITT+57
 +lxD/J8U1TYtgs0D5Im9Ttt09xRzeXB0+gHWUIV7oM/KURL8RO6fPxj1gE5wcQrt
 9C/plVjK
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uncg.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Susan Hensley</md:GivenName>
-      <md:EmailAddress>sshensle@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert Gorrell</md:GivenName>
-      <md:EmailAddress>rwgorrel@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk (6-TECH)</md:GivenName>
-      <md:EmailAddress>6-tech@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uncg.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Susan Hensley</md:GivenName>
+    <md:EmailAddress>sshensle@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert Gorrell</md:GivenName>
+    <md:EmailAddress>rwgorrel@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk (6-TECH)</md:GivenName>
+    <md:EmailAddress>6-tech@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
index 1316f479..77f7a164 100644
--- a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://preprod-meeting.renater.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-11-07T15:23:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-11-07T15:23:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">plateforme de preproduction pour le service rendez vous</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://dev-rdv.visio.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">plateforme de preproduction pour le service rendez vous</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">plateforme de preproduction pour le service rendez vous</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">plateforme de preproduction pour le service rendez vous</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">plateforme de preproduction pour le service rendez vous</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://dev-rdv.visio.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">plateforme de preproduction pour le service rendez vous</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">plateforme de preproduction pour le service rendez vous</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">plateforme de preproduction pour le service rendez vous</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPjCCAiagAwIBAgIJAL5YcwA5sxaHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5mcjAeFw0xNTAyMjAxMjA5MDVaFw0y
 NTAyMTcxMjA5MDVaMCMxITAfBgNVBAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5m
@@ -45,13 +45,13 @@ enR09sxSmXELZwEmrESTbuRlB+c9qhdEpxR/Mjc0g51lAyrI/jnTDeJWKg/VCaI5
 v2pL4O5/2DnqrGVffjSIqLB2
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPjCCAiagAwIBAgIJAL5YcwA5sxaHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5mcjAeFw0xNTAyMjAxMjA5MDVaFw0y
 NTAyMTcxMjA5MDVaMCMxITAfBgNVBAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5m
@@ -72,37 +72,31 @@ enR09sxSmXELZwEmrESTbuRlB+c9qhdEpxR/Mjc0g51lAyrI/jnTDeJWKg/VCaI5
 v2pL4O5/2DnqrGVffjSIqLB2
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-rdv.visio.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev-rdv.visio.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">plateforme de preproduction pour le service rendez vous</md:ServiceName>
-        <md:ServiceName xml:lang="en">plateforme de preproduction pour le service rendez vous</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">plateforme de preproduction pour le service rendez vous</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">plateforme de preproduction pour le service rendez vous</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sami Honein</md:SurName>
-      <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-rdv.visio.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev-rdv.visio.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">plateforme de preproduction pour le service rendez vous</md:ServiceName>
+      <md:ServiceName xml:lang="en">plateforme de preproduction pour le service rendez vous</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">plateforme de preproduction pour le service rendez vous</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">plateforme de preproduction pour le service rendez vous</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sami Honein</md:SurName>
+    <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
index 85647e4e..38a1716e 100644
--- a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://press.endocrine.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:17:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:17:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIJAIDfY9h2oTCVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTMxMjExMDUzOTQ2WhcNMjMxMjA5
 						MDUzOTQ2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
@@ -28,24 +28,24 @@
 						wDROxGmfeBQHWTnOJkbhLdE2Rv1MqCWP4XzA1a8PsuBxyboLCQUYxsn4J8hOP3ZN
 						b3NsdouxzxBdj+PJxciM9yTP1Ju8l1QfVXC68KZ2WeEowX3e84BW8jaZ0OM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://press.endocrine.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://press.endocrine.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Endocrine Press</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://press.endocrine.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://press.endocrine.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://press.endocrine.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Endocrine Press</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://press.endocrine.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml b/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml
index 06cd041a..49947a2f 100644
--- a/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml
+++ b/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://primo.abdn.ac.uk/shib">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC1jCCAb6gAwIBAgIJAMK+qzxsAVY1MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
 						BAMTBXByaW1vMB4XDTExMDcxMjExMTY0MloXDTIxMDcwOTExMTY0MlowEDEOMAwG
 						A1UEAxMFcHJpbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfZEZ7
@@ -29,34 +29,34 @@
 						VJF/Sd68b9N+z5cSyYeNYFdy/dy29I/GNgAdVL4SuKXRTjn4oJCZQP9v7S8vSJYE
 						heKgkUPSXP4Lww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Aberdeen: Primo Resource Discovery</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abdn.ac.uk/library/about.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chrissie</md:GivenName>
-      <md:SurName>Macarthur</md:SurName>
-      <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chrissie</md:GivenName>
-      <md:SurName>Macarthur</md:SurName>
-      <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Aberdeen: Primo Resource Discovery</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abdn.ac.uk/library/about.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chrissie</md:GivenName>
+    <md:SurName>Macarthur</md:SurName>
+    <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chrissie</md:GivenName>
+    <md:SurName>Macarthur</md:SurName>
+    <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml b/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml
index ae7a8b5c..6b93e460 100644
--- a/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml
+++ b/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://primotest.abdn.ac.uk/shib">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJANJZVmK8+XpGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHByaW1vdGVzdC5hYmRuLmFjLnVrMB4XDTExMDcxMzA3NTEzNloXDTIxMDcx
 						MDA3NTEzNlowHzEdMBsGA1UEAxMUcHJpbW90ZXN0LmFiZG4uYWMudWswggEiMA0G
@@ -30,34 +30,34 @@
 						KKuNQE75OgaFXXpH1sbGq6ZGQk6Lc2YIY4NxolHMzWFhuF+ERp73ZMgItrKlGGez
 						oBMSqs6ZDw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Aberdeen: Primo Resource Discovery (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abdn.ac.uk/library/about.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chrissie</md:GivenName>
-      <md:SurName>Macarthur</md:SurName>
-      <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chrissie</md:GivenName>
-      <md:SurName>Macarthur</md:SurName>
-      <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Aberdeen: Primo Resource Discovery (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abdn.ac.uk/library/about.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chrissie</md:GivenName>
+    <md:SurName>Macarthur</md:SurName>
+    <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chrissie</md:GivenName>
+    <md:SurName>Macarthur</md:SurName>
+    <md:EmailAddress>mailto:c.macarthur@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml b/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml
index 054bf55f..94fa0243 100644
--- a/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/prisma.research.se-shibboleth.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://prisma.research.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <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://prisma.research.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://prisma.research.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Prisma - prisma.research.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Prisma - prisma.research.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">I Prisma kan du ansöka om forskningsmedel och hantera dina beviljade bidrag</mdui:Description>
+        <mdui:Description xml:lang="en">Prisma is a joint portal used by several research funders</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://prisma.research.se/Localization/SelectLanguage?languageName=SV&amp;returnUrl=%2FSupport%3Ftitle%3DPersonuppgifter%26description%3D%255BSupport%255D%255BPersonalDetailsDescription%255D%26X-Requested-With%3DXMLHttpRequest</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://prisma.research.se/Support?title=Privacy%20information&amp;description=%5BSupport%5D%5BPersonalDetailsDescription%5D</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md: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://prisma.research.se/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://prisma.research.se/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Prisma - prisma.research.se</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Prisma - prisma.research.se</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">I Prisma kan du ansöka om forskningsmedel och hantera dina beviljade bidrag</mdui:Description>
-          <mdui:Description xml:lang="en">Prisma is a joint portal used by several research funders</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://prisma.research.se/Localization/SelectLanguage?languageName=SV&amp;returnUrl=%2FSupport%3Ftitle%3DPersonuppgifter%26description%3D%255BSupport%255D%255BPersonalDetailsDescription%255D%26X-Requested-With%3DXMLHttpRequest</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://prisma.research.se/Support?title=Privacy%20information&amp;description=%5BSupport%5D%5BPersonalDetailsDescription%5D</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>prisma.research.se</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=prisma.research.se</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAPU2IVw8AYQPMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>prisma.research.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=prisma.research.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAPU2IVw8AYQPMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnByaXNtYS5yZXNlYXJjaC5zZTAeFw0xNDA5MDMxNDIxMTlaFw0yNDA4MzEx
 NDIxMTlaMB0xGzAZBgNVBAMTEnByaXNtYS5yZXNlYXJjaC5zZTCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqrAUhqBgDhOW/hxr8dEk8nb8keS8ofEi1T
@@ -64,46 +64,46 @@ q6rkibKrh2uDmQ+BKvnBfSjuXfDTm2yvdPfk/WAG9f+besVy76dwUWx0GAZXhPm5
 kmPkqx0M3z4YLufx99FWaMygNYUnnge7O348i/SW7UvVALhU4391vqGw+XcSAMh6
 Yw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://prisma.research.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://prisma.research.se/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://prisma.research.se/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prisma.research.se/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prisma.research.se/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prisma.research.se/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prisma.research.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://prisma.research.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prisma.research.se/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prisma.research.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Prisma - prisma.research.se</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Prisma - prisma.research.se</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Prisma - prisma.research.se</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://prisma.research.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Borg</md:SurName>
-      <md:EmailAddress>mailto:peter.borg@vr.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Chrudina</md:SurName>
-      <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://prisma.research.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://prisma.research.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://prisma.research.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prisma.research.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prisma.research.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://prisma.research.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://prisma.research.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://prisma.research.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prisma.research.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prisma.research.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Prisma - prisma.research.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Prisma - prisma.research.se</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Prisma - prisma.research.se</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://prisma.research.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Borg</md:SurName>
+    <md:EmailAddress>mailto:peter.borg@vr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Chrudina</md:SurName>
+    <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/prod.worktribe.com-shibboleth.xml b/swamid-interfederations-2.0/prod.worktribe.com-shibboleth.xml
index 892ccc06..56498a26 100644
--- a/swamid-interfederations-2.0/prod.worktribe.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/prod.worktribe.com-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://prod.worktribe.com/shibboleth">
-    <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T11:06:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T11:06:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIJAM+i8aNSRJPwMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEnByb2Qud29ya3RyaWJlLmNvbTAeFw0xNjA0MTkxNTEyNDdaFw0zMTA0MTYx
 						NTEyNDdaMB0xGzAZBgNVBAMTEnByb2Qud29ya3RyaWJlLmNvbTCCASIwDQYJKoZI
@@ -44,78 +44,78 @@
 						eU6CfY5+oOnS+ZznBYpALSifq83M6hN8mjUygzRAiCYu3gmbVrOcb0GsGSxVYmyE
 						Fh8qHHFsIzq15Rjblb04Yo6QZ4+XY/QB8vANEhOpjaPCcq3KbRb8vw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Worktribe Prod</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Worktribe Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Worktribe (Production)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.worktribe.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@worktribe.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Southall</md:SurName>
-      <md:EmailAddress>mailto:matt.southall@worktribe.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Worktribe Prod</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Worktribe Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Worktribe (Production)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worktribe.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@worktribe.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Southall</md:SurName>
+    <md:EmailAddress>mailto:matt.southall@worktribe.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml b/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml
index 5da38faa..9a7377b5 100644
--- a/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://projecteuclid.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-11T13:43:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-11T13:43:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://projecteuclid.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://projecteuclid.org/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://projecteuclid.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://projecteuclid.org/Shibboleth.sso/DS" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Project Euclid</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Project Euclid, an online publishing service for theoretical and applied mathematics and statistics.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://projecteuclid.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://projecteuclid.org/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://projecteuclid.org/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://projecteuclid.org/Shibboleth.sso/DS" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Project Euclid</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Project Euclid, an online publishing service for theoretical and applied mathematics and statistics.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJANq1a2ZDBykIMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
 						BAMTJXNmLWxpYi1hcHAtMDA4LnNlcnZlcmZhcm0uY29ybmVsbC5lZHUwHhcNMTMw
 						NTMxMTUwNjIyWhcNMjMwNTI5MTUwNjIyWjAwMS4wLAYDVQQDEyVzZi1saWItYXBw
@@ -50,50 +50,50 @@
 						fQHR5b61zSESkl8vo6eFRgzRnETr/fNIj08nhs3UCEfuYVy1yVKv2lHLzIvDTot/
 						TyOzJ1GTj16SNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://projecteuclid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://projecteuclid.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://projecteuclid.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projecteuclid.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://projecteuclid.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projecteuclid.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://projecteuclid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Project Euclid</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://projecteuclid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://projecteuclid.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://projecteuclid.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projecteuclid.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://projecteuclid.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projecteuclid.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://projecteuclid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Project Euclid</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				Project Euclid, an online publishing service for theoretical and applied mathematics and statistics.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cornell University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Project Euclid</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://projecteuclid.org/about</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Ruddy</md:SurName>
-      <md:EmailAddress>mailto:dwr4@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shinwoo</md:GivenName>
-      <md:SurName>Kim</md:SurName>
-      <md:EmailAddress>mailto:EUCLID-TECH-L@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cornell University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Project Euclid</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://projecteuclid.org/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Ruddy</md:SurName>
+    <md:EmailAddress>mailto:dwr4@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shinwoo</md:GivenName>
+    <md:SurName>Kim</md:SurName>
+    <md:EmailAddress>mailto:EUCLID-TECH-L@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml b/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
index fb58abce..9a304afa 100644
--- a/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://projets-webent.univ-lille1.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-13T20:21:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-13T20:21:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université of Lille 1 - projets-webent</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://projets-webent.univ-lille1.fr/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lille 1 - projets-webent</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Cette plate-forme  permet faire de la gestion de projets inter-établissements.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université of Lille 1 - projets-webent</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://projets-webent.univ-lille1.fr/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lille 1 - projets-webent</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Cette plate-forme  permet faire de la gestion de projets inter-établissements.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHjCCAgagAwIBAgIJANuKP33h+ACZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 BAMTHXByb2pldHMtd2ViZW50LnVuaXYtbGlsbGUxLmZyMB4XDTE0MTAzMTIwMTkz
 NloXDTI0MTAyODIwMTkzNlowKDEmMCQGA1UEAxMdcHJvamV0cy13ZWJlbnQudW5p
@@ -43,13 +43,13 @@ J2AcE45AwuM2i0eK9IR+/f4JCJh4R/ikJii2S/HiDn1DZu4M5hexcBxk16tC7nMR
 y2eIDhGMnEJp23NcEvLJPGEHx+9XwZcSkn8aNI8r7LwaXA==
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHjCCAgagAwIBAgIJANuKP33h+ACZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 BAMTHXByb2pldHMtd2ViZW50LnVuaXYtbGlsbGUxLmZyMB4XDTE0MTAzMTIwMTkz
 NloXDTI0MTAyODIwMTkzNlowKDEmMCQGA1UEAxMdcHJvamV0cy13ZWJlbnQudW5p
@@ -69,30 +69,27 @@ J2AcE45AwuM2i0eK9IR+/f4JCJh4R/ikJii2S/HiDn1DZu4M5hexcBxk16tC7nMR
 y2eIDhGMnEJp23NcEvLJPGEHx+9XwZcSkn8aNI8r7LwaXA==
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Université de Lille 1 - projets-webent</md:ServiceName>
-        <md:ServiceName xml:lang="en">Université of Lille 1 - projets-webent</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Cette plate-forme  permet faire de la gestion de projets inter-établissements.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>WALLON Ines</md:SurName>
-      <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Université de Lille 1 - projets-webent</md:ServiceName>
+      <md:ServiceName xml:lang="en">Université of Lille 1 - projets-webent</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Cette plate-forme  permet faire de la gestion de projets inter-établissements.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>WALLON Ines</md:SurName>
+    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml b/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml
index 91223c7b..e5fb4d53 100644
--- a/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml
+++ b/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://psuhr.neocaseonline.com/connexion_neocase">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Penn State Production Back office</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Penn State Production Back office</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEBTCCAu2gAwIBAgIJAJYBe8LIemJnMA0GCSqGSIb3DQEBCwUAMIGYMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBkJvc3RvbjEZMBcGA1UECgwQ
 TmVvY2FzZSBTb2Z0d2FyZTENMAsGA1UECwwEU2FhUzEUMBIGA1UEAwwLbmVvY2Fz
@@ -41,26 +41,26 @@ UJ9IKGY8vyhtLHoVeuOCS+jgk5mEGJ5p/eQbllD3CUApmVCu3X0a3vr+fQMGGAMv
 e8bPhn/1xvpEpJVDwyZkLfPwXLiDRV7LrKmA7+0LSTQuRUeKVilPtRviD+7ZUK7Z
 vd5SAP9ABDJMMCxWArUARFYwlL5Lk2GRGw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psuhr.neocaseonline.com/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott Winter</md:GivenName>
-      <md:EmailAddress>swinter@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philippe Coezy</md:GivenName>
-      <md:EmailAddress>pcoezy@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eileen Szczesuil</md:GivenName>
-      <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psuhr.neocaseonline.com/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott Winter</md:GivenName>
+    <md:EmailAddress>swinter@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philippe Coezy</md:GivenName>
+    <md:EmailAddress>pcoezy@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eileen Szczesuil</md:GivenName>
+    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml b/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml
index 5433acac..90d7aa6a 100644
--- a/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml
+++ b/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://psuportal.neocaseonline.com/connexion_neocase">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Penn State Production portal</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Penn State Production portal</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEBTCCAu2gAwIBAgIJAJYBe8LIemJnMA0GCSqGSIb3DQEBCwUAMIGYMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBkJvc3RvbjEZMBcGA1UECgwQ
 TmVvY2FzZSBTb2Z0d2FyZTENMAsGA1UECwwEU2FhUzEUMBIGA1UEAwwLbmVvY2Fz
@@ -41,26 +41,26 @@ UJ9IKGY8vyhtLHoVeuOCS+jgk5mEGJ5p/eQbllD3CUApmVCu3X0a3vr+fQMGGAMv
 e8bPhn/1xvpEpJVDwyZkLfPwXLiDRV7LrKmA7+0LSTQuRUeKVilPtRviD+7ZUK7Z
 vd5SAP9ABDJMMCxWArUARFYwlL5Lk2GRGw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psuportal.neocaseonline.com/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott Winter</md:GivenName>
-      <md:EmailAddress>swinter@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philippe Coezy</md:GivenName>
-      <md:EmailAddress>pcoezy@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Eileen Szczesuil</md:GivenName>
-      <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psuportal.neocaseonline.com/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott Winter</md:GivenName>
+    <md:EmailAddress>swinter@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philippe Coezy</md:GivenName>
+    <md:EmailAddress>pcoezy@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eileen Szczesuil</md:GivenName>
+    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml
index f018f815..852b1a04 100644
--- a/swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://publishing.rcseng.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-02T13:59:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-02T13:59:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Royal College of Surgeons of England SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Royal College of Surgeons of England publishes the Annals, Bulletin and FDJ journals.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://publishing.rcseng.ac.uk</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Royal College of Surgeons of England SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Royal College of Surgeons of England publishes the Annals, Bulletin and FDJ journals.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://publishing.rcseng.ac.uk</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIJAMhKH6y9Hoa3MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrMB4XDTE1MDUxOTIwMTExOVoXDTE4
 						MDUxODIwMTExOVowIjEgMB4GA1UEAxMXcHVibGlzaGluZy5yY3NlbmcuYWMudWsw
@@ -36,24 +36,24 @@
 						3wvxMOAwc73Gkm2Zrkckq+6SBwQx++uWHktS09fWnbdpLOjEVAlziJ2Dibj/6rQ3
 						JSRe52fl1W9ziYsM
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publishing.rcseng.ac.uk/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publishing.rcseng.ac.uk/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publishing.rcseng.ac.uk/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Surgeons of England SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcseng.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publishing.rcseng.ac.uk/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publishing.rcseng.ac.uk/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publishing.rcseng.ac.uk/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Surgeons of England SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcseng.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
index a933005d..28ceb37e 100644
--- a/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.acs.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-18T17:36:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-18T17:36:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ACS Publications</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Publishes products and services for the practice and advancement of the chemical sciences.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://pubs.acs.org/page/about-us.html</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ACS Publications</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Publishes products and services for the practice and advancement of the chemical sciences.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://pubs.acs.org/page/about-us.html</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAOzcasgcJSa4MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDHB1YnMuYWNzLm9yZzAeFw0xMzExMTkxODU1MDNaFw0yMzExMTcxODU1MDNa
 						MBcxFTATBgNVBAMTDHB1YnMuYWNzLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -35,31 +35,31 @@
 						8GUzvq+yCgYrddBczbR8g2OcC0/xDKm3vE+T6oJkpKHJFMUW26mgOMR3bgtm2Tey
 						ZOvs4J+UrDF71xNxlC9wTQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.acs.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.acs.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.acs.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">American Chemical Society, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ACS Publications</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.acs.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kal</md:GivenName>
-      <md:SurName>Hashmani</md:SurName>
-      <md:EmailAddress>mailto:k_hashmani@acs.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gabriel</md:GivenName>
-      <md:SurName>Kiblin</md:SurName>
-      <md:EmailAddress>mailto:g_kiblin@acs.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>MacArthur</md:SurName>
-      <md:EmailAddress>mailto:j_macarthur@acs.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.acs.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.acs.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.acs.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">American Chemical Society, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ACS Publications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.acs.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kal</md:GivenName>
+    <md:SurName>Hashmani</md:SurName>
+    <md:EmailAddress>mailto:k_hashmani@acs.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gabriel</md:GivenName>
+    <md:SurName>Kiblin</md:SurName>
+    <md:EmailAddress>mailto:g_kiblin@acs.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>MacArthur</md:SurName>
+    <md:EmailAddress>mailto:j_macarthur@acs.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml
index 9d81ef0b..f460226d 100644
--- a/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.aeaweb.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T08:56:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T08:56:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJAKoOWJDw6RetMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3B1YnMuYWVhd2ViLm9yZzAeFw0xMzEyMTIwMTI3NDRaFw0yMzEyMTAwMTI3
 						NDRaMBoxGDAWBgNVBAMTD3B1YnMuYWVhd2ViLm9yZzCCASIwDQYJKoZIhvcNAQEB
@@ -28,24 +28,24 @@
 						xNk/TOrio1K7mK7NE1OuwZ82cUSrPzEyriT0LQOmUCSEOotGLpCk5h8DiC0c8BtU
 						xHfGWdly2G2H86vOxMCeEJ+lpsW/zPvNTHJ4SQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.aeaweb.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.aeaweb.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.aeaweb.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">American Economic Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aeaweb.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.aeaweb.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.aeaweb.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.aeaweb.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">American Economic Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aeaweb.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml
index fbdb3b89..bb8819cb 100644
--- a/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml
@@ -1,28 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.ama-assn.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T10:28:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T10:28:00Z">
-		</mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -48,32 +47,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">JAMA &amp; Archives Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://pubs.ama-assn.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JAMA &amp; Archives Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://pubs.ama-assn.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml
index e22c7139..21c8236b 100644
--- a/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.rsna.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-21T09:50:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-21T09:50:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Radiological Society of North America</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RSNA publishes two top peer-reviewed journals: Radiology, the highest-impact scientific journal in the field, and RadioGraphics, the only journal dedicated to continuing education in radiology.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://pubs.rsna.org/</mdui:InformationURL>
+        <mdui:Logo height="76" width="354">https://pubs.rsna.org/pb/assets/raw/Publications%20%2FJournals_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Radiological Society of North America</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RSNA publishes two top peer-reviewed journals: Radiology, the highest-impact scientific journal in the field, and RadioGraphics, the only journal dedicated to continuing education in radiology.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://pubs.rsna.org/</mdui:InformationURL>
-          <mdui:Logo height="76" width="354">https://pubs.rsna.org/pb/assets/raw/Publications%20%2FJournals_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEDCCAfigAwIBAgIJAJzgAWzkM8T0MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXB1YnMucnNuYS5vcmcwHhcNMTMxMDA3MjA0NzI1WhcNMjMxMDA1MjA0NzI1
 						WjAYMRYwFAYDVQQDEw1wdWJzLnJzbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -36,24 +36,24 @@
 						XZ4ZcLi1+DpZ+s8Cz8C3mKyEo1f6CRUaqaypMRhLDwi9VHOqZtE2nUqEafnyZVd6
 						WKS8JkDbp5nnxgaI0eM2fo7rUFg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.rsna.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.rsna.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.rsna.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Radiological Society of North America</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://pubs.rsna.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.rsna.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.rsna.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.rsna.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Radiological Society of North America</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://pubs.rsna.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml b/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml
index 1425462b..561761f3 100644
--- a/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pymca-wg-gw01.sso.picturemaxx.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEszCCA5ugAwIBAgIDByqUMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
 						MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
 						HhcNMTIwNjI4MjIzNjIzWhcNMTQwODMxMDM1NDExWjCBxDEpMCcGA1UEBRMgSk8z
@@ -38,13 +38,13 @@
 						oxvz+XRdsea4OEIBam0WyrOer7q31FJANo7wXWpW8vDF+Vv969sNJPmQ05QnYLjH
 						Ph2CEHrxjw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEszCCA5ugAwIBAgIDByqUMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
 						MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
 						HhcNMTIwNjI4MjIzNjIzWhcNMTQwODMxMDM1NDExWjCBxDEpMCcGA1UEBRMgSk8z
@@ -72,38 +72,38 @@
 						oxvz+XRdsea4OEIBam0WyrOer7q31FJANo7wXWpW8vDF+Vv969sNJPmQ05QnYLjH
 						Ph2CEHrxjw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KINDIT LIMITED</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KINDIT LIMITED: PYMCA - Photographic, Youth, Music, Culture, Archive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pymca.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Swinstead</md:SurName>
-      <md:EmailAddress>mailto:jon@pymca.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Swinstead</md:SurName>
-      <md:EmailAddress>mailto:jon@pymca.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KINDIT LIMITED</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KINDIT LIMITED: PYMCA - Photographic, Youth, Music, Culture, Archive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pymca.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Swinstead</md:SurName>
+    <md:EmailAddress>mailto:jon@pymca.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Swinstead</md:SurName>
+    <md:EmailAddress>mailto:jon@pymca.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml b/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml
index f1f97dc6..e1a64cb3 100644
--- a/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml
+++ b/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qa-sso.knewknovel.com/entry/uk_federation/Metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-01T14:48:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-01T14:48:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Knovel Corporation: PPhoenix QA-SSO</mdui:DisplayName>
+        <mdui:Logo height="115" width="350">https://qa-content.knewknovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
-          <mdui:DisplayName xml:lang="en">Knovel Corporation: PPhoenix QA-SSO</mdui:DisplayName>
-          <mdui:Logo height="115" width="350">https://qa-content.knewknovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIEFjCCAv6gAwIBAgIJAOFlQKWU0aQPMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
 					VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
 					dmVsIENvcnAxCzAJBgNVBAsMAklUMR4wHAYDVQQDDBVxYS1zc28ua25ld2tub3Zl
@@ -41,13 +41,13 @@
 					/i1QrH7M4EnXvEpRgWRs7OqXzY+Qxf+jcE3DXXtS1UahyUwYf+atf/OC+z/vLmJH
 					QqFMM4bZMW+4qDUdxLYHLJV9La3REELlmA9Hcd1e4rP4XXpKuFeP+EFb
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIEFjCCAv6gAwIBAgIJAOFlQKWU0aQPMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
 					VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
 					dmVsIENvcnAxCzAJBgNVBAsMAklUMR4wHAYDVQQDDBVxYS1zc28ua25ld2tub3Zl
@@ -71,13 +71,13 @@
 					/i1QrH7M4EnXvEpRgWRs7OqXzY+Qxf+jcE3DXXtS1UahyUwYf+atf/OC+z/vLmJH
 					QqFMM4bZMW+4qDUdxLYHLJV9La3REELlmA9Hcd1e4rP4XXpKuFeP+EFb
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDyDCCArCgAwIBAgIJAJCNhx+kTAXdMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
 					BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
 					ZWwgQ29ycG9yYXRpb24xHjAcBgNVBAMTFXFhLXNzby5rbmV3a25vdmVsLmNvbTAe
@@ -100,28 +100,28 @@
 					L/HcJXiw+VosrzUtVGW/lzaKp0xiJVNt9j9GD6ZNGwTOw/+lx89a61syIy14/8vj
 					xYCCDxWspsyeX2go
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Knovel Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Knovel Corporation: Phoenix QA-SSO</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.knovel.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Crisler</md:SurName>
-      <md:EmailAddress>mailto:m.crisler@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Johnny</md:GivenName>
-      <md:SurName>Cheung</md:SurName>
-      <md:EmailAddress>mailto:kops@knovel.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Knovel Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Knovel Corporation: Phoenix QA-SSO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.knovel.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Crisler</md:SurName>
+    <md:EmailAddress>mailto:m.crisler@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johnny</md:GivenName>
+    <md:SurName>Cheung</md:SurName>
+    <md:EmailAddress>mailto:kops@knovel.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml
index 010771ce..9be38ac9 100644
--- a/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qa.dawsonera.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-12T13:17:34Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-12T13:17:34Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qa.dawsonera.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa.dawsonera.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qa.dawsonera.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa.dawsonera.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiQCCQC0Ky/bIMuQajANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJV
 						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
 						c2VtYW50aWNvMRkwFwYDVQQDExBxYS5kYXdzb25lcmEuY29tMB4XDTEzMDQxMDA5
@@ -42,42 +42,42 @@
 						0LfHeCvTazIS97MK6v6zLztr5TE2Up0bGuY40AQ7os+Cve3PiPyZvwj/sh0bYWzY
 						aghk88mgQ85rliDI3J2b+A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dawson Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dawsonbooks.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:daw-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:daw-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dawson Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dawsonbooks.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:daw-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:daw-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
index 7d3b325a..f3a9c345 100644
--- a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qa.esds.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-23T11:54:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-23T11:54:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qa.esds.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa.esds.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qa.esds.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qa.esds.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDxDCCAqygAwIBAgIJAIFv979CtniPMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
 						BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
 						aWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2RhcGxhdDIuZXNzZXguYWMudWswHhcN
@@ -52,42 +52,42 @@
 						LD49UT6gUswxL81WggC8WDMvi5sq6xnHtq1JPxCeTWDeeafn0vCR4WAV2B2y6Iwj
 						ipl34THDqR4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ESDS QA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@ukdataservice.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Amir</md:GivenName>
-      <md:SurName>Moradi</md:SurName>
-      <md:EmailAddress>mailto:amoradi@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ESDS QA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@ukdataservice.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Amir</md:GivenName>
+    <md:SurName>Moradi</md:SurName>
+    <md:EmailAddress>mailto:amoradi@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml
index c6ad0ab1..d765259a 100644
--- a/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qa.idp.uhi.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-08T12:47:43Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-08T12:47:43Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVANneP+Hfy2xrQ53aw8HQ+q7keJG8MA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEHFhLmlkcC51aGkuYWMudWswHhcNMTMwMjA4MDgyODQ1
 						WhcNMzMwMjA4MDgyODQ1WjAbMRkwFwYDVQQDExBxYS5pZHAudWhpLmFjLnVrMIIB
@@ -34,26 +34,26 @@
 						jD7nr8Xu1R7d+yuulxgJQDsBrNUs2vGyBurM1nGqaZePn57HDjczJWKmKFzQ5+HH
 						r5fv3Tl9vSvzKI+N03lMB3+IVQW8H5yMajUA4B8HUAdltcGNFmir4+bgpOYtcP3X
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://qa.idp.uhi.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://qa.idp.uhi.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhi.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVANneP+Hfy2xrQ53aw8HQ+q7keJG8MA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEHFhLmlkcC51aGkuYWMudWswHhcNMTMwMjA4MDgyODQ1
 						WhcNMzMwMjA4MDgyODQ1WjAbMRkwFwYDVQQDExBxYS5pZHAudWhpLmFjLnVrMIIB
@@ -72,25 +72,25 @@
 						jD7nr8Xu1R7d+yuulxgJQDsBrNUs2vGyBurM1nGqaZePn57HDjczJWKmKFzQ5+HH
 						r5fv3Tl9vSvzKI+N03lMB3+IVQW8H5yMajUA4B8HUAdltcGNFmir4+bgpOYtcP3X
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of the Highlands and Islands</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of the Highlands and Islands QA IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uhi.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UHI Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:uhihelpdesk@uhi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UHI Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:uhihelpdesk@uhi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the Highlands and Islands</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the Highlands and Islands QA IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UHI Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:uhihelpdesk@uhi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UHI Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:uhihelpdesk@uhi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml b/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml
index 519b7f4b..e444c497 100644
--- a/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml
+++ b/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">capella.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ztest_Capella University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">capella.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ztest_Capella University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDdDCCAlygAwIBAgIEUKWSDTANBgkqhkiG9w0BAQQFADB8MQswCQYDVQQGEwJVUzESMBAGA1UE
 CBMJTWlubmVzb3RhMRQwEgYDVQQHEwtNaW5uZWFwb2xpczEbMBkGA1UEChMSQ2FwZWxsYSBVbml2
 ZXJzaXR5MQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQY2FwZWxsYS10ZXN0LWlkcDAeFw0xMjExMTYw
@@ -36,19 +36,19 @@ AMmzpUSFLbOvTSGjlkRpKHj+nPykVlZcyO93mAvYtMvAs0JZqVVkkqk3BN1Pnxy59BrFfv0TmLzK
 Ugk8hTFnw3A1kqEh86hAw+7hkfXjmhEzo8kA5RqqibMlY4qybrzJeqU2OwLZ407JRzGDcxETIqd/
 jb8Wak2eV45bmCEpUn9g5JcRS8mTFJSepa9UbWqtdZKt
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20/login"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20/login"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Capella University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ztest_Capella University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.capella.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Angie Shand</md:GivenName>
-      <md:EmailAddress>Angie.Shand@capella.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20/login"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20/login"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Capella University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ztest_Capella University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.capella.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Angie Shand</md:GivenName>
+    <md:EmailAddress>Angie.Shand@capella.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml b/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml
index 957e721b..fecd34d5 100644
--- a/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml
+++ b/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qml.corefacilities.org/account/saml/qml">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T11:59:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T11:59:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDezCCAmOgAwIBAgIJAJ2ckmy8lsPeMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
 						BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
 						HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMwHhcNMTMxMjExMTUyNTA3WhcN
@@ -30,24 +30,24 @@
 						YVcHQX0UCb4Iw4FoEKIzAsQW2aIQnE39DD7410/7YUzwCGVn6F6TGQuglZjGrTWe
 						ITzWFNwFKHtFqy1whxR7MarmC24an1bJCi/yQDHxDQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qml.corefacilities.org/account/saml/qml" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qml-testing.ilabsolutions.com/account/saml/qml" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.corefacilities.org/account/saml/qml" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">iLab Solutions, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">iLab Solutions</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ilabsolutions.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ID Integration support</md:GivenName>
-      <md:EmailAddress>mailto:integrations_id@ilabsolutions.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qml.corefacilities.org/account/saml/qml" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qml-testing.ilabsolutions.com/account/saml/qml" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.corefacilities.org/account/saml/qml" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">iLab Solutions, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">iLab Solutions</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ilabsolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ID Integration support</md:GivenName>
+    <md:EmailAddress>mailto:integrations_id@ilabsolutions.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml
index a20c04a8..d2c00165 100644
--- a/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qmplus.qmul.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-23T11:14:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-23T11:14:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+jCCAeKgAwIBAgIJAPaB7sCOW6sMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXFtcGx1cy5xbXVsLmFjLnVrMB4XDTEyMDMyMDEzNTk0OVoXDTIyMDMxODEz
 						NTk0OVowHDEaMBgGA1UEAxMRcW1wbHVzLnFtdWwuYWMudWswggEiMA0GCSqGSIb3
@@ -41,34 +41,34 @@
 						bz6KW4rkg8eKPLhaIFVt+XE567ZyrpklFJoCNYdIuca4RlGFNwPYD+JOy0um0t7k
 						SwkwunLyPQxUR+IPDEnIaJdbbdJmZA6Ub4aErcVHsvez5uap1LW7i8xTdA2DoA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: QMPlus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Moodle Support</md:GivenName>
-      <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: QMPlus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Moodle Support</md:GivenName>
+    <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml b/swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml
index 7b47106a..e31d0c35 100644
--- a/swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qmul.co-tutor.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-18T09:37:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-18T09:37:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAMPVjUQDBuJ5MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD2lwLTE3Mi0zMS0xMy02MDAeFw0xNTA1MTIxMDAxNDNaFw0yNTA1MDkxMDAx
 						NDNaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS0xMy02MDCCASIwDQYJKoZIhvcNAQEB
@@ -46,43 +46,43 @@
 						pPkRcJVGSe6cU9x58powQzQfNIyb9TtyvnlGWYq/iGPaQOogU8kKtYt2C6uQvNEK
 						nEuAlUv6RvvvmULiZCAyICctzohEu712x3JsegldHPq9oZUhJqTJPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Co-Tutor at QMUL</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Chung</md:SurName>
-      <md:EmailAddress>mailto:ray.chung@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Newman</md:SurName>
-      <md:EmailAddress>mailto:p.m.newman@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Co-Tutor at QMUL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Chung</md:SurName>
+    <md:EmailAddress>mailto:ray.chung@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Newman</md:SurName>
+    <md:EmailAddress>mailto:p.m.newman@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmul.simitive.com.xml b/swamid-interfederations-2.0/qmul.simitive.com.xml
index ad9dc8f1..ab96d2bb 100644
--- a/swamid-interfederations-2.0/qmul.simitive.com.xml
+++ b/swamid-interfederations-2.0/qmul.simitive.com.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qmul.simitive.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T14:35:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T14:35:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmul.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qmul.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmul.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qmul.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSzCCAjOgAwIBAgIJAIWe2hAWoGqQMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
 						BAMTI2hvc3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29tMB4XDTE0MDYx
 						MzE0MTUxNFoXDTI0MDYxMDE0MTUxNFowLjEsMCoGA1UEAxMjaG9zdC05NS0xNTQt
@@ -33,34 +33,34 @@
 						+m7n4+GXiN0LMzp39ylHlZ3PQv3iCO+V+fAvnZuPZGhFZa7JBJnzQewQG9rx0JhJ
 						pYtepKaoxPC3ztnljHK7wrYiuT313JFBFOgkT2HSgw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.simitive.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmul.simitive.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmul.simitive.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">QMUL Simitive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Latham</md:SurName>
-      <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Latham</md:SurName>
-      <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.simitive.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmul.simitive.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmul.simitive.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QMUL Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Latham</md:SurName>
+    <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Latham</md:SurName>
+    <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmulfed.simitive.com.xml b/swamid-interfederations-2.0/qmulfed.simitive.com.xml
index 82dca342..633cf94d 100644
--- a/swamid-interfederations-2.0/qmulfed.simitive.com.xml
+++ b/swamid-interfederations-2.0/qmulfed.simitive.com.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qmulfed.simitive.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-02T09:22:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-02T09:22:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmulfed.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qmulfed.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://qmulfed.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://qmulfed.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOTCCAiGgAwIBAgIJAPVp/A+epmGvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHGh0dHBzOi8vcW11bGZlZC5zaW1pdGl2ZS5jb20wHhcNMTQwNDIzMTYyNTA5
 						WhcNMjQwNDIwMTYyNTA5WjAnMSUwIwYDVQQDExxodHRwczovL3FtdWxmZWQuc2lt
@@ -33,34 +33,34 @@
 						E1XHMX2aZGJ2VM2bMhMJKKI4i2TxHU+qos3+NPRAJKbq7n7MwkKOK5olEp3xOr0z
 						VsmquYm0Rppl3nzMmg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmulfed.simitive.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">QMUL Simitive Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Latham</md:SurName>
-      <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Latham</md:SurName>
-      <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmulfed.simitive.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">QMUL Simitive Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Latham</md:SurName>
+    <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Latham</md:SurName>
+    <md:EmailAddress>mailto:adrian.latham@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
index d3b4c410..8bbce3e7 100644
--- a/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qub.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
 						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
@@ -31,26 +31,26 @@
 						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
 						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
 						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
 						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
@@ -69,26 +69,26 @@
 						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
 						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Queen's University of Belfast</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen's University Belfast</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qub.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>E-Resouces Team</md:GivenName>
-      <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Goodall</md:SurName>
-      <md:EmailAddress>mailto:m.goodall@qub.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Queen's University of Belfast</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen's University Belfast</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qub.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Resouces Team</md:GivenName>
+    <md:EmailAddress>mailto:eresources@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Goodall</md:SurName>
+    <md:EmailAddress>mailto:m.goodall@qub.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml b/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
index 343a70c6..a5451433 100644
--- a/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://quod.lib.umich.edu/shibboleth-sp/acls">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ACLS Humanities E-Book</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ACLS Humanities E-Book is a digital collection of over 3,300 full-text, cross-searchable books in the humanities.</mdui:Description>
+        <mdui:Logo height="74" width="872">https://quod.lib.umich.edu/a/acls/graphics/aclsheader_new.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ACLS Humanities E-Book</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ACLS Humanities E-Book is a digital collection of over 3,300 full-text, cross-searchable books in the humanities.</mdui:Description>
-          <mdui:Logo height="74" width="872">https://quod.lib.umich.edu/a/acls/graphics/aclsheader_new.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
 						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
 						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
@@ -43,13 +43,13 @@
 						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
 						PLcvWTRfLv+JNqoT2yM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
 						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
 						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
@@ -76,30 +76,30 @@
 						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
 						PLcvWTRfLv+JNqoT2yM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">University of Michigan: ACLS Humanities E-Book</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Michigan: ACLS Humanities E-Book</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://humanitiesebook.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Michigan Library IT</md:GivenName>
-      <md:EmailAddress>mailto:lit-cs-sysadmin@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>University of Michigan Library IT</md:GivenName>
-      <md:EmailAddress>mailto:lit-cs-sysadmin@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">University of Michigan: ACLS Humanities E-Book</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Michigan: ACLS Humanities E-Book</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://humanitiesebook.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Michigan Library IT</md:GivenName>
+    <md:EmailAddress>mailto:lit-cs-sysadmin@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>University of Michigan Library IT</md:GivenName>
+    <md:EmailAddress>mailto:lit-cs-sysadmin@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
index 9a2de4db..8a982901 100644
--- a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ra-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rezekne Higher Education Institution</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rezekne Higher Education Institution</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - RA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rezekne Higher Education Institution - RA IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.ru.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - RA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rezekne Higher Education Institution - RA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.ru.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
index bd5f7439..944c26c0 100644
--- a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://randevu.lab.vvc.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">randevu beta webkonferencia szolgáltatás</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jitsi-meet</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Jitsi-meet alapú XMPP, WebRTC, Selective Forwaring Unit technológia teszt</mdui:Description>
+        <mdui:Description xml:lang="en">Jitsi-meet</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://randevu.lab.vvc.niif.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">randevu beta webkonferencia szolgáltatás</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Jitsi-meet</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Jitsi-meet alapú XMPP, WebRTC, Selective Forwaring Unit technológia teszt</mdui:Description>
-          <mdui:Description xml:lang="en">Jitsi-meet</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://randevu.lab.vvc.niif.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEPzCCAyegAwIBAgIJAMKujTOJcbZLMA0GCSqGSIb3DQEBCwUAMIG1MQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIRGVicmVjZW4xFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLDBlWb2ljZSBWaWRlbyBDb2xsYWJvcmF0aW9uMSAwHgYDVQQDDBdyYW5kZXZ1LmxhYi52dmMubmlpZi5odTEiMCAGCSqGSIb3DQEJARYTdmlkZW8tYWRtaW5AbmlpZi5odTAeFw0xNTA2MjQxMjU1MzFaFw0yNTA2MjMxMjU1MzFaMIG1MQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIRGVicmVjZW4xFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLDBlWb2ljZSBWaWRlbyBDb2xsYWJvcmF0aW9uMSAwHgYDVQQDDBdyYW5kZXZ1LmxhYi52dmMubmlpZi5odTEiMCAGCSqGSIb3DQEJARYTdmlkZW8tYWRtaW5AbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4v/XG+RGVVvasAKvNucWWNIKEeqrehbpDEMKzb4flAOHR4p2Lr+XrNEP7eBZy3AHF09MRRvmfWYEf4IBSHUXir7s6C36uxanGFqaQ3ZbASbPzV7g3ommEKArhdh6/gdjGGxefxh/G804EI1dKSUt1AFVg/EbwuuMNTqjhu+SPD8kZ1Ii5a29b8Rl8LzOCJvCMfSaUm08K6IdGBa8DUVnlVKy/UVvzBcXYIiKZSf5jnqbjOseprQJTDWoSyiAl2284JoxHf4gA86B1X1EF/dmZLfBJBmqc/i2exyb+HqDn0AMHaXmjtcKt1fgxo1/X4fBT1pYdc40sirID9KqYIgQ8CAwEAAaNQME4wHQYDVR0OBBYEFLdzD6asNigc000FwGJi7+R6TxIaMB8GA1UdIwQYMBaAFLdzD6asNigc000FwGJi7+R6TxIaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF30tfXyggHu+rYI+YSuotQRQR0D4yG2Pme68hpmu6qRR0jop//OhL1Ii/p9LPqrQd076z3Am9+PeyR5wRck7XtZPHPuXgMEm44/0FjZcEPf4nkzwEhx84NWriN/XldzpvI8rQavL0obRwnp5wvkFhK/xbLqrYntRSdoeK9f0AbBkCVajJ4K/pgK0sg4yEzybDaNFtwDwtgXmdmTu6Vj71b1+2PLiO6KoWA0YJ0y5iIls6Ir0nsbr7GBfF8/ZwTNQFDc3dsNPoX73Lb4TQ7KK9rorfzajChONzpzwylKkG/wKOuG9IP6LwFZSM1Wic4BSIJKNgsbauHX6GihuxuAp4Q=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>randevu.lab.vvc.niif.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">randevu beta webkonferencia szolgáltatás</md:ServiceName>
-        <md:ServiceName xml:lang="en">Jitsi-meet</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEPzCCAyegAwIBAgIJAMKujTOJcbZLMA0GCSqGSIb3DQEBCwUAMIG1MQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIRGVicmVjZW4xFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLDBlWb2ljZSBWaWRlbyBDb2xsYWJvcmF0aW9uMSAwHgYDVQQDDBdyYW5kZXZ1LmxhYi52dmMubmlpZi5odTEiMCAGCSqGSIb3DQEJARYTdmlkZW8tYWRtaW5AbmlpZi5odTAeFw0xNTA2MjQxMjU1MzFaFw0yNTA2MjMxMjU1MzFaMIG1MQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIRGVicmVjZW4xFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLDBlWb2ljZSBWaWRlbyBDb2xsYWJvcmF0aW9uMSAwHgYDVQQDDBdyYW5kZXZ1LmxhYi52dmMubmlpZi5odTEiMCAGCSqGSIb3DQEJARYTdmlkZW8tYWRtaW5AbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4v/XG+RGVVvasAKvNucWWNIKEeqrehbpDEMKzb4flAOHR4p2Lr+XrNEP7eBZy3AHF09MRRvmfWYEf4IBSHUXir7s6C36uxanGFqaQ3ZbASbPzV7g3ommEKArhdh6/gdjGGxefxh/G804EI1dKSUt1AFVg/EbwuuMNTqjhu+SPD8kZ1Ii5a29b8Rl8LzOCJvCMfSaUm08K6IdGBa8DUVnlVKy/UVvzBcXYIiKZSf5jnqbjOseprQJTDWoSyiAl2284JoxHf4gA86B1X1EF/dmZLfBJBmqc/i2exyb+HqDn0AMHaXmjtcKt1fgxo1/X4fBT1pYdc40sirID9KqYIgQ8CAwEAAaNQME4wHQYDVR0OBBYEFLdzD6asNigc000FwGJi7+R6TxIaMB8GA1UdIwQYMBaAFLdzD6asNigc000FwGJi7+R6TxIaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF30tfXyggHu+rYI+YSuotQRQR0D4yG2Pme68hpmu6qRR0jop//OhL1Ii/p9LPqrQd076z3Am9+PeyR5wRck7XtZPHPuXgMEm44/0FjZcEPf4nkzwEhx84NWriN/XldzpvI8rQavL0obRwnp5wvkFhK/xbLqrYntRSdoeK9f0AbBkCVajJ4K/pgK0sg4yEzybDaNFtwDwtgXmdmTu6Vj71b1+2PLiO6KoWA0YJ0y5iIls6Ir0nsbr7GBfF8/ZwTNQFDc3dsNPoX73Lb4TQ7KK9rorfzajChONzpzwylKkG/wKOuG9IP6LwFZSM1Wic4BSIJKNgsbauHX6GihuxuAp4Q=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>randevu.lab.vvc.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">randevu beta webkonferencia szolgáltatás</md:ServiceName>
+      <md:ServiceName xml:lang="en">Jitsi-meet</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
index cb0191bb..f669cb66 100644
--- a/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rastreador.ifba.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifba.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifba.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifba.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifba.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
 SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
@@ -45,26 +45,26 @@ hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
 Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
 NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rastreador.ifba.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rastreador.ifba.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
@@ -89,24 +89,24 @@ Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
 NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFBA - Instituto Federal da Bahia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifba.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifba.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Reinaldo Fonseca</md:SurName>
-      <md:EmailAddress>reinaldocosta@ifba.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFBA - Instituto Federal da Bahia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifba.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifba.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Reinaldo Fonseca</md:SurName>
+    <md:EmailAddress>reinaldocosta@ifba.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml
index 3fdcad9f..c64a6e31 100644
--- a/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rave.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T10:08:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T10:08:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rave.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rave.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo Ravensbourne Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo Ravensbourne Online Resource Booking</mdui:Description>
+        <mdui:Logo height="60" width="60">https://rave.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rave.siso.co/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rave.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SiSo Ravensbourne Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo Ravensbourne Online Resource Booking</mdui:Description>
-          <mdui:Logo height="60" width="60">https://rave.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -51,34 +51,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rave.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo Ravensbourne Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rave.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo Ravensbourne Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
index 14b987be..85590597 100644
--- a/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rcafe01s.inmetro.gov.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inmetro.gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.inmetro.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.inmetro.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inmetro.gov.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.inmetro.gov.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.inmetro.gov.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDZjCCAk4CAQAwDQYJKoZIhvcNAQEFBQAweTEOMAwGA1UEChMFQUJSRVYxDjAM
 BgNVBAsTBUFCUkVWMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEPMA0GA1UECBMG
 QnJhc2lsMQswCQYDVQQGEwJCUjEgMB4GA1UEAxMXcmNhZmUwMXMuaW5tZXRyby5n
@@ -43,26 +43,26 @@ chSF0Vug5F1YTTmJka1DT7l7IjWHeH7AT/rWqjTnWzCkc3PvvK1hWQUXlKaIoKVF
 yUIWfdWTP1qbpv2/D1hS9Ye/4vokTjCzku85qQDYQRzH4NT+GofYlcaQ2FuJRXZk
 czNaGjGLlb2Y0Q==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rcafe01s.inmetro.gov.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inmetro.gov.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rcafe01s.inmetro.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inmetro.gov.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDZjCCAk4CAQAwDQYJKoZIhvcNAQEFBQAweTEOMAwGA1UEChMFQUJSRVYxDjAM
 BgNVBAsTBUFCUkVWMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEPMA0GA1UECBMG
@@ -85,24 +85,24 @@ yUIWfdWTP1qbpv2/D1hS9Ye/4vokTjCzku85qQDYQRzH4NT+GofYlcaQ2FuJRXZk
 czNaGjGLlb2Y0Q==
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.inmetro.gov.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.inmetro.gov.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Fabio Fischer Barros</md:SurName>
-      <md:EmailAddress>ffbarros@inmetro.gov.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.inmetro.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.inmetro.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Fabio Fischer Barros</md:SurName>
+    <md:EmailAddress>ffbarros@inmetro.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml
index 5d59f984..e956b0ae 100644
--- a/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rcm.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcm.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcm.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXjCCAkagAwIBAgIIPDy/aki2TD8wDQYJKoZIhvcNAQEFBQAwRjEjMCEGA1UE
 						CgwaVGhlIFJveWFsIENvbGxlZ2UgT2YgTXVzaWMxHzAdBgNVBAMMFm9wZW5hdGhl
 						bnNsYS5yY20uYWMudWswHhcNMTMxMDE1MTMzNDAwWhcNMjMxMDE1MTMzNDAwWjBG
@@ -31,25 +31,25 @@
 						UztrSjOIxJq/HOK/cJv4DONOpL6wbJHZdA2trTfmm+YBc3cuBtPmhPcHEMfqSGS0
 						Utc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathensla.rcm.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathensla.rcm.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal College of Music</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Music</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcm.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Knapp</md:SurName>
-      <md:EmailAddress>mailto:mknapp@rcm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Knapp</md:SurName>
-      <md:EmailAddress>mailto:mknapp@rcm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathensla.rcm.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathensla.rcm.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal College of Music</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Music</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcm.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Knapp</md:SurName>
+    <md:EmailAddress>mailto:mknapp@rcm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Knapp</md:SurName>
+    <md:EmailAddress>mailto:mknapp@rcm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcn.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/rcn.idm.oclc.org-shibboleth.xml
index bc3f8a09..292f2e65 100644
--- a/swamid-interfederations-2.0/rcn.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/rcn.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rcn.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-12T12:35:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-12T12:35:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFzCCAv+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADBgMRswGQYDVQQDFBIqLnJj
 						bi5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUwIwYJ
 						KoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE2MDQxMTEzNDQz
@@ -36,25 +36,25 @@
 						wz9rC6xduJUyMzKdnHtXbjzqOHkyz7PifkloWGPghtcbE9EbLfKtcnifJy471Qj7
 						29nmJEWFadGcpOrHzgA7pkSGD7vG155lmsu/4XrD4qBY2gs/VToTDp9epg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.rcn.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
index b110a9a8..b706c121 100644
--- a/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
+++ b/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rcnp-test.literatumonline.com/action/samlACS/shibboleth/testshib/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-26T14:28:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-26T14:28:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RCNP Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RCNP Test SP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://rcnp-test.literatumonline.com/page/about-us</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RCNP Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RCNP Test SP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://rcnp-test.literatumonline.com/page/about-us</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIJAMqMZUiIsl4nMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXJjbnB1Ymxpc2hpbmcuY29tMB4XDTEzMTAwMzIxMzU1OFoXDTIzMTAwMTIx
 						MzU1OFowHDEaMBgGA1UEAxMRcmNucHVibGlzaGluZy5jb20wggEiMA0GCSqGSIb3
@@ -35,24 +35,24 @@
 						BBfwdYT/FpEL/nu+CPZwOcochpjY1HNtmq8tYGHv85r3mZkaLLnd+t0HGTw8X/Rs
 						Ulakv64cRCvOJRV/8DpP8bRsMrlqMkCQ2N3nu3eWKuQsgp67
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rcnp-test.literatumonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcnp-test.literatumonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rcnp-test.literatumonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://rcnp-test.literatumonline.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rcnp-test.literatumonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcnp-test.literatumonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rcnp-test.literatumonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://rcnp-test.literatumonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml
index eccf44c5..843bfd6f 100644
--- a/swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rdmc-test.nottingham.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T08:26:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T08:26:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/UKfederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/UKfederation" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/UKfederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/UKfederation" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIErzCCA5egAwIBAgIRANJIX2z8SW0qwHxO7fubgwAwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -58,42 +58,42 @@
 						1jIHuFbL+I053a3tMKtMlSV1SXnHiyum5aAvma7NEsS45HeASQ52zRzcycEjwo2k
 						P+p/
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DSPACE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://rdmc-test.nottingham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:it-helpline@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Betts</md:SurName>
-      <md:EmailAddress>mailto:craig.betts@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DSPACE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://rdmc-test.nottingham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:it-helpline@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:craig.betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml
index 334db4a0..d64d49e9 100644
--- a/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rdmc.nottingham.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-04T11:52:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-04T11:52:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/UKfederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/UKfederation" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/UKfederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/UKfederation" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpTCCA42gAwIBAgIRAJ2/okPnsHx5Wip6mqpvf1AwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -58,42 +58,42 @@
 						8F0iJHeANxWeyb/2GkDR+vuQ7UHpQ76rnYn4P8yCHU3uwegbX7GEkcz6oCCyiDUH
 						Cku4Jqus863LhvmD4gwnwkqqNrOLWpDJ2ED/KY/6bip25QsDgvQn4ZI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DSPACE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://rdmc.nottingham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Betts</md:SurName>
-      <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DSPACE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://rdmc.nottingham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
index 30fb2e3b..88e38b88 100644
--- a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://reading.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-31T10:08:01Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-31T10:08:01Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.edu.my</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.edu.my</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIISa3f8+58NocwDQYJKoZIhvcNAQEFBQAwTDEiMCAGA1UE
 						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzEmMCQGA1UEAwwdb3BlbmF0aGVu
 						cy5hdXRoLnJlYWRpbmcuYWMudWswHhcNMTIwMTEyMTIxNDAwWhcNMjIwMTEyMTIx
@@ -32,13 +32,13 @@
 						S3bWx3YM0LY8BWYUjq8CBR5Sw4WdDcDiR3YeBrT9mUiVa7yqxPoA8I/+mmkjPpiA
 						XJlpnBImjl8K0L6rTNE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIISa3f8+58NocwDQYJKoZIhvcNAQEFBQAwTDEiMCAGA1UE
 						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzEmMCQGA1UEAwwdb3BlbmF0aGVu
 						cy5hdXRoLnJlYWRpbmcuYWMudWswHhcNMTIwMTEyMTIxNDAwWhcNMjIwMTEyMTIx
@@ -59,25 +59,25 @@
 						S3bWx3YM0LY8BWYUjq8CBR5Sw4WdDcDiR3YeBrT9mUiVa7yqxPoA8I/+mmkjPpiA
 						XJlpnBImjl8K0L6rTNE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.auth.reading.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.auth.reading.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Reading</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Reading</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reading.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sue</md:GivenName>
-      <md:SurName>Egleton</md:SurName>
-      <md:EmailAddress>mailto:s.egleton@reading.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Chapman</md:SurName>
-      <md:EmailAddress>mailto:c.d.chapman@reading.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.auth.reading.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.auth.reading.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Reading</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Reading</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reading.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sue</md:GivenName>
+    <md:SurName>Egleton</md:SurName>
+    <md:EmailAddress>mailto:s.egleton@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Chapman</md:SurName>
+    <md:EmailAddress>mailto:c.d.chapman@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
index d09b9939..f4984b70 100644
--- a/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
+++ b/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://reading.ac.uk/oala-test/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T09:56:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T09:56:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.edu.my</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reading.edu.my</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdDCCAlygAwIBAgIIb9uiE/y9tsIwDQYJKoZIhvcNAQEFBQAwUTEiMCAGA1UE
 						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzErMCkGA1UEAwwib3BlbmF0aGVu
 						cy10ZXN0LmF1dGgucmVhZGluZy5hYy51azAeFw0xNDA0MjQxNTI2NTdaFw0yNDA0
@@ -39,13 +39,13 @@
 						9DHO+QKDohvZhFpN70BoM8HZC0uZoZYL0lBYlltfzOmkE+K4W6MK7UUEJlnY/rW1
 						4vOBq2Kkl2te9ZeLhQCT76BypFptGueg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdDCCAlygAwIBAgIIb9uiE/y9tsIwDQYJKoZIhvcNAQEFBQAwUTEiMCAGA1UE
 						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzErMCkGA1UEAwwib3BlbmF0aGVu
 						cy10ZXN0LmF1dGgucmVhZGluZy5hYy51azAeFw0xNDA0MjQxNTI2NTdaFw0yNDA0
@@ -66,25 +66,25 @@
 						9DHO+QKDohvZhFpN70BoM8HZC0uZoZYL0lBYlltfzOmkE+K4W6MK7UUEJlnY/rW1
 						4vOBq2Kkl2te9ZeLhQCT76BypFptGueg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens-test.auth.reading.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens-test.auth.reading.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Reading</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Reading (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reading.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sue</md:GivenName>
-      <md:SurName>Egleton</md:SurName>
-      <md:EmailAddress>mailto:s.egleton@reading.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Chapman</md:SurName>
-      <md:EmailAddress>mailto:c.d.chapman@reading.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens-test.auth.reading.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens-test.auth.reading.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Reading</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Reading (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reading.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sue</md:GivenName>
+    <md:SurName>Egleton</md:SurName>
+    <md:EmailAddress>mailto:s.egleton@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Chapman</md:SurName>
+    <md:EmailAddress>mailto:c.d.chapman@reading.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/redcap.uncg.edu-shibboleth.xml b/swamid-interfederations-2.0/redcap.uncg.edu-shibboleth.xml
index 144284a7..5ca671d7 100644
--- a/swamid-interfederations-2.0/redcap.uncg.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/redcap.uncg.edu-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://redcap.uncg.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://redcap.uncg.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNCG REDCap</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNCG - School of Health and Human Sciences instance of Research Electronic Data Capture (REDCap) software.
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://redcap.uncg.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNCG REDCap</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNCG - School of Health and Human Sciences instance of Research Electronic Data Capture (REDCap) software.
 </mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://project-redcap.org/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://policy.uncg.edu/identity_theft_prevention/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="83" width="270" xml:lang="en">https://redcap.vanderbilt.edu/consortium/resources/img/redcaplogo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:InformationURL xml:lang="en">http://project-redcap.org/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://policy.uncg.edu/identity_theft_prevention/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="83" width="270" xml:lang="en">https://redcap.vanderbilt.edu/consortium/resources/img/redcaplogo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC9DCCAdygAwIBAgIJAK1yg/0VpN2oMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD1BMWC1SRURDQVBXRUIwMTAeFw0xNTA2MDMxNTEzMjJaFw0yNTA1MzExNTEz
 MjJaMBoxGDAWBgNVBAMTD1BMWC1SRURDQVBXRUIwMTCCASIwDQYJKoZIhvcNAQEB
@@ -42,44 +42,44 @@ DcR3wtVT2Uvaoy/IgrVpNHWfUYwrkRNXGJYJ6x7wTT6vUfluBjsi3QvLHBnf25N/
 fEmJcm2kUTYQ6YSJtRZCuymQQ67azrAzsiLnHJgk0Xk6djDHHpyxqHxg28ZkSv3e
 h/qc0giBRmuQau2O9yXc6sVnFUJ7Q/ebirLVFrJ5Q9miyy/OPu192Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://redcap.uncg.edu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://redcap.uncg.edu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.uncg.edu/Shibboleth.sso/SLO/POST"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">UNCG REDCap</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">UNCG - School of Health and Human Sciences instance of Research Electronic Data Capture (REDCap) software.
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://redcap.uncg.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://redcap.uncg.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.uncg.edu/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://redcap.uncg.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">UNCG REDCap</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">UNCG - School of Health and Human Sciences instance of Research Electronic Data Capture (REDCap) software.
 </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uncg.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>idm-admin@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Department Application Hosting</md:GivenName>
-      <md:EmailAddress>its-syn-dept-app-hosting-l@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>6-TECH</md:GivenName>
-      <md:EmailAddress>6-TECH@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Computing Abuse</md:GivenName>
-      <md:EmailAddress>abuse@uncg.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uncg.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>idm-admin@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Department Application Hosting</md:GivenName>
+    <md:EmailAddress>its-syn-dept-app-hosting-l@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>6-TECH</md:GivenName>
+    <md:EmailAddress>6-TECH@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Computing Abuse</md:GivenName>
+    <md:EmailAddress>abuse@uncg.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml
index b47e9a66..09b0950f 100644
--- a/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://register-ci.nii.ac.jp/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/auth/action/ukfamLogin" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/auth/action/ukfamLogin" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEPDCCAyQCCQDZrw7Kede8nzANBgkqhkiG9w0BAQUFADCB3zELMAkGA1UEBhMC
 						SlAxDjAMBgNVBAgTBVRva3lvMRMwEQYDVQQHEwpDaGl5b2RhLWt1MSowKAYDVQQK
 						EyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxPDA6BgNVBAsTM0N5
@@ -35,35 +35,35 @@
 						u22qH/3netIbZQRzEDxUGEvwVHfyKYDe3BrMTviwNTMKYSqGu/Ay5NfZS0Y730WR
 						InZCWpRbzFnfZk1vvI1jImCVZaq8d4DsHIqVuzcAD2Y=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institute of Informatics</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institute of Informatics: CiNii</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Portal Service Unit</md:GivenName>
-      <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Portal Service Unit</md:GivenName>
-      <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institute of Informatics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute of Informatics: CiNii</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Portal Service Unit</md:GivenName>
+    <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Portal Service Unit</md:GivenName>
+    <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
index 3092c465..5ee60ae3 100644
--- a/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registration.dariah.eu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-05-15T11:08:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-05-15T11:08:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH Registration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH Registration</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</mdui:Description>
+        <mdui:Description xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</mdui:Description>
+        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
+        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DARIAH Registration</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DARIAH Registration</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</mdui:Description>
-          <mdui:Description xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</mdui:Description>
-          <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-          <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
 EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
 Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
 MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
@@ -61,53 +61,53 @@ KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
 aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
 q1AZvg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">DARIAH Registration</md:ServiceName>
-        <md:ServiceName xml:lang="en">DARIAH Registration</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Haase</md:SurName>
-      <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Haase</md:SurName>
-      <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Haase</md:SurName>
-      <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">DARIAH Registration</md:ServiceName>
+      <md:ServiceName xml:lang="en">DARIAH Registration</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Haase</md:SurName>
+    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Haase</md:SurName>
+    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Haase</md:SurName>
+    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml b/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml
index 8c288e94..d7035ea7 100644
--- a/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml
+++ b/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry-dev.icer.niaid.nih.gov/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NIAID ICER Collaboration Manager (development)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NIAID ICER collaboration management service</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://comanage-dev.ibrsp.org/spinfo</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://comanage-dev.ibrsp.org/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://comanage-dev.ibrsp.org/logo</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NIAID ICER Collaboration Manager (development)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">NIAID ICER collaboration management service</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://comanage-dev.ibrsp.org/spinfo</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://comanage-dev.ibrsp.org/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://comanage-dev.ibrsp.org/logo</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDITCCAgmgAwIBAgIJAKXHrFJmGSjGMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 BAMTHmR1Yi1pYi1jb21nci1kMDEuZGV2LmlicnNwLm9yZzAeFw0xNTA0MjIxNTEy
 MTZaFw0yNTA0MTkxNTEyMTZaMCkxJzAlBgNVBAMTHmR1Yi1pYi1jb21nci1kMDEu
@@ -42,40 +42,40 @@ kgCqkBIswZlb+wIbxOXh3fHvye+hFIWyzfXqFfBDlqfrjnVJdXEIybcbepFGo6CU
 H5d9gDlXJkUIow33DTF49LNz06qMfwCIYn6Np0I0XuE5QoKLWkBuDI2Mf0QcBPWG
 LrYgVs8i/+PGN80oJnOo07/PFhI0QA8JQwSjUHIbZIBmGB6SUw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NIAID ICER Collaboration Manager (development)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">NIAID ICER collaboration management service</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>cer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>cer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-      <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NIAID ICER Collaboration Manager (development)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NIAID ICER collaboration management service</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>cer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>cer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
+    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml b/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml
index f27cd4c0..a3f9e8f8 100644
--- a/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml
+++ b/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry.icer.niaid.nih.gov/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://registration.icer.niaid.nih.gov/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NIAID ICER Collaboration Manager</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A collaboration management platform designed for virtual organizations.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://scienceforum.sc/registry.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://scienceforum.sc/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://registration.icer.niaid.nih.gov/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NIAID ICER Collaboration Manager</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A collaboration management platform designed for virtual organizations.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://scienceforum.sc/registry.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://scienceforum.sc/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFdzCCA1+gAwIBAgIJAMDh5yvo5rhOMA0GCSqGSIb3DQEBDQUAMFIxJDAiBgNV
 BAMMG3JlZ2lzdHJ5LmljZXIubmlhaWQubmloLmdvdjEqMCgGCSqGSIb3DQEJARYb
 aWNlci12cm8tYWRtaW5AbGlzdC5uaWguZ292MB4XDTE2MDEwODE4MjY1MFoXDTI2
@@ -54,40 +54,40 @@ VUdNkk3QJpJZT0l8ZWZ81HQxprOvEIlWpf6IJvTpP5FhcSKnr7jTQZQIy/VGj0rF
 b2SeLnJHEgFeFqyTlQabwARTqLUDCozkEmnV9fDIYJ1HjRy0IqwHiC35kkNHQdC6
 VLgD+AE4OEIwN+k=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://registration.scienceforum.sc/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registration.scienceforum.sc/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">NIAID ICER Collaboration Manager</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">A collaboration management platform designed for virtual organizations.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-      <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-      <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://registration.scienceforum.sc/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registration.scienceforum.sc/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://registration.scienceforum.sc/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NIAID ICER Collaboration Manager</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A collaboration management platform designed for virtual organizations.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
+    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
+    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml
index 06a64c5b..024303c8 100644
--- a/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry.larpp.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://registry.larpp.internet2.edu/spinfo.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="275" xml:lang="en">https://registry.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Registry</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://registry.larpp.internet2.edu/spinfo.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="275" xml:lang="en">https://registry.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIJAL9sC3mP5/uMMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 BAMTHHJlZ2lzdHJ5LmxhcnBwLmludGVybmV0Mi5lZHUwHhcNMTQwNDI5MTYwOTQz
 WhcNMjQwNDI2MTYwOTQzWjAnMSUwIwYDVQQDExxyZWdpc3RyeS5sYXJwcC5pbnRl
@@ -42,47 +42,47 @@ wz1/tj+w3FgJhPG0qY+TOMGPSe+UagL2O4LMAyFk7I8vEWi60BlO52npDhaYGXeo
 mA/jv7XqqSBfGCvHS973BG/tP1XfuwmpJqgx00x0wQlbPweIH3RmmCg3S11ZCZi8
 Qpkmgq5ZqYDMrzfYjwLpl5kpRrMdP/1Nw6g2BGe6qA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Registry</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tracy Beth Mitrano</md:GivenName>
-      <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LARPP Technical Support</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LARPP Support</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LARPP Incident Response</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tracy Beth Mitrano</md:GivenName>
+    <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LARPP Technical Support</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LARPP Support</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LARPP Incident Response</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml
index 65260d08..702d5230 100644
--- a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml
+++ b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry.shibboleth.ox.ac.uk/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-26T09:12:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-10-26T09:12:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIJAJ3Ublo6lbs7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF2lkcC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDEwOTE0MzkyNFoXDTM0
 						MDEwOTE0MzkyNFowIjEgMB4GA1UEAxMXaWRwLnNoaWJib2xldGgub3guYWMudWsw
@@ -32,26 +32,26 @@
 						ZnKz8ZUKn9ypehARSzHsOYPFBsWzFHWZfhN4JLUmAsaAcapBmDo2Rn1ZkXDAGYMT
 						3We0cygwa3z8pz8F9sHQEhdE2CTxxhJpdmOeI1UYE5c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ox.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIJAJ3Ublo6lbs7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF2lkcC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDEwOTE0MzkyNFoXDTM0
 						MDEwOTE0MzkyNFowIjEgMB4GA1UEAxMXaWRwLnNoaWJib2xldGgub3guYWMudWsw
@@ -71,25 +71,25 @@
 						ZnKz8ZUKn9ypehARSzHsOYPFBsWzFHWZfhN4JLUmAsaAcapBmDo2Rn1ZkXDAGYMT
 						3We0cygwa3z8pz8F9sHQEhdE2CTxxhJpdmOeI1UYE5c=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help</md:GivenName>
-      <md:EmailAddress>mailto:help@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sysdev</md:GivenName>
-      <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help</md:GivenName>
+    <md:EmailAddress>mailto:help@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sysdev</md:GivenName>
+    <md:EmailAddress>mailto:sysdev@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rellias.imodules.com-sp.xml b/swamid-interfederations-2.0/rellias.imodules.com-sp.xml
index fc376a2e..c9073183 100644
--- a/swamid-interfederations-2.0/rellias.imodules.com-sp.xml
+++ b/swamid-interfederations-2.0/rellias.imodules.com-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://rellias.imodules.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">rellias</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">rellias</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
 MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
 MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
@@ -36,18 +36,18 @@ pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
 6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
 MJlfQnuceWY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://relliascommerce.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1325&amp;gid=1" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Raoul Ellias</md:GivenName>
-      <md:EmailAddress>rellias@imodules.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://relliascommerce.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1325&amp;gid=1" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Raoul Ellias</md:GivenName>
+    <md:EmailAddress>rellias@imodules.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml b/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
index 7e1a2dc6..f7cb755b 100644
--- a/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rems.elixir-finland.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">REMS ELIXIR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">REMS ELIXIR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</mdui:Description>
+        <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">REMS ELIXIR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">REMS ELIXIR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</mdui:Description>
-          <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="fi">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFfDCCBGSgAwIBAgIRAOOPBaozx9H6wmXnbZDrqlYwDQYJKoZIhvcNAQEFBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFfDCCBGSgAwIBAgIRAOOPBaozx9H6wmXnbZDrqlYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMEUxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXcmVtcy5lbGl4
@@ -54,46 +54,46 @@ FBgU9FD4sHqSKPEDOitsVTb1Vb1PYLYNaLpJnK70WS/vNCK/mZsy4qWeoxSBIUry
 rlnCOtELPe7YWkB3fAbmzI3FVfHrtb73vAJ6hfbOfuzVwfuEAU4U3+V175fktpw5
 RKcIVJFGa06KaJwT75b637GEuqs/YUdjCJU3uDk/eUnxO8ZZvA7gvxNQXAQBQ0oG
 vzJQyIviY90sJo1Cisoynw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rems.elixir-finland.org/Shibboleth.sso/SLO/POST"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rems.elixir-finland.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">REMS ELIXIR</md:ServiceName>
-        <md:ServiceName xml:lang="en">REMS ELIXIR</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">ELIXIRin aineistojen kayttovaltuuksien hallintajarjestelma.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Timo</md:GivenName>
-      <md:SurName>Mustonen</md:SurName>
-      <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Timo</md:GivenName>
-      <md:SurName>Mustonen</md:SurName>
-      <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rems.elixir-finland.org/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rems.elixir-finland.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">REMS ELIXIR</md:ServiceName>
+      <md:ServiceName xml:lang="en">REMS ELIXIR</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">ELIXIRin aineistojen kayttovaltuuksien hallintajarjestelma.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
index a437bab9..97ed8d53 100644
--- a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rendez-vous.renater.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-16T12:36:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-16T12:36:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">rendez-vous platform</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://rendez-vous.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Videoconferencing service Rendez-vous</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">plateforme rendez-vous</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">service de visio-conférence Rendez-vous</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">rendez-vous platform</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://rendez-vous.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Videoconferencing service Rendez-vous</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">plateforme rendez-vous</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">service de visio-conférence Rendez-vous</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICVDCCAb2gAwIBAgIJANCWoubBHQg0MA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
 BAYTAkZSMRQwEgYDVQQKDAtHSVAgUkVOQVRFUjEeMBwGA1UEAwwVcmVuZGV6dm91
 cy5yZW5hdGVyLmZyMB4XDTE1MDMxNjExMjIwMFoXDTM1MDMxMTExMjIwMFowQzEL
@@ -40,13 +40,13 @@ zj16Ew8OQzC0oKfgorVh3LhhSqykgsmo4gLR6t3EKTtjWjjZ+tP9pVaN6vINj4lw
 40l+az59c1wHjbHZiKbFyBhLDAEwvsO1
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICVDCCAb2gAwIBAgIJANCWoubBHQg0MA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
 BAYTAkZSMRQwEgYDVQQKDAtHSVAgUkVOQVRFUjEeMBwGA1UEAwwVcmVuZGV6dm91
 cy5yZW5hdGVyLmZyMB4XDTE1MDMxNjExMjIwMFoXDTM1MDMxMTExMjIwMFowQzEL
@@ -62,39 +62,34 @@ zj16Ew8OQzC0oKfgorVh3LhhSqykgsmo4gLR6t3EKTtjWjjZ+tP9pVaN6vINj4lw
 40l+az59c1wHjbHZiKbFyBhLDAEwvsO1
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rendez-vous.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rendez-vous.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">plateforme rendez-vous</md:ServiceName>
-        <md:ServiceName xml:lang="en">rendez-vous platform</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">service de visio-conférence Rendez-vous</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Videoconferencing service Rendez-vous</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sami Honein</md:SurName>
-      <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Pawel Domas</md:SurName>
-      <md:EmailAddress>pawel.domas@jitsi.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rendez-vous.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rendez-vous.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">plateforme rendez-vous</md:ServiceName>
+      <md:ServiceName xml:lang="en">rendez-vous platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">service de visio-conférence Rendez-vous</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Videoconferencing service Rendez-vous</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sami Honein</md:SurName>
+    <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pawel Domas</md:SurName>
+    <md:EmailAddress>pawel.domas@jitsi.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
index a4e21071..d3074c17 100644
--- a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repo.clarino.uib.no/shibboleth/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-11-19T14:56:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-11-19T14:56:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repo.clarino.uib.no/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARINO Bergen Langzeitarchiv</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARINO Bergen Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
+        <mdui:Description xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</mdui:Description>
+        <mdui:Logo height="16" width="16">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/favicon.ico</mdui:Logo>
+        <mdui:Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://repo.clarino.uib.no/xmlui/privacypolicy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repo.clarino.uib.no/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">CLARINO Bergen Langzeitarchiv</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CLARINO Bergen Repository</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
-          <mdui:Description xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</mdui:Description>
-          <mdui:Logo height="16" width="16">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/favicon.ico</mdui:Logo>
-          <mdui:Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://repo.clarino.uib.no/xmlui/privacypolicy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>repo.clarino.uib.no</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=repo.clarino.uib.no</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>repo.clarino.uib.no</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=repo.clarino.uib.no</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3JlcG8uY2xhcmluby51aWIubm8wHhcNMTQxMjE4MDkwNTE1WhcNMjQxMjE1
 MDkwNTE1WjAeMRwwGgYDVQQDExNyZXBvLmNsYXJpbm8udWliLm5vMIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OVEwzYCig35Ii37Buky/t7KWlNUEkGP
@@ -50,60 +50,60 @@ tNRgm6CrMBfiQUxQw5Gqsiuyf3rpzQLslEWEmP4AuoiUvlXiWqW+fDKhDhj2vlc8
 0jOCrQaG00xvCbXSg91K+Xxj1kXjArfX4R7aB1TquBqLoFbPo0lNooYBECv+bN2q
 rYzidg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">CLARINO Bergen Langzeitarchiv</md:ServiceName>
-        <md:ServiceName xml:lang="en">CLARINO Bergen Repository</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Oyvind Liland</md:GivenName>
-      <md:SurName>Gjesdal</md:SurName>
-      <md:EmailAddress>mailto:oyvind.gjesdal@uib.no</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Koenraad</md:GivenName>
-      <md:SurName>de Smedt</md:SurName>
-      <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hemed</md:GivenName>
-      <md:SurName>Al Ruwehy</md:SurName>
-      <md:EmailAddress>mailto:hemed.ruwehy@uib.no</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARINO Bergen Langzeitarchiv</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARINO Bergen Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oyvind Liland</md:GivenName>
+    <md:SurName>Gjesdal</md:SurName>
+    <md:EmailAddress>mailto:oyvind.gjesdal@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Koenraad</md:GivenName>
+    <md:SurName>de Smedt</md:SurName>
+    <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hemed</md:GivenName>
+    <md:SurName>Al Ruwehy</md:SurName>
+    <md:EmailAddress>mailto:hemed.ruwehy@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
index 8c932fe7..7d27a7ea 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repos.ids-mannheim.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repos.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Forschungsprimärdatenrepository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Research Data Respository</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
+        <mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
+        <mdui:Logo height="16" width="16">https://repos.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
+        <mdui:Logo height="63" width="318">https://repos.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repos.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Forschungsprimärdatenrepository</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Research Data Respository</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
-          <mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
-          <mdui:Logo height="16" width="16">https://repos.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-          <mdui:Logo height="63" width="318">https://repos.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGHGxH2MWmjANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGHGxH2MWmjANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
 MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
@@ -66,50 +66,50 @@ T4i6DwZIlHs/RRr1euCJszIc25Pco/JCHf+UCNaWmXi8tWbM+RbvP14lGpgMqtEU
 6DYCJd/I407y24ykEwvD8HQjyERNEDJFz2P5IyH4kmsIOwXNQEoOhSFt/cvvSplt
 PZjG46BQGsou6pJHmLhC/+tMXlY0jVRn6uQ4yFjtazWE24EYG+Q7dJ5yMw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Forschungsprimärdatenrepository</md:ServiceName>
-        <md:ServiceName xml:lang="en">Research Data Respository</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Andreas</md:GivenName>
-      <md:SurName>Witt</md:SurName>
-      <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Oliver</md:GivenName>
-      <md:SurName>Schonefeld</md:SurName>
-      <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>AAI</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:aai@ids-mannheim.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Forschungsprimärdatenrepository</md:ServiceName>
+      <md:ServiceName xml:lang="en">Research Data Respository</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Witt</md:SurName>
+    <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Schonefeld</md:SurName>
+    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AAI</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:aai@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml
index 55a90dd6..b95abb01 100644
--- a/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repository.abertay.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-10T13:04:57Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-10T13:04:57Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://repository.abertay.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://repository.abertay.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAMHx/2oqSbXWMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmxhYy1yZXBvLWxpdmU5MB4XDTEyMTEyNzE0MjE1M1oXDTIyMTEyNTE0MjE1
 						M1owGTEXMBUGA1UEAxMObGFjLXJlcG8tbGl2ZTkwggEiMA0GCSqGSIb3DQEBAQUA
@@ -39,39 +39,39 @@
 						ykCTM40AyIXjA/Ta2ITgcF/RrDnBjZsO1e1CA4DYl7T3NYli8IXbZFfo10GNAF3w
 						8pR9IZk5rxzXJj2quy653rOhqoiZJ2sJw6cQW1ZXFas7jy6vfQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.abertay.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Abertay Dundee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Research Repository</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:isservicedesk@abertay.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Colin</md:GivenName>
-      <md:SurName>Watt</md:SurName>
-      <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.abertay.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Abertay Dundee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Research Repository</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:isservicedesk@abertay.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml
index 9bd4f8bb..3de5ad77 100644
--- a/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repository.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-27T14:57:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-27T14:57:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JISC Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access for registered users to JISC Repository.</mdui:Description>
+        <mdui:Logo height="68" width="350">https://repository.jisc.ac.uk/shib/shib_repository_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">JISC Repository</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access for registered users to JISC Repository.</mdui:Description>
-          <mdui:Logo height="68" width="350">https://repository.jisc.ac.uk/shib/shib_repository_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJALWBNu60kA8RMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGpyZXBsdjAxLmppc2MudWxjYy5hYy51azAeFw0xMjA3MDUxMzQ1NTlaFw0y
 						MjA3MDMxMzQ1NTlaMCMxITAfBgNVBAMTGGpyZXBsdjAxLmppc2MudWxjYy5hYy51
@@ -37,34 +37,34 @@
 						SfFVmy2rkht+5rqtDhiHHVkQyr1p40RnXgRNdk1MmkmhXkt4odKYTvTqscnVYvR9
 						fHsDbj+iVNwcJSOlMecWJDLdeA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">JISC Repository</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/aboutus.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Laura</md:GivenName>
-      <md:SurName>Smyth</md:SurName>
-      <md:EmailAddress>mailto:itservicedesk@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Justin</md:GivenName>
-      <md:SurName>Bradley</md:SurName>
-      <md:EmailAddress>mailto:jb4@ecs.soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JISC Repository</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/aboutus.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Laura</md:GivenName>
+    <md:SurName>Smyth</md:SurName>
+    <md:EmailAddress>mailto:itservicedesk@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Justin</md:GivenName>
+    <md:SurName>Bradley</md:SurName>
+    <md:EmailAddress>mailto:jb4@ecs.soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml b/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
index 301bcb98..df55597a 100644
--- a/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
+++ b/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://researchmonitor.euromonitor.com/web/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T12:09:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T12:09:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
 						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
 						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
@@ -32,13 +32,13 @@
 						welIK72JvRFuIH4129ibwKQ+aWdpAJjJJW1tFigKhbBkRW8TECZAvZoR93ipd4Un
 						rYW3RbTRG7qxLXlaiUzJzGuejm0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
 						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
 						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
@@ -61,27 +61,27 @@
 						welIK72JvRFuIH4129ibwKQ+aWdpAJjJJW1tFigKhbBkRW8TECZAvZoR93ipd4Un
 						rYW3RbTRG7qxLXlaiUzJzGuejm0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research Monitor (Live) - Euromonitor International</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jürgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jürgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research Monitor (Live) - Euromonitor International</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jürgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jürgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
index 3d524614..c2e540ec 100644
--- a/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://researchtools.ncl.ac.uk/shibboleth/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-24T10:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-24T10:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6zCCAdOgAwIBAgIJAJn8r34tncaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDHJ1bW1hZ2UtbGl2ZTAeFw0xNDAzMDUxNTIyMTlaFw0yNDAzMDIxNTIyMTla
 						MBcxFTATBgNVBAMTDHJ1bW1hZ2UtbGl2ZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -30,37 +30,37 @@
 						EFUqhPiQJe7Rk/eEObez0JzdYVhaHXAUlc4mbuqolLL2awtse/Jaa1H0Mod8Vn55
 						qgHoQEuHc+zVzvLepkSrLO0FobW/WlrFvORrQ/NsjQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle University: Research Tools server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ISS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:helpline@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Franks</md:SurName>
-      <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle University: Research Tools server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ISS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:helpline@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Franks</md:SurName>
+    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml b/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml
index a90748af..0f6e45ff 100644
--- a/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://retrieverstories-dev.umbc.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Retriever Stories (development)</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://retrieverstories-dev.umbc.edu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Retriever Stories (development)</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://retrieverstories-dev.umbc.edu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHjCCAgagAwIBAgIJAI0RUT0r/oX8MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 BAMTHWphYmJhLXd3dy1wcm9kMS5jb3JlLnVtYmMuZWR1MB4XDTExMTAxMDIwMzYx
 MFoXDTIxMTAwNzIwMzYxMFowKDEmMCQGA1UEAxMdamFiYmEtd3d3LXByb2QxLmNv
@@ -38,38 +38,38 @@ OXVVS7Im4xemrgUPAUArzcGEMhAuGc4fZgiJJ93Vtw/MzpcqXW3woU4s+yuY3Dcn
 wJC08P8O53sa3+tLYDHiJdjRo5cOXwbFhex/GrHIMAnN2s7lFw55P04VmLuo/7pB
 ao6Rbsibw3/fICNNEUjDp113Ypd6MW4ncJ0OJhknmmrRRg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Retriever Stories (development)</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>B. Collier Jones</md:GivenName>
-      <md:EmailAddress>collier@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ed Rude</md:GivenName>
-      <md:EmailAddress>erude1@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Billy Schneider</md:GivenName>
-      <md:EmailAddress>will3@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Retriever Stories (development)</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>B. Collier Jones</md:GivenName>
+    <md:EmailAddress>collier@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ed Rude</md:GivenName>
+    <md:EmailAddress>erude1@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Billy Schneider</md:GivenName>
+    <md:EmailAddress>will3@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml b/swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml
index 54a5d1be..295a548c 100644
--- a/swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://retrieverstories.umbc.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Retriever Stories</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://retrieverstories.umbc.edu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Retriever Stories</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://retrieverstories.umbc.edu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHjCCAgagAwIBAgIJAI0RUT0r/oX8MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 BAMTHWphYmJhLXd3dy1wcm9kMS5jb3JlLnVtYmMuZWR1MB4XDTExMTAxMDIwMzYx
 MFoXDTIxMTAwNzIwMzYxMFowKDEmMCQGA1UEAxMdamFiYmEtd3d3LXByb2QxLmNv
@@ -38,38 +38,38 @@ OXVVS7Im4xemrgUPAUArzcGEMhAuGc4fZgiJJ93Vtw/MzpcqXW3woU4s+yuY3Dcn
 wJC08P8O53sa3+tLYDHiJdjRo5cOXwbFhex/GrHIMAnN2s7lFw55P04VmLuo/7pB
 ao6Rbsibw3/fICNNEUjDp113Ypd6MW4ncJ0OJhknmmrRRg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Retriever Stories</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>B. Collier Jones</md:GivenName>
-      <md:EmailAddress>collier@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ed Rude</md:GivenName>
-      <md:EmailAddress>erude1@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Billy Schneider</md:GivenName>
-      <md:EmailAddress>will3@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Retriever Stories</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>B. Collier Jones</md:GivenName>
+    <md:EmailAddress>collier@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ed Rude</md:GivenName>
+    <md:EmailAddress>erude1@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Billy Schneider</md:GivenName>
+    <md:EmailAddress>will3@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
index 20193670..8a221e4a 100644
--- a/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rhc-fed.reaseheath.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-07T15:39:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-07T15:39:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reaseheath.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reaseheath.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -32,13 +32,13 @@
 						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
 						LesywhYMlSPtH22K+a3CiahDMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -58,13 +58,13 @@
 						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
 						gvZT6e+fbGfucnFJvdlyK66CbQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
 						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
@@ -84,26 +84,26 @@
 						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
 						5QUuKHTcpSRcXCPL+qGac9d/T6E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reaseheath.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reaseheath.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -123,13 +123,13 @@
 						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
 						LesywhYMlSPtH22K+a3CiahDMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
 						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
@@ -149,13 +149,13 @@
 						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
 						gvZT6e+fbGfucnFJvdlyK66CbQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
 						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
@@ -175,23 +175,23 @@
 						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
 						5QUuKHTcpSRcXCPL+qGac9d/T6E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reaseheath College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reaseheath College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services</md:GivenName>
-      <md:EmailAddress>mailto:itservices@reaseheath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Oliver</md:GivenName>
-      <md:SurName>Dickins</md:SurName>
-      <md:EmailAddress>mailto:Oliverd@reaseheath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reaseheath College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reaseheath College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services</md:GivenName>
+    <md:EmailAddress>mailto:itservices@reaseheath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Dickins</md:SurName>
+    <md:EmailAddress>mailto:Oliverd@reaseheath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
index 52f6c46d..112a01eb 100644
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ricevi.ct.infn.it/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-03T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
-          <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
@@ -52,59 +52,59 @@ JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
 W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">RICeVI portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Riccardo</md:GivenName>
-      <md:SurName>Rotondo</md:SurName>
-      <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Giuseppe</md:GivenName>
-      <md:SurName>Platania</md:SurName>
-      <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Carlo</md:GivenName>
-      <md:SurName>Rocca</md:SurName>
-      <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">RICeVI portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
index a0113354..dc310024 100644
--- a/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rigal.enpc.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-28T15:39:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-28T15:39:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enpc.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">École des Ponts ParisTech</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7ElEQVQoz42Rz2/SYBjHX/rSvmW0sK6WhLLLPIhwdX+C2YWYGdDIMJpF/Z+W6XHxJgtTTCZb0xX5ddOMpWNhbiCQFHugykvXtQIeZjAq030vT57n+X6e7+EB40tUq9WmzgkwTUo+n9l6Xa+f/L2aAti2fXhY43m+WHx/JeBdLufz+Z49fWJZ5/l84T+A1taOjuosy8qywnFctboPgP0vICdLPpYV5vhIJMzz3HA4yr7duRSoVqvn1tnq6mNsDnRdh5CMx++22x1dNyYe13g8njRra+sQQp6f6/f7hvFVEK55PDOtdksQhNRK8s+EQqHQM3qI9tA0EoRAOHzDP+tHCHloz+dmS1XVC5v7ohiGcXCgLt5a7HTasVhsckXX9Wy2G4ncLJUr0Wj0V8LurkTTaGnpNgFhJrM1Aba3cxzHLS/fGY9GiqL8BJrN5snpKULoVXqTdLuPjz9pmgYAUFW12/3iOE46vQkh/PBxH9g2AQDIF4pBURTF4L1EPBAQQvPi3p4CACiXK6IYDIXmE4n4wsJ1lmHe5HaIUqmCv/UfPUwBACRJpih6JZnEeLCx8ZKiUCqVNM2BJMkkCRMP7jcaDdf68xcYY5Zhvg+Hpml6Z7wQuswzC2M86/eTFOU4jmVZjJdxES7D6P32h6voB98GBPZakOIQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjIwKzAyOjAwq4YxQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDoyMCswMjowMNrbif0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enpc.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">PhD and Service documentary École des Ponts ParisTech</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">École des Ponts ParisTech</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Doctorants et service documentaire de l'École des Ponts ParisTech</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enpc.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">École des Ponts ParisTech</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7ElEQVQoz42Rz2/SYBjHX/rSvmW0sK6WhLLLPIhwdX+C2YWYGdDIMJpF/Z+W6XHxJgtTTCZb0xX5ddOMpWNhbiCQFHugykvXtQIeZjAq030vT57n+X6e7+EB40tUq9WmzgkwTUo+n9l6Xa+f/L2aAti2fXhY43m+WHx/JeBdLufz+Z49fWJZ5/l84T+A1taOjuosy8qywnFctboPgP0vICdLPpYV5vhIJMzz3HA4yr7duRSoVqvn1tnq6mNsDnRdh5CMx++22x1dNyYe13g8njRra+sQQp6f6/f7hvFVEK55PDOtdksQhNRK8s+EQqHQM3qI9tA0EoRAOHzDP+tHCHloz+dmS1XVC5v7ohiGcXCgLt5a7HTasVhsckXX9Wy2G4ncLJUr0Wj0V8LurkTTaGnpNgFhJrM1Aba3cxzHLS/fGY9GiqL8BJrN5snpKULoVXqTdLuPjz9pmgYAUFW12/3iOE46vQkh/PBxH9g2AQDIF4pBURTF4L1EPBAQQvPi3p4CACiXK6IYDIXmE4n4wsJ1lmHe5HaIUqmCv/UfPUwBACRJpih6JZnEeLCx8ZKiUCqVNM2BJMkkCRMP7jcaDdf68xcYY5Zhvg+Hpml6Z7wQuswzC2M86/eTFOU4jmVZjJdxES7D6P32h6voB98GBPZakOIQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjIwKzAyOjAwq4YxQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDoyMCswMjowMNrbif0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enpc.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">PhD and Service documentary École des Ponts ParisTech</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">École des Ponts ParisTech</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Doctorants et service documentaire de l'École des Ponts ParisTech</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
 NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
@@ -39,23 +39,23 @@ sEO4AsyB/pRaaLnY0f8l4JWQ7FamjxTnh8qHGJoqduObD7Xbb0qXVYkrbFlL3FPM
 PMKklaZEuFwUvhZv4b4/knBsTY44PY+O1RrRrCYPq9vp9Bom1ISiib5z4NEAdqmc
 9qZF1JjPaLWtNJBI1GyC1Pu5LMuR/e/8h0w1OliDby1w3fw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rigal.enpc.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rigal.enpc.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rigal.enpc.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enpc.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rigal.enpc.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rigal.enpc.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rigal.enpc.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enpc.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
 NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
@@ -74,19 +74,19 @@ sEO4AsyB/pRaaLnY0f8l4JWQ7FamjxTnh8qHGJoqduObD7Xbb0qXVYkrbFlL3FPM
 PMKklaZEuFwUvhZv4b4/knBsTY44PY+O1RrRrCYPq9vp9Bom1ISiib5z4NEAdqmc
 9qZF1JjPaLWtNJBI1GyC1Pu5LMuR/e/8h0w1OliDby1w3fw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rigal.enpc.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">École des Ponts ParisTech</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">École des Ponts ParisTech</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enpc.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi-exploitation@enpc.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rigal.enpc.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">École des Ponts ParisTech</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">École des Ponts ParisTech</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enpc.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi-exploitation@enpc.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
index 70fb6f49..dbdc8ead 100644
--- a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rir.dariah.eu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
+        <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
+        <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
-          <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
-          <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>rir.dariah.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rir.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -64,43 +64,43 @@ oLD9C/n5AhDtBEBlw31Od3Lb624xDXOg4xLVn/I+egQWN0bu7ZbXLN3LFzFdNLMK
 TuWnKD0bEWbEYRR2MCx7Md1fKW7MlgMC6jFqpHlZAfb4GVWHdIW6DU/TaxM0KJ7V
 V88S++4/7Dd9Tp/NAtNfdv/hkVRV5yNyM5mIA3eYyrnr6RualuszsdzI
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">RiR Suchportal</md:ServiceName>
-        <md:ServiceName xml:lang="en">RiR Search Portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Relationen im Raum Suchportal</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Relationen im Raum Search Portal</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tamim</md:GivenName>
-      <md:SurName>Ziai</md:SurName>
-      <md:EmailAddress>mailto:tamim.ziai@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dariah</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">RiR Suchportal</md:ServiceName>
+      <md:ServiceName xml:lang="en">RiR Search Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Relationen im Raum Suchportal</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Relationen im Raum Search Portal</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tamim</md:GivenName>
+    <md:SurName>Ziai</md:SurName>
+    <md:EmailAddress>mailto:tamim.ziai@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dariah</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
index 133c62d0..d44a4ea7 100644
--- a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rja-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Riga Graduate School of Law</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Riga Graduate School of Law</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - RJA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Riga Graduate School of Law - RJA IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.rgsl.edu.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - RJA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Riga Graduate School of Law - RJA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.rgsl.edu.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
index c266ca1c..053d54c3 100644
--- a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rnp-cafe.ifs.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFS - Instituto Federal Sergipe</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFS - Instituto Federal Sergipe</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.ifs.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">https://www.ifs.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFS - Instituto Federal Sergipe</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFS - Instituto Federal Sergipe</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.ifs.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">https://www.ifs.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDmjCCAoICAQAwDQYJKoZIhvcNAQEFBQAwgZIxDDAKBgNVBAoTA0lGUzEMMAoG
 A1UECxMDRFRJMR8wHQYJKoZIhvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMQwwCgYD
 VQQHEwNBSlUxJTAjBgNVBAgTHElOU1RJVFVUTyBGRURFUkFMIERFIFNFUkdJUEUx
@@ -44,26 +44,26 @@ VqW3/LVA5m3vxJn0JFoez65HTVlIgaELJbIw5deHZbYe07e0cQKfEcfuJwzh33YO
 R2dlYBbt6VnHnQZs+va8RjGt6Q0lRgBsQ5cfwrwDVIdzdB0gOleF/xa0BeKS0GlT
 MC5VxNHzIJWcOb6+ZOc=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDmjCCAoICAQAwDQYJKoZIhvcNAQEFBQAwgZIxDDAKBgNVBAoTA0lGUzEMMAoG
 A1UECxMDRFRJMR8wHQYJKoZIhvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMQwwCgYD
@@ -87,24 +87,24 @@ R2dlYBbt6VnHnQZs+va8RjGt6Q0lRgBsQ5cfwrwDVIdzdB0gOleF/xa0BeKS0GlT
 MC5VxNHzIJWcOb6+ZOc=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFS - Instituto Federal Sergipe</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.ifs.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">https://www.ifs.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Joao Silvio</md:SurName>
-      <md:EmailAddress>coimr@ifs.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFS - Instituto Federal Sergipe</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ifs.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">https://www.ifs.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Joao Silvio</md:SurName>
+    <md:EmailAddress>coimr@ifs.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml
index f67989b5..addfa75a 100644
--- a/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rns.aai.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
+        <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
-          <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIICvzCCAiigAwIBAgIJAKmmMNNLfw5PMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTAeFw0xNTExMDMxOTA4MjBaFw0yNTEwMzExOTA4MjBaMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxTKyp+PbB4vBlzgPVQsBETA/x+dyTLXqt9F34ujVMj8pHwwyLYBSguTi+sKHBZ4gkeW93BIWAJhX+e1er6oHcjlnwgqEGWOmX+oWKjfqJb7sqlnKTKrBUMTwGsdciXk1QIAXsvEYOJ1Ais8YavgrVqZYkn2tOfAFbNXdmOJTgFkCAwEAAaOBrDCBqTAdBgNVHQ4EFgQUalaXcVa41eu3N4yq1cu/p1yQCM0wegYDVR0jBHMwcYAUalaXcVa41eu3N4yq1cu/p1yQCM2hTqRMMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odYIJAKmmMNNLfw5PMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMHBYCNkUPAf1R14pd2fiOHyTs84ejnGAKghumXqVffUO3AxERutI8AZtaH6ZSt5cfcsGqb+KsHbAb38JrRlrxGr0wxbuTr7gpwessPvECxWGUj6kkKOnQg35Xyd5EQzhsKrjUL2EC7OM5bMwok9TeUkDta4frQW8/RGZIYJq5aQ=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>rns.aai.niif.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
-        <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>NIIFI AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICvzCCAiigAwIBAgIJAKmmMNNLfw5PMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTAeFw0xNTExMDMxOTA4MjBaFw0yNTEwMzExOTA4MjBaMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxTKyp+PbB4vBlzgPVQsBETA/x+dyTLXqt9F34ujVMj8pHwwyLYBSguTi+sKHBZ4gkeW93BIWAJhX+e1er6oHcjlnwgqEGWOmX+oWKjfqJb7sqlnKTKrBUMTwGsdciXk1QIAXsvEYOJ1Ais8YavgrVqZYkn2tOfAFbNXdmOJTgFkCAwEAAaOBrDCBqTAdBgNVHQ4EFgQUalaXcVa41eu3N4yq1cu/p1yQCM0wegYDVR0jBHMwcYAUalaXcVa41eu3N4yq1cu/p1yQCM2hTqRMMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odYIJAKmmMNNLfw5PMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMHBYCNkUPAf1R14pd2fiOHyTs84ejnGAKghumXqVffUO3AxERutI8AZtaH6ZSt5cfcsGqb+KsHbAb38JrRlrxGr0wxbuTr7gpwessPvECxWGUj6kkKOnQg35Xyd5EQzhsKrjUL2EC7OM5bMwok9TeUkDta4frQW8/RGZIYJq5aQ=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>rns.aai.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
+      <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NIIFI AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
index 86799c22..435685f8 100644
--- a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ross.impa.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">impa.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.impa.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.impa.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">impa.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.impa.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.impa.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
 BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
 BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
@@ -43,26 +43,26 @@ xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
 m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
 qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ross.impa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ross.impa.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ross.impa.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ross.impa.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">impa.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ross.impa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ross.impa.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ross.impa.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ross.impa.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">impa.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
 BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
@@ -85,24 +85,24 @@ m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
 qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.impa.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.impa.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Ricardo Gomes</md:SurName>
-      <md:EmailAddress>netadm@impa.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.impa.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.impa.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Ricardo Gomes</md:SurName>
+    <md:EmailAddress>netadm@impa.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml b/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml
index f1b15634..f2646973 100644
--- a/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://royalsocietypublishing.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:24:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:24:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Society Publishing Organization</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://royalsocietypublishing.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Society Publishing Organization</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://royalsocietypublishing.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
index 36ef0c45..8d281af3 100644
--- a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rr.funet.fi/attribute-test">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
+        <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+        <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
-          <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
-          <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
-          <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDkxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLcnIuZnVuZXQu
@@ -57,108 +57,108 @@ SIb3DQEBBQUAA4IBAQCqH0bVH4duhVkYw63tkRZTRLG83JGJWuZYA6bmntr80Wdp
 HnVn+FAnphU6TsJhBYuXkNziSOkrUeZyUTPpRMsz7OlmdrW+i6sLS6RxUprMM6rV
 aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
 7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
-        <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonFullName" Name="urn:oid:1.3.6.1.4.1.16161.1.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonLearnerId" Name="urn:oid:1.3.6.1.4.1.16161.1.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kari</md:GivenName>
-      <md:SurName>Laalo</md:SurName>
-      <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Timo</md:GivenName>
-      <md:SurName>Mustonen</md:SurName>
-      <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonFullName" Name="urn:oid:1.3.6.1.4.1.16161.1.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonLearnerId" Name="urn:oid:1.3.6.1.4.1.16161.1.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rrzfilrshib.uni-regensburg.de-shibboleth.xml b/swamid-interfederations-2.0/rrzfilrshib.uni-regensburg.de-shibboleth.xml
index f6899338..1f5b892f 100644
--- a/swamid-interfederations-2.0/rrzfilrshib.uni-regensburg.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/rrzfilrshib.uni-regensburg.de-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rrzfilrshib.uni-regensburg.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-05-12T06:53:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-05-12T06:53:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rrzfilrshib.uni-regensburg.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">MyFiles (Filr)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MyFiles (Filr)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">MyFiles (Filr) Anmeldung</mdui:Description>
+        <mdui:Description xml:lang="en">MyFiles (Filr) Registration</mdui:Description>
+        <mdui:Logo height="16" width="16">https://rrzfilrshib.uni-regensburg.de/myfiles16x16.png</mdui:Logo>
+        <mdui:Logo height="146" width="350">https://rrzfilrshib.uni-regensburg.de/myfiles.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-regensburg.de/rechenzentrum/it-services/dateidienste/zugang_ohne_novell/index.html#tab_0_4</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://rrzfilrshib.uni-regensburg.de/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rrzfilrshib.uni-regensburg.de/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rrzfilrshib.uni-regensburg.de/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">MyFiles (Filr)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">MyFiles (Filr)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">MyFiles (Filr) Anmeldung</mdui:Description>
-          <mdui:Description xml:lang="en">MyFiles (Filr) Registration</mdui:Description>
-          <mdui:Logo height="16" width="16">https://rrzfilrshib.uni-regensburg.de/myfiles16x16.png</mdui:Logo>
-          <mdui:Logo height="146" width="350">https://rrzfilrshib.uni-regensburg.de/myfiles.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-regensburg.de/rechenzentrum/it-services/dateidienste/zugang_ohne_novell/index.html#tab_0_4</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">https://rrzfilrshib.uni-regensburg.de/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://rrzfilrshib.uni-regensburg.de/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>rrzfilrshib.uni-regensburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=rrzfilrshib.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGLDCCBRSgAwIBAgIHG0/xsT9dvTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rrzfilrshib.uni-regensburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rrzfilrshib.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGLDCCBRSgAwIBAgIHG0/xsT9dvTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
 A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
 bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
@@ -66,15 +66,15 @@ jfclQRSpKZ4/t+FEkgIV5Piujh/Dw4WROM6lXaysyHAsN7ydc8EVw66EnP3DdsPo
 ykCq0v8s2pxO9Z9KR7Rjgg47lcu2GXgkN44r4DpAyj1ENbvMzhvNSuQwJbdJRVhR
 Ym/5bLJ3Xa3+arMxwTMmozCQfpmk4jjZfwoPLrbKiHMMp5DG8UZbYlmA+cako51A
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>rrzfilrshib.uni-regensburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=rrzfilrshib.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGLDCCBRSgAwIBAgIHG0/xsT9dvTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rrzfilrshib.uni-regensburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rrzfilrshib.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGLDCCBRSgAwIBAgIHG0/xsT9dvTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
 A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
 bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
@@ -108,39 +108,39 @@ jfclQRSpKZ4/t+FEkgIV5Piujh/Dw4WROM6lXaysyHAsN7ydc8EVw66EnP3DdsPo
 ykCq0v8s2pxO9Z9KR7Rjgg47lcu2GXgkN44r4DpAyj1ENbvMzhvNSuQwJbdJRVhR
 Ym/5bLJ3Xa3+arMxwTMmozCQfpmk4jjZfwoPLrbKiHMMp5DG8UZbYlmA+cako51A
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rrzfilrshib.uni-regensburg.de/Shibboleth.sso/SLO/POST"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rrzfilrshib.uni-regensburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">MyFiles (Filr)</md:ServiceName>
-        <md:ServiceName xml:lang="en">MyFiles (Filr)</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">MyFiles (Filr) Anmeldung</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">MyFiles (Filr) Registration</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e311</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e311</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Regensburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University Regensburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-regensburg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Edmund</md:GivenName>
-      <md:SurName>Weber</md:SurName>
-      <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Edmund</md:GivenName>
-      <md:SurName>Weber</md:SurName>
-      <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rrzfilrshib.uni-regensburg.de/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rrzfilrshib.uni-regensburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">MyFiles (Filr)</md:ServiceName>
+      <md:ServiceName xml:lang="en">MyFiles (Filr)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">MyFiles (Filr) Anmeldung</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">MyFiles (Filr) Registration</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e311</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e311</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Regensburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University Regensburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-regensburg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Edmund</md:GivenName>
+    <md:SurName>Weber</md:SurName>
+    <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Edmund</md:GivenName>
+    <md:SurName>Weber</md:SurName>
+    <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml b/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml
index 4aa47032..a955396d 100644
--- a/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml
+++ b/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rs.eqa.ggtest.com/AthensWeb/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-05T10:22:35Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-05T10:22:35Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7TCCAdWgAwIBAgIEIjkEdjANBgkqhkiG9w0BAQsFADAnMRIwEAYDVQQKEwlh
 						dGhlbnMgc3AxETAPBgNVBAMTCGdhbGUuY29tMB4XDTEyMTIwNDIxMTYzN1oXDTIy
 						MTIwMjIxMTYzN1owJzESMBAGA1UEChMJYXRoZW5zIHNwMREwDwYDVQQDEwhnYWxl
@@ -25,13 +25,13 @@
 						5EpMA2d9mL90JHaAMXTg15invrvy366hOqcsEYNJIc49+/PS3pLFPhI62KOTwqUj
 						FvuaT4B90sXSnthrg0rErgLVBaaj2eO/v69LA/E8Ru+X
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7TCCAdWgAwIBAgIEIjkEdjANBgkqhkiG9w0BAQsFADAnMRIwEAYDVQQKEwlh
 						dGhlbnMgc3AxETAPBgNVBAMTCGdhbGUuY29tMB4XDTEyMTIwNDIxMTYzN1oXDTIy
 						MTIwMjIxMTYzN1owJzESMBAGA1UEChMJYXRoZW5zIHNwMREwDwYDVQQDEwhnYWxl
@@ -49,27 +49,27 @@
 						5EpMA2d9mL90JHaAMXTg15invrvy366hOqcsEYNJIc49+/PS3pLFPhI62KOTwqUj
 						FvuaT4B90sXSnthrg0rErgLVBaaj2eO/v69LA/E8Ru+X
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cengage Learning Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gale Cengage Learning</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cengage.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joe</md:GivenName>
-      <md:SurName>Mathews</md:SurName>
-      <md:EmailAddress>mailto:Joe.Mathews@cengage.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Selva</md:GivenName>
-      <md:SurName>Rengarajan</md:SurName>
-      <md:EmailAddress>mailto:Selva.Kumar@cengage.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cengage Learning Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gale Cengage Learning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cengage.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Mathews</md:SurName>
+    <md:EmailAddress>mailto:Joe.Mathews@cengage.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Selva</md:GivenName>
+    <md:SurName>Rengarajan</md:SurName>
+    <md:EmailAddress>mailto:Selva.Kumar@cengage.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml
index 13898bb0..1cc9fd93 100644
--- a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rtrvirshib.ifmt.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifmt.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifmt.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifmt.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifmt.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDjjCCAnYCAQAwDQYJKoZIhvcNAQEFBQAwgYwxDTALBgNVBAoTBElGTVQxDTAL
 BgNVBAsTBERHVEkxIDAeBgkqhkiG9w0BCQEWEWluZnJhQGlmbXQuZWR1LmJyMQ8w
 DQYDVQQHEwZDdWlhYmExCzAJBgNVBAgTAk1UMQswCQYDVQQGEwJCUjEfMB0GA1UE
@@ -44,26 +44,26 @@ QczEBrduaMxIw8IVtOGcg6N8xRErRcgO8KLeyjre6Xp/ZX8YYUcYQG0vHpdBRBtx
 9n+qjMNpXSrafOqfJ86ch4VF7jmn+PZZmLiGGlfZUyoo2pKztiDEXEwhdHkMBohY
 16U=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDjjCCAnYCAQAwDQYJKoZIhvcNAQEFBQAwgYwxDTALBgNVBAoTBElGTVQxDTAL
 BgNVBAsTBERHVEkxIDAeBgkqhkiG9w0BCQEWEWluZnJhQGlmbXQuZWR1LmJyMQ8w
@@ -87,24 +87,24 @@ QczEBrduaMxIw8IVtOGcg6N8xRErRcgO8KLeyjre6Xp/ZX8YYUcYQG0vHpdBRBtx
 16U=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifmt.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifmt.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Lilian Maria Goncalves</md:SurName>
-      <md:EmailAddress>infra@ifmt.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifmt.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifmt.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lilian Maria Goncalves</md:SurName>
+    <md:EmailAddress>infra@ifmt.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml
index 9c708169..4a919657 100644
--- a/swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rushib.rockefeller.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://rushib.rockefeller.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rockefeller.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rockefeller University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://rushib.rockefeller.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rockefeller.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rockefeller University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAPI9h0Gu4CtEoQlfycXU2mmLEEeJMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFnJ1c2hpYi5yb2NrZWZlbGxlci5lZHUwHhcNMTQwNTAx
 MTczOTI2WhcNMzQwNTAxMTczOTI2WjAhMR8wHQYDVQQDExZydXNoaWIucm9ja2Vm
@@ -41,31 +41,31 @@ Gg4gEzh7+ZEuj+aLTfa3Y4rmoaV8BJPBX7+ZZKHEmBTOyHZHmCbZfyQOrCXKAN/2
 Bptks6bmLj9P1PAtmV842uqh05xFIHHG4WAqp7tqnglkDDw6Lze4NuxnxU9/xQFU
 XKx9JBd0Ah6DZb6aHj5cXlPl2utzn7Qd
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rushib.rockefeller.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rushib.rockefeller.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Rockefeller University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rockefeller University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rockefeller.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Vancil</md:GivenName>
-      <md:EmailAddress>chrisv@rockefeller.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Anne Duffy</md:GivenName>
-      <md:EmailAddress>anne@rockefeller.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Svetlana Zarubina</md:GivenName>
-      <md:EmailAddress>svetlan@rockefeller.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Marty Leidner</md:GivenName>
-      <md:EmailAddress>marty@rockefeller.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rushib.rockefeller.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rushib.rockefeller.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Rockefeller University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rockefeller University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rockefeller.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Vancil</md:GivenName>
+    <md:EmailAddress>chrisv@rockefeller.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anne Duffy</md:GivenName>
+    <md:EmailAddress>anne@rockefeller.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Svetlana Zarubina</md:GivenName>
+    <md:EmailAddress>svetlan@rockefeller.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Marty Leidner</md:GivenName>
+    <md:EmailAddress>marty@rockefeller.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml
index dd19f1ac..4fe72d60 100644
--- a/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rutcathens.rutc.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rutc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rutc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDuzCCAqOgAwIBAgIJAN1WsDggoMVvMA0GCSqGSIb3DQEBBQUAMEcxJTAjBgNV
 						BAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNVBAMTFXJ1dGNh
 						dGhlbnMucnV0Yy5hYy51azAeFw0xMDExMTExMTM0MTZaFw0yMDExMDgxMTM0MTZa
@@ -32,13 +32,13 @@
 						kTNdyaLJMlqWpe/LumRJ323OxgwDDUxgadxQ99CpcsRN8fn3CyiW5vnf3jjMl91r
 						/N50CdH4cNvfaDEqHTiucQkIxjF+VsVX3S3Q5xGnLOJex9/Li8kVqnR1hZOkxi0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDuzCCAqOgAwIBAgIJAN1WsDggoMVvMA0GCSqGSIb3DQEBBQUAMEcxJTAjBgNV
 						BAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNVBAMTFXJ1dGNh
 						dGhlbnMucnV0Yy5hYy51azAeFw0xMDExMTExMTM0MTZaFw0yMDExMDgxMTM0MTZa
@@ -60,25 +60,25 @@
 						kTNdyaLJMlqWpe/LumRJ323OxgwDDUxgadxQ99CpcsRN8fn3CyiW5vnf3jjMl91r
 						/N50CdH4cNvfaDEqHTiucQkIxjF+VsVX3S3Q5xGnLOJex9/Li8kVqnR1hZOkxi0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rutcathens.rutc.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rutcathens.rutc.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Richmond upon Thames College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Richmond upon Thames College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rutc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jane</md:GivenName>
-      <md:SurName>Ball</md:SurName>
-      <md:EmailAddress>mailto:jane.ball@rutc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Kayes</md:SurName>
-      <md:EmailAddress>mailto:tom.kayes@rutc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rutcathens.rutc.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rutcathens.rutc.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Richmond upon Thames College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Richmond upon Thames College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rutc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jane</md:GivenName>
+    <md:SurName>Ball</md:SurName>
+    <md:EmailAddress>mailto:jane.ball@rutc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Kayes</md:SurName>
+    <md:EmailAddress>mailto:tom.kayes@rutc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml
index bc8358af..d30a834b 100644
--- a/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sa-test.ted.is.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-18T08:51:42Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-18T08:51:42Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJAPiFnX/AGXS/MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNhdC1zYS1hdDF0LmVkLmFjLnVrMB4XDTEzMDIyMjEyMDcyMFoXDTIzMDIy
 						MDEyMDcyMFowHzEdMBsGA1UEAxMUc2F0LXNhLWF0MXQuZWQuYWMudWswggEiMA0G
@@ -46,41 +46,41 @@
 						1YWgivRKg2HaES0eeVEq9sbJEY8rit1UQnOfZ/FGpt+EgYI9F/E9ZHGN2ukKJWIO
 						jau5581/Rw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Allocator - TEST Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Apps Technology Management</md:GivenName>
-      <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Allocator - TEST Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Apps Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml
index 5b1d80fc..cf530762 100644
--- a/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sa1.nimr.mrc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-27T13:26:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-27T13:26:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nimr.mrc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nimr.mrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5jCCAs4CCQCynm0QUqUXRjANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UEBwwJTWlsbCBIaWxsMTAwLgYDVQQK
 						DCdOYXRpb25hbCBJbnN0aXR1dGUgZm9yIE1lZGljYWwgUmVzZWFyY2gxCzAJBgNV
@@ -35,26 +35,26 @@
 						tmPJEmFahk4xLFFNM82KPXn6nFznGT7X2cSZKYpAudcYkn244wq3qL/3s1SjGyBP
 						2VaXuOVNp8DYTM6HlbB8wSBOzqfGWN+xSVT+g/ccRhp4pjtXTvgN4PRb
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nimr.mrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nimr.mrc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5jCCAs4CCQCynm0QUqUXRjANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UEBwwJTWlsbCBIaWxsMTAwLgYDVQQK
 						DCdOYXRpb25hbCBJbnN0aXR1dGUgZm9yIE1lZGljYWwgUmVzZWFyY2gxCzAJBgNV
@@ -77,25 +77,25 @@
 						tmPJEmFahk4xLFFNM82KPXn6nFznGT7X2cSZKYpAudcYkn244wq3qL/3s1SjGyBP
 						2VaXuOVNp8DYTM6HlbB8wSBOzqfGWN+xSVT+g/ccRhp4pjtXTvgN4PRb
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Medical Research Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institute for Medical Research</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nimr.mrc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@nimr.mrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>System Administrator</md:GivenName>
-      <md:EmailAddress>mailto:winsys@nimr.mrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Medical Research Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute for Medical Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nimr.mrc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@nimr.mrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>System Administrator</md:GivenName>
+    <md:EmailAddress>mailto:winsys@nimr.mrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saas1.kuali.co-auth.xml b/swamid-interfederations-2.0/saas1.kuali.co-auth.xml
index a43dd1b9..1b2ad683 100644
--- a/swamid-interfederations-2.0/saas1.kuali.co-auth.xml
+++ b/swamid-interfederations-2.0/saas1.kuali.co-auth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saas1.kuali.co/auth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saml1.kuali.co/auth/saml/meta.xml" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kuali SaaS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Kuali Software as a Service</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://kuali.co/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kuali.co/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saml1.kuali.co/auth/saml/meta.xml" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kuali SaaS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Kuali Software as a Service</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://kuali.co/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.kuali.co/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEtTCCAp2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAjMQswCQYDVQQGEwJVUzEU
 MBIGA1UEAxMLS3VhbGlDbyBDQTIwHhcNMTUwODA1MTMyNzU4WhcNMTYwODA0MTMy
 NzU4WjAyMQswCQYDVQQGEwJVUzEOMAwGA1UEChMFS3VhbGkxEzARBgNVBAMUCiou
@@ -49,13 +49,13 @@ YWV3klx9aYUSSTFIoHOyukyq7yy+yh4fUnQH/Y0YPqwQ4Z0wmJNeaYElOu9gPEhj
 KX7X5FEfXoZHWDUo3ql5oLj/KCkD2A8+xATkcjvo9dw4FF3dJtmLIIPjGlDi8+pG
 9/elGcE7Yp1W
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFeDCCBGCgAwIBAgIQBJoR3riTEvtuh7B80BaO4TANBgkqhkiG9w0BAQUFADBi
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBBc3N1cmVkIElEIENB
@@ -87,44 +87,44 @@ uDuzfB0jPHLWXz31biUf0Dk7WPGA7yqLkM2SvNfiZ4EAdORFpw1Rz6ZoL6D7Xzro
 9I7TEQa8tZ4nnZiRRl4dfMtL2Yw119jFOteUOz3GlPMNMzH3KJE/9BtR88ZtpGu2
 h93Ee/A43W4/JjPR
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1.kuali.co/auth/saml/consume" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1.kuali.co/auth/saml/consume" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas2.kuali.co/auth/saml/consume" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas2.kuali.co/auth/saml/consume" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml1.kuali.co/auth/saml/consume" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml1.kuali.co/auth/saml/consume" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml1-stg.kuali.co/auth/saml/consume" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml1-stg.kuali.co/auth/saml/consume" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml1-tst.kuali.co/auth/saml/consume" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1-sbx.kuali.co/auth/saml/consume" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas2-sbx.kuali.co/auth/saml/consume" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1-tst.kuali.co/auth/saml/consume" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas2-stg.kuali.co/auth/saml/consume" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1-stg.kuali.co/auth/saml/consume" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1-sbx.kuali.co/auth/saml/consume" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas2-sbx.kuali.co/auth/saml/consume" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1-tst.kuali.co/auth/saml/consume" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1-stg.kuali.co/auth/saml/consume" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas2-stg.kuali.co/auth/saml/consume" index="19"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Kuali SaaS</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Kuali Software as a Service</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kuali, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kuali, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.kuali.co/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kuali Support</md:GivenName>
-      <md:EmailAddress>support@kuali.co</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1.kuali.co/auth/saml/consume" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1.kuali.co/auth/saml/consume" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas2.kuali.co/auth/saml/consume" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas2.kuali.co/auth/saml/consume" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml1.kuali.co/auth/saml/consume" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml1.kuali.co/auth/saml/consume" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml1-stg.kuali.co/auth/saml/consume" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml1-stg.kuali.co/auth/saml/consume" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml1-tst.kuali.co/auth/saml/consume" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1-sbx.kuali.co/auth/saml/consume" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas2-sbx.kuali.co/auth/saml/consume" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1-tst.kuali.co/auth/saml/consume" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas2-stg.kuali.co/auth/saml/consume" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saas1-stg.kuali.co/auth/saml/consume" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1-sbx.kuali.co/auth/saml/consume" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas2-sbx.kuali.co/auth/saml/consume" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1-tst.kuali.co/auth/saml/consume" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas1-stg.kuali.co/auth/saml/consume" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas2-stg.kuali.co/auth/saml/consume" index="19"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Kuali SaaS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Kuali Software as a Service</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kuali, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kuali, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kuali.co/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kuali Support</md:GivenName>
+    <md:EmailAddress>support@kuali.co</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
index e4d6905e..e9dd4e62 100644
--- a/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sabia-new.ipen.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xPjA8BgNVBAoTNUlQRU4gLSBJ
 bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQww
 CgYDVQQLEwNHUlMxHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVAaXBlbi5icjESMBAG
@@ -46,26 +46,26 @@ ZrFhqQj34OlapE2GzSHA81UfqOga1nZhwWsGUvzUTPaoyBYyDnHbh5hQC0lcIOWI
 ax5+EE7ugsHIeIktKJMKaVLPwTGHTp5H76D2DL2vYoDgKtPvyW0XmZF6Cjz1ZywL
 Ma65UunXAIA=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sabia-new.ipen.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sabia-new.ipen.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sabia-new.ipen.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sabia-new.ipen.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sabia-new.ipen.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sabia-new.ipen.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sabia-new.ipen.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sabia-new.ipen.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xPjA8BgNVBAoTNUlQRU4gLSBJ
 bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQww
@@ -91,24 +91,24 @@ ax5+EE7ugsHIeIktKJMKaVLPwTGHTp5H76D2DL2vYoDgKtPvyW0XmZF6Cjz1ZywL
 Ma65UunXAIA=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Dorival A. Nunes</md:SurName>
-      <md:EmailAddress>suporte@ipen.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dorival A. Nunes</md:SurName>
+    <md:EmailAddress>suporte@ipen.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
index 106571a8..086af0e0 100644
--- a/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sabia.ipen.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEXDCCA0QCAQAwDQYJKoZIhvcNAQEFBQAwgfMxQzBBBgNVBAoTOklQRU4gLSBJ
 bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzIC0g
 U1AxEzARBgNVBAsTCkJpYmxpb3RlY2ExHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVA
@@ -48,26 +48,26 @@ fNUrS3qTDFop0W8sMweA+5AaaaV9dpi2vgB00MvdL7O4yhuNFrLBxSPQMjCeJq8E
 kZi8sTfQtgq88KrN0RkbdFrUXbw8arkz9Ee5YeXswkBlyN0LD3dCT162AG/Xb0wg
 2jsa3oOpEbS11ilQ7ebVMg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia.ipen.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia.ipen.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sabia.ipen.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sabia.ipen.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sabia.ipen.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sabia.ipen.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia.ipen.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia.ipen.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sabia.ipen.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sabia.ipen.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sabia.ipen.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sabia.ipen.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipen.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEXDCCA0QCAQAwDQYJKoZIhvcNAQEFBQAwgfMxQzBBBgNVBAoTOklQRU4gLSBJ
 bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzIC0g
@@ -95,24 +95,24 @@ kZi8sTfQtgq88KrN0RkbdFrUXbw8arkz9Ee5YeXswkBlyN0LD3dCT162AG/Xb0wg
 2jsa3oOpEbS11ilQ7ebVMg==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia.ipen.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia.ipen.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Suporte</md:SurName>
-      <md:EmailAddress>suporte@ipen.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia.ipen.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia.ipen.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Suporte</md:SurName>
+    <md:EmailAddress>suporte@ipen.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml
index 05faaf25..122a6eb7 100644
--- a/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://safe.epcc.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-17T14:03:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-17T14:03:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EPCC SAFE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SAFE HPC service administration hosted at EPCC</mdui:Description>
+        <mdui:Logo height="65" width="162">https://safe.epcc.ed.ac.uk/images/safelogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EPCC SAFE</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SAFE HPC service administration hosted at EPCC</mdui:Description>
-          <mdui:Logo height="65" width="162">https://safe.epcc.ed.ac.uk/images/safelogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/TCCAeWgAwIBAgIJAM6PYwal8Sr+MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEnNhZmUuZXBjYy5lZC5hYy51azAeFw0xNDA2MTMxMjI1MjNaFw0yNDA2MTAx
 						MjI1MjNaMB0xGzAZBgNVBAMTEnNhZmUuZXBjYy5lZC5hYy51azCCASIwDQYJKoZI
@@ -53,42 +53,42 @@
 						xJJwl96Mjvc83n1JFmgn/IFCrv6Rohp9xKa3AOFpMI/SEbh5kEqKhAPfpFcNVp4c
 						Pg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EPCC SAFE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.epcc.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@epcc.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Booth</md:SurName>
-      <md:EmailAddress>mailto:s.booth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EPCC SAFE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.epcc.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@epcc.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Booth</md:SurName>
+    <md:EmailAddress>mailto:s.booth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml
index bc25233f..dde1d008 100644
--- a/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sal-shib-prod.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-10T09:47:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-10T09:47:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Salford - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Salford</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Salford - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Salford</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJANf0AmxW40+9MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMzkwHhcNMTUwNzA5MTYwNTM0WhcNMjUwNzA2MTYwNTM0WjASMRAw
 						DgYDVQQDEwdhaW8wMDM5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -50,43 +50,43 @@
 						Kb9a5NEhrJtzDPiy1LN3lTyaBRNAa/6S9ejER3as6WK34OrR2BRsoHLPYnjJomn4
 						9uemTBzzKnSChFkaLl11zg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at University of Salford</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at University of Salford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml
index fad7c6ed..b9657ead 100644
--- a/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sal-shib-test.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-12T10:53:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-12T10:53:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Salford - Primo Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is a Test Shibboleth SP for Primo Resource Discovery at University of Salford</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Salford - Primo Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is a Test Shibboleth SP for Primo Resource Discovery at University of Salford</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAKhHDi1Wde/sMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMzEwHhcNMTUwMzIzMTU1NzA5WhcNMjUwMzIwMTU1NzA5WjASMRAw
 						DgYDVQQDEwdhaW8wMDMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -50,43 +50,43 @@
 						1nZCeVMiGP0nRXxb9l5+WVnuomPltvSWbmWetOsESzfHa0NDYRoD0Tcmo3HivT94
 						wcpDxFonOrfUYE8n7Dc8Gg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Test Shibboleth SP for Primo Resource Discovery at University of Salford</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Test Shibboleth SP for Primo Resource Discovery at University of Salford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml
index 5fe9ef6c..7870eefc 100644
--- a/swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://salford.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-08T07:44:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-08T07:44:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEDjCCAvagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBnMR8wHQYDVQQDFBYqLnNh
 						bGZvcmQuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEo
 						MCYGCSqGSIb3DQEJARYZamFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzAeFw0xNTA1
@@ -36,25 +36,25 @@
 						7/DnFzG87+qTQcdqhzs5sVf+UbQEZZWfO2h3SETBJEeurGamU4hb7snRASKCqcw4
 						htEj3D0rPUXTvX36xmS+25M81EcZKM/3NPwnGJgmNUmhPw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Salford Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salford Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-auth.teststudentconnectapi.com.xml b/swamid-interfederations-2.0/saml-auth.teststudentconnectapi.com.xml
index 2c874047..781ac99f 100644
--- a/swamid-interfederations-2.0/saml-auth.teststudentconnectapi.com.xml
+++ b/swamid-interfederations-2.0/saml-auth.teststudentconnectapi.com.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml-auth.teststudentconnectapi.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-09T13:49:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-09T13:49:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">StudentConnect Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is a test­only SP for Student Money Saver. Do not use in production.</mdui:Description>
+        <mdui:Logo height="184" width="250">https://cdn.studentconnectapi.com/branding/logo/studentconnect-icon-blue-250.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">StudentConnect Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is a test­only SP for Student Money Saver. Do not use in production.</mdui:Description>
-          <mdui:Logo height="184" width="250">https://cdn.studentconnectapi.com/branding/logo/studentconnect-icon-blue-250.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+TCCAuGgAwIBAgIJAN+hdFFnn7n8MA0GCSqGSIb3DQEBCwUAMIGSMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMRwwGgYD
 						VQQKDBNTdHVkZW50IE1vbmV5IFNhdmVyMQ8wDQYDVQQLDAZEZXZPcHMxEjAQBgNV
@@ -40,13 +40,13 @@
 						+1uZRTPpl0578hDEKfjdtqNt0GEbskINIHTVfKrhOx2LP/kR+kAVcf0jVaSHR7pV
 						4700ZE8Je1E5Kziz+Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+TCCAuGgAwIBAgIJAN+hdFFnn7n8MA0GCSqGSIb3DQEBCwUAMIGSMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMRwwGgYD
 						VQQKDBNTdHVkZW50IE1vbmV5IFNhdmVyMQ8wDQYDVQQLDAZEZXZPcHMxEjAQBgNV
@@ -70,25 +70,25 @@
 						+1uZRTPpl0578hDEKfjdtqNt0GEbskINIHTVfKrhOx2LP/kR+kAVcf0jVaSHR7pV
 						4700ZE8Je1E5Kziz+Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-auth.teststudentconnectapi.com/signoff"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-auth.teststudentconnectapi.com/consume" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Student Money Saver Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">StudentConnect Test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.studentmoneysaver.co.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@studentmoneysaver.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Silimon</md:SurName>
-      <md:EmailAddress>mailto:adrian@studentmoneysaver.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-auth.teststudentconnectapi.com/signoff"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-auth.teststudentconnectapi.com/consume" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Student Money Saver Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">StudentConnect Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.studentmoneysaver.co.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@studentmoneysaver.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Silimon</md:SurName>
+    <md:EmailAddress>mailto:adrian@studentmoneysaver.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml b/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml
index 2fb30666..7cf480fe 100644
--- a/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml-delegation.data.kit.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-03T14:35:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-03T14:35:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">SAML Delegation</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SAML Delegation</mdui:DisplayName>
+        <mdui:Description xml:lang="de">SAML Delegation</mdui:Description>
+        <mdui:Description xml:lang="en">SAML Delegation</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">SAML Delegation</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SAML Delegation</mdui:DisplayName>
-          <mdui:Description xml:lang="de">SAML Delegation</mdui:Description>
-          <mdui:Description xml:lang="en">SAML Delegation</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>saml-delegation.data.kit.edu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=saml-delegation.data.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIHF7FBl8mW2DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>saml-delegation.data.kit.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=saml-delegation.data.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIHF7FBl8mW2DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
 bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
 Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
@@ -54,50 +54,50 @@ JVX1cCfkR6zXP1IRhPuCjNoNTglrCfnkkLnmGC2ggcDJV7leBR3awzRCEO5ruNKe
 JYUZPz1dlpf1fdFe9DLd7fRcHlL0ATTd87ebMw8hjJrYBVKqPIFu4YXnOikuweOl
 gwAMmqDbvXQigg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">SAML Delegation</md:ServiceName>
-        <md:ServiceName xml:lang="en">SAML Delegation</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">SAML Delegation</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">SAML Delegation</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marcus</md:GivenName>
-      <md:SurName>Hardt</md:SurName>
-      <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marcus</md:GivenName>
-      <md:SurName>Hardt</md:SurName>
-      <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Arsen</md:GivenName>
-      <md:SurName>Hayrapetyan</md:SurName>
-      <md:EmailAddress>mailto:arsen.hayrapetyan@kit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">SAML Delegation</md:ServiceName>
+      <md:ServiceName xml:lang="en">SAML Delegation</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">SAML Delegation</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">SAML Delegation</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marcus</md:GivenName>
+    <md:SurName>Hardt</md:SurName>
+    <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marcus</md:GivenName>
+    <md:SurName>Hardt</md:SurName>
+    <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Arsen</md:GivenName>
+    <md:SurName>Hayrapetyan</md:SurName>
+    <md:EmailAddress>mailto:arsen.hayrapetyan@kit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.adu.edu.xml b/swamid-interfederations-2.0/saml.adu.edu.xml
index 4c901774..10db5fab 100644
--- a/swamid-interfederations-2.0/saml.adu.edu.xml
+++ b/swamid-interfederations-2.0/saml.adu.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.adu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Adventist University of Health Sciences</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://my.adu.edu/university-services/information-technology/incommon-pop</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.adu.edu/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="204" width="600" xml:lang="en">https://saml.adu.edu/simplesaml/module.php/themeADU/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Adventist University of Health Sciences</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://my.adu.edu/university-services/information-technology/incommon-pop</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.adu.edu/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="204" width="600" xml:lang="en">https://saml.adu.edu/simplesaml/module.php/themeADU/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGDTCCA/WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBjjEwMC4GA1UEChMnQWR2
 ZW50aXN0IFVuaXZlcnNpdHkgb2YgSGVhbHRoIFNjaWVuY2VzMR8wHQYDVQQLExZJ
 bmZvcm1hdGlvbiBUZWNobm9sb2d5MRMwEQYDVQQDEwpteS5hZHUuZWR1MSQwIgYJ
@@ -56,27 +56,27 @@ Lo4rpxt3p3jugXN6mz0GFv+3XppUJecuZCGBAJQEiSR/R0l7qcjDfOy/poCdeeF2
 5bJhvZCLcJ3mFZrYriXzACi2qpHgNTEFPiaXZGhPk7tRQjV2flwIV9tjTNb7nFF2
 v37iXkv+oRVPop1y3YlvtgI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.adu.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.adu.edu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Adventist University of Health Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Adventist University of Health Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://adu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>saml.tech@my.adu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Administrative Support</md:GivenName>
-      <md:EmailAddress>saml.admin@my.adu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Technology</md:GivenName>
-      <md:EmailAddress>webmaster@adu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.adu.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.adu.edu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adventist University of Health Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Adventist University of Health Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://adu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>saml.tech@my.adu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Administrative Support</md:GivenName>
+    <md:EmailAddress>saml.admin@my.adu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Technology</md:GivenName>
+    <md:EmailAddress>webmaster@adu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml b/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml
index a81a640e..99c1855f 100644
--- a/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.dpsnc.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dpsnc.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Durham Public Schools</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dpsnc.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Durham Public Schools</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJKP/CmfBsecSjqKa/pkTvBAHmrHMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnNhbWwuZHBzbmMubmV0MB4XDTEyMDYyNzIwNTU0MloX
 DTMyMDYyNzIwNTU0MlowGTEXMBUGA1UEAxMOc2FtbC5kcHNuYy5uZXQwggEiMA0G
@@ -37,23 +37,23 @@ nxzeSWEggus8QdOo6vTSxuSFMbVQ9v0XJbiteDoGWtRKicaGORAYG06f0T8XuOl0
 19dhPE5dRHvbFdwrqXP9J9lCM0JWfn6dUeRJ9cOBJwof0fLWYA7iMib/sSmWRczl
 1pf0MpKWCya3Su27sSYzkqhT3GuFK6L50NUT2Zjrn2QkkU6y5On/zg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dpsnc.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dpsnc.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml.dpsnc.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.dpsnc.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.dpsnc.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dpsnc.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dpsnc.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dpsnc.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml.dpsnc.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.dpsnc.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.dpsnc.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dpsnc.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAJKP/CmfBsecSjqKa/pkTvBAHmrHMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnNhbWwuZHBzbmMubmV0MB4XDTEyMDYyNzIwNTU0MloX
 DTMyMDYyNzIwNTU0MlowGTEXMBUGA1UEAxMOc2FtbC5kcHNuYy5uZXQwggEiMA0G
@@ -72,26 +72,26 @@ nxzeSWEggus8QdOo6vTSxuSFMbVQ9v0XJbiteDoGWtRKicaGORAYG06f0T8XuOl0
 19dhPE5dRHvbFdwrqXP9J9lCM0JWfn6dUeRJ9cOBJwof0fLWYA7iMib/sSmWRczl
 1pf0MpKWCya3Su27sSYzkqhT3GuFK6L50NUT2Zjrn2QkkU6y5On/zg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dpsnc.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Durham Public Schools</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Durham Public Schools</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://dpsnc.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Corwin Armstrong</md:GivenName>
-      <md:EmailAddress>corwin.armstrong@dpsnc.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Qasim Lone</md:GivenName>
-      <md:EmailAddress>qasim.lone@dpsnc.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>help.desk@dpsnc.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dpsnc.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Durham Public Schools</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Durham Public Schools</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dpsnc.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Corwin Armstrong</md:GivenName>
+    <md:EmailAddress>corwin.armstrong@dpsnc.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Qasim Lone</md:GivenName>
+    <md:EmailAddress>qasim.lone@dpsnc.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>help.desk@dpsnc.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.educdesign.lu-saml_metadata.xml.xml b/swamid-interfederations-2.0/saml.educdesign.lu-saml_metadata.xml.xml
index bc83362c..69a2201d 100644
--- a/swamid-interfederations-2.0/saml.educdesign.lu-saml_metadata.xml.xml
+++ b/swamid-interfederations-2.0/saml.educdesign.lu-saml_metadata.xml.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.educdesign.lu/saml_metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2016-05-11T10:55:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2016-05-11T10:55:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">OLEFA SAML Testserver</mdui:DisplayName>
+        <mdui:Description xml:lang="de">OLEFA SAML Testserver ist ein Test Server für OLEFA-basierende Systeme. Er wurde zu Debugging und Testzwecken erschaffen</mdui:Description>
+        <mdui:Keywords xml:lang="de">OLEFA SAML EduID Test Debug</mdui:Keywords>
+        <mdui:Logo width="128" height="128" xml:lang="de">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="fr">Serveur test OLEFA SAML</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Le serveur test OLEFA SAML est un serveur pour les systèmes OLEFA créé pour déboguer et faire des tests</mdui:Description>
+        <mdui:Keywords xml:lang="fr">OLEFA SAML EduID Test Débouger</mdui:Keywords>
+        <mdui:Logo width="128" height="128" xml:lang="fr">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="lb">OLEFA SAML Testserver</mdui:DisplayName>
+        <mdui:Description xml:lang="lb">OLEFA SAML Testserver ass een Test Server fir Systemer déi op OLEFA baséieren. E gouf zu Debugging an Testzwecker erschaaf</mdui:Description>
+        <mdui:Keywords xml:lang="lb">OLEFA SAML EduID Test Debug</mdui:Keywords>
+        <mdui:Logo width="128" height="128" xml:lang="lb">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">OLEFA SAML Testserver</mdui:DisplayName>
+        <mdui:Description xml:lang="en">OLEFA SAML Testserver is a test server for OLEFA-based systems created for debugging and testing purposes</mdui:Description>
+        <mdui:Keywords xml:lang="en">OLEFA SAML EduID Test Debug</mdui:Keywords>
+        <mdui:Logo width="128" height="128" xml:lang="en">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">OLEFA SAML Testserver</mdui:DisplayName>
-          <mdui:Description xml:lang="de">OLEFA SAML Testserver ist ein Test Server für OLEFA-basierende Systeme. Er wurde zu Debugging und Testzwecken erschaffen</mdui:Description>
-          <mdui:Keywords xml:lang="de">OLEFA SAML EduID Test Debug</mdui:Keywords>
-          <mdui:Logo width="128" height="128" xml:lang="de">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
-          <mdui:DisplayName xml:lang="fr">Serveur test OLEFA SAML</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Le serveur test OLEFA SAML est un serveur pour les systèmes OLEFA créé pour déboguer et faire des tests</mdui:Description>
-          <mdui:Keywords xml:lang="fr">OLEFA SAML EduID Test Débouger</mdui:Keywords>
-          <mdui:Logo width="128" height="128" xml:lang="fr">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
-          <mdui:DisplayName xml:lang="lb">OLEFA SAML Testserver</mdui:DisplayName>
-          <mdui:Description xml:lang="lb">OLEFA SAML Testserver ass een Test Server fir Systemer déi op OLEFA baséieren. E gouf zu Debugging an Testzwecker erschaaf</mdui:Description>
-          <mdui:Keywords xml:lang="lb">OLEFA SAML EduID Test Debug</mdui:Keywords>
-          <mdui:Logo width="128" height="128" xml:lang="lb">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">OLEFA SAML Testserver</mdui:DisplayName>
-          <mdui:Description xml:lang="en">OLEFA SAML Testserver is a test server for OLEFA-based systems created for debugging and testing purposes</mdui:Description>
-          <mdui:Keywords xml:lang="en">OLEFA SAML EduID Test Debug</mdui:Keywords>
-          <mdui:Logo width="128" height="128" xml:lang="en">http://saml.educdesign.lu/osr/olefa/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtjCCAp4CCQCyaf8ZxFlImDANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UEBhMC
 TFUxFDASBgNVBAgMC0JldHRlbWJvdXJnMRQwEgYDVQQHDAtCZXR0ZW1ib3VyZzEY
 MBYGA1UECgwPRWR1Y0Rlc2lnbiBTLkEuMSEwHwYDVQQDDBhodHRwOi8vd3d3LmVk
@@ -52,13 +52,13 @@ WSVlD5ebCkdmRSVvGWfgHwcgTf3SC8MGw0QEXFAXOGWRMW9zTUehbKihYB4r69oZ
 XA7r1V3dEDxm9+Rqqqz5kdEnihVfxuESfkyY3dnHrJeMo/b/nQrFHzNz
 
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtjCCAp4CCQCyaf8ZxFlImDANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UEBhMC
 TFUxFDASBgNVBAgMC0JldHRlbWJvdXJnMRQwEgYDVQQHDAtCZXR0ZW1ib3VyZzEY
 MBYGA1UECgwPRWR1Y0Rlc2lnbiBTLkEuMSEwHwYDVQQDDBhodHRwOi8vd3d3LmVk
@@ -81,23 +81,23 @@ WSVlD5ebCkdmRSVvGWfgHwcgTf3SC8MGw0QEXFAXOGWRMW9zTUehbKihYB4r69oZ
 XA7r1V3dEDxm9+Rqqqz5kdEnihVfxuESfkyY3dnHrJeMo/b/nQrFHzNz
 
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://saml.educdesign.lu/saml_acs" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">OLEFA SAML TESTSERVER</md:ServiceName>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EducDesign S.A.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EducDesign S.A.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.educdesign.lu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support EducDesign S.A.</md:GivenName>
-      <md:EmailAddress>support@educdesign.lu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://saml.educdesign.lu/saml_acs" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">OLEFA SAML TESTSERVER</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EducDesign S.A.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EducDesign S.A.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.educdesign.lu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support EducDesign S.A.</md:GivenName>
+    <md:EmailAddress>support@educdesign.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
index 8f3e09be..d4ab16bd 100644
--- a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.edusafe.nordu.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-04T14:43:01Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-04T14:43:01Z" registrationAuthority="https://www.wayf.dk">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to facilitate the easy creation and management of VPNs.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">eduSAFE</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduSAFE</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</mdui:Description>
-          <mdui:Description xml:lang="en">The purpose is to facilitate the easy creation and management of VPNs.</mdui:Description>
-          <mdui:DisplayName xml:lang="da">eduSAFE</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">eduSAFE</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDgzCCAmugAwIBAgIEdheO2zANBgkqhkiG9w0BAQsFADByMRAwDgYDVQQGEwdV bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRMwEQYD VQQKEwprZXltYW5hZ2VyMRMwEQYDVQQLEwpvaW9zYW1sLXNwMRAwDgYDVQQDEwdV bmtub3duMB4XDTE2MDIwMzEyMzAzNFoXDTI1MTIxMjEyMzAzNFowcjEQMA4GA1UE BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjET MBEGA1UEChMKa2V5bWFuYWdlcjETMBEGA1UECxMKb2lvc2FtbC1zcDEQMA4GA1UE AxMHVW5rbm93bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ5hrfBP CSKMhqgFBXUq0HLzLCXukjoP3CXaUj6uDYp1iYR3enV7TnX3uHOzPXcSvPsx4E50 hH58yEUQKuncECWPLsC4OYOWii0UvvC7yY3TcIwLu8yv4ThIwkR9a7cneAfz/5AO d7Lcf2nb3d4yW3oPCiZqWQ21MeKBsh61Cu72bwP0gtetShJu9stPBkkztbTbWlhL 4CQTbl1WowtrXo6+o2zbofcQz4xijW6uQJLsCJz8/RHsaF99OV5P4ioVmxb20kVZ ARtGKcf3rPrDALmjaY66FhoScxuuXTPdzlregXN0Wj55bJIVs2wyd6kGzcIqUkYW sLLYsZN1ysD+xsECAwEAAaMhMB8wHQYDVR0OBBYEFHMn1/gTgQf+nIzzdwjf3DBB mBEKMA0GCSqGSIb3DQEBCwUAA4IBAQCIwXubLDBN+fpWkuQ+RkTeo9CrC2eHd7ZP nnB+CnfUqiiaM8qr8aJsR8Ft16YBTIKganYOCrRZLtlzI5KfKf+2TM0zwinm03SB ee//5Zetj/TRDi64vbQ3X/TdomkFyDdD1Pg4pxIcMb3hmnuNI94ToFlXqCRKvIOJ VlgmqbYNPyj/aRPEvUtpiN+RrZUYPjQXrSDownJkks+5I8/ZodRZ5TFccQPsQRti spB/Tj/mY3fOUQfzKlCmd5QvziIbKa9yJheLWAgHyNDT07oy1KbfK+c8jU6KN+Hb NSY/TWRXqv7IIeDw/yJkTX4CD7q3UGi90sz4g9IptXjseJ827dQg</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.nordu.net/saml/LogoutServiceHTTPRedirect"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://edusafe.nordu.net/saml/SAMLAssertionConsumer"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="da">eduSAFE</md:ServiceName>
-        <md:ServiceName xml:lang="en">eduSAFE</md:ServiceName>
-        <md:ServiceDescription xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">The purpose is to facilitate the easy creation and management of VPNs.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DeIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.deic.dk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>University of Patras</md:Company>
-      <md:EmailAddress>stathopou@ceid.upatras.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgzCCAmugAwIBAgIEdheO2zANBgkqhkiG9w0BAQsFADByMRAwDgYDVQQGEwdV bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRMwEQYD VQQKEwprZXltYW5hZ2VyMRMwEQYDVQQLEwpvaW9zYW1sLXNwMRAwDgYDVQQDEwdV bmtub3duMB4XDTE2MDIwMzEyMzAzNFoXDTI1MTIxMjEyMzAzNFowcjEQMA4GA1UE BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjET MBEGA1UEChMKa2V5bWFuYWdlcjETMBEGA1UECxMKb2lvc2FtbC1zcDEQMA4GA1UE AxMHVW5rbm93bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ5hrfBP CSKMhqgFBXUq0HLzLCXukjoP3CXaUj6uDYp1iYR3enV7TnX3uHOzPXcSvPsx4E50 hH58yEUQKuncECWPLsC4OYOWii0UvvC7yY3TcIwLu8yv4ThIwkR9a7cneAfz/5AO d7Lcf2nb3d4yW3oPCiZqWQ21MeKBsh61Cu72bwP0gtetShJu9stPBkkztbTbWlhL 4CQTbl1WowtrXo6+o2zbofcQz4xijW6uQJLsCJz8/RHsaF99OV5P4ioVmxb20kVZ ARtGKcf3rPrDALmjaY66FhoScxuuXTPdzlregXN0Wj55bJIVs2wyd6kGzcIqUkYW sLLYsZN1ysD+xsECAwEAAaMhMB8wHQYDVR0OBBYEFHMn1/gTgQf+nIzzdwjf3DBB mBEKMA0GCSqGSIb3DQEBCwUAA4IBAQCIwXubLDBN+fpWkuQ+RkTeo9CrC2eHd7ZP nnB+CnfUqiiaM8qr8aJsR8Ft16YBTIKganYOCrRZLtlzI5KfKf+2TM0zwinm03SB ee//5Zetj/TRDi64vbQ3X/TdomkFyDdD1Pg4pxIcMb3hmnuNI94ToFlXqCRKvIOJ VlgmqbYNPyj/aRPEvUtpiN+RrZUYPjQXrSDownJkks+5I8/ZodRZ5TFccQPsQRti spB/Tj/mY3fOUQfzKlCmd5QvziIbKa9yJheLWAgHyNDT07oy1KbfK+c8jU6KN+Hb NSY/TWRXqv7IIeDw/yJkTX4CD7q3UGi90sz4g9IptXjseJ827dQg</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.nordu.net/saml/LogoutServiceHTTPRedirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://edusafe.nordu.net/saml/SAMLAssertionConsumer"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">eduSAFE</md:ServiceName>
+      <md:ServiceName xml:lang="en">eduSAFE</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to facilitate the easy creation and management of VPNs.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DeIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.deic.dk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Patras</md:Company>
+    <md:EmailAddress>stathopou@ceid.upatras.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
index 2910e18d..cd0ba1bc 100644
--- a/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.edusafe.qalab.geant.net.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.edusafe.qalab.geant.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2016-02-24T11:14:58Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2016-02-24T11:14:58Z" registrationAuthority="https://www.wayf.dk">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="da">Formålet er at gøre det nemt at forbinde til MDVPN via et softwarebaseret VPN.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide an easy way to connect to MDVPN instances via a software-based VPN.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">eduSAFE-MDVPN</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduSAFE-MDVPN</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="da">Formålet er at gøre det nemt at forbinde til MDVPN via et softwarebaseret VPN.</mdui:Description>
-          <mdui:Description xml:lang="en">The purpose is to provide an easy way to connect to MDVPN instances via a software-based VPN.</mdui:Description>
-          <mdui:DisplayName xml:lang="da">eduSAFE-MDVPN</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">eduSAFE-MDVPN</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIEfYCcmTANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xEzARBgNVBAoTCmtleW1hbmFnZXIxEzARBgNVBAsTCm9pb3NhbWwtc3AxFjAUBgNVBAMTDWVkdVNBRkUgTURWUE4wHhcNMTYwMjA1MTI1NjU1WhcNMjUxMjE0MTI1NjU1WjB3MQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xEzARBgNVBAoTCmtleW1hbmFnZXIxEzARBgNVBAsTCm9pb3NhbWwtc3AxFjAUBgNVBAMTDWVkdVNBRkUgTURWUE4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEH8g4x6fNa0BRt3ehn6966Q2mX05ccirzAcPwtMzhxnCdXI+dtATcTTp1cdz4YoyqKcHvvTWYMVnI9nY1ISAa8kVQSVp2x8p3nlMjky3HUSDNIHobq7wQTGVoAjOdCOQyaiU/lGO7vhdPnXmRCTdt9OsAGs9bBMyQ3F+eMPkQDEuFVpiyxnQIZBjUOkI4FFG2gmjlwQVosspAhZn3zbfCuBhguAE4InhQeG65Ix+HosP4Ezi/nPiR7EwB/LVTuSNVQ/UYu0ZWbv2KKX/c1bFsseXdOd6YaVYdJ5rOjKUdT5stV66F9bVU8d+MU514XfzOAlXSGcYcyiztIE9D8tStAgMBAAGjITAfMB0GA1UdDgQWBBRua2BgUQtMS9MwXYbkvPHP6CXtJjANBgkqhkiG9w0BAQsFAAOCAQEATq4+q2AMkRF4xjHdKsxcF3BN/OMVSGSRw1E39PASpvqDbPENeJRfCXJSny+LvJC7lIFNvDI83gY1EXr4UDV7Inf40+++F7Mea4QvKDpvAr8eUYy5sUk4eq1NmlkM3jUsSiAZxskakpB/ipkEa81hMX1rw90JmGSGYxYVmkMWrob2hAkPLK0rDvVnjME6tq76BegXV2Kt3JNE0XW1QdXVGPLuoblXeWSvlRwfvJdabc06MFgBJl0loCwIwP6IBgr1PtaV6PVWueUfkYBdq1KAD3QweKzBDZyzdx4S2RKOg5uGwR6GjOf5Lo1zt8rkIz0YNyj2rFpsc9lv1Ky7gXexNw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.psnc.pl/edusafe-portal/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://edusafe.psnc.pl/edusafe-portal/saml/SAMLAssertionConsumer"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="da">eduSAFE-MDVPN</md:ServiceName>
-        <md:ServiceName xml:lang="en">eduSAFE-MDVPN</md:ServiceName>
-        <md:ServiceDescription xml:lang="da">Formålet er at gøre det nemt at forbinde til MDVPN via et softwarebaseret VPN.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">The purpose is to provide an easy way to connect to MDVPN instances via a software-based VPN.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DeIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://deic.dk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>PSNC</md:Company>
-      <md:EmailAddress>labedzki@man.poznan.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIEfYCcmTANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xEzARBgNVBAoTCmtleW1hbmFnZXIxEzARBgNVBAsTCm9pb3NhbWwtc3AxFjAUBgNVBAMTDWVkdVNBRkUgTURWUE4wHhcNMTYwMjA1MTI1NjU1WhcNMjUxMjE0MTI1NjU1WjB3MQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xEzARBgNVBAoTCmtleW1hbmFnZXIxEzARBgNVBAsTCm9pb3NhbWwtc3AxFjAUBgNVBAMTDWVkdVNBRkUgTURWUE4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEH8g4x6fNa0BRt3ehn6966Q2mX05ccirzAcPwtMzhxnCdXI+dtATcTTp1cdz4YoyqKcHvvTWYMVnI9nY1ISAa8kVQSVp2x8p3nlMjky3HUSDNIHobq7wQTGVoAjOdCOQyaiU/lGO7vhdPnXmRCTdt9OsAGs9bBMyQ3F+eMPkQDEuFVpiyxnQIZBjUOkI4FFG2gmjlwQVosspAhZn3zbfCuBhguAE4InhQeG65Ix+HosP4Ezi/nPiR7EwB/LVTuSNVQ/UYu0ZWbv2KKX/c1bFsseXdOd6YaVYdJ5rOjKUdT5stV66F9bVU8d+MU514XfzOAlXSGcYcyiztIE9D8tStAgMBAAGjITAfMB0GA1UdDgQWBBRua2BgUQtMS9MwXYbkvPHP6CXtJjANBgkqhkiG9w0BAQsFAAOCAQEATq4+q2AMkRF4xjHdKsxcF3BN/OMVSGSRw1E39PASpvqDbPENeJRfCXJSny+LvJC7lIFNvDI83gY1EXr4UDV7Inf40+++F7Mea4QvKDpvAr8eUYy5sUk4eq1NmlkM3jUsSiAZxskakpB/ipkEa81hMX1rw90JmGSGYxYVmkMWrob2hAkPLK0rDvVnjME6tq76BegXV2Kt3JNE0XW1QdXVGPLuoblXeWSvlRwfvJdabc06MFgBJl0loCwIwP6IBgr1PtaV6PVWueUfkYBdq1KAD3QweKzBDZyzdx4S2RKOg5uGwR6GjOf5Lo1zt8rkIz0YNyj2rFpsc9lv1Ky7gXexNw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.psnc.pl/edusafe-portal/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://edusafe.psnc.pl/edusafe-portal/saml/SAMLAssertionConsumer"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">eduSAFE-MDVPN</md:ServiceName>
+      <md:ServiceName xml:lang="en">eduSAFE-MDVPN</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at gøre det nemt at forbinde til MDVPN via et softwarebaseret VPN.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide an easy way to connect to MDVPN instances via a software-based VPN.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DeIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://deic.dk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>PSNC</md:Company>
+    <md:EmailAddress>labedzki@man.poznan.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
index f866af0b..210cb1fa 100644
--- a/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.hhs.nl/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-01T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-01T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Haagse Hogeschool</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">The Hague University</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Haagse Hogeschool</mdui:Description>
+        <mdui:Description xml:lang="en">Haagse Hogeschool</mdui:Description>
+        <mdui:Logo height="22" width="108">https://static.surfconext.nl/logos/idp/hhs.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Haagse Hogeschool hhs Hague</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Haagse Hogeschool hhs Hague</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Haagse Hogeschool</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">The Hague University</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Haagse Hogeschool</mdui:Description>
-          <mdui:Description xml:lang="en">Haagse Hogeschool</mdui:Description>
-          <mdui:Logo height="22" width="108">https://static.surfconext.nl/logos/idp/hhs.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Haagse Hogeschool hhs Hague</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Haagse Hogeschool hhs Hague</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/31c58f27e40bd14fe7f81df7725e9a66"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Haagse Hogeschool</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Haagse Hogeschool</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dehaagsehogeschool.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/31c58f27e40bd14fe7f81df7725e9a66"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Haagse Hogeschool</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Haagse Hogeschool</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dehaagsehogeschool.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.lynda.com.xml b/swamid-interfederations-2.0/saml.lynda.com.xml
index 2950b58e..b1db5d34 100644
--- a/swamid-interfederations-2.0/saml.lynda.com.xml
+++ b/swamid-interfederations-2.0/saml.lynda.com.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.lynda.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-06T14:42:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-06T14:42:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">lynda.com</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">lynda.com</mdui:DisplayName>
+        <mdui:Description xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</mdui:Description>
+        <mdui:Description xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://www.lynda.com</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.lynda.com</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">lynda.com</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">lynda.com</mdui:DisplayName>
-          <mdui:Description xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</mdui:Description>
-          <mdui:Description xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</mdui:Description>
-          <mdui:InformationURL xml:lang="de">https://www.lynda.com</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.lynda.com</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://saml.lynda.com</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=https://saml.lynda.com</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAPS3fySJTyfaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://saml.lynda.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://saml.lynda.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAPS3fySJTyfaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFmh0dHBzOi8vc2FtbC5seW5kYS5jb20wHhcNMTUxMDA1MTcxNTA0WhcNMTgx
 MDA0MTcxNTA0WjAhMR8wHQYDVQQDExZodHRwczovL3NhbWwubHluZGEuY29tMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArljPwyk0t7fUrSYp7IcHBSI1
@@ -40,44 +40,44 @@ vEgv+LYSYutkDJG6M5HDkjtxn+SqIqBTr6AxGYdol8WPICgVAlj1LV36NHtE8TUi
 0k0LQi2tiJfdQN1LzTP/z7uglW9MXtsgWQgiY1fbMAU5PLdneI0GHwDUYbnizdk2
 YlDBz1PhAHejnP2Sx6tnjNQ36qgiwvybuEhFWs2/jSOM4SWhyg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.lynda.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml.lynda.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml.lynda.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">lynda.com</md:ServiceName>
-        <md:ServiceName xml:lang="en">lynda.com</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e484</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e484</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">lynda.com, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">lynda.com, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.lynda.com</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.lynda.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Flynn</md:SurName>
-      <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Flynn</md:SurName>
-      <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.lynda.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml.lynda.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml.lynda.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml.lynda.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">lynda.com</md:ServiceName>
+      <md:ServiceName xml:lang="en">lynda.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">lynda.com ist eines der führenden Online-Learning-Unternehmen, das Nutzer dabei unterstützt, persönliche Fähigkeiten im Bereich Business, Software, Technologie und Kreativität zu entwickeln und persönliche und berufliche Ziele besser zu erreichen. Durch Abonnements für Einzelpersonen, Unternehmen, akademische und staatliche Einrichtungen haben Mitglieder Zugang zur lynda.com Videothek mit ansprechenden und hochwertigen Kursen, die von anerkannten Industrie-Experten unterrichtet werden. Das Unternehmen bietet auch Inhalte auf Deutsch, Französisch und Spanisch unter dem Markennamen video2brain an.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">lynda.com is a leading online learning company that helps anyone learn business, software, technology and creative skills to achieve personal and professional goals. Through individual, corporate, academic and government subscriptions, members have access to the lynda.com video library of engaging, top-quality courses taught by recognized industry experts. The company also provides German, French and Spanish language content under the video2brain brand name.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e484</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e484</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">lynda.com, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">lynda.com, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.lynda.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lynda.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Flynn</md:SurName>
+    <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Flynn</md:SurName>
+    <md:EmailAddress>mailto:miflynn@linkedin.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.nelnet.net.xml b/swamid-interfederations-2.0/saml.nelnet.net.xml
index b4d90305..36086065 100644
--- a/swamid-interfederations-2.0/saml.nelnet.net.xml
+++ b/swamid-interfederations-2.0/saml.nelnet.net.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.nelnet.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nelnet.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nelnet Business Solutions</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nelnet.net</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nelnet Business Solutions</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkCgAwIBAgIGAU9vsMY4MA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNVBAYTAlVTMQswCQYD
 VQQIEwJORTEQMA4GA1UEBxMHTGluY29sbjEMMAoGA1UEChMDTkJTMQ8wDQYDVQQLEwZOZWxuZXQx
 IDAeBgNVBAMTF2dhdGVrZWVwZXIuZmFjdHNtZ3QuY29tMB4XDTE1MDgyNzE1MDUwMFoXDTMwMDgy
@@ -36,31 +36,31 @@ Md8rH2VyQc5dLAxyNFfNmKprtXXDZf2pjR8JX8lWMcSDGUZ/++jUFlKRnS3+Dt1WYomoFVdYvZWr
 Cmhe6LS64j//8rgjaSgsAZ037lKxMS9mlc38UZqnGQDl0Q6x+hzbfJc0Xoo0vS7Lj0bVoxybNIV9
 LxKK+M8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.factsmgt.com/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gatekeeper.factsmgt.com/idp/SSO.saml2"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nelnet Business Solutions</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nelnet Business Solutions</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nelnet.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Todd Bryant</md:GivenName>
-      <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Todd Bryant</md:GivenName>
-      <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Todd Bryant</md:GivenName>
-      <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Todd Bryant</md:GivenName>
-      <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.factsmgt.com/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gatekeeper.factsmgt.com/idp/SSO.saml2"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nelnet Business Solutions</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nelnet Business Solutions</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nelnet.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Todd Bryant</md:GivenName>
+    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Todd Bryant</md:GivenName>
+    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Todd Bryant</md:GivenName>
+    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Todd Bryant</md:GivenName>
+    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
index 98fac55d..2a85a69a 100644
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.ps-ui-test.qalab.geant.net/perfsonar-ui">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T10:07:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T10:07:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
 						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
@@ -35,13 +35,13 @@
 						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
 						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
 						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
@@ -61,36 +61,36 @@
 						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
 						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">GÉANT perfSONAR UI Test</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT perfSONAR UI Test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
index 548bc4f3..d4cccbb7 100644
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.ps-ui-test.qalab.geant.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T15:25:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T15:25:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
 						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
@@ -35,13 +35,13 @@
 						L7qgb1CfXuXWFY/Ec1yYFAviHb8LFe92VaTrrdme6Qqba3eryueU4FvjtYfWy6+K
 						KMdsLHnE6yUSj1WUz0AHzZUPDcM9drnKw/k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
 						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
@@ -61,37 +61,37 @@
 						L7qgb1CfXuXWFY/Ec1yYFAviHb8LFe92VaTrrdme6Qqba3eryueU4FvjtYfWy6+K
 						KMdsLHnE6yUSj1WUz0AHzZUPDcM9drnKw/k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">GÉANT perfSONAR UI Test</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GÉANT perfSONAR UI Test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.psui.geant.net.xml b/swamid-interfederations-2.0/saml.psui.geant.net.xml
index de80898b..b3ef9108 100644
--- a/swamid-interfederations-2.0/saml.psui.geant.net.xml
+++ b/swamid-interfederations-2.0/saml.psui.geant.net.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.psui.geant.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T12:37:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T12:37:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - production instance</mdui:Description>
+        <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GÉANT perfSONAR UI - production instance</mdui:Description>
-          <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFjCCAf6gAwIBAgIJAN9/NobZhv1lMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDnBzdWkuZ2VhbnQubmV0MB4XDTE1MDUyOTEwMTM1NFoXDTE4MDUyOTEwMTM1
 						NFowGTEXMBUGA1UEAxMOcHN1aS5nZWFudC5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
@@ -35,13 +35,13 @@
 						UnhRIlC2dWAGrVInFFpZw4gXAAIpgrZRXd22tni7dxcqHy3Dbw5TmHE3w12OB6iT
 						kfAkynNfVcuzg3d1hf1dNs0DGW5uSY68hFk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFjCCAf6gAwIBAgIJAN9/NobZhv1lMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDnBzdWkuZ2VhbnQubmV0MB4XDTE1MDUyOTEwMTM1NFoXDTE4MDUyOTEwMTM1
 						NFowGTEXMBUGA1UEAxMOcHN1aS5nZWFudC5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
@@ -60,45 +60,45 @@
 						UnhRIlC2dWAGrVInFFpZw4gXAAIpgrZRXd22tni7dxcqHy3Dbw5TmHE3w12OB6iT
 						kfAkynNfVcuzg3d1hf1dNs0DGW5uSY68hFk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">GÉANT perfSONAR UI</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - production instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT perfSONAR UI</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>PerfSONAR developers</md:GivenName>
-      <md:EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>PerfSONAR developers</md:GivenName>
-      <md:EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">GÉANT perfSONAR UI</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">GÉANT perfSONAR UI - production instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT perfSONAR UI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>PerfSONAR developers</md:GivenName>
+    <md:EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>PerfSONAR developers</md:GivenName>
+    <md:EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 3ea75771..d7bc2309 100644
--- a/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.sys.kth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
+        <mdui:Logo height="166" width="166">https://saml.sys.kth.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">stockholm</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kth.se</mdui:DomainHint>
+        <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
+        <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
+        <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
+        <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
+        <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
-          <mdui:Logo height="166" width="166">https://saml.sys.kth.se/idp/images/logo.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">stockholm</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kth.se</mdui:DomainHint>
-          <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
-          <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
-          <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
-          <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
-          <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
-          <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
-          <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
-          <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
-          <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
-          <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
-          <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
-          <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
-          <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
-          <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
-          <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
-          <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
-          <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
-          <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
-          <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
-          <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
-          <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAOHnWp4SJR1ucFuzdVgffOjOdhbCMA0GCSqGSIb3DQEB
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAOHnWp4SJR1ucFuzdVgffOjOdhbCMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNhbWwtMi5zeXMua3RoLnNlMB4XDTE0MDMyNDEyNDE1
 OFoXDTM0MDMyNDEyNDE1OFowHDEaMBgGA1UEAxMRc2FtbC0yLnN5cy5rdGguc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBH0+OjrfAPCqpnnbg/DWA
@@ -68,29 +68,29 @@ D005TFeUFavEdpQb0xk3eg5y06P66fiY++ewjyfJNgBrhEChMPPOd3MhTj3Sj2sa
 B7aUMBV4hT03YJmQt+jHO5Pim7pP2AQ/+AmGTixyRs1b4bryD+N/y+FOy7LEd8aO
 X+V6LngODeVrf80YJynJQRppJlSS8ecu8xbM/9GY1o37vXfDLUJVJ21ENC6DxwWe
 x7JUFw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-2.sys.kth.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAOHnWp4SJR1ucFuzdVgffOjOdhbCMA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-2.sys.kth.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAOHnWp4SJR1ucFuzdVgffOjOdhbCMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNhbWwtMi5zeXMua3RoLnNlMB4XDTE0MDMyNDEyNDE1
 OFoXDTM0MDMyNDEyNDE1OFowHDEaMBgGA1UEAxMRc2FtbC0yLnN5cy5rdGguc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBH0+OjrfAPCqpnnbg/DWA
@@ -108,36 +108,36 @@ D005TFeUFavEdpQb0xk3eg5y06P66fiY++ewjyfJNgBrhEChMPPOd3MhTj3Sj2sa
 B7aUMBV4hT03YJmQt+jHO5Pim7pP2AQ/+AmGTixyRs1b4bryD+N/y+FOy7LEd8aO
 X+V6LngODeVrf80YJynJQRppJlSS8ecu8xbM/9GY1o37vXfDLUJVJ21ENC6DxwWe
 x7JUFw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>KTH Royal Institute of Technology</md:Company>
-      <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
-      <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>KTH Royal Institute of Technology</md:Company>
-      <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
-      <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>KTH Royal Institute of Technology</md:Company>
-      <md:SurName>KTH IT-Support</md:SurName>
-      <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>KTH Royal Institute of Technology</md:Company>
+    <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
+    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>KTH Royal Institute of Technology</md:Company>
+    <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
+    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>KTH Royal Institute of Technology</md:Company>
+    <md:SurName>KTH IT-Support</md:SurName>
+    <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
index 4cb5c0a3..4f0fce2c 100644
--- a/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.uvt.nl/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-25T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-25T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit van Tilburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Tilburg University</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit van Tilburg</mdui:Description>
+        <mdui:Description xml:lang="en">Tilburg University</mdui:Description>
+        <mdui:Logo height="160" width="200">https://static.surfconext.nl/logos/idp/uvtboom.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Universiteit van Tilburg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Tilburg University</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Universiteit van Tilburg</mdui:Description>
-          <mdui:Description xml:lang="en">Tilburg University</mdui:Description>
-          <mdui:Logo height="160" width="200">https://static.surfconext.nl/logos/idp/uvtboom.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/59b5bae75a0f1404d48d70dbde8a130e"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tilburg University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tilburg University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.tilburguniversity.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/59b5bae75a0f1404d48d70dbde8a130e"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tilburg University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tilburg University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.tilburguniversity.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml b/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml
index 45e349f8..731855ea 100644
--- a/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samlidp-its.ocad.ca:8443/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-08-14T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-08-14T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ocad.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">OCAD University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ocadu.ca/about_ocad.htm</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ocad.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">OCAD University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ocadu.ca/about_ocad.htm</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVAPRpRT0TrCPgXOSWUxrZTtTEeomRMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0MzAeFw0xNDA3
 MDgxNDE1MThaFw0zNDA3MDgxNDE1MThaMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRz
@@ -36,29 +36,29 @@ cQX0Ii9rS7spjxCmbicvlVfXl5Oe79NdtO+NcxQbRfU3QYHZap0lDVaZd+6zLXXU
 k5TIaeFkSh3RLdm4kBlaLFXzepvESschTHTfbH/PHntSGOYJVRGV34yKUEaG/mSQ
 KA9ippT+XCdKL7aFElL/FkA9Welvsk7w/EHZoo8Ixls=
          </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://samlidp-its.ocad.ca:8443/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ocad.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://samlidp-its.ocad.ca:8443/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ocad.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAo2gAwIBAgIDDC/fMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
 MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
 aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDkwNzI5MTM0NDQ0WhcNMTEwOTI5MTMwOTEy
@@ -77,21 +77,21 @@ AQUFAAOBgQBl1lnGQv6nOHC2Y/IyubqnlOBSW5dbSFSn3pvrxvuL24b1MR0XA+28
 hui8jdimOzGIOWS4+ShIXaO6rAaugPpMxFU+DArOHPJ9xjolw86bFdh6Z1xhLg9P
 lOKqmQXDe3+pEod35AFdmKjRVSbliDv5BZ2lN7GVDTzea0f66nblvQ==
            </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCAD University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OCAD University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ocadu.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Matthew Kwasnicki</md:SurName>
-      <md:EmailAddress>mkwasnicki@ocadu.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCAD University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OCAD University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ocadu.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Matthew Kwasnicki</md:SurName>
+    <md:EmailAddress>mkwasnicki@ocadu.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml
index 48a1829c..cc6c65ae 100644
--- a/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samlviewer.cf.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-15T09:55:20Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-15T09:55:20Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAItfjPqmm9zNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3NhbWx2aWV3ZXIuY2YuYWMudWswHhcNMTIwNTEyMTI0ODUzWhcNMjIwNTEw
 						MTI0ODUzWjAeMRwwGgYDVQQDExNzYW1sdmlld2VyLmNmLmFjLnVrMIIBIjANBgkq
@@ -30,119 +30,119 @@
 						gDjmryhzc9dI92jTLhORxBe7IIEYYFFBHt5w/jkj0ByL+ocWimhzW88rk+gayroy
 						T3DN4A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Cardiff University SAML Viewer</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Cardiff University SAML Viewer</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				This service provider allows you to see the attributes the attributes released to it by your Identity Provider.
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:mace:dir:attribute-def:uid" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="memberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University: SAML Viewer</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:mace:dir:attribute-def:uid" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="memberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University: SAML Viewer</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml b/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml
index 22323737..127e3142 100644
--- a/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml
+++ b/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sandbox-eu.alma.exlibrisgroup.com/mng/login">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-14T14:48:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-14T14:48:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEUDCCArigAwIBAgIEUWQ+bzANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJJ
 						TDESMBAGA1UECBMJSmVydXNhbGVtMRIwEAYDVQQHEwlKZXJ1c2FsZW0xETAPBgNV
 						BAoTCEV4bGlicmlzMQ0wCwYDVQQLEwRBbG1hMREwDwYDVQQDEwhTQU1MIEpLUzAe
@@ -35,25 +35,25 @@
 						s7Q3F7NVAvvfPrcXUfxw67jc3NQEGPGESn2ZCdcD8SQNPBymdG0572nebb4AhmBR
 						2PN4Eg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sandbox-eu.alma.exlibrisgroup.com/mng/pdsHandleLogin" index="0" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ex Libris Alma (Sandbox) - The Next-Generation Library Services Framework</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sandbox-eu.alma.exlibrisgroup.com/mng/pdsHandleLogin" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ex Libris Alma (Sandbox) - The Next-Generation Library Services Framework</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
index 9f509090..70167b93 100644
--- a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sau09ret.ifbaiano.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifbaiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifbaiano.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
 IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
 KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
@@ -45,26 +45,26 @@ FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
 KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
 zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
 IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
@@ -90,24 +90,24 @@ zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFBaiano - Instituto Federal Baiano</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifbaiano.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Humberto Santiago</md:SurName>
-      <md:EmailAddress>cotec@ifbaiano.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFBaiano - Instituto Federal Baiano</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifbaiano.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Humberto Santiago</md:SurName>
+    <md:EmailAddress>cotec@ifbaiano.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
index e9a9adaf..43c751de 100644
--- a/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sb.nemji.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-11-03T10:24:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/hospital</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-11-03T10:24:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/hospital</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hospital Jihlava</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for staff of Hospital Jihlava</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Nemocnice Jihlava, p.o.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.nemji.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.nemji.cz</mdui:InformationURL>
+        <mdui:Logo height="100" width="92">https://sb.nemji.cz/idp/images/logo_nemji.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hospital Jihlava</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for staff of Hospital Jihlava</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Nemocnice Jihlava, p.o.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.nemji.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.nemji.cz</mdui:InformationURL>
-          <mdui:Logo height="100" width="92">https://sb.nemji.cz/idp/images/logo_nemji.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAKZp9gwp4ueLeX2+eB2CvUUrnDkkMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1N1oXDTM1
 MDkyODIwMjY1N1owFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
@@ -49,13 +49,13 @@ xRTQTJkWnQl6/yFldSIS1vjyq4gRDeSAbEamdB9kZYXpso/6+Xci56RGkF2jqhYG
 jBnhOQm9pZ5ExPvfJg8t0uM2JkUPFWXPemvekrOsruK03/aI5fSi1xpDPXagFeTX
 duJQgq77OjeYG4HDOE+/Q1Mc78ihrQGiMt1mQA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAKPyelTVA+LxLwVx00WMBX1JLVLrMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1NloXDTM1
 MDkyODIwMjY1NlowFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
@@ -74,13 +74,13 @@ XtGqoecT2BBbSIpCBnIeffIW4Lri+DSVxE1zDpnbE80VcAF+A5TP2qRNN+KHMbro
 mbbg8OPDJqbEV4TpRiTv1dMW/7Bl3gwslK+RRYC612P8EZxFnjsLBkVzmWXv/Uje
 /5e/14K2hCSYVIQY8/gqbfJYMErJJ8XsW+0SqQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUVFD+QoaYzxD5W4xBkA9MJtVvnREwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLc2IubmVtamkuY3owHhcNMTUwOTI4MjAyNjU2WhcNMzUw
 OTI4MjAyNjU2WjAWMRQwEgYDVQQDDAtzYi5uZW1qaS5jejCCASIwDQYJKoZIhvcN
@@ -99,27 +99,27 @@ GS4qzsVOlYnXW8FZgftgaPqNwu/+EtSlkRtvYQdNSjs6oVXnHgO+5JYTMDgvf0xS
 Pq2qFEC0TqaooIgKbPI9IKAg7WhwSuakyV2FIRtLpbRSZfcwSmzWnYcsmkxTGVnI
 gP5HZMJJz+FjDqHEOLAg0b82EJgLbqzVuBXy
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sb.nemji.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sb.nemji.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sb.nemji.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sb.nemji.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sb.nemji.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sb.nemji.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sb.nemji.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sb.nemji.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAKZp9gwp4ueLeX2+eB2CvUUrnDkkMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1N1oXDTM1
 MDkyODIwMjY1N1owFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
@@ -138,13 +138,13 @@ xRTQTJkWnQl6/yFldSIS1vjyq4gRDeSAbEamdB9kZYXpso/6+Xci56RGkF2jqhYG
 jBnhOQm9pZ5ExPvfJg8t0uM2JkUPFWXPemvekrOsruK03/aI5fSi1xpDPXagFeTX
 duJQgq77OjeYG4HDOE+/Q1Mc78ihrQGiMt1mQA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAKPyelTVA+LxLwVx00WMBX1JLVLrMA0GCSqGSIb3DQEB
 CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1NloXDTM1
 MDkyODIwMjY1NlowFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
@@ -163,13 +163,13 @@ XtGqoecT2BBbSIpCBnIeffIW4Lri+DSVxE1zDpnbE80VcAF+A5TP2qRNN+KHMbro
 mbbg8OPDJqbEV4TpRiTv1dMW/7Bl3gwslK+RRYC612P8EZxFnjsLBkVzmWXv/Uje
 /5e/14K2hCSYVIQY8/gqbfJYMErJJ8XsW+0SqQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUVFD+QoaYzxD5W4xBkA9MJtVvnREwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLc2IubmVtamkuY3owHhcNMTUwOTI4MjAyNjU2WhcNMzUw
 OTI4MjAyNjU2WjAWMRQwEgYDVQQDDAtzYi5uZW1qaS5jejCCASIwDQYJKoZIhvcN
@@ -188,23 +188,23 @@ GS4qzsVOlYnXW8FZgftgaPqNwu/+EtSlkRtvYQdNSjs6oVXnHgO+5JYTMDgvf0xS
 Pq2qFEC0TqaooIgKbPI9IKAg7WhwSuakyV2FIRtLpbRSZfcwSmzWnYcsmkxTGVnI
 gP5HZMJJz+FjDqHEOLAg0b82EJgLbqzVuBXy
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Hospital Jihlava</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hospital Jihlava</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nemji.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.nemji.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Málek</md:SurName>
-      <md:EmailAddress>malekp@nemji.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Hospital Jihlava</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hospital Jihlava</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nemji.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.nemji.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Málek</md:SurName>
+    <md:EmailAddress>malekp@nemji.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml
index 57230ec8..1be559e8 100644
--- a/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scatfam.shrewsbury.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-30T12:52:22Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-30T12:52:22Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shrewsbury.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shrewsbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEDjCCAvYCCQDdX07L9v0VEjANBgkqhkiG9w0BAQUFADCByDELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgMClNocm9wc2hpcmUxEzARBgNVBAcMClNocmV3c2J1cnkxGzAZ
 						BgNVBAoMElNocmV3c2J1cnkgQ29sbGVnZTErMCkGA1UECwwidGVjaG5pY2FsIGFu
@@ -34,26 +34,26 @@
 						u2ROhvMTtYALUGQBvH5xDdSya1yqjjg/wC68x2bn3XEsQqWZsEHQ2wJPtCv0IsFX
 						dPv/acSrfyFVxIZgbRRTDcPSN2uF5wLsH/Ib7aNIsvxj+Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shrewsbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shrewsbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shrewsbury.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shrewsbury.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEDjCCAvYCCQDdX07L9v0VEjANBgkqhkiG9w0BAQUFADCByDELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgMClNocm9wc2hpcmUxEzARBgNVBAcMClNocmV3c2J1cnkxGzAZ
 						BgNVBAoMElNocmV3c2J1cnkgQ29sbGVnZTErMCkGA1UECwwidGVjaG5pY2FsIGFu
@@ -77,27 +77,27 @@
 						u2ROhvMTtYALUGQBvH5xDdSya1yqjjg/wC68x2bn3XEsQqWZsEHQ2wJPtCv0IsFX
 						dPv/acSrfyFVxIZgbRRTDcPSN2uF5wLsH/Ib7aNIsvxj+Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Shrewsbury College of Arts and Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Shrewsbury College of Arts and Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shrewsbury.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Booth</md:SurName>
-      <md:EmailAddress>mailto:richard.booth@shrewsbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robin</md:GivenName>
-      <md:SurName>Breakwell</md:SurName>
-      <md:EmailAddress>mailto:robinb@shrewsbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Shrewsbury College of Arts and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shrewsbury College of Arts and Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shrewsbury.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Booth</md:SurName>
+    <md:EmailAddress>mailto:richard.booth@shrewsbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robin</md:GivenName>
+    <md:SurName>Breakwell</md:SurName>
+    <md:EmailAddress>mailto:robinb@shrewsbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml b/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml
index 441ba0c2..44976627 100644
--- a/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://school.c2kni.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-21T11:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-21T11:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kni.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kni.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVALsvx6NLIdhUhxT9mKREB6ksXTLJMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguYzJrbmkubmV0MB4XDTEwMDgxMjEw
 						MzcxN1oXDTMwMDgxMjEwMzcxN1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtu
@@ -32,26 +32,26 @@
 						roZivJRxgHW76yyE9ASsrzLz3eL4rlbGNK4LCSyWO7I7wsKT0a4XHK3GW/mI5VAS
 						SnrH9o8dANbP72exZm5mEg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.c2kni.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kni.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.c2kni.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kni.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVALsvx6NLIdhUhxT9mKREB6ksXTLJMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguYzJrbmkubmV0MB4XDTEwMDgxMjEw
 						MzcxN1oXDTMwMDgxMjEwMzcxN1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtu
@@ -71,27 +71,27 @@
 						roZivJRxgHW76yyE9ASsrzLz3eL4rlbGNK4LCSyWO7I7wsKT0a4XHK3GW/mI5VAS
 						SnrH9o8dANbP72exZm5mEg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Western Education and Library Board</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">C2k (Western Education Library Board)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joe</md:GivenName>
-      <md:SurName>Boyle</md:SurName>
-      <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joe</md:GivenName>
-      <md:SurName>Boyle</md:SurName>
-      <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Western Education and Library Board</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">C2k (Western Education Library Board)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Boyle</md:SurName>
+    <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Boyle</md:SurName>
+    <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml b/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml
index f448b13f..ac433b18 100644
--- a/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sci-bath.calpendo.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-14T14:30:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-14T14:30:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Calpendo for University of Bath</mdui:DisplayName>
+        <mdui:Logo height="100" width="271">https://downloads.exprodo.com/images/exprodo-software_271x100.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Core facility management, booking system and web-based database for research/clinical facilities.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="3"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Calpendo for University of Bath</mdui:DisplayName>
-          <mdui:Logo height="100" width="271">https://downloads.exprodo.com/images/exprodo-software_271x100.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Core facility management, booking system and web-based database for research/clinical facilities.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
 						MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
@@ -55,48 +55,48 @@
 						29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
 						lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Calpendo for University of Bath</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Exprodo Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Calpendo for University of Bath</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exprodo.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Calpendo for University of Bath</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Exprodo Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Calpendo for University of Bath</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exprodo.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml b/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml
index 15551f24..43eb9b51 100644
--- a/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml
+++ b/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sci-ware-customer.com/swldev/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-05T10:52:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-05T10:52:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAPftzawoE6U+MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlwLTEwLTk1LTE0Mi0xNDUwHhcNMTUxMTAzMTcyNzM1WhcNMjUxMDMxMTcy
 						NzM1WjAbMRkwFwYDVQQDExBpcC0xMC05NS0xNDItMTQ1MIIBIjANBgkqhkiG9w0B
@@ -47,47 +47,47 @@
 						eAquk+r1oYNyazGO4kkBhsYJ33hi9+G5ZJJkBHK8mHvvJMsWmN5ISQSUE0H+5yxy
 						YCzUShNiI4OLItnjtZBuovyi9S3CB0BebK30iaLYM/LXpVI124hiqCbvdQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science Warehouse SwlDev</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alexei</md:GivenName>
-      <md:SurName>Blue</md:SurName>
-      <md:EmailAddress>mailto:alexei.blue@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alexei</md:GivenName>
-      <md:SurName>Blue</md:SurName>
-      <md:EmailAddress>mailto:alexei.blue@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science Warehouse SwlDev</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alexei</md:GivenName>
+    <md:SurName>Blue</md:SurName>
+    <md:EmailAddress>mailto:alexei.blue@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alexei</md:GivenName>
+    <md:SurName>Blue</md:SurName>
+    <md:EmailAddress>mailto:alexei.blue@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
index f3dcc9ec..37fd646f 100644
--- a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://science-gateway.chain-project.eu/shibboleth">
+  <md:Extensions>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T07:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T07:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CHAIN-REDS Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CHAIN-REDS Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</mdui:Description>
+        <mdui:Description xml:lang="it">Il Sciece Gateway del progetto CHAIN-REDS e' una piattaforma web 2.0 basata su standard avente la finilita'  di mostrare speciali casi d'uso ed appicazioni identificate all'interno del progetto (www.chain-project.eu) ed eseguire queste su una infrastruttura di calcolo distribuita su base mondiale e con differenti paradigmi (grid, cloud, HPC)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CHAIN-REDS Science Gateway</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">CHAIN-REDS Science Gateway</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</mdui:Description>
-          <mdui:Description xml:lang="it">Il Sciece Gateway del progetto CHAIN-REDS e' una piattaforma web 2.0 basata su standard avente la finilita'  di mostrare speciali casi d'uso ed appicazioni identificate all'interno del progetto (www.chain-project.eu) ed eseguire queste su una infrastruttura di calcolo distribuita su base mondiale e con differenti paradigmi (grid, cloud, HPC)</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE8TCCA9mgAwIBAgIRAJkwiwyfpx7usj9S/zvy7rIwDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -63,38 +63,38 @@ A4IBAQBRQFOhixQr232gE3iNYIth4OzlMwK3pftdxdsgt3rrOHQBHFv5QBbZL42m
 yfCKbqhsoCXGNbLT2AgzayLYMJRckuTX3VNGFDTdbiFiv62Z842eKkLYlpRYxUi/
 +3A6Rx0nC5V7eKNZwLSToOSPSEQA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">CHAIN-REDS Science Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INFN ROMA3</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INFN ROMA3</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.roma3.infn.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CHAIN-REDS Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN ROMA3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN ROMA3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.roma3.infn.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml b/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml
index 7a8e673d..162a313d 100644
--- a/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scitation.aip.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-09T11:18:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-09T11:18:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnDCCAoSgAwIBAgIEUdvRkTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
@@ -31,23 +31,23 @@
 						GOvb1z0peq8ppMqO8yvvnURF4k8T2Lzt8COgRkumpQztylohokSI0GrtCbsntZn8
 						Q0pEiZ1n5ClvAkHcGhpYog==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scitation.aip.org/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scitation.aip.org/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scitation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://scitation.aip.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help</md:GivenName>
-      <md:EmailAddress>mailto:help@scitation.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scitation.aip.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scitation.aip.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scitation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://scitation.aip.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help</md:GivenName>
+    <md:EmailAddress>mailto:help@scitation.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml b/swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml
index 57325a45..7385e030 100644
--- a/swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scotlandonscreen.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-19T16:04:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-19T16:04:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scotland on Screen</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Access to hundreds of historical Scottish film clips from the NLS Moving Image Archive.</mdui:Description>
+        <mdui:Logo height="120" width="320">https://scotlandonscreen.org.uk/sites/default/files/SOS-UK-Federation-SSO-Logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Scotland on Screen</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Access to hundreds of historical Scottish film clips from the NLS Moving Image Archive.</mdui:Description>
-          <mdui:Logo height="120" width="320">https://scotlandonscreen.org.uk/sites/default/files/SOS-UK-Federation-SSO-Logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJALvpeqGCbrAQMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWxvY2FsaG9zdDAeFw0xNjAxMTkxNTEyMjFaFw0yNjAxMTYxNTEyMjFaMBQx
 						EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -52,43 +52,43 @@
 						3Fh80Lk8STk4KhOTz/TCixAzlwYWnvQta3rwkjutFhmMCNmInc8+W4zpQ3GO26Y2
 						3BS6l6Hdh67Mi3kGZWtG6W0K3ehc3g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scottish Film Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scotland on Screen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://scotlandonscreen.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paolo</md:GivenName>
-      <md:SurName>Ciarrocca</md:SurName>
-      <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paolo</md:GivenName>
-      <md:SurName>Ciarrocca</md:SurName>
-      <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scottish Film Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scotland on Screen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://scotlandonscreen.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paolo</md:GivenName>
+    <md:SurName>Ciarrocca</md:SurName>
+    <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paolo</md:GivenName>
+    <md:SurName>Ciarrocca</md:SurName>
+    <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/screeningshorts.org.uk-shibboleth.xml b/swamid-interfederations-2.0/screeningshorts.org.uk-shibboleth.xml
index 603a1489..b8c659d9 100644
--- a/swamid-interfederations-2.0/screeningshorts.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/screeningshorts.org.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://screeningshorts.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-15T15:56:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-15T15:56:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://screeningshorts.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://screeningshorts.org.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Screening Shorts</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Screening Shorts is a range of in-depth tutorials exploring moving image literacy in the classroom.</mdui:Description>
+        <mdui:Logo height="116" width="350">https://screeningshorts.org.uk/sites/default/files/UK-Fed-SS.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://screeningshorts.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://screeningshorts.org.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Screening Shorts</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Screening Shorts is a range of in-depth tutorials exploring moving image literacy in the classroom.</mdui:Description>
-          <mdui:Logo height="116" width="350">https://screeningshorts.org.uk/sites/default/files/UK-Fed-SS.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAJfnVMY+1ZfdMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWxvY2FsaG9zdDAeFw0xNjA0MTQxNTQ3NDlaFw0yNjA0MTIxNTQ3NDlaMBQx
 						EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -52,43 +52,43 @@
 						RJbkUxN29dAC8j1+1KT9CTYnh9rRW321jJ24Gj/V5fp4QBaZuqZA/Y8J9cAz3Fn6
 						xUXPQ//vxoNpkf4LAWgCpsNZ8iRGbQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://screeningshorts.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scottish Film Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Screening Shorts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://screeningshorts.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paolo</md:GivenName>
-      <md:SurName>Ciarrocca</md:SurName>
-      <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paolo</md:GivenName>
-      <md:SurName>Ciarrocca</md:SurName>
-      <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://screeningshorts.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://screeningshorts.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://screeningshorts.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scottish Film Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Screening Shorts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://screeningshorts.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paolo</md:GivenName>
+    <md:SurName>Ciarrocca</md:SurName>
+    <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paolo</md:GivenName>
+    <md:SurName>Ciarrocca</md:SurName>
+    <md:EmailAddress>mailto:web@scottishfilm.scot</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml
index f1761e05..1c971aef 100644
--- a/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scsh.scran.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T14:42:36Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T14:42:36Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Screening Shorts</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A resource developed by Creative Scotland and Education Scotland to help teachers deliver moving image education (MIE).</mdui:Description>
+        <mdui:Logo height="69" width="250">https://shib.scran.ac.uk/images/logo-scsh.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scsh.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/glow"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Screening Shorts</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A resource developed by Creative Scotland and Education Scotland to help teachers deliver moving image education (MIE).</mdui:Description>
-          <mdui:Logo height="69" width="250">https://shib.scran.ac.uk/images/logo-scsh.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scsh.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/DS/UKFederation" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/glow"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
 						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
@@ -61,57 +61,57 @@
 						LTUxK70J8DSNHEuzC8s+rTfXhsn01ZUKGDQqeFDO3TccF/x8iespeHPJO7uD/klz
 						bjQPf6gJKSkRW/uiwoDLkt/CChMGLGbYpQcx/7RpyzUpN4u4PHLduf03kQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Screening Shorts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.screeningshorts.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Screening Shorts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.screeningshorts.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
index c9cbab1a..4dc15b50 100644
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
+++ b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdauth.sciencedirect.com/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-08T16:50:51Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-08T16:50:51Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Elsevier Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Elsevier Service Provider</mdui:Description>
+        <mdui:Logo height="80" width="73">https://origin-cdn.els-cdn.com/sd/elsevier.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Elsevier Service Provider</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Elsevier Service Provider</mdui:Description>
-          <mdui:Logo height="80" width="73">https://origin-cdn.els-cdn.com/sd/elsevier.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEoDCCA4igAwIBAgIBATANBgkqhkiG9w0BAQQFADCBljELMAkGA1UEBhMCVVMx
 						DTALBgNVBAgTBE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xF
 						WElTLU5FWElTMSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAo
@@ -41,36 +41,36 @@
 						/khhD8zTvlmaPoCttZyxx/VABsfosRfkEgf52ge02TXsHTvDuKe3GKJUqzqYnuQw
 						0sdo9tQp3aTFCi0r/pYqPrB21ZIbkQ/xybNtFratD7yuJ3Or
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc310-auth.elsevier.com/SHIRE/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc310-auth.elsevier.com/SHIRE/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc312-auth.elsevier.com/SHIRE/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc312-auth.elsevier.com/SHIRE/SAML/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML2/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc316-auth.elsevier.com/SHIRE/SAML2/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc316-auth.elsevier.com/SHIRE/SAML/POST" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc327-auth.elsevier.com/SHIRE/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc327-auth.elsevier.com/SHIRE/SAML/POST" index="14"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Elsevier: ScienceDirect</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.elsevier.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Elsevier Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:shibbolethsupport@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Elsevier Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:shibbolethsupport@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc310-auth.elsevier.com/SHIRE/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc310-auth.elsevier.com/SHIRE/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc312-auth.elsevier.com/SHIRE/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc312-auth.elsevier.com/SHIRE/SAML/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc316-auth.elsevier.com/SHIRE/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc316-auth.elsevier.com/SHIRE/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc327-auth.elsevier.com/SHIRE/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc327-auth.elsevier.com/SHIRE/SAML/POST" index="14"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Elsevier: ScienceDirect</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.elsevier.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elsevier Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:shibbolethsupport@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Elsevier Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:shibbolethsupport@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml b/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml
index 261040f8..f5219deb 100644
--- a/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml
+++ b/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdn-openstack.oit.duke.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sdn-openstack-dev-01.oit.duke.edu/Shibboleth.sso/Login" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">OpenStack for Research</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sdn-openstack-dev-01.oit.duke.edu/Shibboleth.sso/Login" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/Shibboleth.sso/Login" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">OpenStack for Research</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKjCCAhKgAwIBAgIJAOJfno4EnLE6MA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
 BAMTIXNkbi1vcGVuc3RhY2stZGV2LTAxLm9pdC5kdWtlLmVkdTAeFw0xNjAxMTIx
 ODEyMTZaFw0yNjAxMDkxODEyMTZaMCwxKjAoBgNVBAMTIXNkbi1vcGVuc3RhY2st
@@ -38,31 +38,31 @@ CriPKh1LYjUQ7p2mF0qQnw0mFvkCgHgKeqx7llzFMKzxk+xAXDcnunXGRB2xVHDL
 JJ7lo9u+ITPEMRXy4dr9NjWXfHVDRBdIq12HG5OR+KBomJSSLoF4B/+Lw8e5UA4k
 hqZYCJefeTUol0vkdULhuiJHN1eaOWijZo9sbu1cYeHxwVXo1hN00PS4WuJ+hg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdn-openstack-dev-01.oit.duke.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/v3/auth/OS-FEDERATION/websso/saml2" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdn-openstack.oit.duke.edu/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack.oit.duke.edu:5000/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack.oit.duke.edu:5000/v3/auth/OS-FEDERATION/websso/saml2" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">OpenStack for Research</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Duke University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Duke University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.duke.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob Carter</md:GivenName>
-      <md:EmailAddress>rob@duke.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shilen Patel</md:GivenName>
-      <md:EmailAddress>shilen@duke.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdn-openstack-dev-01.oit.duke.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/v3/auth/OS-FEDERATION/websso/saml2" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdn-openstack.oit.duke.edu/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack.oit.duke.edu:5000/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack.oit.duke.edu:5000/v3/auth/OS-FEDERATION/websso/saml2" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">OpenStack for Research</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Duke University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Duke University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.duke.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob Carter</md:GivenName>
+    <md:EmailAddress>rob@duke.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shilen Patel</md:GivenName>
+    <md:EmailAddress>shilen@duke.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
index 1b1a8ecc..687f8b6c 100644
--- a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sds.geschkult.fu-berlin.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-11-27T10:01:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-11-27T10:01:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Kunst und Funktion</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Kunst und Funktion</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
+        <mdui:Description xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.kunst-und-funktion.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kunst-und-funktion.de/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Kunst und Funktion</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Kunst und Funktion</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
-          <mdui:Description xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.kunst-und-funktion.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.kunst-und-funktion.de/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGHzCCBQegAwIBAgIHGPldZLrBDjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGHzCCBQegAwIBAgIHGPldZLrBDjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
 ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
 A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
@@ -57,48 +57,48 @@ tM3XDmc1x9DkR22n8kKDNVQvH74LoeMXkT73W6qESha0+K9l+UzJ6/xmsOdWU2m/
 pq5Smjy+M9orfvsuXQYOzxfnYBUIEoyD9eVc2OjiwKy5VA9tISMBiS9Oyx2n42Pe
 TJpLI0EqYx0IYLCS+WkpctBenwMkYEuIOu88njquyjpZqjY=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Kunst und Funktion</md:ServiceName>
-        <md:ServiceName xml:lang="en">Kunst und Funktion</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e5</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e5</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Freie Universität Berlin</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Freie Universität Berlin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Funktionsadresse</md:GivenName>
-      <md:SurName>IT des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
-      <md:EmailAddress>mailto:servermaster@geschkult.fu-berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Funktionsadresse</md:GivenName>
-      <md:SurName>IT-Support des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
-      <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Kunst und Funktion</md:ServiceName>
+      <md:ServiceName xml:lang="en">Kunst und Funktion</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e5</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e5</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Freie Universität Berlin</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Freie Universität Berlin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Funktionsadresse</md:GivenName>
+    <md:SurName>IT des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
+    <md:EmailAddress>mailto:servermaster@geschkult.fu-berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Funktionsadresse</md:GivenName>
+    <md:SurName>IT-Support des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
+    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdstate.infoready4.com-shibboleth.xml b/swamid-interfederations-2.0/sdstate.infoready4.com-shibboleth.xml
index 98060bb3..6f54290d 100644
--- a/swamid-interfederations-2.0/sdstate.infoready4.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sdstate.infoready4.com-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdstate.infoready4.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sdstate.infoready4.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InfoReady Review - South Dakota State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sdstate.infoready4.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">InfoReady Review - South Dakota State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6zCCAdOgAwIBAgIJAOO9wmxE2PCSMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGluZm9yZHl3aW4wMjAeFw0xMzEwMjkwNjE0NDlaFw0yMzEwMjcwNjE0NDla
 MBcxFTATBgNVBAMTDGluZm9yZHl3aW4wMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -36,31 +36,31 @@ zAs2xgBj3V5YWmzS7nk1wPPJBKpr+9W5xixEGfaKfrrQXayP/LVyN+u/3BjZCZfE
 bfqmalH+rjpJ7ZCck4CQFxCvnLhwl+L5DEuEFXmgTzk7EDb65no+rXaZQd3/IEre
 sazovBHNw8FPYGiOCi2757flvBsb6gW+FbN0SPmtSQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdstate.infoready4.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sdstate.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sdstate.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">InfoReady Review - South Dakota State University</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Testa</md:GivenName>
-      <md:EmailAddress>jtesta@inforeadycorp.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdstate.infoready4.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sdstate.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sdstate.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sdstate.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">InfoReady Review - South Dakota State University</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Testa</md:GivenName>
+    <md:EmailAddress>jtesta@inforeadycorp.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
index 3d11176f..31d381f0 100644
--- a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
+++ b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/schereg">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:39:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:39:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.de.dariah.eu/schereg/saml/login/alias/schereg" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH Schema Registry</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH Schema Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH Schema Registry</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH Schema Registry</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.de.dariah.eu/schereg/saml/login/alias/schereg" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DARIAH Schema Registry</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DARIAH Schema Registry</mdui:DisplayName>
-          <mdui:Description xml:lang="de">DARIAH Schema Registry</mdui:Description>
-          <mdui:Description xml:lang="en">DARIAH Schema Registry</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -64,15 +64,15 @@ CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
 Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
 VJ2CRsza
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -106,39 +106,39 @@ CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
 Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
 VJ2CRsza
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">DARIAH Schema Registry</md:ServiceName>
-        <md:ServiceName xml:lang="en">DARIAH Schema Registry</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">DARIAH Schema Registry</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">DARIAH Schema Registry</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tobias</md:GivenName>
-      <md:SurName>Gradl</md:SurName>
-      <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dariah</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">DARIAH Schema Registry</md:ServiceName>
+      <md:ServiceName xml:lang="en">DARIAH Schema Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">DARIAH Schema Registry</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">DARIAH Schema Registry</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tobias</md:GivenName>
+    <md:SurName>Gradl</md:SurName>
+    <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dariah</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-search.xml b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
index a4ffeaec..fa187d3f 100644
--- a/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
+++ b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/search">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:40:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:40:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.de.dariah.eu/search/saml/login/alias/search" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH Generic Search</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH Generic Search</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH Generic Search</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH Generic Search</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.de.dariah.eu/search/saml/login/alias/search" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">DARIAH Generic Search</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">DARIAH Generic Search</mdui:DisplayName>
-          <mdui:Description xml:lang="de">DARIAH Generic Search</mdui:Description>
-          <mdui:Description xml:lang="en">DARIAH Generic Search</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -64,15 +64,15 @@ CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
 Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
 VJ2CRsza
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -106,39 +106,39 @@ CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
 Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
 VJ2CRsza
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">DARIAH Generic Search</md:ServiceName>
-        <md:ServiceName xml:lang="en">DARIAH Generic Search</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">DARIAH Generic Search</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">DARIAH Generic Search</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tobias</md:GivenName>
-      <md:SurName>Gradl</md:SurName>
-      <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dariah</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">DARIAH Generic Search</md:ServiceName>
+      <md:ServiceName xml:lang="en">DARIAH Generic Search</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">DARIAH Generic Search</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">DARIAH Generic Search</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tobias</md:GivenName>
+    <md:SurName>Gradl</md:SurName>
+    <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dariah</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
index 4217a100..69cc1efa 100644
--- a/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
+++ b/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.edusphere.lu/Shibboleth.sso/Metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduSphere Repository (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eduSphere Repository (TEST)</mdui:Description>
+        <mdui:Description xml:lang="fr">eduSphere Repository (TEST)</mdui:Description>
+        <mdui:Description xml:lang="de">eduSphere Repository (TEST)</mdui:Description>
+        <mdui:Description xml:lang="lb">eduSphere Repository (TEST)</mdui:Description>
+        <mdui:Keywords xml:lang="en">eduSphere Repository</mdui:Keywords>
+        <mdui:Logo height="39" width="100" xml:lang="en">http://www.edusphere.lu/wp-content/uploads/2015/03/logo-eduSphere.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://search.edusphere.lu/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.edusphere.lu/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">eduSphere Repository (TEST)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">eduSphere Repository (TEST)</mdui:Description>
-          <mdui:Description xml:lang="fr">eduSphere Repository (TEST)</mdui:Description>
-          <mdui:Description xml:lang="de">eduSphere Repository (TEST)</mdui:Description>
-          <mdui:Description xml:lang="lb">eduSphere Repository (TEST)</mdui:Description>
-          <mdui:Keywords xml:lang="en">eduSphere Repository</mdui:Keywords>
-          <mdui:Logo height="39" width="100" xml:lang="en">http://www.edusphere.lu/wp-content/uploads/2015/03/logo-eduSphere.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://search.edusphere.lu/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.edusphere.lu/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://search.edusphere.lu/Shibboleth.sso/Metadata</ds:KeyName>
-          <ds:KeyName>search.edusphere.lu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=search.edusphere.lu</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFNTCCAx2gAwIBAgIJAIkhjM9ScBFDMA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://search.edusphere.lu/Shibboleth.sso/Metadata</ds:KeyName>
+        <ds:KeyName>search.edusphere.lu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.edusphere.lu</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFNTCCAx2gAwIBAgIJAIkhjM9ScBFDMA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
 BAMTE3NlYXJjaC5lZHVzcGhlcmUubHUwHhcNMTUxMDI5MTIyMDU4WhcNMjUxMDI2
 MTIyMDU4WjAeMRwwGgYDVQQDExNzZWFyY2guZWR1c3BoZXJlLmx1MIICIjANBgkq
 hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuNZkuqPOUYwgBNjScaDTt8VtHAUJkRrf
@@ -70,56 +70,56 @@ mCuDGuwPo68IZYRHU6KEx9JBJAJ/yoOxiSTG35rau4lIeOulcnS3PvcIwOMoxJ8f
 h5uzEETXp2xNkw59WdhPREf0/Z6BvNqohgAGSX3kiiphFJlLQHrJA40y3yfcZvH3
 epmQlqycyg3pWXHGI7YitqTUMbAI6gy9z7a6rXcaDmJrb1BxF/iRzkg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">https://search.edusphere.lu/Shibboleth.sso/Metadata</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="MEN-currentstudentassignments" Name="MEN-currentstudentassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="MEN-currentteachingassignments" Name="MEN-currentteachingassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="MEN-currentotherassignments" Name="MEN-currentotherassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.edusphere.lu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.edusphere.lu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Carlos</md:GivenName>
-      <md:SurName>Gamboa</md:SurName>
-      <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Carlos</md:GivenName>
-      <md:SurName>Gamboa</md:SurName>
-      <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">https://search.edusphere.lu/Shibboleth.sso/Metadata</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="MEN-currentstudentassignments" Name="MEN-currentstudentassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="MEN-currentteachingassignments" Name="MEN-currentteachingassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="MEN-currentotherassignments" Name="MEN-currentotherassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.edusphere.lu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.edusphere.lu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carlos</md:GivenName>
+    <md:SurName>Gamboa</md:SurName>
+    <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Carlos</md:GivenName>
+    <md:SurName>Gamboa</md:SurName>
+    <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml b/swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml
index 1f643cc9..5833b51b 100644
--- a/swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.aleks.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.aleks.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ALEKS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ALEKS is an artificially intelligent assessment and learning system founded on ground-breaking research in mathematical cognitive science.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.aleks.com/about_aleks/overview</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.aleks.com/privacy_statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="41" width="206" xml:lang="en">https://www.aleks.com/aleks/logo_top.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.aleks.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ALEKS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ALEKS is an artificially intelligent assessment and learning system founded on ground-breaking research in mathematical cognitive science.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.aleks.com/about_aleks/overview</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.aleks.com/privacy_statement</mdui:PrivacyStatementURL>
-          <mdui:Logo height="41" width="206" xml:lang="en">https://www.aleks.com/aleks/logo_top.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIJAKOVM4UJy40CMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEHNlY3VyZS5hbGVrcy5jb20wHhcNMTAwNzE0MTc1NDE5WhcNMjAwNzExMTc1
 NDE5WjAbMRkwFwYDVQQDExBzZWN1cmUuYWxla3MuY29tMIIBIjANBgkqhkiG9w0B
@@ -41,34 +41,34 @@ ow0p7IVKCMykorSUHLjS7zQcDuZdbDACK1C5g+ejKWTEy9+gwFv3samxQfhpy9Uj
 8pyQ75SYZUppucohJlMf8B1y1UEYeUhCFhLwmvOr+4uZnJpsQSgFpsV0F8N2NpI1
 i9RZ+e4I5wMgVOkY/2tDhphMUzlO7vl5e1ptPqXLcxShXlQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.aleks.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.aleks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">ALEKS</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">ALEKS is an artificially intelligent assessment and learning system founded on ground-breaking research in mathematical cognitive science.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ALEKS Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ALEKS Corporation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aleks.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicolas Thiery</md:GivenName>
-      <md:EmailAddress>nthiery@aleks.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.aleks.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.aleks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">ALEKS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">ALEKS is an artificially intelligent assessment and learning system founded on ground-breaking research in mathematical cognitive science.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ALEKS Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ALEKS Corporation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aleks.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicolas Thiery</md:GivenName>
+    <md:EmailAddress>nthiery@aleks.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml b/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml
index d463afd8..6a3fd295 100644
--- a/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.anatomy.tv/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-22T16:57:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-22T16:57:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Primal Pictures - Anatomy.tv</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The most comprehensive, accurate and detailed 3D models of the human body. Our range of medical software covers anatomy for every region of the body plus specialised titles that focus on muscle function, injuries and more, providing over 6,500 3D anatomical structures, clinical slides, dissections, illustrations, animations and much more.</mdui:Description>
+        <mdui:Logo height="85" width="350">https://secure.anatomy.tv/images/Anatomy-TV-logo-Athens.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Primal Pictures - Anatomy.tv</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The most comprehensive, accurate and detailed 3D models of the human body. Our range of medical software covers anatomy for every region of the body plus specialised titles that focus on muscle function, injuries and more, providing over 6,500 3D anatomical structures, clinical slides, dissections, illustrations, animations and much more.</mdui:Description>
-          <mdui:Logo height="85" width="350">https://secure.anatomy.tv/images/Anatomy-TV-logo-Athens.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrzCCApegAwIBAgIJAP7Ws37fxxA8MA0GCSqGSIb3DQEBBQUAMEMxJTAjBgNV
 						BAoTHFByaW1hbCBQaWN0dXJlcyAtIEFuYXRvbXkudHYxGjAYBgNVBAMTEXNlY3Vy
 						ZS5hbmF0b215LnR2MB4XDTEzMTEyMjEzNDY1OVoXDTIzMTEyMDEzNDY1OVowQzEl
@@ -38,13 +38,13 @@
 						AtuEdQrTeTQPFL40SxAPy//3f8yoCvleohvzN6T8GUPIt2F74Tapoj941DJeHWtZ
 						xhknE0CxeTWhHOBRY2zULtp+XeSN+EskWe1jPdY+1Houu4s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrzCCApegAwIBAgIJAP7Ws37fxxA8MA0GCSqGSIb3DQEBBQUAMEMxJTAjBgNV
 						BAoTHFByaW1hbCBQaWN0dXJlcyAtIEFuYXRvbXkudHYxGjAYBgNVBAMTEXNlY3Vy
 						ZS5hbmF0b215LnR2MB4XDTEzMTEyMjEzNDY1OVoXDTIzMTEyMDEzNDY1OVowQzEl
@@ -66,27 +66,27 @@
 						AtuEdQrTeTQPFL40SxAPy//3f8yoCvleohvzN6T8GUPIt2F74Tapoj941DJeHWtZ
 						xhknE0CxeTWhHOBRY2zULtp+XeSN+EskWe1jPdY+1Houu4s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Primal Pictures Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Primal Pictures - Anatomy.tv</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.primalpictures.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Deepesh</md:GivenName>
-      <md:SurName>Shah</md:SurName>
-      <md:EmailAddress>mailto:deepesh@primalpictures.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Deepesh</md:GivenName>
-      <md:SurName>Shah</md:SurName>
-      <md:EmailAddress>mailto:deepesh@primalpictures.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Primal Pictures Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Primal Pictures - Anatomy.tv</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.primalpictures.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Deepesh</md:GivenName>
+    <md:SurName>Shah</md:SurName>
+    <md:EmailAddress>mailto:deepesh@primalpictures.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Deepesh</md:GivenName>
+    <md:SurName>Shah</md:SurName>
+    <md:EmailAddress>mailto:deepesh@primalpictures.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml
index ab5d1843..07073245 100644
--- a/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.binghamton.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">binghamton.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Binghamton University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Binghamton University Authentication Service.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://its.binghamton.edu/policies/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="115" width="315" xml:lang="en">https://www.binghamton.edu/images/v2/binghamton-university-logo2.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">binghamton.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Binghamton University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Binghamton University Authentication Service.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://its.binghamton.edu/policies/privacy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="115" width="315" xml:lang="en">https://www.binghamton.edu/images/v2/binghamton-university-logo2.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUaNyL/kKbNYZG22emI/Cb4+ITWZMwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10b24uZWR1MB4XDTExMDgwMjEz
 Mzg1N1oXDTMxMDgwMjEzMzg1N1owIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10
@@ -41,23 +41,23 @@ xzL9vm94Z43S9K/AKJWw7nCAMLki45IGpdAjkdz/KmegCh3wxhUaw1S5oINPa9MP
 xx7ETaJyTVowumfQdsWbZn40f4hTtiDqG/5re3T6FSQLnwcidZO8jj9FdVsfCL9X
 oTSbLzM6GP7AOzXuk8ZOqBrCkA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.binghamton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.binghamton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://secure.binghamton.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.binghamton.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.binghamton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">binghamton.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.binghamton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.binghamton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://secure.binghamton.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.binghamton.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.binghamton.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">binghamton.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUaNyL/kKbNYZG22emI/Cb4+ITWZMwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10b24uZWR1MB4XDTExMDgwMjEz
 Mzg1N1oXDTMxMDgwMjEzMzg1N1owIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10
@@ -77,22 +77,22 @@ xzL9vm94Z43S9K/AKJWw7nCAMLki45IGpdAjkdz/KmegCh3wxhUaw1S5oINPa9MP
 xx7ETaJyTVowumfQdsWbZn40f4hTtiDqG/5re3T6FSQLnwcidZO8jj9FdVsfCL9X
 oTSbLzM6GP7AOzXuk8ZOqBrCkA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.binghamton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Binghamton University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Binghamton University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.binghamton.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Frank Saraceno</md:GivenName>
-      <md:EmailAddress>saraceno@binghamton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank Saraceno</md:GivenName>
-      <md:EmailAddress>saraceno@binghamton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.binghamton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Binghamton University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Binghamton University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.binghamton.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Frank Saraceno</md:GivenName>
+    <md:EmailAddress>saraceno@binghamton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank Saraceno</md:GivenName>
+    <md:EmailAddress>saraceno@binghamton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
index 5bcc2566..5b13ceb3 100644
--- a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.huygens.knaw.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-17T11:14:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-17T11:14:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="0"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Huygens ING (CLARIN Dienste)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Huygens ING (CLARIN services)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</mdui:Description>
+        <mdui:Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</mdui:Logo>
+        <mdui:Logo height="64" width="96">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.huygens.knaw.nl/wp-content/uploads/2013/10/20140327-privacy-policy-HIRE2.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="0"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Huygens ING (CLARIN Dienste)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Huygens ING (CLARIN services)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</mdui:Description>
-          <mdui:Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</mdui:Logo>
-          <mdui:Logo height="64" width="96">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.huygens.knaw.nl/wp-content/uploads/2013/10/20140327-privacy-policy-HIRE2.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
 LmtuYXcubmwxIjAgBgkqhkiG9w0BCQEWE3Nzb0BodXlnZW5zLmtuYXcubmwwHhcN
@@ -85,15 +85,15 @@ WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
 hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
 LmtuYXcubmwxIjAgBgkqhkiG9w0BCQEWE3Nzb0BodXlnZW5zLmtuYXcubmwwHhcN
@@ -146,38 +146,38 @@ WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
 hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Huygens ING (CLARIN Dienste)</md:ServiceName>
-        <md:ServiceName xml:lang="en">Huygens ING (CLARIN services)</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:SurName>Huygens ING (KNAW)</md:SurName>
-      <md:EmailAddress>mailto:sso@huygens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:SurName>Huygens ING (KNAW)</md:SurName>
-      <md:EmailAddress>mailto:sso@huygens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Huygens ING (CLARIN Dienste)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Huygens ING (CLARIN services)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:SurName>Huygens ING (KNAW)</md:SurName>
+    <md:EmailAddress>mailto:sso@huygens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:SurName>Huygens ING (KNAW)</md:SurName>
+    <md:EmailAddress>mailto:sso@huygens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
index e17b58f1..316bbb11 100644
--- a/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.nature.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nature Publishing Group journals</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to Nature Publishing Group journals</mdui:Description>
+        <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2png.PNG</mdui:Logo>
+        <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logopng.PNG</mdui:Logo>
+        <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2.GIF</mdui:Logo>
+        <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logo.GIF</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nature Publishing Group journals</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access to Nature Publishing Group journals</mdui:Description>
-          <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2png.PNG</mdui:Logo>
-          <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logopng.PNG</mdui:Logo>
-          <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2.GIF</mdui:Logo>
-          <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logo.GIF</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIESsDsijANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJVSzEPMA0GA1UE
 						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
 						dXJlLm5hdHVyZS5jb20wHhcNMTUwNjIzMDgxODQ3WhcNMjUwNjIwMDgxODQ3WjBcMQswCQYDVQQG
@@ -35,27 +35,27 @@
 						mxxchptFQSwuunaMQuJhSrR18v8AFekwNd6YEDzxQSqKOo/9eLoymeztcHBVP9f+l39z/rvGsWlZ
 						5C+nbg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml
index c0913142..6f46df2e 100644
--- a/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.palgrave-journals.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbTCCAlWgAwIBAgIEJo7y3DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVSzEPMA0GA1UE
 						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzElMCMGA1UEAxMcc2Vj
 						dXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTAeFw0xNTA2MjMwODIwMzBaFw0yNTA2MjAwODIwMzBa
@@ -25,27 +25,27 @@
 						TUBa9dLKwTnygIRH8P9M4EpFybaKGwSsx3KOA6lUQ1NhbdBJ3kXmgt9k1mAPJU6X8LXfASKgwIcv
 						7plg8LczSM6koeb2N/Za1Zh+whmyl8Eq7q8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Palgrave Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Palgrave Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
index 8aaaa10d..377d9ba3 100644
--- a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.palgraveconnect.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T09:56:41Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T09:56:41Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIEUgn/jjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEjMCEGA1UEAxMac2VjdXJlLnBhbGdyYXZlY29ubmVjdC5jb20wHhcNMTMw
@@ -27,27 +27,27 @@
 						TEGsxRspwZ7E6JlhHEbi4meh4zlPLll7d7el31no1O9mD+n+E8hGQCpwz/fpDWlh
 						JMnPorN3jbXoB/LWy9wZpDt7llDnSqOcr6s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chike</md:GivenName>
-      <md:SurName>Abia</md:SurName>
-      <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chike</md:GivenName>
-      <md:SurName>Abia</md:SurName>
-      <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chike</md:GivenName>
+    <md:SurName>Abia</md:SurName>
+    <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chike</md:GivenName>
+    <md:SurName>Abia</md:SurName>
+    <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
index 4554880b..94fa2fae 100644
--- a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.stevenson.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stevenson.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stevenson University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stevenson.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stevenson University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKgovFDN1fBUWFA+v7d4R+4C2FLWMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNlY3VyZS5zdGV2ZW5zb24uZWR1MB4XDTEyMDcxODE4
 NDUyNFoXDTMyMDcxODE4NDUyNFowHzEdMBsGA1UEAxMUc2VjdXJlLnN0ZXZlbnNv
@@ -38,27 +38,27 @@ QUqhM9TAwowIJzUEfJcwkNrCkBAzuUIG/R9zgi/wWARXSBdpvRwTeh2feHIoRrlL
 BVngyd850gsxHeIyUveI6rZDsRI6MozOP7ApzA482aHh8YHlekMh+mDafbuYDtMV
 vcW4oD4N2OIPcMam+7V1yw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.stevenson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.stevenson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://secure.stevenson.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.stevenson.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.stevenson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.stevenson.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stevenson University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stevenson University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stevenson.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.stevenson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.stevenson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://secure.stevenson.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.stevenson.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.stevenson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.stevenson.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stevenson University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stevenson University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stevenson.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shibadmin@stevenson.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.uva.nl-cas.xml b/swamid-interfederations-2.0/secure.uva.nl-cas.xml
index c34f61e9..03b99a71 100644
--- a/swamid-interfederations-2.0/secure.uva.nl-cas.xml
+++ b/swamid-interfederations-2.0/secure.uva.nl-cas.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.uva.nl/cas">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-30T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-30T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit van Amsterdam</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Amsterdam</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit van Amsterdam</mdui:Description>
+        <mdui:Description xml:lang="en">Universiteit van Amsterdam</mdui:Description>
+        <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/uva.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Universiteit van Amsterdam</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Amsterdam</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Universiteit van Amsterdam</mdui:Description>
-          <mdui:Description xml:lang="en">Universiteit van Amsterdam</mdui:Description>
-          <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/uva.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/1b2e4ba73d7b526eee14a91782c45435"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Universiteit van Amsterdam</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Universiteit van Amsterdam</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Universiteit van Amsterdam</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Universiteit van Amsterdam</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.uva.nl</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uva.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/1b2e4ba73d7b526eee14a91782c45435"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Universiteit van Amsterdam</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Universiteit van Amsterdam</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Universiteit van Amsterdam</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit van Amsterdam</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.uva.nl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uva.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/seminar.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/seminar.nordu.net-shibboleth.xml
index 90826185..cf4e6e84 100644
--- a/swamid-interfederations-2.0/seminar.nordu.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/seminar.nordu.net-shibboleth.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://seminar.nordu.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/DS/kalmar2"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/Login/feide"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/haka.funet.fi"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/haka.funet.fi" index="5"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/Login/idp.funet.fi"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NORDUnet Seminar Service</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://seminar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/DS/kalmar2"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/Login/feide"/>
-        <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://seminar.nordu.net/Shibboleth.sso/DS/haka.funet.fi"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://seminar.nordu.net/Shibboleth.sso/DS/haka.funet.fi" index="5"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://seminar.nordu.net/Shibboleth.sso/Login/idp.funet.fi"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NORDUnet Seminar Service</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>ac-w01.nordu.net</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=ac-w01.nordu.net</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAK6IEFZqeYNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ac-w01.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ac-w01.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAK6IEFZqeYNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEGFjLXcwMS5ub3JkdS5uZXQwHhcNMTUxMTI1MTQzMTMxWhcNMjUxMTIyMTQz
 MTMxWjAbMRkwFwYDVQQDExBhYy13MDEubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAm5n/c1jQxsE6ZLDCaLkxAzMkYAveKeF0uMosuZAm
@@ -68,32 +68,32 @@ A9ToIGUpGX3izWzTLU+7h2do56ZxbVwH5c+NtQAGEIqDCEbtLvAaWu4XVor8Shj7
 pdi0ryFf9fQWwe8aUhmC8BNl5KNnDMgo3ka39txGyo9bxjJHEHJDwiZNasMgHoCa
 o53aOf7QIMq0SMHnBJXRznGwibXlXP0Wtbl2hpcO5QxiZHziD434b0eYqQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://seminar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://seminar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>NORDUnet NOC</md:Company>
-      <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://seminar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://seminar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml b/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml
index 0cd218fc..f2703a5c 100644
--- a/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml
+++ b/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://send.goetec.ac.uk/simplesaml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-13T17:34:39Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-13T17:34:39Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GOESEND</mdui:DisplayName>
+        <mdui:Logo height="66" width="325">https://send.goetec.ac.uk/federation-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GOESEND</mdui:DisplayName>
-          <mdui:Logo height="66" width="325">https://send.goetec.ac.uk/federation-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID7zCCAtegAwIBAgIJAJ98fbY88KSnMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEfMB0G
 						A1UECgwWVGhlIFVuaXZlcnNpdHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRp
@@ -37,13 +37,13 @@
 						TXnyUIgzIGIeCKLwH1bnhGGrV0pDbWh1rL2OzhtdeMHY64tPI2yfvuWg/a7SXILO
 						aQpy
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID7zCCAtegAwIBAgIJAJ98fbY88KSnMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEfMB0G
 						A1UECgwWVGhlIFVuaXZlcnNpdHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRp
@@ -67,27 +67,27 @@
 						TXnyUIgzIGIeCKLwH1bnhGGrV0pDbWh1rL2OzhtdeMHY64tPI2yfvuWg/a7SXILO
 						aQpy
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GOESEND</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.goetec.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GOESEND Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:goesend@goetec.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Charlton</md:SurName>
-      <md:EmailAddress>mailto:B.C.Charlton@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GOESEND</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goetec.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GOESEND Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:goesend@goetec.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Charlton</md:SurName>
+    <md:EmailAddress>mailto:B.C.Charlton@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
index 56ade0ab..df39014f 100644
--- a/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://serviceadmin-test.company.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-17T13:22:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-17T13:22:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
 						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -47,45 +47,45 @@
 						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
 						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/Artifact" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Service Admin (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JANET TAG</md:GivenName>
-      <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>JANET TAG</md:GivenName>
-      <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Service Admin (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JANET TAG</md:GivenName>
+    <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>JANET TAG</md:GivenName>
+    <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
index 96818b7e..1d665620 100644
--- a/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://serviceadmin.company.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-17T14:09:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-17T14:09:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
 						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -47,45 +47,45 @@
 						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
 						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Service Admin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JANET TAG</md:GivenName>
-      <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>JANET TAG</md:GivenName>
-      <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Service Admin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JANET TAG</md:GivenName>
+    <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>JANET TAG</md:GivenName>
+    <md:EmailAddress>mailto:jtag@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
index 00084528..59c6376d 100644
--- a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.internet2.edu/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.internet2.edu/Shibboleth.sso/DS" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.incommon.org/Shibboleth.sso/DS" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://service3.internet2.edu/Shibboleth.sso/DS" index="4"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://devtracker.internet2.edu/Shibboleth.sso/Login" index="5"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.usucan.org/Shibboleth.sso/DS" index="6"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt.internet2.edu/Shibboleth.sso/DS" index="7"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://chinatest.internet2.edu/Shibboleth.sso/Login" index="8"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://china.internet2.edu/Shibboleth.sso/Login" index="9"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum.internet2.edu/Shibboleth.sso/Login" index="10"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webtest.internet2.edu/Shibboleth.sso/Login" index="11"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://splunk.internet2.edu/Shibboleth.sso/Login" index="12"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum-staging.internet2.edu/Shibboleth.sso/Login" index="13"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.internet2.edu/Shibboleth.sso/Login" index="14"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saltweb.internet2.edu/Shibboleth.sso/Login" index="15"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://deepfield.internet2.edu/Shibboleth.sso/Login" index="16"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://deepfield.internet2.edu/Shibboleth.sso/DS" index="17"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetings.internet2.edu/Shibboleth.sso/Login" index="18"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetingtest.internet2.edu/Shibboleth.sso/Login" index="19"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.perfsonar.net/Shibboleth.sso/Login" index="20"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webtest.perfsonar.net/Shibboleth.sso/Login" index="21"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum.unizin.org/Shibboleth.sso/Login" index="22"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum-staging.internet2.edu/Shibboleth.sso/Login" index="23"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum-staging.internet2.edu/Shibboleth.sso/Login" index="24"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Internet2 Services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing for administration of Net+ services.  Planned additions include Filesender, the Internet2 Member Portal, and wikis.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.internet2.edu/help/federated-services-user-guide/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="91" width="122" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/10/15/internet2_logo_200pxtrans.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.internet2.edu/Shibboleth.sso/DS" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.internet2.edu/Shibboleth.sso/DS" index="2"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.incommon.org/Shibboleth.sso/DS" index="3"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://service3.internet2.edu/Shibboleth.sso/DS" index="4"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://devtracker.internet2.edu/Shibboleth.sso/Login" index="5"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lists.usucan.org/Shibboleth.sso/DS" index="6"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rt.internet2.edu/Shibboleth.sso/DS" index="7"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://chinatest.internet2.edu/Shibboleth.sso/Login" index="8"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://china.internet2.edu/Shibboleth.sso/Login" index="9"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum.internet2.edu/Shibboleth.sso/Login" index="10"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webtest.internet2.edu/Shibboleth.sso/Login" index="11"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://splunk.internet2.edu/Shibboleth.sso/Login" index="12"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum-staging.internet2.edu/Shibboleth.sso/Login" index="13"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.internet2.edu/Shibboleth.sso/Login" index="14"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saltweb.internet2.edu/Shibboleth.sso/Login" index="15"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://deepfield.internet2.edu/Shibboleth.sso/Login" index="16"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://deepfield.internet2.edu/Shibboleth.sso/DS" index="17"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetings.internet2.edu/Shibboleth.sso/Login" index="18"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetingtest.internet2.edu/Shibboleth.sso/Login" index="19"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.perfsonar.net/Shibboleth.sso/Login" index="20"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webtest.perfsonar.net/Shibboleth.sso/Login" index="21"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum.unizin.org/Shibboleth.sso/Login" index="22"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum-staging.internet2.edu/Shibboleth.sso/Login" index="23"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://forum-staging.internet2.edu/Shibboleth.sso/Login" index="24"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Internet2 Services</mdui:DisplayName>
-          <mdui:Description xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing for administration of Net+ services.  Planned additions include Filesender, the Internet2 Member Portal, and wikis.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.internet2.edu/help/federated-services-user-guide/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="91" width="122" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/10/15/internet2_logo_200pxtrans.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFTCCAf2gAwIBAgIJAJcmxvLDIe+oMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
 BAMMFnNlcnZpY2VzLmludGVybmV0Mi5lZHUwHhcNMTUxMDA2MTIzODA2WhcNMjUx
 MDA2MTIzODA2WjAhMR8wHQYDVQQDDBZzZXJ2aWNlcy5pbnRlcm5ldDIuZWR1MIIB
@@ -65,63 +65,63 @@ WTU70aLaOQq0r3eG3FW+Net1U/dmr28QY4J0UOvD5f2LoWNPXo9xW7N+ZJHd/KsE
 uALfHFGgUGQfHIrJKfHTrdO098Yefwvxh46l/xm9r0c/HKkyfDo5UKPuVOe4srr1
 jNU70ZWm1b9LIxhfoMCYGi7dvyTnW61MVA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.internet2.edu/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.internet2.edu/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.internet2.edu/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service3.internet2.edu/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service3.internet2.edu/Shibboleth.sso/SAML/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.incommon.org/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.incommon.org/Shibboleth.sso/SAML/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.usucan.org/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.usucan.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.internet2.edu/Shibboleth.sso/SAML2/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rt.internet2.edu/Shibboleth.sso/SAML/POST" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://china.internet2.edu/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtest.internet2.edu/Shibboleth.sso/SAML2/POST" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saltweb.internet2.edu/Shibboleth.sso/SAML2/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://deepfield.internet2.edu/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetings.internet2.edu/Shibboleth.sso/SAML2/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetingtest.internet2.edu/Shibboleth.sso/SAML2/POST" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.perfsonar.net/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtest.perfsonar.net/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum.internet2.edu/Shibboleth.sso/SAML2/POST" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum.unizin.org/Shibboleth.sso/SAML2/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum-staging.internet2.edu/Shibboleth.sso/SAML2/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devtracker.internet2.edu/Shibboleth.sso/SAML2/POST" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devtracker.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinatest.internet2.edu/Shibboleth.sso/SAML2/POST" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://splunk.internet2.edu/Shibboleth.sso/SAML2/POST" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://splunk.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Internet2 Services</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing for administration of Net+ services.  Planned additions include Filesender, the Internet2 Member Portal, and wikis.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.internet2.edu/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.internet2.edu/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.internet2.edu/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service3.internet2.edu/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service3.internet2.edu/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.incommon.org/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.incommon.org/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.usucan.org/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.usucan.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.internet2.edu/Shibboleth.sso/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rt.internet2.edu/Shibboleth.sso/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://china.internet2.edu/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtest.internet2.edu/Shibboleth.sso/SAML2/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saltweb.internet2.edu/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://deepfield.internet2.edu/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetings.internet2.edu/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetingtest.internet2.edu/Shibboleth.sso/SAML2/POST" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.perfsonar.net/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtest.perfsonar.net/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum.internet2.edu/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum.unizin.org/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum-staging.internet2.edu/Shibboleth.sso/SAML2/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devtracker.internet2.edu/Shibboleth.sso/SAML2/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devtracker.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinatest.internet2.edu/Shibboleth.sso/SAML2/POST" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://splunk.internet2.edu/Shibboleth.sso/SAML2/POST" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://splunk.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Internet2 Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing for administration of Net+ services.  Planned additions include Filesender, the Internet2 Member Portal, and wikis.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml b/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml
index 42d4a2b9..9cfb6f0e 100644
--- a/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml
@@ -1,28 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.oxfordjournals.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:05:53Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:05:53Z">
-		</mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -48,32 +47,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oxford Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oxfordjournals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oxfordjournals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services01.hobsons.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/services01.hobsons.co.uk-shibboleth-sp.xml
index a91c832c..caa57b36 100644
--- a/swamid-interfederations-2.0/services01.hobsons.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/services01.hobsons.co.uk-shibboleth-sp.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services01.hobsons.co.uk/shibboleth/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-23T10:17:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-23T10:17:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hobsons SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Hobsons SP for Shibboleth authentication in Hobsons Connect CRM and related products.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hobsons SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Hobsons SP for Shibboleth authentication in Hobsons Connect CRM and related products.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGjCCAgKgAwIBAgIJAOzxPZ7/e0OEMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB0hvYnNvbnMwHhcNMTMwNDAzMjEwNzA2WhcNMjMwNDAxMjEwNzA2WjASMRAw
 						DgYDVQQDEwdIb2Jzb25zMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -34,29 +34,29 @@
 						072m4d3brpF/841Cbx2TTN95Y9ttchhguxGf6ehkWihH3T7PPAT84Y2wSY0ueHeP
 						x5K99xWnliNamHVTeURTuRL3Hnx6tOCiKROUC9yI
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hobsons Plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hobsons</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hobsons.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Ivett</md:SurName>
-      <md:EmailAddress>mailto:david.ivett@hobsons.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Noel</md:GivenName>
-      <md:SurName>Thomas</md:SurName>
-      <md:EmailAddress>mailto:noel.thomas@hobsons.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://services01.hobsons.co.uk/shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hobsons Plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hobsons</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hobsons.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Ivett</md:SurName>
+    <md:EmailAddress>mailto:david.ivett@hobsons.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Noel</md:GivenName>
+    <md:SurName>Thomas</md:SurName>
+    <md:EmailAddress>mailto:noel.thomas@hobsons.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
index 9c422dea..2d0d30cb 100644
--- a/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sesame.ifsttar.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:33:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:33:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifsttar.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSTTAR</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQ4y5WSPQrCQBCFvw3ewEoURWzFJgTJOSz0DuIdcgfxBhZapPYAFgFF0ijYCaLgBazXRuNks2viaxIm835mJgoHovVeF2rjQJk1VZXsEqm5yLIxWu91u9XkersXBL0qLr/S5RKskoWG3fv5xfmKE16e/D+8soZup1eozeJYz+JYw/sKprtJOl0GANkSo3GgPgJemeNmW7cmm49GCqBmui+TJwB93wegMQTE9cwLOXdwPByy9/SRkD6Swh4AlEwwCadKfpRJpGAuwYdkm08S+76fiVUawRSRQrIna7L9SJNwquQ4NoNcfNs+yvACMY5sWAU9eNwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDBDp9MfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwMvprowAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ifsttar.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IFSTTAR</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifsttar.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFSTTAR</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQ4y5WSPQrCQBCFvw3ewEoURWzFJgTJOSz0DuIdcgfxBhZapPYAFgFF0ijYCaLgBazXRuNks2viaxIm835mJgoHovVeF2rjQJk1VZXsEqm5yLIxWu91u9XkersXBL0qLr/S5RKskoWG3fv5xfmKE16e/D+8soZup1eozeJYz+JYw/sKprtJOl0GANkSo3GgPgJemeNmW7cmm49GCqBmui+TJwB93wegMQTE9cwLOXdwPByy9/SRkD6Swh4AlEwwCadKfpRJpGAuwYdkm08S+76fiVUawRSRQrIna7L9SJNwquQ4NoNcfNs+yvACMY5sWAU9eNwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDBDp9MfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwMvprowAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ifsttar.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IFSTTAR</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUFBBFYZ1kzTq980fHApAgt04rr94wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRc2VzYW1lLmlmc3R0YXIuZnIwHhcNMTIxMDE4MTI0NzIw
 WhcNMzIxMDE4MTI0NzIwWjAcMRowGAYDVQQDExFzZXNhbWUuaWZzdHRhci5mcjCC
@@ -38,21 +38,21 @@ jfwiOmxdx8Rh/05DYJIU5hv9mjFdpBrpFUrOFup68kp4tqnNhwPmvHWF0E6FiRdU
 0iPZrN+gUvb3I0gaxKAR7bvJIvKlcRZxpMfizcIFnTNI6olY9hCGPPbPsbfZH+b1
 oTFF
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sesame.ifsttar.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFSTTAR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFSTTAR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifsttar.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>expl@ifsttar.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sesame.ifsttar.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFSTTAR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFSTTAR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifsttar.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>expl@ifsttar.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
index 236dedcb..f24c8329 100644
--- a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">
                         Africa Grid Science Gateway
                     </mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">
+        <mdui:DisplayName xml:lang="it">
                         Africa Grid Science Gateway
                     </mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+        <mdui:Description xml:lang="en">
                         This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
                     </mdui:Description>
-          <mdui:Description xml:lang="it">
+        <mdui:Description xml:lang="it">
                         Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
                     </mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDzDCCArQCCQDwUkvvefGTEzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMC
 SVQxDzANBgNVBAgMBlNpY2lseTEQMA4GA1UEBwwHQ2F0YW5pYTEtMCsGA1UECgwk
 VW5pdmVyc2l0w4PCoCBkZWdsaSBTdHVkaSBkaSBDYXRhbmlhMRwwGgYDVQQDDBNz
@@ -50,43 +50,43 @@ z0fsAS7/I9bJHhCaot7JqIyQpBj2qZZqMzH4OQ6AI7A0AyKIbeZJv+2hu4oH4JwR
 aRbN4kArWr3XV+KM0DX1uqJmAao79Mj6xUm0y2SK3nrQaaqvdH91jd9VEwumRTNt
 r8HKk5/D3aGIXkAlM/9S6A==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
                     This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
                 </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
index f141e165..1366e4fb 100644
--- a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-09T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-09T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
                     </mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
+        <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
                     </mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE6TCCA9GgAwIBAgIRALptUo7+DEUSrs09PRm311swDQYJKoZIhvcNAQEFBQAw
 PzELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEfMB0GA1UEAxMWVEVSRU5B
 IGVTY2llbmNlIFNTTCBDQTAeFw0xNTAxMDcwMDAwMDBaFw0xNjAyMDYyMzU5NTla
@@ -54,37 +54,37 @@ oV/0KZ66qrvlXYsF2RYt0SOixsJC4YOkirXzoT7Pb8jSizVZJ3DWfwvdAlXU0DNE
 hrolz4U0Hxn5gCYTiDXtQBe4c8dj4IJYa1vTZgpJnO4aDQcQeuKLiJmSuOnTuuE1
 L0omxxTTWQuG2yPHqQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
-        <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:sgwadmin@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
+      <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:sgwadmin@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml b/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml
index e9b4d7e4..46592ced 100644
--- a/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shakespeare.acropolis.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-04T16:37:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-04T16:37:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BBC Shakespeare Archive Resource</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</mdui:Description>
+        <mdui:Logo height="170" width="350">https://shakespeare.acropolis.org.uk/assets/shakespeare-350x170.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">BBC Shakespeare Archive Resource</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</mdui:Description>
-          <mdui:Logo height="170" width="350">https://shakespeare.acropolis.org.uk/assets/shakespeare-350x170.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMzCCAxugAwIBAgIJAIQQbjEkRVeBMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSkwJwYDVQQKDCBCcml0aXNoIEJyb2Fk
 						Y2FzdGluZyBDb3Jwb3JhdGlvbjEcMBoGA1UECwwTQXJjaGl2ZSBEZXZlbG9wbWVu
@@ -41,13 +41,13 @@
 						676YU6Puh5cRfQI1JFl9BonHZ1Pr/QWtBYt9ZnpA/VnfJ3hWCMQsUfwbJ1PfBUjy
 						/c56ELxxmXaa2osp99WXDsVLDjCDanE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMzCCAxugAwIBAgIJAIQQbjEkRVeBMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSkwJwYDVQQKDCBCcml0aXNoIEJyb2Fk
 						Y2FzdGluZyBDb3Jwb3JhdGlvbjEcMBoGA1UECwwTQXJjaGl2ZSBEZXZlbG9wbWVu
@@ -72,35 +72,35 @@
 						676YU6Puh5cRfQI1JFl9BonHZ1Pr/QWtBYt9ZnpA/VnfJ3hWCMQsUfwbJ1PfBUjy
 						/c56ELxxmXaa2osp99WXDsVLDjCDanE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">BBC Shakespeare Archive Resource</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">BBC Worldwide Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">BBC Shakespeare Archive Resource</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cy">BBC Shakespeare Ffeil Adnoddau</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://shakespeare.ch.bbc.co.uk/index.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cy">http://shakespeare.ch.bbc.co.uk/index.cy</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>BBC Shakespeare Archive Resource Access Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:shakespeareaccess@bbc.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>BBC Archive Development Operations</md:GivenName>
-      <md:EmailAddress>mailto:adops@bbc.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">BBC Shakespeare Archive Resource</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BBC Worldwide Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BBC Shakespeare Archive Resource</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cy">BBC Shakespeare Ffeil Adnoddau</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://shakespeare.ch.bbc.co.uk/index.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cy">http://shakespeare.ch.bbc.co.uk/index.cy</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>BBC Shakespeare Archive Resource Access Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:shakespeareaccess@bbc.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>BBC Archive Development Operations</md:GivenName>
+    <md:EmailAddress>mailto:adops@bbc.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
index e29783c0..0904fa3f 100644
--- a/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sharav.abes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-10T08:58:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-10T08:58:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ABES - French Bibliographic Agency for Higher Education</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuklEQVQ4y5WTQUtUURiGn+/eM3Nv11Eaa6ZypCjMkSIKMlCCCqLAoH6AtonZ2CII2vcTaimCuGjbomhZBFEkQrQoRIMQKnKRpoNjzXg799zTYnCYmCvTPMvvfXh5z+LI3akFO1zsxZiIZkQcPD+FYNkOI2xsAVvPELTqZu794qw6N5Rl/NIhktiqVLE49PT4LVk5hMVPKVQUxS1hHMPc/ALTM8/B9ZksXeb8SPEfR0dgrUXtzGpmfaPCg+kXPHn0DNhDsM9ndKSI0+RYW3+KQwJBkObMyX7o7oNCluLRXLIIqKRjV+AzeWuMQiFPaDQ3rg5DJwUA+VyG0sRF2uG0Ndqw64LVcsjrDz9wEC6czrM/6/3/gj/a8vjlFyYevuHOzDxP3y539oQojtGuoT8TYKqape8VjOmgIPBcStcGuH19AJtyySgfkV0KbMLRYtnYDPn5K2Swby+jp3I4TrKnPLc1EYSPy2W+rf7m/s0TXDlbaHHSCkQEVdNp1moQm+YCOH7kMPfGD3DsoMdatf4/GrMF1rch1LFS7z6vzC59XcFEGkEa45QruK7CmBhtTCOzWEQESXeprVr06i+wzJYRwl1xdgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMAMfjYUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTQrMDI6MDByQjU5AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.abes.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Agency staff</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ABES - Agence Bibliographique de l'Enseignement Supérieur</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels de l'Agence</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ABES - French Bibliographic Agency for Higher Education</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuklEQVQ4y5WTQUtUURiGn+/eM3Nv11Eaa6ZypCjMkSIKMlCCCqLAoH6AtonZ2CII2vcTaimCuGjbomhZBFEkQrQoRIMQKnKRpoNjzXg799zTYnCYmCvTPMvvfXh5z+LI3akFO1zsxZiIZkQcPD+FYNkOI2xsAVvPELTqZu794qw6N5Rl/NIhktiqVLE49PT4LVk5hMVPKVQUxS1hHMPc/ALTM8/B9ZksXeb8SPEfR0dgrUXtzGpmfaPCg+kXPHn0DNhDsM9ndKSI0+RYW3+KQwJBkObMyX7o7oNCluLRXLIIqKRjV+AzeWuMQiFPaDQ3rg5DJwUA+VyG0sRF2uG0Ndqw64LVcsjrDz9wEC6czrM/6/3/gj/a8vjlFyYevuHOzDxP3y539oQojtGuoT8TYKqape8VjOmgIPBcStcGuH19AJtyySgfkV0KbMLRYtnYDPn5K2Swby+jp3I4TrKnPLc1EYSPy2W+rf7m/s0TXDlbaHHSCkQEVdNp1moQm+YCOH7kMPfGD3DsoMdatf4/GrMF1rch1LFS7z6vzC59XcFEGkEa45QruK7CmBhtTCOzWEQESXeprVr06i+wzJYRwl1xdgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMAMfjYUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTQrMDI6MDByQjU5AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.abes.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Agency staff</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ABES - Agence Bibliographique de l'Enseignement Supérieur</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels de l'Agence</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVAMJyfTXyWtg2HoJZYvPzC5uTOkpLMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMMDnNoYXJhdi5hYmVzLmZyMB4XDTE1MDMxNjA5MzYxM1oX
 DTM1MDMxNjA5MzYxM1owGTEXMBUGA1UEAwwOc2hhcmF2LmFiZXMuZnIwggEiMA0G
@@ -39,24 +39,24 @@ kCI8+2KPpfuz002xNQID4wKyUJy9jyuE/2cn2JA1iYB0MMc3uqIls8T8Wn1leWr+
 TG5a9eJRJRp7O8KekUdkn17tzldLodiuduABA/gncseSrDLBUJntriF3yGGbCdJz
 8Dg24giw4jehoGYeEf1DW9ACdySlZDzf6YPGNUfVY9kVNDnLi9Th2Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sharav.abes.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sharav.abes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ABES - Agence Bibliographique de l'Enseignement Supérieur</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ABES - Agence Bibliographique de l'Enseignement Supérieur</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>p2i@abes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sharav.abes.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sharav.abes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ABES - Agence Bibliographique de l'Enseignement Supérieur</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ABES - Agence Bibliographique de l'Enseignement Supérieur</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>p2i@abes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sharjah.imodules.com-sp.xml b/swamid-interfederations-2.0/sharjah.imodules.com-sp.xml
index 5bd84fde..8e519344 100644
--- a/swamid-interfederations-2.0/sharjah.imodules.com-sp.xml
+++ b/swamid-interfederations-2.0/sharjah.imodules.com-sp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sharjah.imodules.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AUS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">1467</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">AUS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">1467</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBDCCAeygAwIBAgIQtU/8O+MRcYxO3taUvY2wRzANBgkqhkiG9w0BAQQFADAX
 MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTYwMzA4MTY0NjA2WhcNMzYwMzA4
 MTY0NjA1WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
@@ -37,18 +37,18 @@ Oais5C1CVFTJ+HRebC+m+ynNspNWCioQk0PnsuQVxOC/7wnt7upO8Thj9aep9h7+
 6BViVKs0QyFgrwEHI5ugm4yzWrTQGT3Aou0RfWPkHGnKs6CJ/HUYojM1G5TfZFJ/
 /vRurgaGYhc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secureau.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1467" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Evan Krieger</md:GivenName>
-      <md:EmailAddress>ekrieger@imodules.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secureau.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1467" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Evan Krieger</md:GivenName>
+    <md:EmailAddress>ekrieger@imodules.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shfed.augusta.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shfed.augusta.edu-idp-shibboleth.xml
index 83cca535..220e7976 100644
--- a/swamid-interfederations-2.0/shfed.augusta.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shfed.augusta.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shfed.augusta.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">augusta.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Augusta University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">augusta.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Augusta University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUQ0k0DvqYzUB+2FqlbJ6wSij4ChMwDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRc2hmZWQuYXVndXN0YS5lZHUwHhcNMTYwMzAyMTQxNTE2
 WhcNMzYwMzAyMTQxNTE2WjAcMRowGAYDVQQDDBFzaGZlZC5hdWd1c3RhLmVkdTCC
@@ -41,28 +41,28 @@ kxMxh4weCpeKdYkVWeAds27123As+m2O8f36bqzhLFKhmYzKpdIIiB+NuljiQJBd
 VdqdJzZoyuqY6gMBf5LpbGYHDDu1PuJrmwKJYxGVz7lTEQxMS5G9/gpYUIcpXf/B
 HzYL
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shfed.augusta.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shfed.augusta.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shfed.augusta.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Augusta University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Augusta University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.augusta.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew Smith</md:GivenName>
-      <md:EmailAddress>andsmith@augusta.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ryan O'Neil</md:GivenName>
-      <md:EmailAddress>roneil@augusta.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chris Peavler</md:GivenName>
-      <md:EmailAddress>cpeavler@augusta.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shfed.augusta.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shfed.augusta.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shfed.augusta.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Augusta University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Augusta University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.augusta.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew Smith</md:GivenName>
+    <md:EmailAddress>andsmith@augusta.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ryan O'Neil</md:GivenName>
+    <md:EmailAddress>roneil@augusta.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Peavler</md:GivenName>
+    <md:EmailAddress>cpeavler@augusta.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml
index 4e189362..1bfff377 100644
--- a/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-dev-idp.ucl.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-26T17:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-26T17:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIERjCCAy6gAwIBAgIJAMLCfrKk2sGkMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
 						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
@@ -42,26 +42,26 @@
 						I+b4Q2MQMtUWQ2XszBlFshWBPZMOhDx8QLJ1x1cN/f2qofy7LAM6az+mdW0rtera
 						gUPawdt5n6YlXLM9X/CsxbEXT8e52U80+JxaaXgfk/vtiGCb8yYRvehe
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIERjCCAy6gAwIBAgIJAMLCfrKk2sGkMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
 						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
@@ -86,26 +86,26 @@
 						I+b4Q2MQMtUWQ2XszBlFshWBPZMOhDx8QLJ1x1cN/f2qofy7LAM6az+mdW0rtera
 						gUPawdt5n6YlXLM9X/CsxbEXT8e52U80+JxaaXgfk/vtiGCb8yYRvehe
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College London (Shib Dev)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library e-resource help</md:GivenName>
-      <md:EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Barker</md:SurName>
-      <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College London (Shib Dev)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library e-resource help</md:GivenName>
+    <md:EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Barker</md:SurName>
+    <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index e61f2d77..e9642e1f 100644
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp-1.oru.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
+        <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>oru.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
-          <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
-          <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>oru.se</mdui:DomainHint>
-          <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
 NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
@@ -50,26 +50,26 @@ x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
 SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
 JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
 Pz8R3A==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-1.oru.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-1.oru.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
 NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
@@ -87,36 +87,36 @@ x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
 SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
 JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
 Pz8R3A==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ORU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Örebro universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Örebro University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oru.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Örebro University</md:Company>
-      <md:SurName>IT Avdelningen</md:SurName>
-      <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Örebro University</md:Company>
-      <md:SurName>Jonny Ehrnberg</md:SurName>
-      <md:EmailAddress>mailto:jonny.ehrnberg@oru.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 19 303851</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Örebro University</md:Company>
-      <md:SurName>IT Avdelningen Örebro universitet</md:SurName>
-      <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ORU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Örebro universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Örebro University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oru.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Örebro University</md:Company>
+    <md:SurName>IT Avdelningen</md:SurName>
+    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Örebro University</md:Company>
+    <md:SurName>Jonny Ehrnberg</md:SurName>
+    <md:EmailAddress>mailto:jonny.ehrnberg@oru.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 19 303851</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Örebro University</md:Company>
+    <md:SurName>IT Avdelningen Örebro universitet</md:SurName>
+    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
index 329a9fc4..6433428a 100644
--- a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.cms.hu-berlin.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-10-21T09:44:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-10-21T09:44:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hu-berlin.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Humboldt-Universität zu Berlin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Humboldt-Universität zu Berlin</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Humboldt-Universität zu Berlin</mdui:Description>
+        <mdui:Description xml:lang="en">IdP der Humboldt-Universität zu Berlin</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.hu-berlin.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hu-berlin.de/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hu-berlin.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Humboldt-Universität zu Berlin</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Humboldt-Universität zu Berlin</mdui:DisplayName>
-          <mdui:Description xml:lang="de">IdP der Humboldt-Universität zu Berlin</mdui:Description>
-          <mdui:Description xml:lang="en">IdP der Humboldt-Universität zu Berlin</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.hu-berlin.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hu-berlin.de/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGUzCCBTugAwIBAgIHGYZDvIB0rjANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGUzCCBTugAwIBAgIHGYZDvIB0rjANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQG
 EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
 MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
 HhcNMTUwNTI4MDczOTI1WhcNMTgwODI0MDczOTI1WjCBqDELMAkGA1UEBhMCREUx
@@ -58,31 +58,31 @@ UM/uOPW9OZjmgJXz16GJb9IfS1dH69DP7kK05vYKaRjP8jMismqnwvhQ3LoIR0ZW
 RCsDJl531ldKNCAFBju3d4ip9KtS8W9HVCIv2yqo1vm2GDcRpfkLnSz3TAiP8ctC
 mFsxhGZXe6H3Sr7aLhCsdB+7yKCROUaNU9C28W9fp3N+oFK8AGpt
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hu-berlin.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGUzCCBTugAwIBAgIHGYZDvIB0rjANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hu-berlin.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGUzCCBTugAwIBAgIHGYZDvIB0rjANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQG
 EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
 MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
 HhcNMTUwNTI4MDczOTI1WhcNMTgwODI0MDczOTI1WjCBqDELMAkGA1UEBhMCREUx
@@ -117,35 +117,35 @@ UM/uOPW9OZjmgJXz16GJb9IfS1dH69DP7kK05vYKaRjP8jMismqnwvhQ3LoIR0ZW
 RCsDJl531ldKNCAFBju3d4ip9KtS8W9HVCIv2yqo1vm2GDcRpfkLnSz3TAiP8ctC
 mFsxhGZXe6H3Sr7aLhCsdB+7yKCROUaNU9C28W9fp3N+oFK8AGpt
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e233</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e233</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Humboldt-University Berlin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.hu-berlin.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hu-berlin.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Petra</md:GivenName>
-      <md:SurName>Berg</md:SurName>
-      <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petra</md:GivenName>
-      <md:SurName>Berg</md:SurName>
-      <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Petra</md:GivenName>
-      <md:SurName>Berg</md:SurName>
-      <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e233</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e233</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Humboldt-University Berlin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.hu-berlin.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hu-berlin.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Petra</md:GivenName>
+    <md:SurName>Berg</md:SurName>
+    <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petra</md:GivenName>
+    <md:SurName>Berg</md:SurName>
+    <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Petra</md:GivenName>
+    <md:SurName>Berg</md:SurName>
+    <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml
index c8f30bc6..60d613ec 100644
--- a/swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.dev.ja.net/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-26T09:17:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-26T09:17:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.ja.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.ja.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUaU3qUCHZr7xxUW7Knfvc2zgBW7QwDQYJKoZIhvcNAQEL
 						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
 						NTNaFw0zNTA4MjQxODQ4NTNaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
@@ -37,13 +37,13 @@
 						gS8kL8UfacDILGi4Vrf+pbQ4vR433boq3x+sT6hgs3whi5ZK1ltABgTbmCVtNEwn
 						uoDqeFZtzSo+FJM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUQQ9WRv8vtZUnDG3HA8pY15fsjgkwDQYJKoZIhvcNAQEL
 						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
 						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
@@ -63,13 +63,13 @@
 						II3qo5yGEItsYApBOcXMSXOrFd3OjyCUepX7P7siAMpQ538DnmuSLdURgdYUlIID
 						avp66EtCEnhWtN8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUJNP74b6Wyv0z7gWAfmYFvRKaOPcwDQYJKoZIhvcNAQEL
 						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
 						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
@@ -89,31 +89,31 @@
 						vUurDG6P3/K7rNPP5pC43C0sUgf7PC9PvDdkz6RDLvr3EK9nqTLwvR6F2uX2OwCt
 						9Bt3PLpZ5T1ZzOo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.dev.ja.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.ja.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.dev.ja.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dev.ja.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUaU3qUCHZr7xxUW7Knfvc2zgBW7QwDQYJKoZIhvcNAQEL
 						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
 						NTNaFw0zNTA4MjQxODQ4NTNaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
@@ -133,13 +133,13 @@
 						gS8kL8UfacDILGi4Vrf+pbQ4vR433boq3x+sT6hgs3whi5ZK1ltABgTbmCVtNEwn
 						uoDqeFZtzSo+FJM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUQQ9WRv8vtZUnDG3HA8pY15fsjgkwDQYJKoZIhvcNAQEL
 						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
 						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
@@ -159,13 +159,13 @@
 						II3qo5yGEItsYApBOcXMSXOrFd3OjyCUepX7P7siAMpQ538DnmuSLdURgdYUlIID
 						avp66EtCEnhWtN8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUJNP74b6Wyv0z7gWAfmYFvRKaOPcwDQYJKoZIhvcNAQEL
 						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
 						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
@@ -185,25 +185,25 @@
 						vUurDG6P3/K7rNPP5pC43C0sUgf7PC9PvDdkz6RDLvr3EK9nqTLwvR6F2uX2OwCt
 						9Bt3PLpZ5T1ZzOo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc Technologies (Development Shibboleth IdP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rhys</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:Rhys.Smith@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rhys</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:Rhys.Smith@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc Technologies (Development Shibboleth IdP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:Rhys.Smith@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rhys</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:Rhys.Smith@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml
index 6fb04705..0b6f0a1f 100644
--- a/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.hs-osnabrueck.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-01-20T09:45:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-01-20T09:45:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-osnabrueck.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Osnabrück</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hochschule Osnabrück</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Hochschule Osnabrück University of Applied Sciences</mdui:Description>
+        <mdui:Description xml:lang="en">Hochschule Osnabrück University of Applied Sciences</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.hs-osnabrueck.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hs-osnabrueck.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-osnabrueck.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Hochschule Osnabrück</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Hochschule Osnabrück</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Hochschule Osnabrück University of Applied Sciences</mdui:Description>
-          <mdui:Description xml:lang="en">Hochschule Osnabrück University of Applied Sciences</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.hs-osnabrueck.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hs-osnabrueck.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib-idp.hs-osnabrueck.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib-idp.hs-osnabrueck.de,OU=Zentrale IT,O=Hochschule Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHSjCCBjKgAwIBAgIHGmQuE/sKwDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib-idp.hs-osnabrueck.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib-idp.hs-osnabrueck.de,OU=Zentrale IT,O=Hochschule Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHSjCCBjKgAwIBAgIHGmQuE/sKwDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgT3NuYWJydWVjazEUMBIGA1UECxML
 emVudHJhbGUgSVQxKDAmBgNVBAMTH0hvY2hzY2h1bGUgT3NuYWJydWVjayBDQSAt
 IEcgMDExIjAgBgkqhkiG9w0BCQEWE2NhQGhzLW9zbmFicnVlY2suZGUwHhcNMTUx
@@ -69,28 +69,28 @@ GVccHbtBOzplFQIpBatohmXYUv4j6r5QLeXyh1biVxqXoFwK6j7BKIBN3iOVTNBj
 UU0mCrGIoiuCzEM6Lc7eY57KuByxmyCIPflBIx6ohH7uP+4pV6nEayUZF/1p8AWN
 0NFm1Pj8gmi0E0RBnTPSFcyoXtOL7stEa/4Cjppsk0JhVDARUQ60bpCIXa6oCA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-osnabrueck.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib-idp.hs-osnabrueck.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib-idp.hs-osnabrueck.de,OU=Zentrale IT,O=Hochschule Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHSjCCBjKgAwIBAgIHGmQuE/sKwDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-osnabrueck.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib-idp.hs-osnabrueck.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib-idp.hs-osnabrueck.de,OU=Zentrale IT,O=Hochschule Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHSjCCBjKgAwIBAgIHGmQuE/sKwDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgT3NuYWJydWVjazEUMBIGA1UECxML
 emVudHJhbGUgSVQxKDAmBgNVBAMTH0hvY2hzY2h1bGUgT3NuYWJydWVjayBDQSAt
 IEcgMDExIjAgBgkqhkiG9w0BCQEWE2NhQGhzLW9zbmFicnVlY2suZGUwHhcNMTUx
@@ -130,35 +130,35 @@ GVccHbtBOzplFQIpBatohmXYUv4j6r5QLeXyh1biVxqXoFwK6j7BKIBN3iOVTNBj
 UU0mCrGIoiuCzEM6Lc7eY57KuByxmyCIPflBIx6ohH7uP+4pV6nEayUZF/1p8AWN
 0NFm1Pj8gmi0E0RBnTPSFcyoXtOL7stEa/4Cjppsk0JhVDARUQ60bpCIXa6oCA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e495</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e495</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Hochschule Osnabrück</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hochschule Osnabrück</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.hs-osnabrueck.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.hs-osnabrueck.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bernd</md:GivenName>
-      <md:SurName>Beining</md:SurName>
-      <md:EmailAddress>mailto:b.beining@hs-osnabrueck.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sebastian</md:GivenName>
-      <md:SurName>Möller</md:SurName>
-      <md:EmailAddress>mailto:s.moeller@hs-osnabrueck.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sebastian</md:GivenName>
-      <md:SurName>Möller</md:SurName>
-      <md:EmailAddress>mailto:s.moeller@hs-osnabrueck.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e495</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e495</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Hochschule Osnabrück</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hochschule Osnabrück</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.hs-osnabrueck.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hs-osnabrueck.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bernd</md:GivenName>
+    <md:SurName>Beining</md:SurName>
+    <md:EmailAddress>mailto:b.beining@hs-osnabrueck.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sebastian</md:GivenName>
+    <md:SurName>Möller</md:SurName>
+    <md:EmailAddress>mailto:s.moeller@hs-osnabrueck.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sebastian</md:GivenName>
+    <md:SurName>Möller</md:SurName>
+    <md:EmailAddress>mailto:s.moeller@hs-osnabrueck.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml
index f1af59a2..b3b972b7 100644
--- a/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.its.csufresno.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csufresno.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Fresno</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csufresno.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Fresno</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVALSvbUT9X5BLZlEcvo8wdsnCxnQ1MA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWItaWRwLml0cy5jc3VmcmVzbm8uZWR1MB4XDTA4
 MTExMjE2MzAzMFoXDTI4MTExMjE2MzAzMFowJTEjMCEGA1UEAxMac2hpYi1pZHAu
@@ -41,24 +41,24 @@ g+CXvCIuHws5vUt9Y6cbzws0vgtxEP6lLP2aVsESuVJBX1BivGgpYP4gU9mVo/EK
 XyFi44m87acoHxdzxSwFUz7nIvXinIB15IrsIp2BgkblbSiJudOJGxpcq0eIGI+j
 khQt9bzJkX3J4Cg2WQo63SIREH799iBIRT7he/NurdO1UVGLStfEjw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.its.csufresno.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.its.csufresno.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csufresno.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.its.csufresno.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.its.csufresno.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csufresno.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVALSvbUT9X5BLZlEcvo8wdsnCxnQ1MA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWItaWRwLml0cy5jc3VmcmVzbm8uZWR1MB4XDTA4
 MTExMjE2MzAzMFoXDTI4MTExMjE2MzAzMFowJTEjMCEGA1UEAxMac2hpYi1pZHAu
@@ -78,23 +78,23 @@ g+CXvCIuHws5vUt9Y6cbzws0vgtxEP6lLP2aVsESuVJBX1BivGgpYP4gU9mVo/EK
 XyFi44m87acoHxdzxSwFUz7nIvXinIB15IrsIp2BgkblbSiJudOJGxpcq0eIGI+j
 khQt9bzJkX3J4Cg2WQo63SIREH799iBIRT7he/NurdO1UVGLStfEjw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.its.csufresno.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Fresno</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Fresno</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csufresno.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS Systems Group</md:GivenName>
-      <md:EmailAddress>sysadmin@csufresno.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike Garvey</md:GivenName>
-      <md:EmailAddress>mikeg@csufresno.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.its.csufresno.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Fresno</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Fresno</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csufresno.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Systems Group</md:GivenName>
+    <md:EmailAddress>sysadmin@csufresno.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike Garvey</md:GivenName>
+    <md:EmailAddress>mikeg@csufresno.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml
index 4770c920..a6e3ea36 100644
--- a/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.rpi.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rpi.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rensselaer Polytechnic Institute</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rpi.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rensselaer Polytechnic Institute</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANLgKXs6iKtLWK5YzJ889P9ABepqMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnJwaS5lZHUwHhcNMTAxMDA3MTY1NTI5
 WhcNMzAxMDA3MTY1NTI5WjAbMRkwFwYDVQQDExBzaGliLWlkcC5ycGkuZWR1MIIB
@@ -37,23 +37,23 @@ ETfd87oqwGzPJmfcMzDuxemHaQx9GRxaDbVt90Dun2rjZvwn6eJl4vzGzUQRn7tD
 pLAzcXdj85j7T2prc171AicsqFiKs7H0BbZJWzuby8mM0mSyydQot4AjKSEn3XjH
 tft1Upc9k4NmeGcokAOPbfZsqCBW8ESJxCqBQsrfVHb/8s5Za9BCRXlwKZYezeK6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.rpi.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.rpi.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.rpi.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rpi.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.rpi.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.rpi.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.rpi.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rpi.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANLgKXs6iKtLWK5YzJ889P9ABepqMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnJwaS5lZHUwHhcNMTAxMDA3MTY1NTI5
 WhcNMzAxMDA3MTY1NTI5WjAbMRkwFwYDVQQDExBzaGliLWlkcC5ycGkuZWR1MIIB
@@ -72,19 +72,19 @@ ETfd87oqwGzPJmfcMzDuxemHaQx9GRxaDbVt90Dun2rjZvwn6eJl4vzGzUQRn7tD
 pLAzcXdj85j7T2prc171AicsqFiKs7H0BbZJWzuby8mM0mSyydQot4AjKSEn3XjH
 tft1Upc9k4NmeGcokAOPbfZsqCBW8ESJxCqBQsrfVHb/8s5Za9BCRXlwKZYezeK6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rensselaer Polytechnic Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rensselaer Polytechnic Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rpi.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alan Powell</md:GivenName>
-      <md:EmailAddress>powela@rpi.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rensselaer Polytechnic Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rensselaer Polytechnic Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rpi.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alan Powell</md:GivenName>
+    <md:EmailAddress>powela@rpi.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml
index 6927ebc5..cc914cb1 100644
--- a/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.siu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Southern Illinois University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Southern Illinois University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAIJcn4M3RZTxxXP7hVa6qv+n806fMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnNpdS5lZHUwHhcNMTMwMjIxMTk0ODMw
 WhcNMzMwMjIxMTk0ODMwWjAbMRkwFwYDVQQDExBzaGliLWlkcC5zaXUuZWR1MIIB
@@ -40,24 +40,24 @@ xSVY5pXQEXc1rjR6hSYZJNSkwMpipp/l7uIbvTrUicPHIXBlOgHCfxjnZD7KCZNU
 THhkLPoiTD6LKEMsf5E4vm24y70NfsQDbLRt8xO4JXec8wK05K/D2dFkvqZgrF0s
 JcNjbx+tHm0hFfpjX8J2OY+FfSw71mQ7vmgKpoVv+QesTzYaFqfZIv1ZG25t5Ga9
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.siu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.siu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.siu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.siu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.siu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.siu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.siu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.siu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAIJcn4M3RZTxxXP7hVa6qv+n806fMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnNpdS5lZHUwHhcNMTMwMjIxMTk0ODMw
 WhcNMzMwMjIxMTk0ODMwWjAbMRkwFwYDVQQDExBzaGliLWlkcC5zaXUuZWR1MIIB
@@ -76,26 +76,26 @@ xSVY5pXQEXc1rjR6hSYZJNSkwMpipp/l7uIbvTrUicPHIXBlOgHCfxjnZD7KCZNU
 THhkLPoiTD6LKEMsf5E4vm24y70NfsQDbLRt8xO4JXec8wK05K/D2dFkvqZgrF0s
 JcNjbx+tHm0hFfpjX8J2OY+FfSw71mQ7vmgKpoVv+QesTzYaFqfZIv1ZG25t5Ga9
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southern Illinois University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southern Illinois University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIUC Shibboleth Tech</md:GivenName>
-      <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SIUC Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SIUC Shibboleth Support</md:GivenName>
-      <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southern Illinois University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southern Illinois University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIUC Shibboleth Tech</md:GivenName>
+    <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SIUC Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SIUC Shibboleth Support</md:GivenName>
+    <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml
index c8c1c60a..77279357 100644
--- a/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.tufts.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tufts.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Tufts University</mdui:DisplayName>
+        <mdui:Logo height="67" width="154" xml:lang="en">https://shib-idp.tufts.edu/tufts_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tufts.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Tufts University</mdui:DisplayName>
-          <mdui:Logo height="67" width="154" xml:lang="en">https://shib-idp.tufts.edu/tufts_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDujCCAqICCQDcDfgQ9DFFeTANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
 VVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxEzARBgNVBAcTClNvbWVydmlsbGUx
 GTAXBgNVBAoTEFR1ZnRzIFVuaXZlcnNpdHkxDDAKBgNVBAsTA1VJVDEbMBkGA1UE
@@ -44,24 +44,24 @@ r9ZgIOxCK7D9Ec6rhlX0jxy+ouZ5YtgENiIgCsvJaKnrMLkQrePkiunedxSHsgap
 h7eQBFk5zu2vH7IlJ+5NrUQPM5srLIyyAQPkX3TwCIu0imLAMKVb/QMpa3jfj0u4
 nx4gfZBsxdfXaIUPuLZsW1Ae7E8kqKmgkS5floclqDnC9ebJtliJqXqaGQr+/A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.tufts.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tufts.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.tufts.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tufts.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDujCCAqICCQDcDfgQ9DFFeTANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
 VVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxEzARBgNVBAcTClNvbWVydmlsbGUx
 GTAXBgNVBAoTEFR1ZnRzIFVuaXZlcnNpdHkxDDAKBgNVBAsTA1VJVDEbMBkGA1UE
@@ -83,31 +83,31 @@ r9ZgIOxCK7D9Ec6rhlX0jxy+ouZ5YtgENiIgCsvJaKnrMLkQrePkiunedxSHsgap
 h7eQBFk5zu2vH7IlJ+5NrUQPM5srLIyyAQPkX3TwCIu0imLAMKVb/QMpa3jfj0u4
 nx4gfZBsxdfXaIUPuLZsW1Ae7E8kqKmgkS5floclqDnC9ebJtliJqXqaGQr+/A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tufts University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tufts University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tufts.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>George Turner</md:GivenName>
-      <md:EmailAddress>george.turner@tufts.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>ESS</md:GivenName>
-      <md:EmailAddress>ESS@tufts.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>George Turner</md:GivenName>
-      <md:EmailAddress>george.turner@tufts.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>PeiQuan Ho</md:GivenName>
-      <md:EmailAddress>PeiQuan.Ho@tufts.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tufts University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tufts University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tufts.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>George Turner</md:GivenName>
+    <md:EmailAddress>george.turner@tufts.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>ESS</md:GivenName>
+    <md:EmailAddress>ESS@tufts.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>George Turner</md:GivenName>
+    <md:EmailAddress>george.turner@tufts.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>PeiQuan Ho</md:GivenName>
+    <md:EmailAddress>PeiQuan.Ho@tufts.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml
index 65bd9c36..01bc4fa3 100644
--- a/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.ucl.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-04T11:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-04T11:40:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UCL (University College London)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.ucl.ac.uk/images/shib-ucl-logo-80-60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.ucl.ac.uk/images/shib-ucl-logo-16-16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UCL (University College London)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.ucl.ac.uk/images/shib-ucl-logo-80-60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.ucl.ac.uk/images/shib-ucl-logo-16-16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEBjCCAu6gAwIBAgIJAL1ZxB217UWjMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
 						bGxlZ2UgTG9uZG9uMRswGQYDVQQDDBJzaGliLWlkcC51Y2wuYWMudWsxIjAgBgkq
@@ -41,26 +41,26 @@
 						1erUYkjIA7Zm87b9RXqPLiISMLio1Ncl1ppJZqu8a34sNyvYDKPtzcKZ4v0gxovk
 						askhslrZvXeC4StCDJMj32vSTmKVQZ9S8F0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEBjCCAu6gAwIBAgIJAL1ZxB217UWjMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
 						bGxlZ2UgTG9uZG9uMRswGQYDVQQDDBJzaGliLWlkcC51Y2wuYWMudWsxIjAgBgkq
@@ -84,26 +84,26 @@
 						1erUYkjIA7Zm87b9RXqPLiISMLio1Ncl1ppJZqu8a34sNyvYDKPtzcKZ4v0gxovk
 						askhslrZvXeC4StCDJMj32vSTmKVQZ9S8F0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UCL (University College London)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library e-resource help</md:GivenName>
-      <md:EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Barker</md:SurName>
-      <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UCL (University College London)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library e-resource help</md:GivenName>
+    <md:EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Barker</md:SurName>
+    <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml
index a661e503..79f0635f 100644
--- a/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.umsystem.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsystem.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">missouri.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mizzou.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umh.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umkc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsl.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mst.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Missouri System</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsystem.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">missouri.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mizzou.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umh.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umkc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsl.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mst.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Missouri System</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGXzCCBEegAwIBAgIJAKWtz8DsmzihMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwITWlzc291cmkxETAPBgNVBAcMCENvbHVtYmlhMSYw
 JAYDVQQKDB1Vbml2ZXJzaXR5IG9mIE1pc3NvdXJpIFN5c3RlbTEeMBwGA1UECwwV
@@ -64,30 +64,30 @@ GilxOAYqD/dn9JE+f20/uJ85UVu56uqg8kGrpSA/feVlJAaV0u8L5XROJ14NCgLx
 0uQ2ga4iAWdPhlJEgCHMPKfizeqZKMV4nY7i6TygxvhVTWYm5GhpOgQj4r8C73Mr
 br3E
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.umsystem.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsystem.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">missouri.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mizzou.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umh.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umkc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsl.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mst.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.umsystem.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsystem.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">missouri.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mizzou.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umh.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umkc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsl.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mst.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGXzCCBEegAwIBAgIJAKWtz8DsmzihMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwITWlzc291cmkxETAPBgNVBAcMCENvbHVtYmlhMSYw
 JAYDVQQKDB1Vbml2ZXJzaXR5IG9mIE1pc3NvdXJpIFN5c3RlbTEeMBwGA1UECwwV
@@ -124,27 +124,27 @@ GilxOAYqD/dn9JE+f20/uJ85UVu56uqg8kGrpSA/feVlJAaV0u8L5XROJ14NCgLx
 0uQ2ga4iAWdPhlJEgCHMPKfizeqZKMV4nY7i6TygxvhVTWYm5GhpOgQj4r8C73Mr
 br3E
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Missouri System</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Missouri System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://umsystem.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UM System Shibboleth Technical Contact</md:GivenName>
-      <md:EmailAddress>shib-tech@umsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>UM System Shibboleth Administration</md:GivenName>
-      <md:EmailAddress>shib-admin@umsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UM System Shibboleth Support</md:GivenName>
-      <md:EmailAddress>shib-support@umsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Missouri System</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Missouri System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://umsystem.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UM System Shibboleth Technical Contact</md:GivenName>
+    <md:EmailAddress>shib-tech@umsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>UM System Shibboleth Administration</md:GivenName>
+    <md:EmailAddress>shib-admin@umsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UM System Shibboleth Support</md:GivenName>
+    <md:EmailAddress>shib-support@umsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
index 471679f3..2b7dcb16 100644
--- a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-osnabrueck.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-09T14:39:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/ndsidm-member</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-09T14:39:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/ndsidm-member</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Osnabrück</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Osnabrück</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider für die Mitglieder der Universität Osnabrück</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider für die Mitglieder der Universität Osnabrück</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.uni-osnabrueck.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-osnabrueck.de/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Osnabrück</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Osnabrück</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider für die Mitglieder der Universität Osnabrück</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider für die Mitglieder der Universität Osnabrück</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.uni-osnabrueck.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-osnabrueck.de/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
 BhMCREUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQL
 Ew1SZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBH
 LTAwMjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTUw
@@ -67,31 +67,31 @@ yyskKDqfOdlEYTKCQ3DeP30wtws5KGeM9q924XR6DlDjcsyG2PokwTk389q2ibpV
 TaZM7XbRWs5/gwBpj9NpzsBY1PkDD54mvLEFCYrlXAMszFyjQeDVXHayJ17WIDrO
 zYfn5UP+rfVyScJjmLxneyX4yu4iwS+Bv9CpJ/lBl8hJkf5YEJ+Tkr9b
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
 BhMCREUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQL
 Ew1SZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBH
 LTAwMjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTUw
@@ -127,30 +127,30 @@ yyskKDqfOdlEYTKCQ3DeP30wtws5KGeM9q924XR6DlDjcsyG2PokwTk389q2ibpV
 TaZM7XbRWs5/gwBpj9NpzsBY1PkDD54mvLEFCYrlXAMszFyjQeDVXHayJ17WIDrO
 zYfn5UP+rfVyScJjmLxneyX4yu4iwS+Bv9CpJ/lBl8hJkf5YEJ+Tkr9b
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e303</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e303</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Osnabrück</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Universität Osnabrück</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-osnabrueck.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-osnabrueck.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Werner</md:GivenName>
-      <md:SurName>Nienhüser</md:SurName>
-      <md:EmailAddress>mailto:Werner.Nienhueser@Uni-Osnabrueck.DE</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Werner</md:GivenName>
-      <md:SurName>Nienhüser</md:SurName>
-      <md:EmailAddress>mailto:Werner.Nienhueser@Uni-Osnabrueck.DE</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e303</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e303</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Osnabrück</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universität Osnabrück</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-osnabrueck.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-osnabrueck.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Werner</md:GivenName>
+    <md:SurName>Nienhüser</md:SurName>
+    <md:EmailAddress>mailto:Werner.Nienhueser@Uni-Osnabrueck.DE</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Werner</md:GivenName>
+    <md:SurName>Nienhüser</md:SurName>
+    <md:EmailAddress>mailto:Werner.Nienhueser@Uni-Osnabrueck.DE</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml
index ee6ac1fc..cd6b4c10 100644
--- a/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp2.uth.tmc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.uthouston.edu/index/contact-mailing.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.tmc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At Houston</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.uthouston.edu/index/contact-mailing.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.tmc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At Houston</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEmzCCA4OgAwIBAgIJANowEgZ9Hf00MA0GCSqGSIb3DQEBBQUAMIHjMQswCQYD
 VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xJzAlBgNV
 BAoMHlRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIFN5c3RlbTFBMD8GA1UECww4VGhl
@@ -45,24 +45,24 @@ b1YqSvpKowYPaW4keBJiLSw8hjqabL8BMv1GFz2tX2CwBukM4yLkzHMLJMGuIC1o
 ZvQfpZbP1uqoDBU3aKTbLI4gC50lC5fgEisQTjCZj0qmqWry0YaNWMQ/Qz4gPc3Z
 QWOGBj3N6LrNN6zE2+Re+ESb02hXCgk6Wi/aFeGS+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp2.uth.tmc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.tmc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp2.uth.tmc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uth.tmc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEmzCCA4OgAwIBAgIJANowEgZ9Hf00MA0GCSqGSIb3DQEBBQUAMIHjMQswCQYD
 VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xJzAlBgNV
 BAoMHlRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIFN5c3RlbTFBMD8GA1UECww4VGhl
@@ -89,27 +89,27 @@ b1YqSvpKowYPaW4keBJiLSw8hjqabL8BMv1GFz2tX2CwBukM4yLkzHMLJMGuIC1o
 ZvQfpZbP1uqoDBU3aKTbLI4gC50lC5fgEisQTjCZj0qmqWry0YaNWMQ/Qz4gPc3Z
 QWOGBj3N6LrNN6zE2+Re+ESb02hXCgk6Wi/aFeGS+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas Health Science Center At Houston</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At Houston</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uth.tmc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fagon Istre</md:GivenName>
-      <md:EmailAddress>Fagon.M.Istre@uth.tmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OAC Support</md:GivenName>
-      <md:EmailAddress>support@uth.tmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IdM Support</md:GivenName>
-      <md:EmailAddress>idm-support@utsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas Health Science Center At Houston</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At Houston</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uth.tmc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fagon Istre</md:GivenName>
+    <md:EmailAddress>Fagon.M.Istre@uth.tmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OAC Support</md:GivenName>
+    <md:EmailAddress>support@uth.tmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IdM Support</md:GivenName>
+    <md:EmailAddress>idm-support@utsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-pp.unicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-pp.unicaen.fr-idp-shibboleth.xml
index 61d8b55d..a89e15ec 100644
--- a/swamid-interfederations-2.0/shib-pp.unicaen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-pp.unicaen.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-pp.unicaen.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-05-18T09:55:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-05-18T09:55:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicaen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Caen Normandie - preprod</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAATpJREFUOI2dk7uOwjAQRY/H4SGtAAEiBUpBB/z/H/AZIBqgwAUpEoSQjD1brEBLEhaxV3Iz9j0aj6/NarXaAX3+pyIBRsBXdUdViTEiIogIqtoESBLgVq3ejdPplNFoRLvdZrvdUhQFIvL76C1pMnc6HZbLJQDOOc7nM9frtWr+aaFaMMYwn8+5XC6s12tUFWPMY1X1hAwhkKYprVaLzWYDgLUWEWk01wDGGHq9Hsfj8TGHd3q6gohwOBzw3mOtfWuudaCqZFnGeDwmhPA5IMaIqjKZTIgxfg4wxuCco9/vMxwO8d6/ClAzQEQoy5LdbsdisSBNU4wxhBBegmo5sNY+BjmbzciyDO89+/2esixrL1MD3CHOOU6nE4PBgG63i/e+MQvJXxBVJc9zVPVVmJIEyGn4UHe9CVPxDUVshznQDe0fAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.unicaen.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Workers and students from university of Caen</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Caen Normandie - preprod</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et étudiants de l'université de Caen</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicaen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Caen Normandie - preprod</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAATpJREFUOI2dk7uOwjAQRY/H4SGtAAEiBUpBB/z/H/AZIBqgwAUpEoSQjD1brEBLEhaxV3Iz9j0aj6/NarXaAX3+pyIBRsBXdUdViTEiIogIqtoESBLgVq3ejdPplNFoRLvdZrvdUhQFIvL76C1pMnc6HZbLJQDOOc7nM9frtWr+aaFaMMYwn8+5XC6s12tUFWPMY1X1hAwhkKYprVaLzWYDgLUWEWk01wDGGHq9Hsfj8TGHd3q6gohwOBzw3mOtfWuudaCqZFnGeDwmhPA5IMaIqjKZTIgxfg4wxuCco9/vMxwO8d6/ClAzQEQoy5LdbsdisSBNU4wxhBBegmo5sNY+BjmbzciyDO89+/2esixrL1MD3CHOOU6nE4PBgG63i/e+MQvJXxBVJc9zVPVVmJIEyGn4UHe9CVPxDUVshznQDe0fAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.unicaen.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Workers and students from university of Caen</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Caen Normandie - preprod</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels et étudiants de l'université de Caen</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVANpB3MsVdTuP9M+pT0gvdOx997zZMA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEnNoaWItcHAudW5pY2Flbi5mcjAeFw0xNjA1MTcwOTM4
 NTdaFw0zNjA1MTcwOTM4NTdaMB0xGzAZBgNVBAMMEnNoaWItcHAudW5pY2Flbi5m
@@ -40,24 +40,24 @@ QsJOKlxA6VGWqdvo7CRtW7Qh41FyJ2/TY1x3G11geVUyv1eyFt8HCybNtJEN/wbm
 cS7swZsLNpAXgNJviqdizN3us0YNnIoXafRkS52vRFGu24Rp5L8FPdVOUe1wv+Nn
 SERP0pHfeMQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-pp.unicaen.fr/dp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-pp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Caen Normandie - preprod</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Caen Normandie - preprod</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unicaen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi.sysadmin@unicaen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-pp.unicaen.fr/dp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-pp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-pp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Caen Normandie - preprod</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Caen Normandie - preprod</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unicaen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi.sysadmin@unicaen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml b/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml
index 6936c102..5cc3d882 100644
--- a/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml
+++ b/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-pprd.middleware.vt.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login-pprd.middleware.vt.edu/support.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">zTEST_VTIdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TEST Virginia Tech IdP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login-pprd.middleware.vt.edu/support.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">zTEST_VTIdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">TEST Virginia Tech IdP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEMTCCAxmgAwIBAgIJAKdWq5o75wFhMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
 PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
@@ -45,27 +45,27 @@ RGfMNHwWfa0PXRqOMktEB4KRMimTVu7FfRX/NI8Qt1cMl0Ur/EKapBVy58SChwsS
 ekCkx5H2+ar5TQpn8MoyloboaroHeHtFlQxhUY6fJWjcvZke6hY0W9MMubaovizq
 AzGwzzUtK3/d7PxUuTm7H1vsPcEs
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-pprd.middleware.vt.edu/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-pprd.middleware.vt.edu/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEMTCCAxmgAwIBAgIJAKnt8KUieXQOMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
 PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
@@ -90,19 +90,19 @@ wHLf5kXcL0BSav4X7toyyqjvlvqZMEz4PB6A16q005R+4GN1xgAjvjKjFlLDFhEh
 cOOlMaw85rDIC2DeqD8SFdnjGvNsP+Y6F9xWta9yDgA0J8r5PeOlPYEvhKYlWlb3
 c7h6iKRJ/Px5kmp/5GQqsrZ/c+1x
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">zTEST_VTIdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marvin Addison</md:GivenName>
-      <md:EmailAddress>serac@vt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">zTEST_VTIdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marvin Addison</md:GivenName>
+    <md:EmailAddress>serac@vt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp-01.ads.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-sp-01.ads.ntu.ac.uk-shibboleth.xml
index f2ab6ba2..bce1d687 100644
--- a/swamid-interfederations-2.0/shib-sp-01.ads.ntu.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-sp-01.ads.ntu.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-01.ads.ntu.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-19T10:36:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-19T10:36:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAMQFC8lRUNLGMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWItc3AtMDEuYWRzLm50dS5hYy51azAeFw0xNjA0MDcxMjMyMTJaFw0y
 						NjA0MDUxMjMyMTJaMCMxITAfBgNVBAMTGHNoaWItc3AtMDEuYWRzLm50dS5hYy51
@@ -47,43 +47,43 @@
 						/Og8wJO9K41UB7l4DjoBS8kgsIQrU1mjIsxWMruhzjWrPU6U9s4hcE4K5e7YbBCd
 						yZT55jrZJ2bHpXQ3QjiNyjgtIw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NTU Service Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Cross</md:SurName>
-      <md:EmailAddress>mailto:Richard.cross@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Hallam</md:SurName>
-      <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-01.ads.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NTU Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Cross</md:SurName>
+    <md:EmailAddress>mailto:Richard.cross@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Hallam</md:SurName>
+    <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
index 65475e8e..584ee5a3 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-dev.cf.ac.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
 						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -28,13 +28,13 @@
 						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
 						ZgojzE1jEQkVmYzQirlmP/kiz1k5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
 						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -53,38 +53,38 @@
 						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
 						ZgojzE1jEQkVmYzQirlmP/kiz1k5
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University Test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>mailto:idman@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml b/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
index 8de03fe1..c9a6f8d3 100644
--- a/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
+++ b/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.mediacore.tv">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:25:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:25:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDITCCAgmgAwIBAgIJAKfy0phoffhNMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNoaWItc3AubWVkaWFjb3JlLnR2MB4XDTE1MDMyNTAwNTQxN1oXDTM1MDMy
 						MDAwNTQxN1owHzEdMBsGA1UEAxMUc2hpYi1zcC5tZWRpYWNvcmUudHYwggEiMA0G
@@ -47,40 +47,40 @@
 						xlVZV+KkIj289EpGS6soJhh1Fq7yUmXpeXW9rZ5AMBIqiIHzauoIVIDnxZ/594eJ
 						ImZdG1OeHzR4UnAhWvd4uMM5Raah+XPIvd6mFHE+KETjsMohIw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mediacore (EMEA) Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MediaCore Video Learning Platform</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mediacore.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Maddy</md:GivenName>
-      <md:SurName>Bentley</md:SurName>
-      <md:EmailAddress>mailto:support@mediacore.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Cross</md:SurName>
-      <md:EmailAddress>mailto:james@mediacore.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Vliet</md:SurName>
-      <md:EmailAddress>mailto:matthew@mediacore.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mediacore (EMEA) Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MediaCore Video Learning Platform</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mediacore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Maddy</md:GivenName>
+    <md:SurName>Bentley</md:SurName>
+    <md:EmailAddress>mailto:support@mediacore.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Cross</md:SurName>
+    <md:EmailAddress>mailto:james@mediacore.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Vliet</md:SurName>
+    <md:EmailAddress>mailto:matthew@mediacore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml b/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml
index 84aae9b4..0393f69f 100644
--- a/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.unity.ac/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-09T12:53:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-09T12:53:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp.unity.ac/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">*Unity</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.unity.ac</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp.unity.ac/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">*Unity</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.unity.ac</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHDCCAgSgAwIBAgIJALWq54jw0HS7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNoaWItc3AudW5pdHkuYWMwHhcNMTQxMDAzMTA0ODI1WhcNMjQwOTMwMTA0
 						ODI1WjAbMRkwFwYDVQQDExBzaGliLXNwLnVuaXR5LmFjMIIBIjANBgkqhkiG9w0B
@@ -50,46 +50,46 @@
 						PUPWRVqOa6ad3PTyhntihn88t5k8KA5HvwE3iX9JX/a+OLLKLbHbieX4F5FT02gK
 						EfBbdfskIzAWEJ158qAfJe4Sx4Jy0PCJHMOqVW6uySw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.unity.ac/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">https://shib-sp.unity.ac/shibboleth</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Research Research Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Unity</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://researchresearch.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Potter</md:SurName>
-      <md:EmailAddress>mailto:unity-sso@researchresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Potter</md:SurName>
-      <md:EmailAddress>mailto:unity-sso@researchresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.unity.ac/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">https://shib-sp.unity.ac/shibboleth</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Research Research Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Unity</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://researchresearch.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Potter</md:SurName>
+    <md:EmailAddress>mailto:unity-sso@researchresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Potter</md:SurName>
+    <md:EmailAddress>mailto:unity-sso@researchresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
index ddd7f3bc..d83ac2dc 100644
--- a/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-staging.data-archive.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-06T09:44:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-06T09:44:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shib-staging.data-archive.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shib-staging.data-archive.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0DCCAbigAwIBAgIEVqdXCTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9z
 						aGliLXN0YWdpbmcuZGF0YS1hcmNoaXZlLmFjLnVrMB4XDTE2MDEyNjExMjQwNloX
 						DTI2MDEyNjExMjQwNlowKjEoMCYGA1UEAwwfc2hpYi1zdGFnaW5nLmRhdGEtYXJj
@@ -30,13 +30,13 @@
 						y6DN8jRe9Sz3V1/aaMPA32N3MdqAu8uGumsKBAlL9jW4H9FqJ1kueeUdA2tMGI6o
 						mCV3qw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIVAPm6pSVpZZ6fKqqcgHO3xG0rISAyMA0GCSqGSIb3DQEB
 						CwUAMBYxFDASBgNVBAMMC2Rhc2hpYmlkcHN0MB4XDTE1MTAyNzA4NTgxMFoXDTM1
 						MTAyNzA3NTgxMFowFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwggEiMA0GCSqGSIb3
@@ -55,13 +55,13 @@
 						xn2l4WS//kg233EZAvBfh46NTA2mqU1PId5mswayGYKZQzd73UBzezCKLBINEZkg
 						goVqVyaQUtY5LDwxyzBA3v1gXLEOaPTwfsU0Zw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFzCCAf+gAwIBAgIUbmZf4OLB72R9bysOhNJ/qf1ChDkwDQYJKoZIhvcNAQEL
 						BQAwFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwHhcNMTUxMDI3MDg1ODEzWhcNMzUx
 						MDI3MDc1ODEzWjAWMRQwEgYDVQQDDAtkYXNoaWJpZHBzdDCCASIwDQYJKoZIhvcN
@@ -80,26 +80,26 @@
 						bmujUTisfVuQKj7QgByAsz/7myhfeMvMLbcPg0d9hB39IkwgtwGmA6LVFfBIsEaz
 						Y5LKo2ucwCDxr38OpQBbp9NxkMk7kBm54d+L
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-staging.data-archive.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shib-staging.data-archive.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-staging.data-archive.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shib-staging.data-archive.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0DCCAbigAwIBAgIEVqdXCTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9z
 						aGliLXN0YWdpbmcuZGF0YS1hcmNoaXZlLmFjLnVrMB4XDTE2MDEyNjExMjQwNloX
 						DTI2MDEyNjExMjQwNlowKjEoMCYGA1UEAwwfc2hpYi1zdGFnaW5nLmRhdGEtYXJj
@@ -117,13 +117,13 @@
 						y6DN8jRe9Sz3V1/aaMPA32N3MdqAu8uGumsKBAlL9jW4H9FqJ1kueeUdA2tMGI6o
 						mCV3qw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIVAPm6pSVpZZ6fKqqcgHO3xG0rISAyMA0GCSqGSIb3DQEB
 						CwUAMBYxFDASBgNVBAMMC2Rhc2hpYmlkcHN0MB4XDTE1MTAyNzA4NTgxMFoXDTM1
 						MTAyNzA3NTgxMFowFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwggEiMA0GCSqGSIb3
@@ -142,13 +142,13 @@
 						xn2l4WS//kg233EZAvBfh46NTA2mqU1PId5mswayGYKZQzd73UBzezCKLBINEZkg
 						goVqVyaQUtY5LDwxyzBA3v1gXLEOaPTwfsU0Zw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFzCCAf+gAwIBAgIUbmZf4OLB72R9bysOhNJ/qf1ChDkwDQYJKoZIhvcNAQEL
 						BQAwFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwHhcNMTUxMDI3MDg1ODEzWhcNMzUx
 						MDI3MDc1ODEzWjAWMRQwEgYDVQQDDAtkYXNoaWJpZHBzdDCCASIwDQYJKoZIhvcN
@@ -167,24 +167,24 @@
 						bmujUTisfVuQKj7QgByAsz/7myhfeMvMLbcPg0d9hB39IkwgtwGmA6LVFfBIsEaz
 						Y5LKo2ucwCDxr38OpQBbp9NxkMk7kBm54d+L
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UK Data Archive: test IdP (do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.data-archive.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Sexton</md:SurName>
-      <md:EmailAddress>mailto:jpsexton@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Amir</md:GivenName>
-      <md:SurName>Moradi</md:SurName>
-      <md:EmailAddress>mailto:amoradi@essex.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UK Data Archive: test IdP (do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.data-archive.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Sexton</md:SurName>
+    <md:EmailAddress>mailto:jpsexton@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Amir</md:GivenName>
+    <md:SurName>Moradi</md:SurName>
+    <md:EmailAddress>mailto:amoradi@essex.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
index ffd6e491..53adbc59 100644
--- a/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-test.raven.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-31T14:51:11Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-31T14:51:11Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Cambridge (test only)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shib-test.raven.cam.ac.uk/test-idp-logo-80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib-test.raven.cam.ac.uk/idp-logo-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>128.232.0.0/16</mdui:IPHint>
+        <mdui:IPHint>129.169.0.0/16</mdui:IPHint>
+        <mdui:IPHint>131.111.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.18.195.0/24</mdui:IPHint>
+        <mdui:IPHint>193.60.80.0/20</mdui:IPHint>
+        <mdui:IPHint>193.63.252.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:630:200::/48</mdui:IPHint>
+        <mdui:DomainHint>cam.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:52.208056,0.1225</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Cambridge (test only)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shib-test.raven.cam.ac.uk/test-idp-logo-80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib-test.raven.cam.ac.uk/idp-logo-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>128.232.0.0/16</mdui:IPHint>
-          <mdui:IPHint>129.169.0.0/16</mdui:IPHint>
-          <mdui:IPHint>131.111.0.0/16</mdui:IPHint>
-          <mdui:IPHint>192.18.195.0/24</mdui:IPHint>
-          <mdui:IPHint>193.60.80.0/20</mdui:IPHint>
-          <mdui:IPHint>193.63.252.0/23</mdui:IPHint>
-          <mdui:IPHint>2001:630:200::/48</mdui:IPHint>
-          <mdui:DomainHint>cam.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:52.208056,0.1225</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIJANGv1GtjrUKOMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXNoaWItdGVzdC5yYXZlbi5jYW0uYWMudWswHhcNMTIxMjA0MTE1NjQ0WhcN
 						MjIxMjAyMTE1NjQ0WjAkMSIwIAYDVQQDExlzaGliLXRlc3QucmF2ZW4uY2FtLmFj
@@ -52,27 +52,27 @@
 						/XyCLO75rEBXAmp8/L96QjlEUiQukScWn3jNRsI6lX9GypVZKBm/y5v5Tyj/x+i2
 						SuQ4UiVzLdJ3C6y7SMog3XganjH9Qg6r6AA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test.raven.cam.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test.raven.cam.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRjCCAi6gAwIBAgIJANGv1GtjrUKOMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXNoaWItdGVzdC5yYXZlbi5jYW0uYWMudWswHhcNMTIxMjA0MTE1NjQ0WhcN
 						MjIxMjAyMTE1NjQ0WjAkMSIwIAYDVQQDExlzaGliLXRlc3QucmF2ZW4uY2FtLmFj
@@ -92,25 +92,25 @@
 						/XyCLO75rEBXAmp8/L96QjlEUiQukScWn3jNRsI6lX9GypVZKBm/y5v5Tyj/x+i2
 						SuQ4UiVzLdJ3C6y7SMog3XganjH9Qg6r6AA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge (test only)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University Information Services' Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:service-desk@uis.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Raven Support</md:GivenName>
-      <md:EmailAddress>mailto:raven-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge (test only)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University Information Services' Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:service-desk@uis.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Raven Support</md:GivenName>
+    <md:EmailAddress>mailto:raven-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml
index 50b714a1..1fc2e25b 100644
--- a/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-uat-idp.ucl.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-12T14:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-12T14:49:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIERjCCAy6gAwIBAgIJAMClfsZN+MybMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
 						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
@@ -42,26 +42,26 @@
 						pFhZrqa7z3Xufm2qnsfX4agfpQ0fId9S1qp1Rx0YxcWj6mPv4BhXWuV9UzdleygO
 						mOwV4il8hzDV8GfAgM7Is0wGG5VwGATSEjlR30FRsOHjeaNqm5GvFGDB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIERjCCAy6gAwIBAgIJAMClfsZN+MybMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
 						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
 						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
@@ -86,26 +86,26 @@
 						pFhZrqa7z3Xufm2qnsfX4agfpQ0fId9S1qp1Rx0YxcWj6mPv4BhXWuV9UzdleygO
 						mOwV4il8hzDV8GfAgM7Is0wGG5VwGATSEjlR30FRsOHjeaNqm5GvFGDB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College London (Shib UAT)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library e-resource help</md:GivenName>
-      <md:EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Barker</md:SurName>
-      <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College London (Shib UAT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library e-resource help</md:GivenName>
+    <md:EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Barker</md:SurName>
+    <md:EmailAddress>mailto:systems@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml
index 6048b2d5..d9d18b10 100644
--- a/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.alexanderstreet.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-11T17:15:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-11T17:15:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.alexanderstreet.com/Shibboleth.sso/WAYF" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.alexanderstreet.com/Shibboleth.sso/WAYF" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwDCCAqgCCQDCf0TzHdVL9zANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
 						VVMxETAPBgNVBAgMCFZpcmdpbmlhMRMwEQYDVQQHDApBbGV4YW5kcmlhMR8wHQYD
 						VQQKDBZBbGV4YW5kZXIgU3RyZWV0IFByZXNzMSEwHwYDVQQDDBhzaGliLmFsZXhh
@@ -35,36 +35,36 @@
 						De08tywH8Z0G4Htt9kxk6Em2I/C+6x7hMYYoK0mAWGcKktXMaaAFyoQQv5WZPzxB
 						TVh0fw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Alexander Street Press, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Alexander Street Press LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.alexanderstreet.com/about/index.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@alexanderstreet.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Field</md:SurName>
-      <md:EmailAddress>mailto:jfield@astreetpress.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Alexander Street Press, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Alexander Street Press LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.alexanderstreet.com/about/index.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@alexanderstreet.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Field</md:SurName>
+    <md:EmailAddress>mailto:jfield@astreetpress.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml
index cac0eda5..b935107e 100644
--- a/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.aylesbury.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-27T16:02:15Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-27T16:02:15Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aylesbury.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aylesbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQCoGCOGp22Z0jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEYMBYGA1UECBMPQnVja2luZ2hhbXNoaXJlMRIwEAYDVQQHEwlBeWxlc2J1cnkx
 						GjAYBgNVBAoTEUF5bGVzYnVyeSBDb2xsZWdlMR0wGwYDVQQDExRzaGliLmF5bGVz
@@ -31,26 +31,26 @@
 						DsCMKW23XoT1PDhMDTN6TTAp2sppMU6xnDTX7rMe4dxWMUwvCn8Yhsp1T8KdmLYf
 						PclJOZZKA2T28cz9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.aylesbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aylesbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.aylesbury.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aylesbury.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQCoGCOGp22Z0jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEYMBYGA1UECBMPQnVja2luZ2hhbXNoaXJlMRIwEAYDVQQHEwlBeWxlc2J1cnkx
 						GjAYBgNVBAoTEUF5bGVzYnVyeSBDb2xsZWdlMR0wGwYDVQQDExRzaGliLmF5bGVz
@@ -71,26 +71,26 @@
 						DsCMKW23XoT1PDhMDTN6TTAp2sppMU6xnDTX7rMe4dxWMUwvCn8Yhsp1T8KdmLYf
 						PclJOZZKA2T28cz9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aylesbury College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aylesbury College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aylesbury.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Support</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Humphries</md:SurName>
-      <md:EmailAddress>mailto:mhumphries@aylesbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aylesbury College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aylesbury College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aylesbury.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Support</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Humphries</md:SurName>
+    <md:EmailAddress>mailto:mhumphries@aylesbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml
index e6cdb461..846287c6 100644
--- a/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.blackpool.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:25:30Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:25:30Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Blackpool and The Fylde College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shib.blackpool.ac.uk/gif/BFC-Logo-80x60.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.blackpool.ac.uk/gif/BFC-Logo-16x16.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
+        <mdui:DomainHint>blackpool.ac.uk</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Blackpool and The Fylde College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shib.blackpool.ac.uk/gif/BFC-Logo-80x60.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib.blackpool.ac.uk/gif/BFC-Logo-16x16.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
-          <mdui:DomainHint>blackpool.ac.uk</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwSgAwIBAgIJAOAT321OtbqJMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
 						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
@@ -50,26 +50,26 @@
 						uSVAFkSET1uR2S8RieT8+j5VkE4sXl13Ah0oLDU8WVUhoxAPX25urwsPYQjbaAhF
 						PowqpyHvz1/+EN+tCkdVCNBO/4Oaz1hfGLKwM6Yu16b+OmiQfsAx+w6cMd0R8wtS
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.blackpool.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.blackpool.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwSgAwIBAgIJAOAT321OtbqJMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
 						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
@@ -93,25 +93,25 @@
 						uSVAFkSET1uR2S8RieT8+j5VkE4sXl13Ah0oLDU8WVUhoxAPX25urwsPYQjbaAhF
 						PowqpyHvz1/+EN+tCkdVCNBO/4Oaz1hfGLKwM6Yu16b+OmiQfsAx+w6cMd0R8wtS
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Blackpool and The Fylde College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Blackpool and The Fylde College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.blackpool.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@blackpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical support</md:GivenName>
-      <md:EmailAddress>mailto:shib-tech@blackpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Blackpool and The Fylde College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Blackpool and The Fylde College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.blackpool.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@blackpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical support</md:GivenName>
+    <md:EmailAddress>mailto:shib-tech@blackpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
index c42c7420..565cef2b 100644
--- a/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.bsdc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T09:42:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T09:42:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUN8y30toYLjtWupKH7DVDzwSSKuswDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMVoX
 						DTM1MDcyMjExMDkwMVowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
@@ -31,13 +31,13 @@
 						ahWWCR4DULcp+U1czGshTbCTSosxDbJSxeiqVhaBKnmzPBtc4jXuejjCfZ/cW63A
 						87436RAvjG0udEJ+1t5U5y+N8oPQC61crI39fcviBBGvdg82Y4mmCY+yxw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUTbwjzHy1V/QauduA1UWBe4i3xUwwDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMFoX
 						DTM1MDcyMjExMDkwMFowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
@@ -56,13 +56,13 @@
 						/v833iBKd3o2FdR4hoajUlNy5qida3w+5tgQjCkIg5Uv34TZekf9KpbJeo9aC7rs
 						Js7zvcVri+nme42f+NejEW+w6qOYYYZVUT09NhIEKgqUrBJuF7KVi1ELlw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAI7EL52ouKYn3I0Z+dRy2QFDx5jFMA0GCSqGSIb3DQEB
 						CwUAMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azAeFw0xNTA3MjIxMTA5MDFa
 						Fw0zNTA3MjIxMTA5MDFaMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azCCASIw
@@ -81,26 +81,26 @@
 						Oybgnnk8z9+xVZrJPihLdrcLVLfqW88KZOWKk6f7UuRMLiuA/PI2Fm15KOjxldT8
 						dMcsID2b60k2kzoN1u1QOsCwZv0CkOcRz+sjVix5YBsiAdkDOn3vXkSk4KE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.bsdc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.bsdc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsdc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUN8y30toYLjtWupKH7DVDzwSSKuswDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMVoX
 						DTM1MDcyMjExMDkwMVowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
@@ -119,13 +119,13 @@
 						ahWWCR4DULcp+U1czGshTbCTSosxDbJSxeiqVhaBKnmzPBtc4jXuejjCfZ/cW63A
 						87436RAvjG0udEJ+1t5U5y+N8oPQC61crI39fcviBBGvdg82Y4mmCY+yxw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUTbwjzHy1V/QauduA1UWBe4i3xUwwDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMFoX
 						DTM1MDcyMjExMDkwMFowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
@@ -144,13 +144,13 @@
 						/v833iBKd3o2FdR4hoajUlNy5qida3w+5tgQjCkIg5Uv34TZekf9KpbJeo9aC7rs
 						Js7zvcVri+nme42f+NejEW+w6qOYYYZVUT09NhIEKgqUrBJuF7KVi1ELlw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIVAI7EL52ouKYn3I0Z+dRy2QFDx5jFMA0GCSqGSIb3DQEB
 						CwUAMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azAeFw0xNTA3MjIxMTA5MDFa
 						Fw0zNTA3MjIxMTA5MDFaMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azCCASIw
@@ -169,27 +169,27 @@
 						Oybgnnk8z9+xVZrJPihLdrcLVLfqW88KZOWKk6f7UuRMLiuA/PI2Fm15KOjxldT8
 						dMcsID2b60k2kzoN1u1QOsCwZv0CkOcRz+sjVix5YBsiAdkDOn3vXkSk4KE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Burton and South Derbyshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Burton and South Derbyshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.bsdc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@bsdc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alan</md:GivenName>
-      <md:SurName>Coats</md:SurName>
-      <md:EmailAddress>mailto:alan.coats@bsdc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@bsdc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Burton and South Derbyshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Burton and South Derbyshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.bsdc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@bsdc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alan</md:GivenName>
+    <md:SurName>Coats</md:SurName>
+    <md:EmailAddress>mailto:alan.coats@bsdc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@bsdc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml
index 6b2aebfb..70ee2748 100644
--- a/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.bu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Boston University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Boston University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUe//QyolSjXGskJVe42L94YYJ7rswDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLc2hpYi5idS5lZHUwHhcNMTEwNjIxMTYwMTQ5WhcNMzEw
 NjIxMTYwMTQ5WjAWMRQwEgYDVQQDEwtzaGliLmJ1LmVkdTCCASIwDQYJKoZIhvcN
@@ -40,24 +40,24 @@ N5TIK/J7ALA8/xVFgo6XluioA6DYDq7CrJUPrc6LEDApexF5i7pyns7FV+d3EzlF
 TazioztaYa7yyphC1XgYol9So698mI3wfTQz9QEA6E9iuayzj+kJU7QAQ5pdA19w
 5cQaCFdIkECu3Ruv8jGs5oF5Zo37L1gK2j11
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Boston University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Boston University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>BU IT Help Center</md:GivenName>
-      <md:EmailAddress>ithelp@bu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>BU IT Help Center</md:GivenName>
-      <md:EmailAddress>ithelp@bu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Boston University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Boston University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>BU IT Help Center</md:GivenName>
+    <md:EmailAddress>ithelp@bu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>BU IT Help Center</md:GivenName>
+    <md:EmailAddress>ithelp@bu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
index 353aa483..3a7012ed 100644
--- a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.bucknell.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucknell.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bucknell University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Bucknell University, founded in 1846, combines the personal liberal arts experience with first-class research facilities, global study opportunities and 110 fields of study.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bucknell.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.bucknell.edu/documents/lit/policies/InCommonPOP.pdf</mdui:PrivacyStatementURL>
+        <mdui:Logo height="95" width="181" xml:lang="en">https://www.bucknell.edu/images/system/bucknell_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucknell.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bucknell University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Bucknell University, founded in 1846, combines the personal liberal arts experience with first-class research facilities, global study opportunities and 110 fields of study.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.bucknell.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.bucknell.edu/documents/lit/policies/InCommonPOP.pdf</mdui:PrivacyStatementURL>
-          <mdui:Logo height="95" width="181" xml:lang="en">https://www.bucknell.edu/images/system/bucknell_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAJ0ZQz8YWKCXgcIODVaZZT9umZsiMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWIuYnVja25lbGwuZWR1MB4XDTExMDYyOTIwMDEw
 OVoXDTMxMDYyOTIwMDEwOVowHDEaMBgGA1UEAxMRc2hpYi5idWNrbmVsbC5lZHUw
@@ -42,23 +42,23 @@ PHxTSHfK3OYwOdHEdEjfPU4QE/bvOgonzZ5V9mHBq9xA1gp/MSM4VAFeCRP87R3n
 IRk0CqcZsAp4GAiJK9lrIAjARM8DcOm2x2qspk9ys25K45yOAxuf3VbNX7E4wYD2
 D0UPBA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bucknell.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bucknell.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.bucknell.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bucknell.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bucknell.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucknell.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bucknell.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bucknell.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.bucknell.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bucknell.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bucknell.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bucknell.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAJ0ZQz8YWKCXgcIODVaZZT9umZsiMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWIuYnVja25lbGwuZWR1MB4XDTExMDYyOTIwMDEw
 OVoXDTMxMDYyOTIwMDEwOVowHDEaMBgGA1UEAxMRc2hpYi5idWNrbmVsbC5lZHUw
@@ -78,23 +78,23 @@ PHxTSHfK3OYwOdHEdEjfPU4QE/bvOgonzZ5V9mHBq9xA1gp/MSM4VAFeCRP87R3n
 IRk0CqcZsAp4GAiJK9lrIAjARM8DcOm2x2qspk9ys25K45yOAxuf3VbNX7E4wYD2
 D0UPBA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bucknell.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bucknell.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bucknell University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bucknell University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bucknell.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bucknell Systems</md:GivenName>
-      <md:EmailAddress>systems@bucknell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bucknell Systems</md:GivenName>
-      <md:EmailAddress>systems@bucknell.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bucknell.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bucknell.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bucknell University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bucknell University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bucknell.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bucknell Systems</md:GivenName>
+    <md:EmailAddress>systems@bucknell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bucknell Systems</md:GivenName>
+    <md:EmailAddress>systems@bucknell.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml
index 0b3919f6..168398ca 100644
--- a/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.byu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">byu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brigham Young University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Brigham Young University IdP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">byu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brigham Young University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Brigham Young University IdP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAMdtkhNUKYuSdtVPTI46fURWKKoyMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNoaWIuYnl1LmVkdTAeFw0xNTAzMjYyMjI0NTdaFw0z
 NTAzMjYyMjI0NTdaMBcxFTATBgNVBAMTDHNoaWIuYnl1LmVkdTCCASIwDQYJKoZI
@@ -38,31 +38,31 @@ CjKIp5uLbOun7i02xqPFWP98i/NYeeelpv8B9rjdPgXSUIoraJU0dmezG3WRVcEx
 geODhddBhA/9t4MPUhxE2NkerjOJ1kxuxzyTBtvo1kS7Hhe+BnwZceEfqZ3Ieb+k
 tAvdjb86Vcp7Qd6mgqHTsmU05bXWB4TCg0JngVfp4bo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.byu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.byu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brigham Young University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brigham Young University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.byu.edu/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Doug Walker</md:GivenName>
-      <md:EmailAddress>djw5@byu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan McNeece</md:GivenName>
-      <md:EmailAddress>dbm8@byu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex Olson</md:GivenName>
-      <md:EmailAddress>ako@byu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>BYU IAM Team</md:GivenName>
-      <md:EmailAddress>valinda@byu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.byu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.byu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brigham Young University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brigham Young University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.byu.edu/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Doug Walker</md:GivenName>
+    <md:EmailAddress>djw5@byu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan McNeece</md:GivenName>
+    <md:EmailAddress>dbm8@byu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Olson</md:GivenName>
+    <md:EmailAddress>ako@byu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>BYU IAM Team</md:GivenName>
+    <md:EmailAddress>valinda@byu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml
index a817cb02..82e554c8 100644
--- a/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.calu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shib.calu.edu/idp/profile/SAML2/POST/SSO" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California University of Pennsylvania</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.calu.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.calu.edu/faculty-staff/it-services/policies-guides/index.htm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="72" width="72" xml:lang="en">https://www.calu.edu/_files/images/logo_72red.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shib.calu.edu/idp/profile/SAML2/POST/SSO" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California University of Pennsylvania</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.calu.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.calu.edu/faculty-staff/it-services/policies-guides/index.htm</mdui:PrivacyStatementURL>
-          <mdui:Logo height="72" width="72" xml:lang="en">https://www.calu.edu/_files/images/logo_72red.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUNTBoyq7vKsfRV+tm+aeq+fVualkwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc2hpYi5jYWx1LmVkdTAeFw0xMzAzMjcyMDMwMzlaFw0z
 MzAzMjcyMDMwMzlaMBgxFjAUBgNVBAMTDXNoaWIuY2FsdS5lZHUwggEiMA0GCSqG
@@ -40,23 +40,23 @@ XVQ1sD4SrD1zvkgHGNmJdwcAADWt1HV80FZK2ruiaum0vskTIJxQ6BBQKnWPl0xD
 g1Yiin78qAMDA92LfN/ctvj8sFivFbL4FJeH035tl/y7k/rJJVpsDjQIHJDPROCG
 3Jz8+VUS/n8RsCWiCcjLEM+SzCbGXM1Rp9ndtD2CSwKn2dc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.calu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.calu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.calu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.calu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.calu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.calu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.calu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.calu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.calu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.calu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUNTBoyq7vKsfRV+tm+aeq+fVualkwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc2hpYi5jYWx1LmVkdTAeFw0xMzAzMjcyMDMwMzlaFw0z
 MzAzMjcyMDMwMzlaMBgxFjAUBgNVBAMTDXNoaWIuY2FsdS5lZHUwggEiMA0GCSqG
@@ -75,18 +75,18 @@ XVQ1sD4SrD1zvkgHGNmJdwcAADWt1HV80FZK2ruiaum0vskTIJxQ6BBQKnWPl0xD
 g1Yiin78qAMDA92LfN/ctvj8sFivFbL4FJeH035tl/y7k/rJJVpsDjQIHJDPROCG
 3Jz8+VUS/n8RsCWiCcjLEM+SzCbGXM1Rp9ndtD2CSwKn2dc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.calu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.calu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Donna Wright</md:GivenName>
-      <md:EmailAddress>utechrequests@calu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.calu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.calu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Donna Wright</md:GivenName>
+    <md:EmailAddress>utechrequests@calu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml
index 3162a12a..f8eb467f 100644
--- a/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ccbcmd.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccbcmd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Community College of Baltimore County</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Community College of Baltimore County IdP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ccbcmd.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ccbcmd.edu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="74" width="194" xml:lang="en">https://www.ccbcmd.edu/images/templates/logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccbcmd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Community College of Baltimore County</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Community College of Baltimore County IdP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ccbcmd.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ccbcmd.edu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="74" width="194" xml:lang="en">https://www.ccbcmd.edu/images/templates/logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAK2wXYHuV+AmoZ5JI4gKKJP/+dP2MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTAeFw0xMzEyMTcxODAxMTZa
 Fw0zMzEyMTcxODAxMTZaMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTCCASIw
@@ -41,23 +41,23 @@ a3vZNAtqSNh4Z5biYa1QT1Y3GcpxtUHE2NPmtl+K2aV7jcTAiqhvUwz3b+qtIQmd
 zY7Z5MPDyMIkT8vHoulLG+LnJDZaXjq9FKwxn1eekks9+A9r+y0T4HwzZOOzyfS8
 pMKrmA66kUgrP4d284xTvD0qYc3SifZmzNIEaMGhpCL/WW1U5XkNHvKv2qo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ccbcmd.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ccbcmd.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ccbcmd.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccbcmd.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ccbcmd.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ccbcmd.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ccbcmd.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccbcmd.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAK2wXYHuV+AmoZ5JI4gKKJP/+dP2MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTAeFw0xMzEyMTcxODAxMTZa
 Fw0zMzEyMTcxODAxMTZaMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTCCASIw
@@ -76,26 +76,26 @@ a3vZNAtqSNh4Z5biYa1QT1Y3GcpxtUHE2NPmtl+K2aV7jcTAiqhvUwz3b+qtIQmd
 zY7Z5MPDyMIkT8vHoulLG+LnJDZaXjq9FKwxn1eekks9+A9r+y0T4HwzZOOzyfS8
 pMKrmA66kUgrP4d284xTvD0qYc3SifZmzNIEaMGhpCL/WW1U5XkNHvKv2qo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Community College of Baltimore County</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Community College of Baltimore County</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ccbcmd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben Thompson</md:GivenName>
-      <md:EmailAddress>bthompson@ccbcmd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Desra Dickerson</md:GivenName>
-      <md:EmailAddress>systemsengineering@ccbcmd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>System Engineering</md:GivenName>
-      <md:EmailAddress>systemsengineering@ccbcmd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Community College of Baltimore County</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Community College of Baltimore County</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccbcmd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben Thompson</md:GivenName>
+    <md:EmailAddress>bthompson@ccbcmd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Desra Dickerson</md:GivenName>
+    <md:EmailAddress>systemsengineering@ccbcmd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>System Engineering</md:GivenName>
+    <md:EmailAddress>systemsengineering@ccbcmd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
index 4967bb74..f8e94f13 100644
--- a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.comune.trieste.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices that supports Wi-Fi</mdui:Description>
+        <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices that supports Wi-Fi</mdui:Description>
-          <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
 MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
@@ -41,13 +41,13 @@ fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
 P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
 xEb0XXxzdH8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
 MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
@@ -67,41 +67,41 @@ fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
 P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
 xEb0XXxzdH8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-        <md:ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Municipality of Trieste</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Comune di Trieste</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:triestefreespots@comune.trieste.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
+      <md:ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Municipality of Trieste</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Comune di Trieste</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:triestefreespots@comune.trieste.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml b/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml
index e28c8c09..b9f59769 100644
--- a/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.courseleaf.com-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.courseleaf.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.courseleaf.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CourseLeaf</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Leepfrog Technologies CourseLeaf</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://courseleaf.com</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.courseleaf.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CourseLeaf</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Leepfrog Technologies CourseLeaf</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://courseleaf.com</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDzCCAfegAwIBAgIJALAsCdsphihDMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMME3NoaWIuY291cnNlbGVhZi5jb20wHhcNMTQwNDExMTYwMjAxWhcNMjQwNDA4
 MTYwMjAxWjAeMRwwGgYDVQQDDBNzaGliLmNvdXJzZWxlYWYuY29tMIIBIjANBgkq
@@ -39,163 +39,163 @@ EB9avy/o/5Ciu0/Iw/ogixkQoMvtDrh3cC4QdVz4d8OjQzP9xbPMtcWbzJIzf6/O
 EsvIY/ZNwb1RTkT8GIXwkC7EgO0m5UeRMJJWFU1K8Jk9chpCmebrXFcz1RqJBlUE
 jhao0WXgTHHQUUpEzZXrh/Bzyw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currbulletin.wustl.edu/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.wustl.edu/Shibboleth.sso/SAML2/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursecatalog-new.web.cmu.edu/Shibboleth.sso/SAML2/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upcomingcatalog.uchicago.edu/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stagingcatalog.uchicago.edu/Shibboleth.sso/SAML2/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.odu.edu/Shibboleth.sso/SAML2/POST" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.odu.edu/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-catalog.ncsu.edu/Shibboleth.sso/SAML2/POST" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current-catalog.ncsu.edu/Shibboleth.sso/SAML2/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exploredegrees-admin.stanford.edu/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exploredegrees-nextyear.stanford.edu/Shibboleth.sso/SAML2/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.brown.edu/Shibboleth.sso/SAML2/POST" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.brown.edu/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uark.edu/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uark.edu/Shibboleth.sso/SAML2/POST" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.utexas.edu/Shibboleth.sso/SAML2/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currcatalog.utexas.edu/Shibboleth.sso/SAML2/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog-admin.calpoly.edu/Shibboleth.sso/SAML2/POST" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog-admin.calpoly.edu/Shibboleth.sso/SAML2/POST" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.missouri.edu/Shibboleth.sso/SAML2/POST" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.missouri.edu/Shibboleth.sso/SAML2/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.umsl.edu/Shibboleth.sso/SAML2/POST" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.umsl.edu/Shibboleth.sso/SAML2/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.mst.edu/Shibboleth.sso/SAML2/POST" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.mst.edu/Shibboleth.sso/SAML2/POST" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.sandburg.edu/Shibboleth.sso/SAML2/POST" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.sandburg.edu/Shibboleth.sso/SAML2/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.utsa.edu/Shibboleth.sso/SAML2/POST" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.utsa.edu/Shibboleth.sso/SAML2/POST" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-next.uvm.edu/Shibboleth.sso/SAML2/POST" index="38"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-current.uvm.edu/Shibboleth.sso/SAML2/POST" index="39"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.lehigh.edu/Shibboleth.sso/SAML2/POST" index="40"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.lehigh.edu/Shibboleth.sso/SAML2/POST" index="41"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courseadmin.ou.edu/Shibboleth.sso/SAML2/POST" index="42"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uthscsa.edu/Shibboleth.sso/SAML2/POST" index="43"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uthscsa.edu/Shibboleth.sso/SAML2/POST" index="44"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-nextcatalog.jhu.edu/Shibboleth.sso/SAML2/POST" index="45"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-currentcatalog.jhu.edu/Shibboleth.sso/SAML2/POST" index="46"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.ku.edu/Shibboleth.sso/SAML2/POST" index="47"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.ku.edu/Shibboleth.sso/SAML2/POST" index="48"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uoregon.edu/Shibboleth.sso/SAML2/POST" index="49"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uoregon.edu/Shibboleth.sso/SAML2/POST" index="50"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uis.edu/Shibboleth.sso/SAML2/POST" index="51"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uis.edu/Shibboleth.sso/SAML2/POST" index="52"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uic.edu/Shibboleth.sso/SAML2/POST" index="53"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uic.edu/Shibboleth.sso/SAML2/POST" index="54"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.bulletin.gwu.edu/Shibboleth.sso/SAML2/POST" index="55"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.bulletin.gwu.edu/Shibboleth.sso/SAML2/POST" index="56"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcourses.illinois.edu/Shibboleth.sso/SAML2/POST" index="57"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcourses.illinois.edu/Shibboleth.sso/SAML2/POST" index="58"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.csusb.edu/Shibboleth.sso/SAML2/POST" index="59"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.csusb.edu/Shibboleth.sso/SAML2/POST" index="60"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.apu.edu/Shibboleth.sso/SAML2/POST" index="61"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.apu.edu/Shibboleth.sso/SAML2/POST" index="62"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.umkc.edu/Shibboleth.sso/SAML2/POST" index="63"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://editcatalog.umkc.edu/Shibboleth.sso/SAML2/POST" index="64"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.creighton.edu/Shibboleth.sso/SAML2/POST" index="65"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.creighton.edu/Shibboleth.sso/SAML2/POST" index="66"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classplanning.northwestern.edu/Shibboleth.sso/SAML2/POST" index="67"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.towson.edu/Shibboleth.sso/SAML2/POST" index="68"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.towson.edu/Shibboleth.sso/SAML2/POST" index="69"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-next.courseleaf.com/Shibboleth.sso/SAML2/POST" index="70"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="71"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.njit.edu/Shibboleth.sso/SAML2/POST" index="72"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.njit.edu/Shibboleth.sso/SAML2/POST" index="73"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://northwestern-dev.courseleaf.com/Shibboleth.sso/SAML2/POST" index="74"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.temple.edu/Shibboleth.sso/SAML2/POST" index="75"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.temple.edu/Shibboleth.sso/SAML2/POST" index="76"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="77"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="78"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.mtholyoke.edu/Shibboleth.sso/SAML2/POST" index="79"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.mtholyoke.edu/Shibboleth.sso/SAML2/POST" index="80"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uwgb.edu/Shibboleth.sso/SAML2/POST" index="81"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uwgb.edu/Shibboleth.sso/SAML2/POST" index="82"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.twu.edu/Shibboleth.sso/SAML2/POST" index="83"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.twu.edu/Shibboleth.sso/SAML2/POST" index="84"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.stolaf.edu/Shibboleth.sso/SAML2/POST" index="85"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currcatalog.stolaf.edu/Shibboleth.sso/SAML2/POST" index="86"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.colostate.edu/Shibboleth.sso/SAML2/POST" index="87"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-dev.mit.edu/Shibboleth.sso/SAML2/POST" index="88"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mit-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="89"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colostate-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="90"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.udayton.edu/Shibboleth.sso/SAML2/POST" index="91"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.udayton.edu/Shibboleth.sso/SAML2/POST" index="92"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utexas-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="93"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uic-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="94"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-test.uwplatt.edu/Shibboleth.sso/SAML2/POST" index="95"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.mycatalog.txstate.edu/Shibboleth.sso/SAML2/POST" index="96"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.mycatalog.txstate.edu/Shibboleth.sso/SAML2/POST" index="97"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-bulletin.miami.edu/Shibboleth.sso/SAML2/POST" index="98"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miami-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="99"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uah.edu/Shibboleth.sso/SAML2/POST" index="100"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uah-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="101"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextschedule.unomaha.edu/Shibboleth.sso/SAML2/POST" index="102"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.shsu.edu/Shibboleth.sso/SAML2/POST" index="103"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shsu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="104"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.northeastern.edu/Shibboleth.sso/SAML2/POST" index="105"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://northeastern-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="106"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stanford-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="107"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easyschedule.fau.edu/Shibboleth.sso/SAML2/POST" index="108"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uci-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="109"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.ou.edu/Shibboleth.sso/SAML2/POST" index="110"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ou-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="111"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unomaha-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="112"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uwec.edu/Shibboleth.sso/SAML2/POST" index="113"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwec-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="114"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.registrar.iastate.edu/Shibboleth.sso/SAML2/POST" index="115"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.registrar.iastate.edu/Shibboleth.sso/SAML2/POST" index="116"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://georgetown-next.courseleaf.com/Shibboleth.sso/SAML2/POST" index="117"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uaf.edu/Shibboleth.sso/SAML2/POST" index="118"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uaf-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="119"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mines-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="120"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mines-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="121"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.mines.edu/Shibboleth.sso/SAML2/POST" index="122"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.mines.edu/Shibboleth.sso/SAML2/POST" index="123"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatech-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="124"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-next.gatech.edu/Shibboleth.sso/SAML2/POST" index="125"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://temple-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="126"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uvu.edu/Shibboleth.sso/SAML2/POST" index="127"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uvu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="128"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwplatt-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="129"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.unc.edu/Shibboleth.sso/SAML2/POST" index="130"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unc-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="131"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.sfsu.edu/Shibboleth.sso/SAML2/POST" index="132"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sfsu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="133"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devcatalog.utep.edu/Shibboleth.sso/SAML2/POST" index="134"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testcatalog.utep.edu/Shibboleth.sso/SAML2/POST" index="135"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-guide.wisc.edu/Shibboleth.sso/SAML2/POST" index="136"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisc-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="137"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="138"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catdev.colorado.edu/Shibboleth.sso/SAML2/POST" index="139"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colorado-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="140"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courseleaf.rice.edu/Shibboleth.sso/SAML2/POST" index="141"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">CourseLeaf</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Leepfrog Technologies CourseLeaf</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Leepfrog Technologies, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leepfrog Technologies, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leepfrog.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Wes Bachman</md:GivenName>
-      <md:EmailAddress>wbachman@leepfrog.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.courseleaf.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currbulletin.wustl.edu/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.wustl.edu/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursecatalog-new.web.cmu.edu/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upcomingcatalog.uchicago.edu/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stagingcatalog.uchicago.edu/Shibboleth.sso/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.odu.edu/Shibboleth.sso/SAML2/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.odu.edu/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-catalog.ncsu.edu/Shibboleth.sso/SAML2/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current-catalog.ncsu.edu/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exploredegrees-admin.stanford.edu/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exploredegrees-nextyear.stanford.edu/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.brown.edu/Shibboleth.sso/SAML2/POST" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.brown.edu/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uark.edu/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uark.edu/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.utexas.edu/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currcatalog.utexas.edu/Shibboleth.sso/SAML2/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog-admin.calpoly.edu/Shibboleth.sso/SAML2/POST" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog-admin.calpoly.edu/Shibboleth.sso/SAML2/POST" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.missouri.edu/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.missouri.edu/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.umsl.edu/Shibboleth.sso/SAML2/POST" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.umsl.edu/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.mst.edu/Shibboleth.sso/SAML2/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.mst.edu/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.sandburg.edu/Shibboleth.sso/SAML2/POST" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.sandburg.edu/Shibboleth.sso/SAML2/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.utsa.edu/Shibboleth.sso/SAML2/POST" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.utsa.edu/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-next.uvm.edu/Shibboleth.sso/SAML2/POST" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-current.uvm.edu/Shibboleth.sso/SAML2/POST" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.lehigh.edu/Shibboleth.sso/SAML2/POST" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.lehigh.edu/Shibboleth.sso/SAML2/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courseadmin.ou.edu/Shibboleth.sso/SAML2/POST" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uthscsa.edu/Shibboleth.sso/SAML2/POST" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uthscsa.edu/Shibboleth.sso/SAML2/POST" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-nextcatalog.jhu.edu/Shibboleth.sso/SAML2/POST" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-currentcatalog.jhu.edu/Shibboleth.sso/SAML2/POST" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.ku.edu/Shibboleth.sso/SAML2/POST" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.ku.edu/Shibboleth.sso/SAML2/POST" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uoregon.edu/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uoregon.edu/Shibboleth.sso/SAML2/POST" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uis.edu/Shibboleth.sso/SAML2/POST" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uis.edu/Shibboleth.sso/SAML2/POST" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uic.edu/Shibboleth.sso/SAML2/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uic.edu/Shibboleth.sso/SAML2/POST" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.bulletin.gwu.edu/Shibboleth.sso/SAML2/POST" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.bulletin.gwu.edu/Shibboleth.sso/SAML2/POST" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcourses.illinois.edu/Shibboleth.sso/SAML2/POST" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcourses.illinois.edu/Shibboleth.sso/SAML2/POST" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.csusb.edu/Shibboleth.sso/SAML2/POST" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.csusb.edu/Shibboleth.sso/SAML2/POST" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.apu.edu/Shibboleth.sso/SAML2/POST" index="61"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.apu.edu/Shibboleth.sso/SAML2/POST" index="62"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.umkc.edu/Shibboleth.sso/SAML2/POST" index="63"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://editcatalog.umkc.edu/Shibboleth.sso/SAML2/POST" index="64"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.creighton.edu/Shibboleth.sso/SAML2/POST" index="65"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.creighton.edu/Shibboleth.sso/SAML2/POST" index="66"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classplanning.northwestern.edu/Shibboleth.sso/SAML2/POST" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.towson.edu/Shibboleth.sso/SAML2/POST" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.towson.edu/Shibboleth.sso/SAML2/POST" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-next.courseleaf.com/Shibboleth.sso/SAML2/POST" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.njit.edu/Shibboleth.sso/SAML2/POST" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalog.njit.edu/Shibboleth.sso/SAML2/POST" index="73"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://northwestern-dev.courseleaf.com/Shibboleth.sso/SAML2/POST" index="74"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.temple.edu/Shibboleth.sso/SAML2/POST" index="75"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.temple.edu/Shibboleth.sso/SAML2/POST" index="76"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="77"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.catalogue.uci.edu/Shibboleth.sso/SAML2/POST" index="78"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.mtholyoke.edu/Shibboleth.sso/SAML2/POST" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.mtholyoke.edu/Shibboleth.sso/SAML2/POST" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uwgb.edu/Shibboleth.sso/SAML2/POST" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.uwgb.edu/Shibboleth.sso/SAML2/POST" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.twu.edu/Shibboleth.sso/SAML2/POST" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.twu.edu/Shibboleth.sso/SAML2/POST" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.stolaf.edu/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currcatalog.stolaf.edu/Shibboleth.sso/SAML2/POST" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.catalog.colostate.edu/Shibboleth.sso/SAML2/POST" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-dev.mit.edu/Shibboleth.sso/SAML2/POST" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mit-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colostate-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.udayton.edu/Shibboleth.sso/SAML2/POST" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.udayton.edu/Shibboleth.sso/SAML2/POST" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utexas-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uic-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-test.uwplatt.edu/Shibboleth.sso/SAML2/POST" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next.mycatalog.txstate.edu/Shibboleth.sso/SAML2/POST" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://current.mycatalog.txstate.edu/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-bulletin.miami.edu/Shibboleth.sso/SAML2/POST" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miami-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uah.edu/Shibboleth.sso/SAML2/POST" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uah-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextschedule.unomaha.edu/Shibboleth.sso/SAML2/POST" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.shsu.edu/Shibboleth.sso/SAML2/POST" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shsu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.northeastern.edu/Shibboleth.sso/SAML2/POST" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://northeastern-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stanford-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easyschedule.fau.edu/Shibboleth.sso/SAML2/POST" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uci-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.ou.edu/Shibboleth.sso/SAML2/POST" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ou-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unomaha-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uwec.edu/Shibboleth.sso/SAML2/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwec-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.registrar.iastate.edu/Shibboleth.sso/SAML2/POST" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentcatalog.registrar.iastate.edu/Shibboleth.sso/SAML2/POST" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://georgetown-next.courseleaf.com/Shibboleth.sso/SAML2/POST" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uaf.edu/Shibboleth.sso/SAML2/POST" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uaf-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mines-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="120"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mines-prior.courseleaf.com/Shibboleth.sso/SAML2/POST" index="121"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.mines.edu/Shibboleth.sso/SAML2/POST" index="122"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://currentbulletin.mines.edu/Shibboleth.sso/SAML2/POST" index="123"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatech-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="124"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog-next.gatech.edu/Shibboleth.sso/SAML2/POST" index="125"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://temple-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="126"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.uvu.edu/Shibboleth.sso/SAML2/POST" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uvu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="128"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwplatt-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="129"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextcatalog.unc.edu/Shibboleth.sso/SAML2/POST" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unc-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="131"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nextbulletin.sfsu.edu/Shibboleth.sso/SAML2/POST" index="132"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sfsu-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="133"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devcatalog.utep.edu/Shibboleth.sso/SAML2/POST" index="134"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testcatalog.utep.edu/Shibboleth.sso/SAML2/POST" index="135"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://next-guide.wisc.edu/Shibboleth.sso/SAML2/POST" index="136"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisc-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="137"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uww-test.courseleaf.com/Shibboleth.sso/SAML2/POST" index="138"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catdev.colorado.edu/Shibboleth.sso/SAML2/POST" index="139"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colorado-curr.courseleaf.com/Shibboleth.sso/SAML2/POST" index="140"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courseleaf.rice.edu/Shibboleth.sso/SAML2/POST" index="141"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CourseLeaf</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Leepfrog Technologies CourseLeaf</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leepfrog Technologies, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leepfrog Technologies, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leepfrog.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wes Bachman</md:GivenName>
+    <md:EmailAddress>wbachman@leepfrog.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml
index 02ef566e..830b90fb 100644
--- a/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.csub.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csub.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Bakersfield</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csub.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Bakersfield</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFxTCCBK2gAwIBAgIQPc05I8UKJsaaDlPUHfscQzANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -51,13 +51,13 @@ Cuph5aZTUR+pAj4g+ks54l5X6Q0hj6VBKInLv7DwXcwizR56O3e/fV6E49qNm2YF
 4tYQJZJ8/YKA8V2GzKr2k64ZpHIBYg3k3XLEJ6mSpP2XWYc5Lkx0VgTk9PiSPrzz
 QF+Q3+1t51b68ryVpJeqcC9J/6pKQDd18xvgtLXJFKoIzs68rKYsUfA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVANTK3G8C7AHnSEGrmCj2kqRBk2pBMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVkdTAeFw0xMDA1MjQyMTQw
 MzZaFw0zMDA1MjQyMTQwMzZaMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVk
@@ -77,23 +77,23 @@ o+UtOXA0Di8W4M4d00na+QjugX9++yOX+88VYqnbzldY5M1VTWJCSsSY9kbtNtRO
 xMhd5OBqZzYJDvXNjaJrMGbFjw+lYQfFaR6/SYVfjihaGN38RlOqxMLZlIV/DwSZ
 WYA2GI4Dt+c=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.csub.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.csub.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.csub.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.csub.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.csub.edu/idp/profile/Shibboleth/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csub.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.csub.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.csub.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.csub.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.csub.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.csub.edu/idp/profile/Shibboleth/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csub.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFxTCCBK2gAwIBAgIQPc05I8UKJsaaDlPUHfscQzANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -126,13 +126,13 @@ Cuph5aZTUR+pAj4g+ks54l5X6Q0hj6VBKInLv7DwXcwizR56O3e/fV6E49qNm2YF
 4tYQJZJ8/YKA8V2GzKr2k64ZpHIBYg3k3XLEJ6mSpP2XWYc5Lkx0VgTk9PiSPrzz
 QF+Q3+1t51b68ryVpJeqcC9J/6pKQDd18xvgtLXJFKoIzs68rKYsUfA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVANTK3G8C7AHnSEGrmCj2kqRBk2pBMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVkdTAeFw0xMDA1MjQyMTQw
 MzZaFw0zMDA1MjQyMTQwMzZaMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVk
@@ -152,18 +152,18 @@ o+UtOXA0Di8W4M4d00na+QjugX9++yOX+88VYqnbzldY5M1VTWJCSsSY9kbtNtRO
 xMhd5OBqZzYJDvXNjaJrMGbFjw+lYQfFaR6/SYVfjihaGN38RlOqxMLZlIV/DwSZ
 WYA2GI4Dt+c=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.csub.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Bakersfield</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Bakersfield</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csub.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Network Operations Center</md:GivenName>
-      <md:EmailAddress>netops@csub.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.csub.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Bakersfield</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Bakersfield</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csub.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Network Operations Center</md:GivenName>
+    <md:EmailAddress>netops@csub.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
index 5f75297c..2eaef8f1 100644
--- a/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.dr.ufu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMjAwBgNVBAoUKVVGVSAtIFVuaXZ
 lcnNpZGFkZSBGZWRlcmFsIGRlIFViZXJsw6JuZGlhMTMwMQYDVQQLFCpDVEkgLSBDZW
 50cm8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHDAaBgkqhkiG9w0BCQEWD
@@ -46,26 +46,26 @@ G94QZbel2spNfB+Z8JzZcgyIGCjGAscPX+9CA07ie02x9jIOOC9JNlDGgfwhbWmzg97
 aCMtX+kA/sVbLZxQwFlKqaRyDcKQUKzz7wTzhBZMz8etcMkkzfKA0FINRU5bSTenRjX
 hSn3iPrOyRPY80Vexzr4=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dr.ufu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dr.ufu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dr.ufu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dr.ufu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMjAwBgNVBAoUKVVGVSAtIFVuaXZ
 lcnNpZGFkZSBGZWRlcmFsIGRlIFViZXJsw6JuZGlhMTMwMQYDVQQLFCpDVEkgLSBDZW
@@ -91,24 +91,24 @@ aCMtX+kA/sVbLZxQwFlKqaRyDcKQUKzz7wTzhBZMz8etcMkkzfKA0FINRU5bSTenRjX
 hSn3iPrOyRPY80Vexzr4=
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Divisao de Redes</md:SurName>
-      <md:EmailAddress>dr@cti.ufu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Divisao de Redes</md:SurName>
+    <md:EmailAddress>dr@cti.ufu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml
index e0a6f9d0..91b234a6 100644
--- a/swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.dur.ac.uk:444/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Durham test (Do not use)</mdui:DisplayName>
+        <mdui:Logo height="101" width="90">https://shib.dur.ac.uk:444/idp/images/du90x101.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.dur.ac.uk:444/idp/images/du16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Durham test (Do not use)</mdui:DisplayName>
-          <mdui:Logo height="101" width="90">https://shib.dur.ac.uk:444/idp/images/du90x101.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib.dur.ac.uk:444/idp/images/du16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
 						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
 						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
@@ -44,26 +44,26 @@
 						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
 						CDgIrJGVkQXCNg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk:444/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk:444/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
 						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
 						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
@@ -87,27 +87,27 @@
 						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
 						CDgIrJGVkQXCNg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Durham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Durham test (Do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dur.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:m.a.young@durham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:m.a.young@durham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Durham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Durham test (Do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dur.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:m.a.young@durham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:m.a.young@durham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml b/swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml
index 59a6b391..d7063b09 100644
--- a/swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.exprodo.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-23T14:30:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-23T14:30:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Exprodo Software</mdui:DisplayName>
+        <mdui:Logo height="100" width="271">https://www.exprodo.com/wp-content/uploads/2014/10/exprodo-software_271x100.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Web-based database and research/clinical bookings and facility management software</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.exprodo.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.exprodo.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Exprodo Software</mdui:DisplayName>
-          <mdui:Logo height="100" width="271">https://www.exprodo.com/wp-content/uploads/2014/10/exprodo-software_271x100.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Web-based database and research/clinical bookings and facility management software</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.exprodo.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.exprodo.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
 						MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
@@ -53,43 +53,43 @@
 						29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
 						lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.exprodo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.exprodo.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.exprodo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Exprodo Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Exprodo Software</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exprodo.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.exprodo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.exprodo.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.exprodo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Exprodo Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Exprodo Software</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exprodo.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:paul@exprodo.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml
index 9d3b21e6..866c9d31 100644
--- a/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.fortlewis.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fortlewis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Fort Lewis College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fortlewis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Fort Lewis College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAKAwA2GeOWnox0HE2Cs9vOZ+vGNlMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVkdTAeFw0xMzA4MTYxMzMz
 MzVaFw0yODA4MTYxMzMzMzVaMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVk
@@ -38,13 +38,13 @@ L44iLiEoDtkonZHj80wAxweX2ZKTUV3Zx1rN9izq0/7Wmcs8d7kxK/fUvSRMOLeY
 aQ3ZXyJG9G28xL1x7mCjLJ8atZIXr+Y74eG0dH+02TBR8zBwIOwfRORG+2XdydG+
 Zw/pUkWhDXU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFFTCCA/2gAwIBAgIRAPUWamBIK1aXyICncL6wac0wDQYJKoZIhvcNAQEFBQAw
 UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
 b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMjEwMTcwMDAw
@@ -74,23 +74,23 @@ VTadJwCCueFoLeybzutNJ4IOELLDRvFcea2IY9C+c31MowYoa+hV75HqXGpgnvGU
 T7QYiZ2Vq8KFk/pYWOQfBPkGVcosrLHHv7I3n8BsdY2I/hcCluZah/E9hNo6nXgC
 Cl7+smoK7FL0
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.fortlewis.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.fortlewis.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.fortlewis.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.fortlewis.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.fortlewis.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fortlewis.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.fortlewis.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.fortlewis.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.fortlewis.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.fortlewis.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.fortlewis.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fortlewis.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAKAwA2GeOWnox0HE2Cs9vOZ+vGNlMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVkdTAeFw0xMzA4MTYxMzMz
 MzVaFw0yODA4MTYxMzMzMzVaMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVk
@@ -110,13 +110,13 @@ L44iLiEoDtkonZHj80wAxweX2ZKTUV3Zx1rN9izq0/7Wmcs8d7kxK/fUvSRMOLeY
 aQ3ZXyJG9G28xL1x7mCjLJ8atZIXr+Y74eG0dH+02TBR8zBwIOwfRORG+2XdydG+
 Zw/pUkWhDXU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFFTCCA/2gAwIBAgIRAPUWamBIK1aXyICncL6wac0wDQYJKoZIhvcNAQEFBQAw
 UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
 b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMjEwMTcwMDAw
@@ -146,26 +146,26 @@ VTadJwCCueFoLeybzutNJ4IOELLDRvFcea2IY9C+c31MowYoa+hV75HqXGpgnvGU
 T7QYiZ2Vq8KFk/pYWOQfBPkGVcosrLHHv7I3n8BsdY2I/hcCluZah/E9hNo6nXgC
 Cl7+smoK7FL0
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.fortlewis.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Fort Lewis College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Fort Lewis College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://explore.fortlewis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>James Bodine</md:GivenName>
-      <md:EmailAddress>bodine_j@fortlewis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary Maxwell</md:GivenName>
-      <md:EmailAddress>maxwell_g@fortlewis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gary Maxwell</md:GivenName>
-      <md:EmailAddress>maxwell_g@fortlewis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.fortlewis.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Fort Lewis College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Fort Lewis College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://explore.fortlewis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>James Bodine</md:GivenName>
+    <md:EmailAddress>bodine_j@fortlewis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary Maxwell</md:GivenName>
+    <md:EmailAddress>maxwell_g@fortlewis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gary Maxwell</md:GivenName>
+    <md:EmailAddress>maxwell_g@fortlewis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml
index 7acd3531..59d18e8b 100644
--- a/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.gcu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-03T11:52:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-03T11:52:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUGOsthEUhMn8ZqSRhbf29aeFD9OswDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOc2hpYi5nY3UuYWMudWswHhcNMTQwNDAxMTUxOTAwWhcN
 						MzQwNDAxMTUxOTAwWjAZMRcwFQYDVQQDEw5zaGliLmdjdS5hYy51azCCASIwDQYJ
@@ -31,29 +31,29 @@
 						OK8MOQIZBD6o4lZJNsg2YCUHuHMDE3hrYDZQjraE7R6GcyC9lkaHNonm1lQKf+oP
 						/0/rNHQNKC7TUfL8iAQ4ZPlfaXK3Joo2G+NL8Pg6ldPP1hBDvnvt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.gcu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.gcu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUGOsthEUhMn8ZqSRhbf29aeFD9OswDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOc2hpYi5nY3UuYWMudWswHhcNMTQwNDAxMTUxOTAwWhcN
 						MzQwNDAxMTUxOTAwWjAZMRcwFQYDVQQDEw5zaGliLmdjdS5hYy51azCCASIwDQYJ
@@ -72,25 +72,25 @@
 						OK8MOQIZBD6o4lZJNsg2YCUHuHMDE3hrYDZQjraE7R6GcyC9lkaHNonm1lQKf+oP
 						/0/rNHQNKC7TUfL8iAQ4ZPlfaXK3Joo2G+NL8Pg6ldPP1hBDvnvt
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Glasgow Caledonian University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glasgow Caledonian University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gcu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:ddil@gcu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:ddil@gcu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Glasgow Caledonian University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow Caledonian University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gcu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:ddil@gcu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:ddil@gcu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.globaldata.com-shibboleth.xml b/swamid-interfederations-2.0/shib.globaldata.com-shibboleth.xml
index 24839dc3..e44eab89 100644
--- a/swamid-interfederations-2.0/shib.globaldata.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.globaldata.com-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.globaldata.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-25T15:12:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-25T15:12:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.globaldata.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.globaldata.com/Shibboleth.sso/UKfederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.globaldata.com/Shibboleth.sso/UKfederation" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.globaldata.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.globaldata.com/Shibboleth.sso/UKfederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.globaldata.com/Shibboleth.sso/UKfederation" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFTCCAf2gAwIBAgIJAIPtXUnJnE1GMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnBkbTc2d2ViMjEucGRtMTZkYXRhLmxvY2FsMB4XDTE2MDIyNDEyMjQyOFoX
 						DTI2MDIyMTEyMjQyOFowJTEjMCEGA1UEAxMacGRtNzZ3ZWIyMS5wZG0xNmRhdGEu
@@ -49,63 +49,63 @@
 						YurWPT+UtAXIsDyZ+/PTwDFBA6VF/WsKMPuvwzt/20b/dJeR3lmA2OHJ9XSnqSly
 						AZjDyGL+M78bgGAJHAB3ULGowwH4yckkYg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.globaldata.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Marketline Advantage</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Geoffrey</md:GivenName>
-      <md:SurName>Hogg</md:SurName>
-      <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Geoffrey</md:GivenName>
-      <md:SurName>Hogg</md:SurName>
-      <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.globaldata.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Marketline Advantage</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Geoffrey</md:GivenName>
+    <md:SurName>Hogg</md:SurName>
+    <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:assad.imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:panagiotis.sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoffrey</md:GivenName>
+    <md:SurName>Hogg</md:SurName>
+    <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml
index 2711a8b0..4a686c59 100644
--- a/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.hope.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hope.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hope.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUF9LBjyyNarRHVF85JrS8jx1eFDIwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMB4XDTEzMDcxNjA4NDgyMloX
 						DTMzMDcxNjA4NDgyMlowGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMIIBIjAN
@@ -29,26 +29,26 @@
 						rGFF1QHnMhz7uidDubpoJ6ZJtPhXIr+eFPw15Y0P4Rw9rTFGKofJ5lbX7FleuQJv
 						wMyh37KZ3ivrQ8dpKTnnMnKyckECdFT0jqYAZHMeHLWiRYfxAAXi3mqDzQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.hope.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.hope.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.hope.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.hope.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hope.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.hope.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.hope.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.hope.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.hope.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hope.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIUF9LBjyyNarRHVF85JrS8jx1eFDIwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMB4XDTEzMDcxNjA4NDgyMloX
 						DTMzMDcxNjA4NDgyMlowGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMIIBIjAN
@@ -67,27 +67,27 @@
 						rGFF1QHnMhz7uidDubpoJ6ZJtPhXIr+eFPw15Y0P4Rw9rTFGKofJ5lbX7FleuQJv
 						wMyh37KZ3ivrQ8dpKTnnMnKyckECdFT0jqYAZHMeHLWiRYfxAAXi3mqDzQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Liverpool Hope University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Liverpool Hope University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hope.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Beecroft</md:SurName>
-      <md:EmailAddress>mailto:beecrom@hope.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeff</md:GivenName>
-      <md:SurName>Stone</md:SurName>
-      <md:EmailAddress>mailto:stonej@hope.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Liverpool Hope University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Liverpool Hope University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hope.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Beecroft</md:SurName>
+    <md:EmailAddress>mailto:beecrom@hope.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeff</md:GivenName>
+    <md:SurName>Stone</md:SurName>
+    <md:EmailAddress>mailto:stonej@hope.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml
index ffbdd7e8..f755aebd 100644
--- a/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.hopwood.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-25T16:02:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-25T16:02:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hopwood.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hopwood.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEsTCCA5mgAwIBAgIRALnjZG05JaVVoUZ0xE0JifUwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMTA4MTgwMDAwMDBaFw0xNDA4MTcyMzU5NTlaMIGIMQswCQYD
@@ -40,26 +40,26 @@
 						AFrPIiFp7CO63f1PksTxW1WEYIs2h5iRHPJlUY0TCpOti+PO+h4WIKCL3jAvhcMH
 						u1oFYBY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.hopwood.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hopwood.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.hopwood.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hopwood.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEsTCCA5mgAwIBAgIRALnjZG05JaVVoUZ0xE0JifUwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMTA4MTgwMDAwMDBaFw0xNDA4MTcyMzU5NTlaMIGIMQswCQYD
@@ -87,27 +87,27 @@
 						AFrPIiFp7CO63f1PksTxW1WEYIs2h5iRHPJlUY0TCpOti+PO+h4WIKCL3jAvhcMH
 						u1oFYBY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hopwood Hall College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hopwood Hall College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hopwood.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Les</md:GivenName>
-      <md:SurName>Douthwaite</md:SurName>
-      <md:EmailAddress>mailto:Les.Douthwaite@hopwood.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Les</md:GivenName>
-      <md:SurName>Douthwaite</md:SurName>
-      <md:EmailAddress>mailto:Les.Douthwaite@hopwood.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hopwood Hall College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hopwood Hall College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hopwood.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Les</md:GivenName>
+    <md:SurName>Douthwaite</md:SurName>
+    <md:EmailAddress>mailto:Les.Douthwaite@hopwood.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Les</md:GivenName>
+    <md:SurName>Douthwaite</md:SurName>
+    <md:EmailAddress>mailto:Les.Douthwaite@hopwood.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
index c4cb5493..136619bd 100644
--- a/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ifgoiano.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifgoiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifgoiano.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
 IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
 ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
@@ -47,26 +47,26 @@ m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
 0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
 t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ifgoiano.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ifgoiano.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
 IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
@@ -93,24 +93,24 @@ m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
 t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFGOIANO - Instituto Federal Goiano</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifgoiano.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Frederico Pereira da Cunha</md:SurName>
-      <md:EmailAddress>frederico.pereira@ifgoiano.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFGOIANO - Instituto Federal Goiano</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifgoiano.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frederico Pereira da Cunha</md:SurName>
+    <md:EmailAddress>frederico.pereira@ifgoiano.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
index 22447504..990d1666 100644
--- a/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ihs.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-06-03T09:19:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-06-03T09:19:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihs.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Höhere Studien (IHS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Advanced Studies (IHS)</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ihs.ac.at/</mdui:InformationURL>
+        <mdui:Logo width="312" height="53">https://shib.ihs.ac.at/logo.jpg</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://shib.ihs.ac.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>78.104.136.0/21</mdui:IPHint>
+        <mdui:DomainHint>ihs.ac.at</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:48.19539,16.34310</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihs.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Institut für Höhere Studien (IHS)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Institute for Advanced Studies (IHS)</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ihs.ac.at/</mdui:InformationURL>
-          <mdui:Logo width="312" height="53">https://shib.ihs.ac.at/logo.jpg</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://shib.ihs.ac.at/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>78.104.136.0/21</mdui:IPHint>
-          <mdui:DomainHint>ihs.ac.at</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:48.19539,16.34310</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAOgeJhXY1VXjDMkzFquM9nu+yZo+MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnNoaWIuaWhzLmFjLmF0MB4XDTE0MDUwOTE1MjU1MloX
 DTM0MDUwOTE1MjU1MlowGTEXMBUGA1UEAxMOc2hpYi5paHMuYWMuYXQwggEiMA0G
@@ -49,32 +49,32 @@ sGSusWJI4ZNZ4/Nd9u4/RJ7te2n84xl9qYQ0RsQ/7vr5Tp31JiFlsi+0nrUr6y0N
 lEVKAYqUEoEwL/X/qMs2kR2kp148SaKFZ5JwjiFjss9eXOIMwJuue5khX4on7WkB
 JLo91A2mOkXHy02yCevI30nGPpmdkozBkfz59uy1k2gzB0XQ85jQuw==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ihs.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ihs.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ihs.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Institut für Höhere Studien</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Institute for Advanced Studies</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Institut für Höhere Studien (IHS)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Studies (IHS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ihs.ac.at/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IHS</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@ihs.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ihs.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ihs.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ihs.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Institut für Höhere Studien</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Institute for Advanced Studies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Institut für Höhere Studien (IHS)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Studies (IHS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ihs.ac.at/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IHS</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@ihs.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
index 4ed26c4d..6ff4dc6a 100644
--- a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.informit.com.au/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-23T10:04:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-23T10:04:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
+        <mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/DS" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/UKfedWAYF"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/UKfedWAYF" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</mdui:Description>
-          <mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
-          <mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/DS" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.informit.com.au/Shibboleth.sso/UKfedWAYF"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.informit.com.au/Shibboleth.sso/UKfedWAYF" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJAMJQ7W9dNntWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXNoaWJwcmR3czAxLnJtaXQuaW50ZXJuYWwwHhcNMTYwMjE1MjMwNjM0WhcN
 						MjYwMjEyMjMwNjM0WjAkMSIwIAYDVQQDExlzaGlicHJkd3MwMS5ybWl0LmludGVy
@@ -59,76 +59,76 @@
 						EKhu2M87LgaVdkNX7Byh25ha8ELXFBxMcv/uMmImAT53C9rd/4UTLaHQffFVDD1C
 						jMB14stpA71j1X9hdeFzaL/T/NYkww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.informit.com.au/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.informit.com.au/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Informit</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="auEduPersonSharedToken" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RMIT Training Pty Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Informit</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.informit.com.au/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Informit Support</md:GivenName>
-      <md:EmailAddress>mailto:support@rmitpublishing.com.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dominic</md:GivenName>
-      <md:SurName>Crowther</md:SurName>
-      <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Loan</md:GivenName>
-      <md:SurName>Pham</md:SurName>
-      <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paras</md:GivenName>
-      <md:SurName>Daftary</md:SurName>
-      <md:EmailAddress>mailto:paras.daftary@rmit.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.informit.com.au/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.informit.com.au/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Informit</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="auEduPersonSharedToken" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RMIT Training Pty Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Informit</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.informit.com.au/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Informit Support</md:GivenName>
+    <md:EmailAddress>mailto:support@rmitpublishing.com.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dominic</md:GivenName>
+    <md:SurName>Crowther</md:SurName>
+    <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Loan</md:GivenName>
+    <md:SurName>Pham</md:SurName>
+    <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paras</md:GivenName>
+    <md:SurName>Daftary</md:SurName>
+    <md:EmailAddress>mailto:paras.daftary@rmit.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml b/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml
index 5d08ad13..f73a003e 100644
--- a/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ingramdigital.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-02T16:54:25Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-02T16:54:25Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.ingramdigital.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.ingramdigital.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.ingramdigital.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.ingramdigital.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFxDCCBKygAwIBAgIQOpCD+8UZ84TwSedea43aUDANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -44,34 +44,34 @@
 						mMUY52JZtyVONCAvb8UlR67nIEfo1gKWsLqajHh3T39WaAzlqN7wJm+ugOx9WD/S
 						o8jyra7+kME1GlD/W7OIckTkwxoAkB3J8jOgmlzVfOtITlgjTn/iHA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ingramdigital.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingram Digital</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MyiLibrary.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.myilibrary.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Deron</md:GivenName>
-      <md:SurName>Masales</md:SurName>
-      <md:EmailAddress>mailto:dmasales@myilibrary.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Deron</md:GivenName>
-      <md:SurName>Masales</md:SurName>
-      <md:EmailAddress>mailto:dmasales@myilibrary.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ingramdigital.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingram Digital</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MyiLibrary.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.myilibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Deron</md:GivenName>
+    <md:SurName>Masales</md:SurName>
+    <md:EmailAddress>mailto:dmasales@myilibrary.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Deron</md:GivenName>
+    <md:SurName>Masales</md:SurName>
+    <md:EmailAddress>mailto:dmasales@myilibrary.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml b/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml
index 44de30f7..2e1e9c2d 100644
--- a/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml
+++ b/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.labarchives.com/sp/production">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-18T17:36:26Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-18T17:36:26Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.labarchives.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LabArchives</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Electronic Laboratory Notebook, including Professional and Classroom Editions.</mdui:Description>
+        <mdui:Logo height="100" width="100">https://mynotebook.labarchives.com/images/la_beaker.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.labarchives.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LabArchives</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Electronic Laboratory Notebook, including Professional and Classroom Editions.</mdui:Description>
-          <mdui:Logo height="100" width="100">https://mynotebook.labarchives.com/images/la_beaker.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQjCCAiqgAwIBAgIJAN/P3HVfB4O6MA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNV
 						BAMTKWRvbVUtMTItMzEtMzktMDMtMzAtNTQuY29tcHV0ZS0xLmludGVybmFsMB4X
 						DTEyMTIwNDIxMDM1NloXDTIyMTIwMjIxMDM1NlowNDEyMDAGA1UEAxMpZG9tVS0x
@@ -35,33 +35,33 @@
 						yIRaQldYvHwxl9A5OL7ZutupYQ4z+C3c7QNBvrRVvM+bcDqxNVGk4MuhcjBdlIlE
 						/C6n87viaq/ZgIt4Vck1JCGjLbLlqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.labarchives.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.labarchives.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.labarchives.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LabArchives, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LabArchives</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.labarchives.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LabArchives Support</md:GivenName>
-      <md:EmailAddress>mailto:support@labarchives.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Norman</md:GivenName>
-      <md:SurName>Kenney</md:SurName>
-      <md:EmailAddress>mailto:nkenney@labarchives.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.labarchives.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.labarchives.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.labarchives.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LabArchives, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LabArchives</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.labarchives.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LabArchives Support</md:GivenName>
+    <md:EmailAddress>mailto:support@labarchives.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Norman</md:GivenName>
+    <md:SurName>Kenney</md:SurName>
+    <md:EmailAddress>mailto:nkenney@labarchives.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lexisnexis.com.xml b/swamid-interfederations-2.0/shib.lexisnexis.com.xml
index 2ff2477c..9824d466 100644
--- a/swamid-interfederations-2.0/shib.lexisnexis.com.xml
+++ b/swamid-interfederations-2.0/shib.lexisnexis.com.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.lexisnexis.com">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEQzCCAyugAwIBAgIJAKsEBMs9ysWqMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
 						BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYD
 						VQQKEwtMRVhJUy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbTAe
@@ -32,52 +32,52 @@
 						k5wU1ANaeyvxE8/SFlu3Vi9H0z1ga7Cqp/W9SK93M2yf+ThYWfQj685P2pZkFlm9
 						+3eetB5dJG2Q/ZtZB6LI+i7qqpIoe0fMVx/5GS/Le5m1vuHaCU95
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lexisnexis.com/start/shib/post" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lexisnexis.com/start/shib/artifact" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc1-www.lexisnexis.com/start/shib/post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc1-www.lexisnexis.com/start/shib/artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc2-www.lexisnexis.com/start/shib/post" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc2-www.lexisnexis.com/start/shib/artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc3-www.lexisnexis.com/start/shib/post" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc3-www.lexisnexis.com/start/shib/artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc4-www.lexisnexis.com/start/shib/post" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc4-www.lexisnexis.com/start/shib/artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc5-www.lexisnexis.com/start/shib/post" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc5-www.lexisnexis.com/start/shib/artifact" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc6-www.lexisnexis.com/start/shib/post" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc6-www.lexisnexis.com/start/shib/artifact" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc7-www.lexisnexis.com/start/shib/post" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc7-www.lexisnexis.com/start/shib/artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc8-www.lexisnexis.com/start/shib/post" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc8-www.lexisnexis.com/start/shib/artifact" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc9-www.lexisnexis.com/start/shib/post" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc9-www.lexisnexis.com/start/shib/artifact" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc9shib-www.lexisnexis.com/start/shib/post" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc9shib-www.lexisnexis.com/start/shib/artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc10-www.lexisnexis.com/start/shib/post" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc10-www.lexisnexis.com/start/shib/artifact" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc11-www.lexisnexis.com/start/shib/post" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc11-www.lexisnexis.com/start/shib/artifact" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc12-www.lexisnexis.com/start/shib/post" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc12-www.lexisnexis.com/start/shib/artifact" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://release-www.lexisnexis.com/start/shib/post" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://release-www.lexisnexis.com/start/shib/artifact" index="29"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lexis-Nexis Europe Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LexisNexis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lexisnexis.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Key Accounts Support</md:GivenName>
-      <md:EmailAddress>mailto:KeyAccountsSupport@lexisnexis.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:technical.helpdesk@lexisnexis.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lexisnexis.com/start/shib/post" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lexisnexis.com/start/shib/artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc1-www.lexisnexis.com/start/shib/post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc1-www.lexisnexis.com/start/shib/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc2-www.lexisnexis.com/start/shib/post" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc2-www.lexisnexis.com/start/shib/artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc3-www.lexisnexis.com/start/shib/post" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc3-www.lexisnexis.com/start/shib/artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc4-www.lexisnexis.com/start/shib/post" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc4-www.lexisnexis.com/start/shib/artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc5-www.lexisnexis.com/start/shib/post" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc5-www.lexisnexis.com/start/shib/artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc6-www.lexisnexis.com/start/shib/post" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc6-www.lexisnexis.com/start/shib/artifact" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc7-www.lexisnexis.com/start/shib/post" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc7-www.lexisnexis.com/start/shib/artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc8-www.lexisnexis.com/start/shib/post" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc8-www.lexisnexis.com/start/shib/artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc9-www.lexisnexis.com/start/shib/post" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc9-www.lexisnexis.com/start/shib/artifact" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc9shib-www.lexisnexis.com/start/shib/post" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc9shib-www.lexisnexis.com/start/shib/artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc10-www.lexisnexis.com/start/shib/post" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc10-www.lexisnexis.com/start/shib/artifact" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc11-www.lexisnexis.com/start/shib/post" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc11-www.lexisnexis.com/start/shib/artifact" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc12-www.lexisnexis.com/start/shib/post" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc12-www.lexisnexis.com/start/shib/artifact" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://release-www.lexisnexis.com/start/shib/post" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://release-www.lexisnexis.com/start/shib/artifact" index="29"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lexis-Nexis Europe Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LexisNexis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lexisnexis.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Key Accounts Support</md:GivenName>
+    <md:EmailAddress>mailto:KeyAccountsSupport@lexisnexis.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:technical.helpdesk@lexisnexis.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml
index efa4b002..4c556ba3 100644
--- a/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.lynda.com/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFDCCAfygAwIBAgIJAMLZrCd7zl9XMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXd3dy5seW5kYS5jb20wHhcNMTExMDIxMTQ0OTE5WhcNMzExMDE2MTQ0OTE5
 						WjAYMRYwFAYDVQQDEw13d3cubHluZGEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -26,38 +26,38 @@
 						oaHoiht2caAGV9kXMykmV7dAK/qQlkGz1l1/3r+EN/NorVNj2KXJNH6Ut/0rp9o1
 						TJM9F1C2c+z/p0fksgBV2U5qy5W32bkU
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lynda.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lynda.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/ECP" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.lynda.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.lynda.com/Shibboleth.sso/SAML/Artifact" index="8"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lynda.com</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lynda.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lynda.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Flynn</md:SurName>
-      <md:EmailAddress>mailto:mflynn@lynda.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Flynn</md:SurName>
-      <md:EmailAddress>mailto:mflynn@lynda.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lynda.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lynda.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/ECP" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.lynda.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.lynda.com/Shibboleth.sso/SAML/Artifact" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lynda.com</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lynda.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lynda.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Flynn</md:SurName>
+    <md:EmailAddress>mailto:mflynn@lynda.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Flynn</md:SurName>
+    <md:EmailAddress>mailto:mflynn@lynda.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml
index 5dffa4d6..a6996bba 100644
--- a/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.lythamsixth.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-19T12:06:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-19T12:06:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lythamsixth.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lytham Sixth Form College</mdui:DisplayName>
+        <mdui:Logo height="146" width="350">https://shib.lythamsixth.ac.uk/gif/LSF-Logo-350x64.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
+        <mdui:DomainHint>lythamsixth.ac.uk</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lythamsixth.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lytham Sixth Form College</mdui:DisplayName>
-          <mdui:Logo height="146" width="350">https://shib.lythamsixth.ac.uk/gif/LSF-Logo-350x64.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
-          <mdui:DomainHint>lythamsixth.ac.uk</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEdjCCA16gAwIBAgIJAOeox3UBOO8vMA0GCSqGSIb3DQEBCwUAMIG7MQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIw
 						IAYDVQQKExlMeXRoYW0gU2l4dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBT
@@ -53,26 +53,26 @@
 						XuCbJtyKrqjmkL9TD9qXKQBBDxHCqOmGdJRp5EhUyVoC3u3wFDhaUufSXd6K863r
 						jxKoHRU8H+vWtT+cjFopBvaAVyQjqNRoN7zXX5xjecEFsnNkhSgjeZTR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lythamsixth.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lythamsixth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lythamsixth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lythamsixth.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEdjCCA16gAwIBAgIJAOeox3UBOO8vMA0GCSqGSIb3DQEBCwUAMIG7MQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIw
 						IAYDVQQKExlMeXRoYW0gU2l4dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBT
@@ -98,25 +98,25 @@
 						XuCbJtyKrqjmkL9TD9qXKQBBDxHCqOmGdJRp5EhUyVoC3u3wFDhaUufSXd6K863r
 						jxKoHRU8H+vWtT+cjFopBvaAVyQjqNRoN7zXX5xjecEFsnNkhSgjeZTR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Blackpool and The Fylde College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lytham Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lythamsixth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@blackpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical support</md:GivenName>
-      <md:EmailAddress>mailto:shib-tech@blackpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Blackpool and The Fylde College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lytham Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lythamsixth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@blackpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical support</md:GivenName>
+    <md:EmailAddress>mailto:shib-tech@blackpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
index a7432be4..d4ff03fa 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Manchester</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
+        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Manchester</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
-          <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
-          <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
-          <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
-          <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
-          <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
-          <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGTDCCBTSgAwIBAgIRAKqovYJemilLsOjpGizaFjgwDQYJKoZIhvcNAQELBQAw
 						gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 						BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
@@ -74,13 +74,13 @@
 						RmuVUzTOZswHLYbuTcs9oGhhYPfmyzsSZ7KSpK7JRwVQmNM+McKSVmPRUlVFr8hS
 						HhJYh990GQT5rBgj66iBBXAFUAERRh6xQ1qdzSUhXmo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
@@ -106,26 +106,26 @@
 						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
 						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGTDCCBTSgAwIBAgIRAKqovYJemilLsOjpGizaFjgwDQYJKoZIhvcNAQELBQAw
 						gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 						BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
@@ -161,13 +161,13 @@
 						RmuVUzTOZswHLYbuTcs9oGhhYPfmyzsSZ7KSpK7JRwVQmNM+McKSVmPRUlVFr8hS
 						HhJYh990GQT5rBgj66iBBXAFUAERRh6xQ1qdzSUhXmo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
@@ -193,26 +193,26 @@
 						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
 						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Manchester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth support</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-support@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rachid</md:GivenName>
-      <md:SurName>Chalabi</md:SurName>
-      <md:EmailAddress>mailto:r.chalabi@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Manchester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth support</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-support@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rachid</md:GivenName>
+    <md:SurName>Chalabi</md:SurName>
+    <md:EmailAddress>mailto:r.chalabi@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml
index 604c0112..b283389c 100644
--- a/swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.mcnallysmith.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnallysmith.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">McNally Smith College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnallysmith.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">McNally Smith College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYTCCAkmgAwIBAgIVAM47804tppNeaFK403GcGkz0zlxlMA0GCSqGSIb3DQEB
 BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgubWNuYWxseXNtaXRoLmxvY2FsMB4X
 DTExMDUzMTE2Mzg1NloXDTMxMDUzMTE2Mzg1NlowKDEmMCQGA1UEAxMdc2hpYmJv
@@ -39,23 +39,23 @@ DNhPVw00eoP0NCWoIOswqdMAKY3ekPmjwYhllbPkOBFKuWZqUHgEw6RjPEISk99u
 W3wi9jRKmEDn2R/qt1u74BUd6B3UcLSWYQhMd2/dOyTtB4Eux5vRlRsNqx+mbKms
 BcfhYPA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnallysmith.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnallysmith.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnallysmith.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnallysmith.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnallysmith.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnallysmith.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnallysmith.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnallysmith.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYTCCAkmgAwIBAgIVAM47804tppNeaFK403GcGkz0zlxlMA0GCSqGSIb3DQEB
 BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgubWNuYWxseXNtaXRoLmxvY2FsMB4X
 DTExMDUzMTE2Mzg1NloXDTMxMDUzMTE2Mzg1NlowKDEmMCQGA1UEAxMdc2hpYmJv
@@ -76,18 +76,18 @@ DNhPVw00eoP0NCWoIOswqdMAKY3ekPmjwYhllbPkOBFKuWZqUHgEw6RjPEISk99u
 W3wi9jRKmEDn2R/qt1u74BUd6B3UcLSWYQhMd2/dOyTtB4Eux5vRlRsNqx+mbKms
 BcfhYPA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">McNally Smith College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">McNally Smith College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mcnallysmith.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick Kaihoi</md:GivenName>
-      <md:EmailAddress>nick.kaihoi@mcnallysmith.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">McNally Smith College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">McNally Smith College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mcnallysmith.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick Kaihoi</md:GivenName>
+    <md:EmailAddress>nick.kaihoi@mcnallysmith.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml
index 475b880a..a90313ba 100644
--- a/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.mdanderson.org/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdanderson.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas M.D. Anderson Cancer Center</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdanderson.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas M.D. Anderson Cancer Center</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAN9NaOe859o4m2yJ5DUijMku+q4tMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWIubWRhbmRlcnNvbi5vcmcwHhcNMDkxMDAxMjI0
 NjAyWhcNMjkxMDAxMjI0NjAyWjAeMRwwGgYDVQQDExNzaGliLm1kYW5kZXJzb24u
@@ -38,24 +38,24 @@ t0OioSV7pwA9szQp2fCqvp61B5RP1zeUfWJIcjpKYlRCejwboHTN/S40bjxsXJ32
 c6j5VoHLH/WEfXJ262osyqeyDwVPyJZx7WWPWlYY3GCKYxwhrAZSA7A1u8VHe3wD
 qHwdXzHWzbbPX5x9
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mdanderson.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mdanderson.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mdanderson.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mdanderson.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mdanderson.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mdanderson.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdanderson.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mdanderson.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mdanderson.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mdanderson.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mdanderson.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mdanderson.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mdanderson.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdanderson.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAN9NaOe859o4m2yJ5DUijMku+q4tMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWIubWRhbmRlcnNvbi5vcmcwHhcNMDkxMDAxMjI0
 NjAyWhcNMjkxMDAxMjI0NjAyWjAeMRwwGgYDVQQDExNzaGliLm1kYW5kZXJzb24u
@@ -75,23 +75,23 @@ t0OioSV7pwA9szQp2fCqvp61B5RP1zeUfWJIcjpKYlRCejwboHTN/S40bjxsXJ32
 c6j5VoHLH/WEfXJ262osyqeyDwVPyJZx7WWPWlYY3GCKYxwhrAZSA7A1u8VHe3wD
 qHwdXzHWzbbPX5x9
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mdanderson.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mdanderson.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas M.D. Anderson Cancer Center</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas M.D. Anderson Cancer Center</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mdanderson.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>MDACC IdM Support</md:GivenName>
-      <md:EmailAddress>idm@mdanderson.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MDACC 4Info</md:GivenName>
-      <md:EmailAddress>4info@mdanderson.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mdanderson.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mdanderson.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas M.D. Anderson Cancer Center</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas M.D. Anderson Cancer Center</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mdanderson.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>MDACC IdM Support</md:GivenName>
+    <md:EmailAddress>idm@mdanderson.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MDACC 4Info</md:GivenName>
+    <md:EmailAddress>4info@mdanderson.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml
index 1ca1a508..40c5ea71 100644
--- a/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.med.cornell.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shib.med.cornell.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.cornell.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Weill Cornell Medical College</mdui:DisplayName>
+        <mdui:Logo height="87" width="360" xml:lang="en">https://shib.med.cornell.edu/idp/images/wcmc.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shib.med.cornell.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.cornell.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Weill Cornell Medical College</mdui:DisplayName>
-          <mdui:Logo height="87" width="360" xml:lang="en">https://shib.med.cornell.edu/idp/images/wcmc.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVALf2UjTulHPvT1Tql4y9F07IaKUoMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWIubWVkLmNvcm5lbGwuZWR1MB4XDTExMTIxMjIz
 NDMwMVoXDTMxMTIxMjIzNDMwMVowHzEdMBsGA1UEAxMUc2hpYi5tZWQuY29ybmVs
@@ -42,23 +42,23 @@ NbQ++tq32Y01h5+LgfGaK0QJ1nkUthT09OtyT/1Zs1X5plOvUvCHpfCcq9exE/G9
 8AZTYkxqWSzEVVXNh2dglaskxIfxRaKfTsznYfuqu+sDLNWPDiP7TCJ5pBHUSqO/
 MkcicsifJ9hvJTUFVS7mSg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.med.cornell.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.med.cornell.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.med.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.cornell.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.med.cornell.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.med.cornell.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.med.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.cornell.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVALf2UjTulHPvT1Tql4y9F07IaKUoMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWIubWVkLmNvcm5lbGwuZWR1MB4XDTExMTIxMjIz
 NDMwMVoXDTMxMTIxMjIzNDMwMVowHzEdMBsGA1UEAxMUc2hpYi5tZWQuY29ybmVs
@@ -78,22 +78,22 @@ NbQ++tq32Y01h5+LgfGaK0QJ1nkUthT09OtyT/1Zs1X5plOvUvCHpfCcq9exE/G9
 8AZTYkxqWSzEVVXNh2dglaskxIfxRaKfTsznYfuqu+sDLNWPDiP7TCJ5pBHUSqO/
 MkcicsifJ9hvJTUFVS7mSg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Weill Cornell Medical College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.med.cornell.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom McMahon</md:GivenName>
-      <md:EmailAddress>tom2010@med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS Service Desk</md:GivenName>
-      <md:EmailAddress>Support@med.cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Weill Cornell Medical College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.med.cornell.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom McMahon</md:GivenName>
+    <md:EmailAddress>tom2010@med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Service Desk</md:GivenName>
+    <md:EmailAddress>Support@med.cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
index 73144928..2d5df1ef 100644
--- a/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.mines-albi.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-12T16:14:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-12T16:14:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-albi.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mines-Albi</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACeElEQVQ4y32SWUjUURjFf/fOpmOLimurSyJCkQ+mPSSGbZBRYPnQAkFY+iBFpa2U1UtQkUSkRvhiBAUJlUQJPqRt2KKiLSao5ZY0oOOoM47zn//tYcRR0w7cl8M59/sO30EpxZyvp5H0m6+OK0cf82qUYm5yEtdq2lTa1bc1anwYpXvn1EpmQ3Oz9Mj1Az02+0j9TxcNNvdWkfe8X6QUnxVCQMuNGXIxfaJDA5vd+S0+zJr0vG2QHWUfwSRBSDBawGH7o0qy1mE2d8/6QONJlzF0Y8T4QHBQgOnuu17yH30FowQxbZw0gGdC10u2hQsYBOGLIIQJe9+Plg6HMmXe+UT+g9Z/zQC6F0wBUmbfahRC+jeIOlhe4IhPvu2y2cEgfOb5IA1g6yRV2nMbKgorJMBEfHK2a3gMLIb/mxHgcYPTzu+FUXsBjABDQiaA7te5vaApkIDZ4NvKlxUG2sGl0auTAEye0auZpsxOjdLdiXy/ksHrE2mkLgkCpwa6gvZm0mNCqCragXJ5LICvSJyra+BkraLghap8161m4/77bkVumaqsbZriLla3fvAXqbmpDoMRNJ3M1ZH/JE9bYaV0+xr2bUqe4jq6e974ezDSh7jQNI4KsJTnJJK3YTkAI26Nons1BJokcZEhHH3cgOf+MWz2UW/0YqsRKf1NFGv3byMp5SVONzGx4YQGmGn80MnKxEgk0DU2wbJAE70uIxXFh3cdWsWzmVX+fAlx2r2ZqOineLEy7uZUznqSIxbQOziKJchK7Zf+ieozO/co3VvN9CLNgGeE9MKH57XgsAybU4s1L7SKFRFhv4JGx+qrsoYuY1kEcVum5H8BReRiA2ayAcEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDDmguK/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU5KzAyOjAwl99aAwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enstimac.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole des mines d'Albi-Carmaux</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-albi.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mines-Albi</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACeElEQVQ4y32SWUjUURjFf/fOpmOLimurSyJCkQ+mPSSGbZBRYPnQAkFY+iBFpa2U1UtQkUSkRvhiBAUJlUQJPqRt2KKiLSao5ZY0oOOoM47zn//tYcRR0w7cl8M59/sO30EpxZyvp5H0m6+OK0cf82qUYm5yEtdq2lTa1bc1anwYpXvn1EpmQ3Oz9Mj1Az02+0j9TxcNNvdWkfe8X6QUnxVCQMuNGXIxfaJDA5vd+S0+zJr0vG2QHWUfwSRBSDBawGH7o0qy1mE2d8/6QONJlzF0Y8T4QHBQgOnuu17yH30FowQxbZw0gGdC10u2hQsYBOGLIIQJe9+Plg6HMmXe+UT+g9Z/zQC6F0wBUmbfahRC+jeIOlhe4IhPvu2y2cEgfOb5IA1g6yRV2nMbKgorJMBEfHK2a3gMLIb/mxHgcYPTzu+FUXsBjABDQiaA7te5vaApkIDZ4NvKlxUG2sGl0auTAEye0auZpsxOjdLdiXy/ksHrE2mkLgkCpwa6gvZm0mNCqCragXJ5LICvSJyra+BkraLghap8161m4/77bkVumaqsbZriLla3fvAXqbmpDoMRNJ3M1ZH/JE9bYaV0+xr2bUqe4jq6e974ezDSh7jQNI4KsJTnJJK3YTkAI26Nons1BJokcZEhHH3cgOf+MWz2UW/0YqsRKf1NFGv3byMp5SVONzGx4YQGmGn80MnKxEgk0DU2wbJAE70uIxXFh3cdWsWzmVX+fAlx2r2ZqOineLEy7uZUznqSIxbQOziKJchK7Zf+ieozO/co3VvN9CLNgGeE9MKH57XgsAybU4s1L7SKFRFhv4JGx+qrsoYuY1kEcVum5H8BReRiA2ayAcEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDDmguK/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU5KzAyOjAwl99aAwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enstimac.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole des mines d'Albi-Carmaux</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVAP0DZFmoaqaMkf4YJmDc1SwYfx2yMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMMEnNoaWIubWluZXMtYWxiaS5mcjAeFw0xNTAyMTcwODU0
 NDhaFw0zNTAyMTcwODU0NDhaMB0xGzAZBgNVBAMMEnNoaWIubWluZXMtYWxiaS5m
@@ -38,26 +38,26 @@ nxi4i5Y1wnnNHebY9PNYU+rJPabA1HsrC4qBw9jFiTa2LonPdXIc9SYTxASbcZ96
 SksdcOTnimu/nRLGQnwqpOvNYEsom3R26wT2q0C8Joro18KXAZ7ebzn0/l0jOi+Q
 8o++pmkdoIw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mines-albi.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mines-albi.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mines-albi.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole des mines d'Albi-Carmaux</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole des mines d'Albi-Carmaux</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enstimac.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ORTEU Catherine</md:SurName>
-      <md:EmailAddress>catherine.orteu@mines-albi.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>OTTON Emmanuel</md:SurName>
-      <md:EmailAddress>emmanuel.otton@mines-albi.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mines-albi.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mines-albi.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mines-albi.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole des mines d'Albi-Carmaux</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des mines d'Albi-Carmaux</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enstimac.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ORTEU Catherine</md:SurName>
+    <md:EmailAddress>catherine.orteu@mines-albi.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>OTTON Emmanuel</md:SurName>
+    <md:EmailAddress>emmanuel.otton@mines-albi.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml
index 7fdb78d0..13f849fd 100644
--- a/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.newbury-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-17T14:27:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-17T14:27:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newbury-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newbury-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUKgGFTl/wyIVoEZcrAuaNGJkaS4AwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMac2hpYi5uZXdidXJ5LWNvbGxlZ2UuYWMudWswHhcNMTQw
 						NDMwMTU1OTUzWhcNMzQwNDMwMTU1OTUzWjAlMSMwIQYDVQQDExpzaGliLm5ld2J1
@@ -32,26 +32,26 @@
 						V0IUrFMXIcCZ7rucxgmvsdp3f31bscAZfyqW5OvpnkZbXndLSRhseVgeeeyUOl9k
 						t13oLz/71kVuQ4KeP949T8BcB33uLI+rJpCvWPPa25DFQvaSMkGl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.newbury-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newbury-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.newbury-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">newbury-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUKgGFTl/wyIVoEZcrAuaNGJkaS4AwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMac2hpYi5uZXdidXJ5LWNvbGxlZ2UuYWMudWswHhcNMTQw
 						NDMwMTU1OTUzWhcNMzQwNDMwMTU1OTUzWjAlMSMwIQYDVQQDExpzaGliLm5ld2J1
@@ -71,27 +71,27 @@
 						V0IUrFMXIcCZ7rucxgmvsdp3f31bscAZfyqW5OvpnkZbXndLSRhseVgeeeyUOl9k
 						t13oLz/71kVuQ4KeP949T8BcB33uLI+rJpCvWPPa25DFQvaSMkGl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Newbury College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newbury College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newbury-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Elwell</md:SurName>
-      <md:EmailAddress>mailto:r-elwell@newbury-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Elwell</md:SurName>
-      <md:EmailAddress>mailto:r-elwell@newbury-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Newbury College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newbury College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newbury-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Elwell</md:SurName>
+    <md:EmailAddress>mailto:r-elwell@newbury-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Elwell</md:SurName>
+    <md:EmailAddress>mailto:r-elwell@newbury-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml
index 024364f5..74c46977 100644
--- a/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.nnc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-30T10:04:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-30T10:04:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nnc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nnc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUAVYbxlyk3ieD8sFKJKXLfvokSAIwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOc2hpYi5ubmMuYWMudWswHhcNMTQwODExMTUwNzQ4WhcN
 						MzQwODExMTUwNzQ4WjAZMRcwFQYDVQQDEw5zaGliLm5uYy5hYy51azCCASIwDQYJ
@@ -36,26 +36,26 @@
 						JHiLYUmU5kt5LWExuOvufsm7O8xy5jU0rJ+Gtwo5ikylbxnGrET0E1YdIcug3Ps4
 						vKyBVK0HbJsFP4JQVkZ84kTqxJWEXlUssTOLLeJ1l/2xAHhDd577
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nnc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nnc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nnc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nnc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIzCCAgugAwIBAgIUAVYbxlyk3ieD8sFKJKXLfvokSAIwDQYJKoZIhvcNAQEF
 						BQAwGTEXMBUGA1UEAxMOc2hpYi5ubmMuYWMudWswHhcNMTQwODExMTUwNzQ4WhcN
 						MzQwODExMTUwNzQ4WjAZMRcwFQYDVQQDEw5zaGliLm5uYy5hYy51azCCASIwDQYJ
@@ -74,27 +74,27 @@
 						JHiLYUmU5kt5LWExuOvufsm7O8xy5jU0rJ+Gtwo5ikylbxnGrET0E1YdIcug3Ps4
 						vKyBVK0HbJsFP4JQVkZ84kTqxJWEXlUssTOLLeJ1l/2xAHhDd577
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North Nottinghamshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North Notts College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nnc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Elce</md:SurName>
-      <md:EmailAddress>mailto:aelce@nnc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Watson</md:SurName>
-      <md:EmailAddress>mailto:cwatson@nnc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North Nottinghamshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North Notts College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nnc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Elce</md:SurName>
+    <md:EmailAddress>mailto:aelce@nnc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Watson</md:SurName>
+    <md:EmailAddress>mailto:cwatson@nnc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
index 6af91d65..2580eeef 100644
--- a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.oclc.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEgDCCA2igAwIBAgIJAK0C0pCgLQHkMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD
 						VQQGEwJVUzELMAkGA1UECBMCT0gxDzANBgNVBAcTBkR1YmxpbjETMBEGA1UEChMK
 						T0NMQywgSW5jLjEgMB4GA1UECxMXR2xvYmFsIFdvcmxkIERvbWluYXRpb24xIjAg
@@ -34,25 +34,25 @@
 						W0/AQEl5+bAMZvoC+cqpQR3pmxwKZPHOI1zb5SY5wmRxAd772nBH31b9br2L7ETI
 						G2k2Hg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.shire" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OCLC FirstSearch</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UK Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Scranton</md:SurName>
-      <md:EmailAddress>mailto:scrantor@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.shire" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OCLC FirstSearch</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UK Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Scranton</md:SurName>
+    <md:EmailAddress>mailto:scrantor@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml
index 969fa65a..c0bd2763 100644
--- a/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ou.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Oklahoma</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Oklahoma</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAigCCQDc5lzkFlIc/jANBgkqhkiG9w0BAQUFADBiMRQwEgYDVQQDEwtz
 aGliLm91LmVkdTEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBPa2xhaG9tYTELMAkG
 A1UEBhMCVVMxCzAJBgNVBAgTAk9LMQ8wDQYDVQQHEwZOb3JtYW4wHhcNMTExMjA5
@@ -38,24 +38,24 @@ gyHNLf2byp1u1gSTRBbC8m1bESeQRTphQtsM+o3m6JUR3k9bV2tfgXLV8zaFWWuM
 aQgoBThl3ubE6tZmNvkC76OAzv+E+bRNfLV9lm+5Y66Ar9rSQHKur9xGm59GtmI/
 Ghy0tfpx50Ku5N+Baf2OZmHjuv4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ou.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ou.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ou.edu:443/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ou.edu:443/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ou.edu:443/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ou.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ou.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ou.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ou.edu:443/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ou.edu:443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ou.edu:443/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ou.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAigCCQDc5lzkFlIc/jANBgkqhkiG9w0BAQUFADBiMRQwEgYDVQQDEwtz
 aGliLm91LmVkdTEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBPa2xhaG9tYTELMAkG
 A1UEBhMCVVMxCzAJBgNVBAgTAk9LMQ8wDQYDVQQHEwZOb3JtYW4wHhcNMTExMjA5
@@ -75,27 +75,27 @@ gyHNLf2byp1u1gSTRBbC8m1bESeQRTphQtsM+o3m6JUR3k9bV2tfgXLV8zaFWWuM
 aQgoBThl3ubE6tZmNvkC76OAzv+E+bRNfLV9lm+5Y66Ar9rSQHKur9xGm59GtmI/
 Ghy0tfpx50Ku5N+Baf2OZmHjuv4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ou.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ou.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oklahoma</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oklahoma</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ou.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Horton</md:GivenName>
-      <md:EmailAddress>david-horton@ouhsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Aaron Bighourse</md:GivenName>
-      <md:EmailAddress>bighorse@ou.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pat Amburn</md:GivenName>
-      <md:EmailAddress>pat-amburn@ouhsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ou.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ou.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oklahoma</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oklahoma</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ou.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Horton</md:GivenName>
+    <md:EmailAddress>david-horton@ouhsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Aaron Bighourse</md:GivenName>
+    <md:EmailAddress>bighorse@ou.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pat Amburn</md:GivenName>
+    <md:EmailAddress>pat-amburn@ouhsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml
index 0835861b..2f8e9e56 100644
--- a/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.pebblepad.co.uk/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:1.0:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:1.0:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIJAL5B8Zy7kEzwMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEc
 						MBoGA1UEChMTUGViYmxlIExlYXJuaW5nIEx0ZDETMBEGA1UECxMKVUsgSG9zdGlu
@@ -33,13 +33,13 @@
 						TrsG+JZHCj5y3rzxae76z/T9zfa1oTaQRYUonCqQfTh3t3l2SJX6B1Pw6r2n0HJJ
 						8yu2OwvTBnRwfBEZAo9YeLOl8VXR2AZS/AE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEZjCCA06gAwIBAgIJAL5B8Zy7kEzwMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEc
 						MBoGA1UEChMTUGViYmxlIExlYXJuaW5nIEx0ZDETMBEGA1UECxMKVUsgSG9zdGlu
@@ -65,37 +65,37 @@
 						TrsG+JZHCj5y3rzxae76z/T9zfa1oTaQRYUonCqQfTh3t3l2SJX6B1Pw6r2n0HJJ
 						8yu2OwvTBnRwfBEZAo9YeLOl8VXR2AZS/AE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pebble Learning Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pebble Learning Ltd: PebblePad</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pebblepad.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joanne</md:GivenName>
-      <md:SurName>Edgecombe</md:SurName>
-      <md:EmailAddress>mailto:support@pebblelearning.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Everson</md:SurName>
-      <md:EmailAddress>mailto:andy@pebblelearning.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pebble Learning Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pebble Learning Ltd: PebblePad</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pebblepad.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joanne</md:GivenName>
+    <md:SurName>Edgecombe</md:SurName>
+    <md:EmailAddress>mailto:support@pebblelearning.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Everson</md:SurName>
+    <md:EmailAddress>mailto:andy@pebblelearning.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
index 942bff54..e2aa4f5f 100644
--- a/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.raven.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Cambridge</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shib.raven.cam.ac.uk/idp-logo-80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.raven.cam.ac.uk/idp-logo-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>128.232.0.0/16</mdui:IPHint>
+        <mdui:IPHint>129.169.0.0/16</mdui:IPHint>
+        <mdui:IPHint>131.111.0.0/16</mdui:IPHint>
+        <mdui:IPHint>192.18.195.0/24</mdui:IPHint>
+        <mdui:IPHint>193.60.80.0/20</mdui:IPHint>
+        <mdui:IPHint>193.63.252.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:630:200::/48</mdui:IPHint>
+        <mdui:DomainHint>cam.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:52.208056,0.1225</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Cambridge</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shib.raven.cam.ac.uk/idp-logo-80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib.raven.cam.ac.uk/idp-logo-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>128.232.0.0/16</mdui:IPHint>
-          <mdui:IPHint>129.169.0.0/16</mdui:IPHint>
-          <mdui:IPHint>131.111.0.0/16</mdui:IPHint>
-          <mdui:IPHint>192.18.195.0/24</mdui:IPHint>
-          <mdui:IPHint>193.60.80.0/20</mdui:IPHint>
-          <mdui:IPHint>193.63.252.0/23</mdui:IPHint>
-          <mdui:IPHint>2001:630:200::/48</mdui:IPHint>
-          <mdui:DomainHint>cam.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:52.208056,0.1225</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICujCCAaICCQDN9BMM2g2oWzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRz
 						aGliLnJhdmVuLmNhbS5hYy51azAeFw0xNTExMjAxNDUwNTFaFw0yNTExMTcxNDUw
 						NTFaMB8xHTAbBgNVBAMTFHNoaWIucmF2ZW4uY2FtLmFjLnVrMIIBIjANBgkqhkiG
@@ -44,27 +44,27 @@
 						ZBb6lO15RJ5qwk6paQG87nhMPAFwSbK+OpCkt3hYd7l8LjXNG74eOZdPM5V6DmZz
 						nMRF0t4QBDKsuZ64N/+u7R3Nj6uzsQsb7PJXGNTf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.raven.cam.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.raven.cam.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cam.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICujCCAaICCQDN9BMM2g2oWzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRz
 						aGliLnJhdmVuLmNhbS5hYy51azAeFw0xNTExMjAxNDUwNTFaFw0yNTExMTcxNDUw
 						NTFaMB8xHTAbBgNVBAMTFHNoaWIucmF2ZW4uY2FtLmFjLnVrMIIBIjANBgkqhkiG
@@ -81,25 +81,25 @@
 						ZBb6lO15RJ5qwk6paQG87nhMPAFwSbK+OpCkt3hYd7l8LjXNG74eOZdPM5V6DmZz
 						nMRF0t4QBDKsuZ64N/+u7R3Nj6uzsQsb7PJXGNTf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University Information Services' Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:service-desk@uis.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Raven Support</md:GivenName>
-      <md:EmailAddress>mailto:raven-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University Information Services' Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:service-desk@uis.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Raven Support</md:GivenName>
+    <md:EmailAddress>mailto:raven-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml
index a81c3ff0..c103d147 100644
--- a/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.rcs.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-01T17:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-01T17:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcs.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlYCCQCDCJdvHB5WaDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxLDAqBgNVBAoT
 						I1RoZSBSb3lhbCBDb25zZXJ2YXRvaXJlIG9mIFNjb3RsYW5kMRcwFQYDVQQDEw5z
@@ -33,26 +33,26 @@
 						bblLBonmSadeuNSLiq+w/a5BgMK9HI2h4Ou4kis756bHzsM4/TjXzfK+wyHWfzEb
 						lqZ24vi8hAuJEGe32pxCm2MO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rcs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlYCCQCDCJdvHB5WaDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxLDAqBgNVBAoT
 						I1RoZSBSb3lhbCBDb25zZXJ2YXRvaXJlIG9mIFNjb3RsYW5kMRcwFQYDVQQDEw5z
@@ -73,27 +73,27 @@
 						bblLBonmSadeuNSLiq+w/a5BgMK9HI2h4Ou4kis756bHzsM4/TjXzfK+wyHWfzEb
 						lqZ24vi8hAuJEGe32pxCm2MO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Conservatoire of Scotland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Conservatoire of Scotland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Hunter</md:SurName>
-      <md:EmailAddress>mailto:b.hunter@rcs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Hunter</md:SurName>
-      <md:EmailAddress>mailto:b.hunter@rcs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Conservatoire of Scotland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Conservatoire of Scotland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Hunter</md:SurName>
+    <md:EmailAddress>mailto:b.hunter@rcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Hunter</md:SurName>
+    <md:EmailAddress>mailto:b.hunter@rcs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml
index 493ef998..222f43f0 100644
--- a/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.rio.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rio.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Rio Grande</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for the University of Rio Grande and Rio Grande Community College</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.rio.edu/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.rio.edu/camptech/Policies.cfm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="185" width="149" xml:lang="en">https://shib.rio.edu/idp/images/rio-icon.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rio.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Rio Grande</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for the University of Rio Grande and Rio Grande Community College</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.rio.edu/about/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.rio.edu/camptech/Policies.cfm</mdui:PrivacyStatementURL>
-          <mdui:Logo height="185" width="149" xml:lang="en">https://shib.rio.edu/idp/images/rio-icon.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUaUJi0vL1gnTjBfKAu4Q0FSERZxkwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MB4XDTE1MDQyMTE0NDgwNloXDTM1
 MDQyMTE0NDgwNlowFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MIIBIjANBgkqhkiG
@@ -42,23 +42,23 @@ OKOmJecKqgmREgX4UNBLvnCRSC5IQfcQtC3gwlwVHy0JsMaoOOW/4jUcpaZ8wX4d
 tL65yo0BeCIJZLm4krEnwTp4IRJDitiRgvxX/TtD3ukGkSWstdktq9kAT9dGP753
 uXkfozJhPiwV90P6DNBkmS6MeSVPWoggq75BbFMFCg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rio.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rio.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rio.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rio.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rio.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rio.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rio.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rio.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rio.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rio.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rio.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rio.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUaUJi0vL1gnTjBfKAu4Q0FSERZxkwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MB4XDTE1MDQyMTE0NDgwNloXDTM1
 MDQyMTE0NDgwNlowFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MIIBIjANBgkqhkiG
@@ -77,30 +77,30 @@ OKOmJecKqgmREgX4UNBLvnCRSC5IQfcQtC3gwlwVHy0JsMaoOOW/4jUcpaZ8wX4d
 tL65yo0BeCIJZLm4krEnwTp4IRJDitiRgvxX/TtD3ukGkSWstdktq9kAT9dGP753
 uXkfozJhPiwV90P6DNBkmS6MeSVPWoggq75BbFMFCg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rio.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Rio Grande</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Rio Grande</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rio.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kingsley Meyer</md:GivenName>
-      <md:EmailAddress>kmeyer@rio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rio Grande Technical Support</md:GivenName>
-      <md:EmailAddress>support@rio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rio Grande Technical Support</md:GivenName>
-      <md:EmailAddress>support@rio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Rio Grande Technical Support</md:GivenName>
-      <md:EmailAddress>support@rio.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rio.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Rio Grande</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Rio Grande</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rio.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kingsley Meyer</md:GivenName>
+    <md:EmailAddress>kmeyer@rio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rio Grande Technical Support</md:GivenName>
+    <md:EmailAddress>support@rio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rio Grande Technical Support</md:GivenName>
+    <md:EmailAddress>support@rio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Rio Grande Technical Support</md:GivenName>
+    <md:EmailAddress>support@rio.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml b/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml
index 9157c500..1c886977 100644
--- a/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.rsc-uat.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-14T12:34:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-14T12:34:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.rsc-uat.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.rsc-uat.org/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.rsc-uat.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.rsc-uat.org/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAIdMRZNoOlUKMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNoaWIucnNjLXVhdC5vcmcwHhcNMTMwNjEzMTUxMTA3WhcNMjMwNjExMTUx
 						MTA3WjAbMRkwFwYDVQQDExBzaGliLnJzYy11YXQub3JnMIIBIjANBgkqhkiG9w0B
@@ -47,45 +47,45 @@
 						/rfTDcT7i58eKalUZtWL7XvKZ+kp5ziyyWnjqRyLUbrWaBXOlBsyZkrhu4i+XwHl
 						E9Z+U+Ne35q+J2NuQ3Z3TXADXkPmz5i2O87MoZcKhdcm1EoZdpi3iUJAgA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Society of Chemistry</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Society of Chemistry Test System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Internet Services</md:GivenName>
-      <md:EmailAddress>mailto:internet_services@rsc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Internet Services</md:GivenName>
-      <md:EmailAddress>mailto:internet_services@rsc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Society of Chemistry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Society of Chemistry Test System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Internet Services</md:GivenName>
+    <md:EmailAddress>mailto:internet_services@rsc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Internet Services</md:GivenName>
+    <md:EmailAddress>mailto:internet_services@rsc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml
index ae00d2e1..74528dee 100644
--- a/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.rsc.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-20T11:51:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-20T11:51:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.rsc.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.rsc.org/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.rsc.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.rsc.org/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6zCCAdOgAwIBAgIJAI2c7IusuZ5TMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDHNoaWIucnNjLm9yZzAeFw0xMDA3MjcxMTA3MzlaFw0yMDA3MjQxMTA3Mzla
 						MBcxFTATBgNVBAMTDHNoaWIucnNjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -47,45 +47,45 @@
 						0FenvgTlpbL0eKdn0WkkyPrcakFZk9d3l5aiKxcffteu1G/V5AyQiL2ZkI/hhU5V
 						8WXqr8jwzK1gLwel29uXXyVjCDSVfSWSSHBHqhn9/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.rsc.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.rsc.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Society of Chemistry</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Society of Chemistry</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsc.org/aboutus/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ICT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ict@rsc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ICT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ict@rsc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.rsc.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.rsc.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Society of Chemistry</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Society of Chemistry</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsc.org/aboutus/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ict@rsc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ICT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ict@rsc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rz.tu-harburg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.rz.tu-harburg.de-idp-shibboleth.xml
index c80348c7..6050a044 100644
--- a/swamid-interfederations-2.0/shib.rz.tu-harburg.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.rz.tu-harburg.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.rz.tu-harburg.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-11-10T07:41:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-11-10T07:41:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuhh.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TU Hamburg-Harburg (TUHH)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hamburg University of Technology (TUHH)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität Hamburg-Harburg</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the Hamburg University of Technology</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.tuhh.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.tuhh.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuhh.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">TU Hamburg-Harburg (TUHH)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Hamburg University of Technology (TUHH)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Technischen Universität Hamburg-Harburg</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of the Hamburg University of Technology</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.tuhh.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.tuhh.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.rz.tu-harburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib.rz.tu-harburg.de,OU=Rechenzentrum,O=Technische Universitaet Hamburg-Harburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGXLJXi6myTANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib.rz.tu-harburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.rz.tu-harburg.de,OU=Rechenzentrum,O=Technische Universitaet Hamburg-Harburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGXLJXi6myTANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
 BhMCREUxMDAuBgNVBAoTJ1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEhhbWJ1cmct
 SGFyYnVyZzEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEoMCYGA1UEAxMfVFVISCBD
 QSBpbiBERk4tUEtJIEdsb2JhbCAtIEcwMTErMCkGCSqGSIb3DQEJARYcdHVoaC1k
@@ -58,29 +58,29 @@ Gprp6C7I6VaVVogo3eGD8RRdjH2EgkZ/eL0aBfTfqMtsfASW+mA0Zn0D+WaR24Ab
 S9xBr72cLGGsrVUN/rksOFwXWqYmpk62Tea3IGLQXGHYeNkiT8qeB9isT0hBX2Yx
 +6AvONG+BqjHIGLXQP+VpJc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rz.tu-harburg.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rz.tu-harburg.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rz.tu-harburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rz.tu-harburg.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuhh.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.rz.tu-harburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib.rz.tu-harburg.de,OU=Rechenzentrum,O=Technische Universitaet Hamburg-Harburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGXLJXi6myTANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rz.tu-harburg.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rz.tu-harburg.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rz.tu-harburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rz.tu-harburg.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuhh.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib.rz.tu-harburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.rz.tu-harburg.de,OU=Rechenzentrum,O=Technische Universitaet Hamburg-Harburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGXLJXi6myTANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
 BhMCREUxMDAuBgNVBAoTJ1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEhhbWJ1cmct
 SGFyYnVyZzEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEoMCYGA1UEAxMfVFVISCBD
 QSBpbiBERk4tUEtJIEdsb2JhbCAtIEcwMTErMCkGCSqGSIb3DQEJARYcdHVoaC1k
@@ -115,30 +115,30 @@ Gprp6C7I6VaVVogo3eGD8RRdjH2EgkZ/eL0aBfTfqMtsfASW+mA0Zn0D+WaR24Ab
 S9xBr72cLGGsrVUN/rksOFwXWqYmpk62Tea3IGLQXGHYeNkiT8qeB9isT0hBX2Yx
 +6AvONG+BqjHIGLXQP+VpJc=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e186</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e186</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Technische Universität Hamburg (TUHH)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hamburg University of Technology (TUHH)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.tuhh.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.tuhh.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dirk</md:GivenName>
-      <md:SurName>Husung</md:SurName>
-      <md:EmailAddress>mailto:husung@tuhh.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dirk</md:GivenName>
-      <md:SurName>Husung</md:SurName>
-      <md:EmailAddress>mailto:husung@tuhh.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rz.tu-harburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e186</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e186</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität Hamburg (TUHH)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hamburg University of Technology (TUHH)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.tuhh.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tuhh.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dirk</md:GivenName>
+    <md:SurName>Husung</md:SurName>
+    <md:EmailAddress>mailto:husung@tuhh.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dirk</md:GivenName>
+    <md:SurName>Husung</md:SurName>
+    <md:EmailAddress>mailto:husung@tuhh.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml
index 2214c37d..e683ad1b 100644
--- a/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.sou.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shib.sou.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sou.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Southern Oregon University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A public liberal arts university.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.sou.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.sou.edu/policies/Electronic-Commerce-Privacy.pdf</mdui:PrivacyStatementURL>
+        <mdui:Logo height="96" width="96" xml:lang="en">https://shib.sou.edu/SOU-Logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shib.sou.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sou.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Southern Oregon University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A public liberal arts university.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.sou.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.sou.edu/policies/Electronic-Commerce-Privacy.pdf</mdui:PrivacyStatementURL>
-          <mdui:Logo height="96" width="96" xml:lang="en">https://shib.sou.edu/SOU-Logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUHi1qf8ZHuuT85F7NR8j74fvWWqIwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc2hpYi5zb3UuZWR1MB4XDTExMDUxMjIwMDkxNVoXDTMx
 MDUxMjIwMDkxNVowFzEVMBMGA1UEAxMMc2hpYi5zb3UuZWR1MIIBIjANBgkqhkiG
@@ -41,27 +41,27 @@ iypEYN6U2M5cN/5un4rR6NI0950Fg6YizIh58SkPVNxkRTNyQC/Djxmz44q05oKz
 V6vQDuNw1E/38wMn3hRvr+xDshTOrgTAAdmO0g+Fnn2ewD2lBow/6aqaXPUqOqxB
 uoe4SJwHwKvWq/ZZBvDfR9GwlXaDOR9yXXDLLIcYaA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.sou.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.sou.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.sou.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.sou.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.sou.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.sou.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Southern Oregon University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Southern Oregon University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sou.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brad Christ</md:GivenName>
-      <md:EmailAddress>christb@sou.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Whipp</md:GivenName>
-      <md:EmailAddress>whipp@sou.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.sou.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.sou.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.sou.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.sou.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.sou.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.sou.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Southern Oregon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Southern Oregon University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sou.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brad Christ</md:GivenName>
+    <md:EmailAddress>christb@sou.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Whipp</md:GivenName>
+    <md:EmailAddress>whipp@sou.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
index a1a3c576..646834bc 100644
--- a/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.theiet.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-30T09:54:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-30T09:54:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.theiet.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.theiet.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDITCCAgmgAwIBAgIJAN2I4zf0p8hfMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHjYzMzkzMy13c2VpMS5sb24uaW50ZW5zaXZlLmludDAeFw0xNTA3MjMwNzQy
 						MjdaFw0yNTA3MjAwNzQyMjdaMCkxJzAlBgNVBAMTHjYzMzkzMy13c2VpMS5sb24u
@@ -47,43 +47,43 @@
 						LS9D/jGafuWQZ6Wu2E7/tgGPdh3ncDsFwXEw4BBx3NVu8UxPuGBwBSzjl4JetuOM
 						EiKAsWccGKR+zkAE1ZQv9Kf0t1dxdsNPK9aoLqY1dO3dILZdow==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.theiet.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.theiet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Institution of Engineering and Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Institution of Engineering and Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.theiet.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ross</md:GivenName>
-      <md:SurName>London</md:SurName>
-      <md:EmailAddress>mailto:RLondon@theiet.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ravi</md:GivenName>
-      <md:SurName>Racharla</md:SurName>
-      <md:EmailAddress>mailto:ravi.racharla@northgate-is.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.theiet.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.theiet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Institution of Engineering and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Institution of Engineering and Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.theiet.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ross</md:GivenName>
+    <md:SurName>London</md:SurName>
+    <md:EmailAddress>mailto:RLondon@theiet.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ravi</md:GivenName>
+    <md:SurName>Racharla</md:SurName>
+    <md:EmailAddress>mailto:ravi.racharla@northgate-is.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml
index 8807ff24..7e011579 100644
--- a/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.towson.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shib.towson.edu/errorpage.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">towson.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Towson University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Towson University Shibboleth Identity Provider allows TU faculty, staff and students to access external service providers using their TU NetID.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://shib.towson.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://inside.towson.edu/generalcampus/tupolicies/categorylist.cfm?thecategory=Information%20Technology</mdui:PrivacyStatementURL>
+        <mdui:Logo height="95" width="150" xml:lang="en">https://shib.towson.edu/tulogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shib.towson.edu/errorpage.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">towson.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Towson University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Towson University Shibboleth Identity Provider allows TU faculty, staff and students to access external service providers using their TU NetID.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://shib.towson.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://inside.towson.edu/generalcampus/tupolicies/categorylist.cfm?thecategory=Information%20Technology</mdui:PrivacyStatementURL>
-          <mdui:Logo height="95" width="150" xml:lang="en">https://shib.towson.edu/tulogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDqDCCApACCQD7EyU78OybHDANBgkqhkiG9w0BAQsFADCBlTELMAkGA1UEBhMC
 TUQxETAPBgNVBAgMCE1hcnlsYW5kMQ8wDQYDVQQHDAZUb3dzb24xGjAYBgNVBAoM
 EVRvd3NvbiBVbml2ZXJzaXR5MQwwCgYDVQQLDANPVFMxGDAWBgNVBAMMD3NoaWIu
@@ -47,24 +47,24 @@ Tpt+FOsZ+xFe0nqAU81kchOoOjgR02OY0CoYERX6oaQDblw1mhyw7xM4U+j2Qjkh
 CvmuHM+tUlsm9qISuZCNGXwplGakkjduF5PQ9UXI/otLC2hiuAnA0R2QWpWI9cn0
 cgveWZLPjJi18fsuQa7S0C4bslW+fhWIwqzYVA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.towson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.towson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.towson.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.towson.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.towson.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.towson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">towson.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.towson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.towson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.towson.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.towson.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.towson.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.towson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">towson.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDqDCCApACCQD7EyU78OybHDANBgkqhkiG9w0BAQsFADCBlTELMAkGA1UEBhMC
 TUQxETAPBgNVBAgMCE1hcnlsYW5kMQ8wDQYDVQQHDAZUb3dzb24xGjAYBgNVBAoM
 EVRvd3NvbiBVbml2ZXJzaXR5MQwwCgYDVQQLDANPVFMxGDAWBgNVBAMMD3NoaWIu
@@ -86,31 +86,31 @@ Tpt+FOsZ+xFe0nqAU81kchOoOjgR02OY0CoYERX6oaQDblw1mhyw7xM4U+j2Qjkh
 CvmuHM+tUlsm9qISuZCNGXwplGakkjduF5PQ9UXI/otLC2hiuAnA0R2QWpWI9cn0
 cgveWZLPjJi18fsuQa7S0C4bslW+fhWIwqzYVA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.towson.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.towson.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Towson University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Towson University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://towson.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Technical Issues</md:GivenName>
-      <md:EmailAddress>shib@towson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Student Computing Services</md:GivenName>
-      <md:EmailAddress>scs@towson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OTS Help Center</md:GivenName>
-      <md:EmailAddress>helpcenter@towson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shibboleth Technical Issues</md:GivenName>
-      <md:EmailAddress>shib@towson.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.towson.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.towson.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Towson University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Towson University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://towson.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Technical Issues</md:GivenName>
+    <md:EmailAddress>shib@towson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Student Computing Services</md:GivenName>
+    <md:EmailAddress>scs@towson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OTS Help Center</md:GivenName>
+    <md:EmailAddress>helpcenter@towson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth Technical Issues</md:GivenName>
+    <md:EmailAddress>shib@towson.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
index 3bf2e63b..956a8cdb 100644
--- a/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.u-paris10.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T10:12:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T10:12:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-paris10.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAQUlEQVQY04WOMQ4AMAgC+f9L3XkAjWnaqAwOmngoAlBRSsjOUmgTTSdgZPeQeWjZSQ81PQa5OdrVIC+Hyo/4JP0OTEq5NtQeSrYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-paris10.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-paris10.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAQUlEQVQY04WOMQ4AMAgC+f9L3XkAjWnaqAwOmngoAlBRSsjOUmgTTSdgZPeQeWjZSQ81PQa5OdrVIC+Hyo/4JP0OTEq5NtQeSrYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-paris10.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEbzCCA1egAwIBAgIQZbrrSlxkQhTabmBhnkMIcjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQyOTAwMDAwMFoXDTE3MDQyODIzNTk1OVowPzEhMB8GA1UE
@@ -44,26 +44,26 @@ wC8FqLmFxsFhnsy4AYicdZyv2zf5e3zIFbaIqJOunr+K1ovMan9M+B+pme5Da7n9
 HmJ60tKDP/4kWNMI1ciPuZ+tFjQFDjbCZTGEL9fcx2+FpHFBc3rLBFqnU4wTr8g+
 tX8DeAKftA5fK5bves4MG9LRLqWMkHmYHZ40TOv95xpE40k=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.u-paris10.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.u-paris10.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.u-paris10.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Paris Ouest Nanterre La Défense</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-paris10.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Driss Bouzekhrout</md:SurName>
-      <md:EmailAddress>driss@u-paris10.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Gaël Merlin</md:SurName>
-      <md:EmailAddress>gmerlin@u-paris10.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.u-paris10.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.u-paris10.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.u-paris10.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Paris Ouest Nanterre La Défense</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-paris10.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Driss Bouzekhrout</md:SurName>
+    <md:EmailAddress>driss@u-paris10.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gaël Merlin</md:SurName>
+    <md:EmailAddress>gmerlin@u-paris10.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
index f7608b56..44a6cca4 100644
--- a/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ufg.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFG - Universidade Federal de Goias</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFG - Universidade Federal de Goias</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufg.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFG - Universidade Federal de Goias</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFG - Universidade Federal de Goias</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufg.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufg.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
 Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
@@ -46,26 +46,26 @@ EqoljRD7IOrbW5m12y+UCojor5ttyl5aYIk3DYXLlqiddtxHwyAyP4VKxOS5373c
 CmAJ4XbSf9+t9lVDXZtJ7GST/AoVT4775ELCkfN/EjEXzqg8uxWgl89feJQyz1u6
 4mvZ4bNMmCEq59Krwicex9EzFraCH4W99LvdMvKBp88MseBihz8=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ufg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ufg.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ufg.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ufg.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufg.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ufg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ufg.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ufg.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ufg.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufg.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
@@ -91,24 +91,24 @@ CmAJ4XbSf9+t9lVDXZtJ7GST/AoVT4775ELCkfN/EjEXzqg8uxWgl89feJQyz1u6
 4mvZ4bNMmCEq59Krwicex9EzFraCH4W99LvdMvKBp88MseBihz8=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFG - Universidade Federal de Goias</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFG - Universidade Federal de Goias</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFG - Universidade Federal de Goias</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufg.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufg.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Douglas Borges de Oliveira Filho</md:SurName>
-      <md:EmailAddress>douglasfilho@cercomp.ufg.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFG - Universidade Federal de Goias</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFG - Universidade Federal de Goias</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFG - Universidade Federal de Goias</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufg.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufg.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Douglas Borges de Oliveira Filho</md:SurName>
+    <md:EmailAddress>douglasfilho@cercomp.ufg.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml
index 6107b0d9..208c289a 100644
--- a/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ukmsl.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-16T16:43:06.362897Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-16T16:43:06.362897Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.ukmsl.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.ukmsl.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.ukmsl.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.ukmsl.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGzCCAgOgAwIBAgIJAOulbFGs3eq7MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHHR1cmJlcnQuc3VuaW9uLndhcndpY2suYWMudWswHhcNMTEwODMwMDkwNzMw
 						WhcNMjEwODI3MDkwNzMwWjAnMSUwIwYDVQQDExx0dXJiZXJ0LnN1bmlvbi53YXJ3
@@ -32,34 +32,34 @@
 						WG2lytblwDmdavbtjGzserMTYQSqn2/F5Cv8J+3c7XSvZufqFc4CbwlGJTIgTtT8
 						QVg8XpX98kwieHCNWmeVMJL2qiov3OhYK8xG4uYHAQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ukmsl.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: MSL Test Service Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ukmsl.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ukmsl.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: MSL Test Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukmsl.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml
index 24abda97..355a22f9 100644
--- a/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ulster.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-29T15:21:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-29T15:21:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulster.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUDpGkh/duNiN6+rhYKO7+e0H+z0owDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRc2hpYi51bHN0ZXIuYWMudWswHhcNMTQwOTI5MTMxMDQw
 						WhcNMzQwOTI5MTMxMDQwWjAcMRowGAYDVQQDExFzaGliLnVsc3Rlci5hYy51azCC
@@ -37,29 +37,29 @@
 						hmWzROvxEEf88wjO6qxxJCahd+tcJ7k8ef5q/5xinQwuwIW3ln8CGcPXEfJiYnHo
 						k4aR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ulster.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulster.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ulster.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulster.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUDpGkh/duNiN6+rhYKO7+e0H+z0owDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRc2hpYi51bHN0ZXIuYWMudWswHhcNMTQwOTI5MTMxMDQw
 						WhcNMzQwOTI5MTMxMDQwWjAcMRowGAYDVQQDExFzaGliLnVsc3Rlci5hYy51azCC
@@ -79,31 +79,31 @@
 						hmWzROvxEEf88wjO6qxxJCahd+tcJ7k8ef5q/5xinQwuwIW3ln8CGcPXEfJiYnHo
 						k4aR
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Ulster</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Ulster - Shibboleth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ulster.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ISD Service desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@ulster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Vitty</md:SurName>
-      <md:EmailAddress>mailto:paul@ulster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barney</md:GivenName>
-      <md:SurName>Carolan</md:SurName>
-      <md:EmailAddress>mailto:barney@ulster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Ulster</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Ulster - Shibboleth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ulster.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ISD Service desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@ulster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Vitty</md:SurName>
+    <md:EmailAddress>mailto:paul@ulster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barney</md:GivenName>
+    <md:SurName>Carolan</md:SurName>
+    <md:EmailAddress>mailto:barney@ulster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
index 744a0c5d..5dec211e 100644
--- a/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uni-mainz.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-05-17T15:01:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-05-17T15:01:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Mainz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Mainz</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Single-Sign-On der Johannes Gutenberg-Universität Mainz</mdui:Description>
+        <mdui:Description xml:lang="en">Single-Sign-On der Johannes Gutenberg-Universität Mainz</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.uni-mainz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-mainz.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Mainz</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Mainz</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Single-Sign-On der Johannes Gutenberg-Universität Mainz</mdui:Description>
-          <mdui:Description xml:lang="en">Single-Sign-On der Johannes Gutenberg-Universität Mainz</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.uni-mainz.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-mainz.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF2jCCBMKgAwIBAgIHFUXfZ4347jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF2jCCBMKgAwIBAgIHFUXfZ4347jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
 FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
@@ -56,15 +56,15 @@ Zt2tbiyWnF28DXObhDp6tKRbnaEyX1/lTSNVHB20tvj4yPhfNgy6BINSpkPa3Otg
 rmPKXapBTUXw83z+IQnGkFBKypI3ceETkGaydx+aHwCyL9WBKRC87GfKFSvB620e
 QlWpyRQfOn6GOvmhDbM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF8DCCBNigAwIBAgIHGlGNEMJrKTANBgkqhkiG9w0BAQsFADCBojELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF8DCCBNigAwIBAgIHGlGNEMJrKTANBgkqhkiG9w0BAQsFADCBojELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
 FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
@@ -97,28 +97,28 @@ M6VaDqej+QIgKFmUHqDy1MpFFr1cmTQa0G8aCccAHPzMDzpsy4ixjL+MeV/XQDr3
 4Wjha/zHnj7H5lVSNXdKuo8JwBERv5nf++6IiJs8R7agG7h9Lg9sc5oXyY+dv3pO
 KYeXaQluI5vCZTsL0vjTNZ1kphU4MWsXGXXtiP5p2G+cZw8s
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni-mainz.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF2jCCBMKgAwIBAgIHFUXfZ4347jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni-mainz.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF2jCCBMKgAwIBAgIHFUXfZ4347jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UE
 BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
 LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
 FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
@@ -151,30 +151,30 @@ Zt2tbiyWnF28DXObhDp6tKRbnaEyX1/lTSNVHB20tvj4yPhfNgy6BINSpkPa3Otg
 rmPKXapBTUXw83z+IQnGkFBKypI3ceETkGaydx+aHwCyL9WBKRC87GfKFSvB620e
 QlWpyRQfOn6GOvmhDbM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e265</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e265</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-mainz.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-mainz.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Glatzer</md:SurName>
-      <md:EmailAddress>mailto:glatzert@uni-mainz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ZDV</md:GivenName>
-      <md:SurName>Hotline</md:SurName>
-      <md:EmailAddress>mailto:hotline@uni-mainz.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e265</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e265</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-mainz.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-mainz.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Glatzer</md:SurName>
+    <md:EmailAddress>mailto:glatzert@uni-mainz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ZDV</md:GivenName>
+    <md:SurName>Hotline</md:SurName>
+    <md:EmailAddress>mailto:hotline@uni-mainz.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml
index 14c779a5..a2011b0f 100644
--- a/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uni.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Northern Iowa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Northern Iowa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uni.edu/its/success/federated-identity-based-authentication-and-authorization</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni.edu/policies/web-privacy-statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="151" width="150" xml:lang="en">https://shib.uni.edu/uni_shib_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Northern Iowa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Northern Iowa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uni.edu/its/success/federated-identity-based-authentication-and-authorization</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uni.edu/policies/web-privacy-statement</mdui:PrivacyStatementURL>
-          <mdui:Logo height="151" width="150" xml:lang="en">https://shib.uni.edu/uni_shib_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUCu4IcZbPLmOuHB1lfiwiMS3C3awwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MB4XDTEwMTEwODIyMTYwN1oXDTMw
 MTEwODIyMTYwN1owFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MIIBIjANBgkqhkiG
@@ -41,23 +41,23 @@ r+MGykM/8VJU9Qql88dSUZ/kJru02gNQaqFpjAL3fk+R901tdP4+B4LYQlb+jHg5
 3p5sK3Hiue0026r9kZw9D7u+fPecPUxnjZLBo7WgI5fPZ+lKhXTPNzeFqP+rAdDe
 kCdWJpucLkkmoLQQ21pIXNh5PSelhthswpCAnAkulA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUCu4IcZbPLmOuHB1lfiwiMS3C3awwDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MB4XDTEwMTEwODIyMTYwN1oXDTMw
 MTEwODIyMTYwN1owFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MIIBIjANBgkqhkiG
@@ -76,22 +76,22 @@ r+MGykM/8VJU9Qql88dSUZ/kJru02gNQaqFpjAL3fk+R901tdP4+B4LYQlb+jHg5
 3p5sK3Hiue0026r9kZw9D7u+fPecPUxnjZLBo7WgI5fPZ+lKhXTPNzeFqP+rAdDe
 kCdWJpucLkkmoLQQ21pIXNh5PSelhthswpCAnAkulA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Northern Iowa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Northern Iowa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uni.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Aaron Thompson</md:GivenName>
-      <md:EmailAddress>aaron.thompson@uni.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Steve Moon</md:GivenName>
-      <md:EmailAddress>steve.moon@uni.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Northern Iowa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Northern Iowa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uni.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aaron Thompson</md:GivenName>
+    <md:EmailAddress>aaron.thompson@uni.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Steve Moon</md:GivenName>
+    <md:EmailAddress>steve.moon@uni.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
index 9ed00174..39f61b7d 100644
--- a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unibo.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università di Bologna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Bologna</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Università di Bologna</mdui:Description>
+        <mdui:Description xml:lang="en">University of Bologna</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.unibo.it/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unibo.it/idem</mdui:InformationURL>
+        <mdui:Keywords xml:lang="it">unibo bologna alma alma+mater </mdui:Keywords>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unibo.it</mdui:DomainHint>
+        <mdui:DomainHint>www.unibo.it</mdui:DomainHint>
+        <mdui:IPHint>137.204.0.0/16</mdui:IPHint>
+        <mdui:GeolocationHint>geo:44.497253,11.353107</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.140212,12.24427</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.219036,12.042714</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.413318,12.200308</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.061449,12.569894</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università di Bologna</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Bologna</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Università di Bologna</mdui:Description>
-          <mdui:Description xml:lang="en">University of Bologna</mdui:Description>
-          <mdui:InformationURL xml:lang="it">http://www.unibo.it/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.unibo.it/idem</mdui:InformationURL>
-          <mdui:Keywords xml:lang="it">unibo bologna alma alma+mater </mdui:Keywords>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>unibo.it</mdui:DomainHint>
-          <mdui:DomainHint>www.unibo.it</mdui:DomainHint>
-          <mdui:IPHint>137.204.0.0/16</mdui:IPHint>
-          <mdui:GeolocationHint>geo:44.497253,11.353107</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:44.140212,12.24427</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:44.219036,12.042714</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:44.413318,12.200308</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:44.061449,12.569894</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
 MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
@@ -56,24 +56,24 @@ vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
 tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
 WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unibo.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unibo.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unibo.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unibo.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unibo.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unibo.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unibo.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unibo.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
 MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
@@ -92,23 +92,23 @@ vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
 tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
 WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unibo.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unibo.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Bologna</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università di Bologna</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Bologna</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Bologna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eng.unibo.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unibo.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:cesia-sso-support@unibo.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unibo.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unibo.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bologna</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università di Bologna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bologna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Bologna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eng.unibo.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unibo.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:cesia-sso-support@unibo.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml
index 060c51f6..b031581a 100644
--- a/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.univ-reims.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-08T10:46:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-08T10:46:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TEST - URCA</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-reims.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">TEST - URCA</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">TEST - URCA</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">TEST - URCA</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">TEST - URCA</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-reims.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">TEST - URCA</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">TEST - URCA</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">TEST - URCA</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVAPkhMvLgY2ZrI5pH4Iz9K3yEoaBnMA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEnNoaWIudW5pdi1yZWltcy5mcjAeFw0xNTEyMDcxNjE4
 MjJaFw0zNTEyMDcxNjE4MjJaMB0xGzAZBgNVBAMMEnNoaWIudW5pdi1yZWltcy5m
@@ -39,22 +39,22 @@ RII++BqGUGcbDULDV3QsfqmhtGIJx3zeenGcdbJlwv7mdzYywvtlXrmSpLWkdDO6
 KjXqULhEIW1vrF4ffyTEphjqptw89dWd2O972IM/xSiEWz1HDXd8BsyODRihLZq/
 LJ8gs2GQxRQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TEST - URCA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TEST - URCA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-reims.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Kevin Déré</md:SurName>
-      <md:EmailAddress>kevin.dere@univ-reims.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TEST - URCA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TEST - URCA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-reims.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Kevin Déré</md:SurName>
+    <md:EmailAddress>kevin.dere@univ-reims.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
index 3c3d31ec..f7a52a3d 100644
--- a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unl.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unl.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nebraska-Lincoln</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Nebraska-Lincoln, chartered in 1869, is an educational institution of international stature. UNL is listed by the Carnegie Foundation within the "Research Universities (very high research activity)" category. UNL is a land-grant university and a member of the Association of Public and Land-grant Universities (APLU). The university is accredited by the Higher Learning Commission of the North Central Association of Colleges and Schools.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unl.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://its.unl.edu/unlprivacypolicy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="67" width="66" xml:lang="en">https://idm.unl.edu/wdn/templates_3.0/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unl.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nebraska-Lincoln</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Nebraska-Lincoln, chartered in 1869, is an educational institution of international stature. UNL is listed by the Carnegie Foundation within the "Research Universities (very high research activity)" category. UNL is a land-grant university and a member of the Association of Public and Land-grant Universities (APLU). The university is accredited by the Higher Learning Commission of the North Central Association of Colleges and Schools.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unl.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://its.unl.edu/unlprivacypolicy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="67" width="66" xml:lang="en">https://idm.unl.edu/wdn/templates_3.0/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVALR4hUzlhDFUyPrCzbCR8aB8/okIMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTAeFw0xMDA5MTAyMTA4MjZaFw0z
 MDA5MTAyMTA4MjZaMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTCCASIwDQYJKoZI
@@ -44,33 +44,33 @@ ko224ENGUqVqFkBiZJWH5ooxOM/8Gt4Ut1cTkNxyMSJvno7Gki95l0M45fNfSbWw
 voZFOzm0IBZx1K786PNxotISs/WY/R7yJA91L0FCzrXFMh+jK5L1nCg5ZfEL0YEM
 D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unl.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unl.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unl.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unl.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Paul Erickson</md:GivenName>
-      <md:EmailAddress>phe@unl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UNL Computer Help Center</md:GivenName>
-      <md:EmailAddress>mysupport@unl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brett Bieber</md:GivenName>
-      <md:EmailAddress>bieber@unl.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>UNL Security Team</md:GivenName>
-      <md:EmailAddress>security@unl.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unl.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unl.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unl.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unl.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Paul Erickson</md:GivenName>
+    <md:EmailAddress>phe@unl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UNL Computer Help Center</md:GivenName>
+    <md:EmailAddress>mysupport@unl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brett Bieber</md:GivenName>
+    <md:EmailAddress>bieber@unl.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>UNL Security Team</md:GivenName>
+    <md:EmailAddress>security@unl.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml
index 37279e26..64ae9ff2 100644
--- a/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.utb.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://helpdesk.utb.edu/SitePages/default.aspx" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas At Brownsville</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://helpdesk.utb.edu/SitePages/default.aspx" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas At Brownsville</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAPskM9VOo/UHjUvs7z0EEEw6JcEUMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTAeFw0wOTExMTIxODQyNTRa
 Fw0yOTExMTIxODQyNTRaMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTCCASIw
@@ -37,23 +37,23 @@ ErShJeYhWztnOVhcLe8pFrJt0BwJZO63mgRRmyiZ93GjvPeRIm4ky9HEooA6n8y4
 Q/0+/UE2jZugQtVTd7yOtBYRKGpSSiDgsQRMyi9nacHoWS9nKqDnOUEFYQ3Zt9lL
 a9FpqaeIdrzlh0WNP/SodyEYHiALp5t9uvLCXzHb6wfvNhzRj7FB4AhRTLw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.utb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.utb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.utb.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.utb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.utb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.utb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.utb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.utb.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.utb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.utb.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAPskM9VOo/UHjUvs7z0EEEw6JcEUMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTAeFw0wOTExMTIxODQyNTRa
 Fw0yOTExMTIxODQyNTRaMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTCCASIw
@@ -72,23 +72,23 @@ ErShJeYhWztnOVhcLe8pFrJt0BwJZO63mgRRmyiZ93GjvPeRIm4ky9HEooA6n8y4
 Q/0+/UE2jZugQtVTd7yOtBYRKGpSSiDgsQRMyi9nacHoWS9nKqDnOUEFYQ3Zt9lL
 a9FpqaeIdrzlh0WNP/SodyEYHiALp5t9uvLCXzHb6wfvNhzRj7FB4AhRTLw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.utb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.utb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas At Brownsville</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas At Brownsville</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utb.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Abel De La Garza</md:GivenName>
-      <md:EmailAddress>Abel.DeLaGarza@utb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hermilo Deluze</md:GivenName>
-      <md:EmailAddress>Hermilo.Deluze1@utb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.utb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.utb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas At Brownsville</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas At Brownsville</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utb.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Abel De La Garza</md:GivenName>
+    <md:EmailAddress>Abel.DeLaGarza@utb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hermilo Deluze</md:GivenName>
+    <md:EmailAddress>Hermilo.Deluze1@utb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml
index 15b66c59..f9f48cf7 100644
--- a/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uthscsa.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://ims.uthscsa.edu/TechSuppt/HelpDesk.aspx" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthscsa.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At San Antonio</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://ims.uthscsa.edu/TechSuppt/HelpDesk.aspx" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthscsa.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At San Antonio</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUOBCFT1ioD0RKc/AB856Jnvb79kEwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQc2hpYi51dGhzY3NhLmVkdTAeFw0wOTEwMTkxNTUwMDha
 Fw0yOTEwMTkxNTUwMDhaMBsxGTAXBgNVBAMTEHNoaWIudXRoc2NzYS5lZHUwggEi
@@ -37,24 +37,24 @@ RDu+MTSSlVM/XbDOUxtoLWV0YnhhFksN6cseeqW5sUK+4pbj9as+PgTLSt+pxLzY
 WNfu12cY6+Qjam6zo6qiYXfqrvqoVvWf971mJWgf7APZqdp5GrLpMqQoa3XSgfQ6
 sZemi2r9GnG7yy/S/oAW5ZJjeHjRkp+4IBAjCVy8XmRkqx9Lbvq/eincPQjhDjQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uthscsa.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uthscsa.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uthscsa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uthscsa.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthscsa.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uthscsa.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uthscsa.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uthscsa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uthscsa.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthscsa.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUOBCFT1ioD0RKc/AB856Jnvb79kEwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQc2hpYi51dGhzY3NhLmVkdTAeFw0wOTEwMTkxNTUwMDha
 Fw0yOTEwMTkxNTUwMDhaMBsxGTAXBgNVBAMTEHNoaWIudXRoc2NzYS5lZHUwggEi
@@ -73,19 +73,19 @@ RDu+MTSSlVM/XbDOUxtoLWV0YnhhFksN6cseeqW5sUK+4pbj9as+PgTLSt+pxLzY
 WNfu12cY6+Qjam6zo6qiYXfqrvqoVvWf971mJWgf7APZqdp5GrLpMqQoa3XSgfQ6
 sZemi2r9GnG7yy/S/oAW5ZJjeHjRkp+4IBAjCVy8XmRkqx9Lbvq/eincPQjhDjQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas Health Science Center At San Antonio</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At San Antonio</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uthscsa.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian Purcell</md:GivenName>
-      <md:EmailAddress>purcell@uthscsa.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas Health Science Center At San Antonio</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At San Antonio</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uthscsa.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian Purcell</md:GivenName>
+    <md:EmailAddress>purcell@uthscsa.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml
index ebf2561f..09b02e96 100644
--- a/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uvu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Utah Valley University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Utah Valley University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIWjwZnQgd29AuQOjNMS9y2+8FFwMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTAeFw0xMzEyMTAxNzU3MDNaFw0z
 MzEyMTAxNzU3MDNaMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTCCASIwDQYJKoZI
@@ -40,26 +40,26 @@ VMrMibM4Ev/bsVae0FBMJFhOvNc23AbdB4tGn28u7TKhh9GhVT6OQCFt3Mh9t7s9
 8ImEM2KbtYysjpDT7fIvlc7AOeeXSAmhdjSB+D3BKcJfwWqHEl9mZ0WQHgmPUj+L
 Brv9aaSeb9ZfeFo2Sw2coWZe3ONc4UsUWdwDiPjTElU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uvu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uvu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uvu.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uvu.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uvu.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uvu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uvu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uvu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uvu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uvu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uvu.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uvu.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uvu.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uvu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uvu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uvu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIWjwZnQgd29AuQOjNMS9y2+8FFwMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTAeFw0xMzEyMTAxNzU3MDNaFw0z
 MzEyMTAxNzU3MDNaMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTCCASIwDQYJKoZI
@@ -78,30 +78,30 @@ VMrMibM4Ev/bsVae0FBMJFhOvNc23AbdB4tGn28u7TKhh9GhVT6OQCFt3Mh9t7s9
 8ImEM2KbtYysjpDT7fIvlc7AOeeXSAmhdjSB+D3BKcJfwWqHEl9mZ0WQHgmPUj+L
 Brv9aaSeb9ZfeFo2Sw2coWZe3ONc4UsUWdwDiPjTElU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uvu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Utah Valley University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Utah Valley University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uvu.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel Hutchison</md:GivenName>
-      <md:EmailAddress>daniel.hutchison@uvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roark Fisher</md:GivenName>
-      <md:EmailAddress>roark.fisher@uvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ray Walker</md:GivenName>
-      <md:EmailAddress>ray.walker@uvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UVU Service Desk</md:GivenName>
-      <md:EmailAddress>servicedesk@uvu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uvu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Utah Valley University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Utah Valley University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uvu.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel Hutchison</md:GivenName>
+    <md:EmailAddress>daniel.hutchison@uvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roark Fisher</md:GivenName>
+    <md:EmailAddress>roark.fisher@uvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ray Walker</md:GivenName>
+    <md:EmailAddress>ray.walker@uvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UVU Service Desk</md:GivenName>
+    <md:EmailAddress>servicedesk@uvu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml
index f4cf90cc..5901912f 100644
--- a/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.wheatonma.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wheatonma.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wheaton College (MA)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wheaton College Norton, MA</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wheatonma.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Wheaton College (MA)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Wheaton College Norton, MA</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDTCCAfWgAwIBAgIJAP6+QFyXUWbFMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMMEnNoaWIud2hlYXRvbm1hLmVkdTAeFw0xNDA0MTAxMjU2MzJaFw0yNDA0MDcx
 MjU2MzJaMB0xGzAZBgNVBAMMEnNoaWIud2hlYXRvbm1hLmVkdTCCASIwDQYJKoZI
@@ -41,23 +41,23 @@ S2QrfAb23EkRNm9JHzM7s5BBJJ/3D3ZvK52/XEb8fH//u0Y5cynkwpemf5PZYFnR
 UHlWki9gH3Vd3GPCCnSYDIuKE0QtzrjFoNdBgBsGxs82wyT/Tt6emn86g/xzWi/M
 Lcl69y1Yfli289CCOSkgiaU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.wheatonma.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.wheatonma.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.wheatonma.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wheatonma.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.wheatonma.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.wheatonma.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.wheatonma.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wheatonma.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDTCCAfWgAwIBAgIJAP6+QFyXUWbFMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMMEnNoaWIud2hlYXRvbm1hLmVkdTAeFw0xNDA0MTAxMjU2MzJaFw0yNDA0MDcx
 MjU2MzJaMB0xGzAZBgNVBAMMEnNoaWIud2hlYXRvbm1hLmVkdTCCASIwDQYJKoZI
@@ -76,18 +76,18 @@ S2QrfAb23EkRNm9JHzM7s5BBJJ/3D3ZvK52/XEb8fH//u0Y5cynkwpemf5PZYFnR
 UHlWki9gH3Vd3GPCCnSYDIuKE0QtzrjFoNdBgBsGxs82wyT/Tt6emn86g/xzWi/M
 Lcl69y1Yfli289CCOSkgiaU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wheaton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wheaton College (MA)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wheatoncollege.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian Gibson</md:GivenName>
-      <md:EmailAddress>incommon@wheatoncollege.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wheaton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wheaton College (MA)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wheatoncollege.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian Gibson</md:GivenName>
+    <md:EmailAddress>incommon@wheatoncollege.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml
index f0b8754f..e2573a7a 100644
--- a/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.wit.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wentworth Institute of Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.wit.edu/dts/network-services</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.wit.edu/dts/policies/incommon.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="85" width="274" xml:lang="en">https://shib.wit.edu/logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Wentworth Institute of Technology</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.wit.edu/dts/network-services</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.wit.edu/dts/policies/incommon.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="85" width="274" xml:lang="en">https://shib.wit.edu/logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAL4gPAI3pps+1dKHkSSIGxbUOJQVMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTAeFw0xMzA3MDIyMDQ1MDVaFw0z
 MzA3MDIyMDQ1MDVaMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTCCASIwDQYJKoZI
@@ -40,23 +40,23 @@ y6QzabIS0ZwYXcX++WTIQeRCenro+0AvjvYOw6ZPKdrTuzImGdPk37eXuXgqj1a1
 A6dXswKkeOmY7Ky2OFtCmKzgXiwzoUyAwijdkkpEKqKF+gl9kyef3H6pcYHr8/dJ
 pDCw7VYeZA86FY+O/OlnlcceJZkWJb7rRITUEVvQYz8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.wit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.wit.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.wit.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.wit.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.wit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.wit.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.wit.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.wit.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAL4gPAI3pps+1dKHkSSIGxbUOJQVMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTAeFw0xMzA3MDIyMDQ1MDVaFw0z
 MzA3MDIyMDQ1MDVaMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTCCASIwDQYJKoZI
@@ -75,30 +75,30 @@ y6QzabIS0ZwYXcX++WTIQeRCenro+0AvjvYOw6ZPKdrTuzImGdPk37eXuXgqj1a1
 A6dXswKkeOmY7Ky2OFtCmKzgXiwzoUyAwijdkkpEKqKF+gl9kyef3H6pcYHr8/dJ
 pDCw7VYeZA86FY+O/OlnlcceJZkWJb7rRITUEVvQYz8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wentworth Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wentworth Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Justin Sabourin</md:GivenName>
-      <md:EmailAddress>sabourinj@wit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Justin Ragsdale</md:GivenName>
-      <md:EmailAddress>ragsdalej@wit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DTS Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@wit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>John Knights</md:GivenName>
-      <md:EmailAddress>knightsj@wit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wentworth Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wentworth Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Justin Sabourin</md:GivenName>
+    <md:EmailAddress>sabourinj@wit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Justin Ragsdale</md:GivenName>
+    <md:EmailAddress>ragsdalej@wit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DTS Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@wit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>John Knights</md:GivenName>
+    <md:EmailAddress>knightsj@wit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml b/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml
index c787fe3e..3bf5bbd6 100644
--- a/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.worldcat.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE/zCCA+egAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBtTEaMBgGA1UEAxMRc2hp
 						Yi53b3JsZGNhdC5vcmcxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYD
 						VQQHEwZEdWJsaW4xMTAvBgNVBAoTKE9DTEMgT25saW5lIENvbXB1dGVyIExpYnJh
@@ -36,26 +36,26 @@
 						T4uXjY9tj/G02GBmtWdUU613Tw9zUbvpadjpb0ZwFfDE325mEa+2zg1UDFnNiwSK
 						XukDgQJevk8a+0iUk2C2SHuZwE88iFVjbZcqc1ZEoqlXct0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.worldcat.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.worldcat.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.worldcat.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.worldcat.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OCLC (UK) Limited: WorldCat.org</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UK Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Don</md:GivenName>
-      <md:SurName>Hamparian</md:SurName>
-      <md:EmailAddress>mailto:hamparid@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.worldcat.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.worldcat.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.worldcat.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.worldcat.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OCLC (UK) Limited: WorldCat.org</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UK Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Don</md:GivenName>
+    <md:SurName>Hamparian</md:SurName>
+    <md:EmailAddress>mailto:hamparid@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
index 2483e40e..6295effb 100644
--- a/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.york.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-15T11:05:25.614639Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-15T11:05:25.614639Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
 						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
@@ -36,26 +36,26 @@
 						WhdbSNckji6+UTBB/qSf6hsmJnVa4CQmg0XVqy0ceBkrkYHgEuVxesT64stH5nMJ
 						qc/emtVSHd3jgeSW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.york.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.york.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.york.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.york.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
 						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
 						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
@@ -79,25 +79,25 @@
 						WhdbSNckji6+UTBB/qSf6hsmJnVa4CQmg0XVqy0ceBkrkYHgEuVxesT64stH5nMJ
 						qc/emtVSHd3jgeSW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of York</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of York</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
index c9d072cc..646f6f32 100644
--- a/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.zcu.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:22:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:22:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zcu.cz</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gapps.zcu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of West Bohemia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Západočeská univerzita v Plzni</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for students and staff of the University of West Bohemia.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Západočeské univerzity v Plzni.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.zcu.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.zcu.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://shib.zcu.cz/icons/zcu_logo_40px.png</mdui:Logo>
+        <mdui:Logo height="102" width="102">https://shib.zcu.cz/icons/zcu_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zcu.cz</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gapps.zcu.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of West Bohemia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Západočeská univerzita v Plzni</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for students and staff of the University of West Bohemia.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Západočeské univerzity v Plzni.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.zcu.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.zcu.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://shib.zcu.cz/icons/zcu_logo_40px.png</mdui:Logo>
-          <mdui:Logo height="102" width="102">https://shib.zcu.cz/icons/zcu_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
 NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
@@ -52,29 +52,29 @@ d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
 C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.zcu.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.zcu.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.zcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.zcu.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zcu.cz</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gapps.zcu.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.zcu.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.zcu.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.zcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.zcu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zcu.cz</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gapps.zcu.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
 NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
@@ -94,27 +94,27 @@ d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
 C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of West Bohemia</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Západočeská univerzita v Plzni</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of West Bohemia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Západočeská univerzita v Plzni</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.zcu.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.zcu.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Grolmus</md:SurName>
-      <md:EmailAddress>indy@civ.zcu.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of West Bohemia</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Západočeská univerzita v Plzni</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of West Bohemia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Západočeská univerzita v Plzni</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.zcu.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.zcu.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Grolmus</md:SurName>
+    <md:EmailAddress>indy@civ.zcu.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
index bdb35c6a..bfa8bbf6 100644
--- a/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.coastal.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coastal.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Coastal Carolina University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coastal.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Coastal Carolina University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAPmtKMkTjP6RBo5vqaqeBo9Cwh65MA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEXNoaWIxLmNvYXN0YWwuZWR1MB4XDTE1MTIyMTE5NDAw
 OFoXDTM1MTIyMTE5NDAwOFowHDEaMBgGA1UEAwwRc2hpYjEuY29hc3RhbC5lZHUw
@@ -39,20 +39,20 @@ kF50bURYh9pl1w+m1JehzSeR0rPuFhx5uMXuD34tyO0ofwmlKJB+MCnhpZh9VXsU
 VySeXmS5PG0tCJeyQU0flRjY0Yvpy7VmPYBCiFjhKJ8/k5wHRO1fA7Dw052XeDZP
 T9t6jQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.coastal.edu/idp/profile/Logout"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.coastal.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.coastal.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coastal Carolina University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coastal Carolina University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.coastal.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike Richter</md:GivenName>
-      <md:EmailAddress>mrichter@coastal.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.coastal.edu/idp/profile/Logout"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.coastal.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.coastal.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coastal Carolina University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coastal Carolina University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.coastal.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike Richter</md:GivenName>
+    <md:EmailAddress>mrichter@coastal.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml
index 5f7306a4..958e127c 100644
--- a/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.hw.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-02T16:47:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-02T16:47:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hw.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hw.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEyjCCA7KgAwIBAgIJAIRz4nENPzTrMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRpbmJ1cmdoMR8w
 						HQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQLEwJJUzEXMBUG
@@ -40,26 +40,26 @@
 						LVmqVmL3cap2AeHoYFLsZerEuI/3ZgBE/P0em2OQxFyXAlWOSiD2piEgAUUxl4Vt
 						TeTRcCOx2CPOUV8iEok1S6c/YqtF3YOSmCca1Ey2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hw.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hw.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEyjCCA7KgAwIBAgIJAIRz4nENPzTrMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRpbmJ1cmdoMR8w
 						HQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQLEwJJUzEXMBUG
@@ -87,26 +87,26 @@
 						LVmqVmL3cap2AeHoYFLsZerEuI/3ZgBE/P0em2OQxFyXAlWOSiD2piEgAUUxl4Vt
 						TeTRcCOx2CPOUV8iEok1S6c/YqtF3YOSmCca1Ey2
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Heriot-Watt University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Heriot-Watt University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hw.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:ithelp@hw.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>George</md:GivenName>
-      <md:SurName>Livie</md:SurName>
-      <md:EmailAddress>mailto:G.Livie@hw.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Heriot-Watt University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Heriot-Watt University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hw.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:ithelp@hw.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>George</md:GivenName>
+    <md:SurName>Livie</md:SurName>
+    <md:EmailAddress>mailto:G.Livie@hw.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml b/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml
index 9fffe906..881f35aa 100644
--- a/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.napier.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-08T17:11:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-08T17:11:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">napier.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">napier.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUTi/qwLJiY52T4kltTmNqkd1B5l4wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVrMB4XDTE0MDMyNDE2MjEy
 						NloXDTM0MDMyNDE2MjEyNlowHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVr
@@ -32,26 +32,26 @@
 						NVZrPTK8LScXAcwOoMDzltNhzLHUa/WJUB95shI9hXSscHrpt8oQfHyAsrUoV07t
 						DeJEdpoirw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.napier.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.napier.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.napier.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.napier.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">napier.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.napier.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.napier.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.napier.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.napier.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">napier.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIUTi/qwLJiY52T4kltTmNqkd1B5l4wDQYJKoZIhvcNAQEF
 						BQAwHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVrMB4XDTE0MDMyNDE2MjEy
 						NloXDTM0MDMyNDE2MjEyNlowHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVr
@@ -71,27 +71,27 @@
 						NVZrPTK8LScXAcwOoMDzltNhzLHUa/WJUB95shI9hXSscHrpt8oQfHyAsrUoV07t
 						DeJEdpoirw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Edinburgh Napier University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edinburgh Napier University (legacy)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.napier.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Foley</md:SurName>
-      <md:EmailAddress>mailto:citsupport@napier.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Todd</md:SurName>
-      <md:EmailAddress>mailto:J.Todd@napier.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Edinburgh Napier University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edinburgh Napier University (legacy)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.napier.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Foley</md:SurName>
+    <md:EmailAddress>mailto:citsupport@napier.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Todd</md:SurName>
+    <md:EmailAddress>mailto:J.Todd@napier.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml
index 07dcc7a1..3003962e 100644
--- a/swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.univ-nc.nc/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-07T06:55:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-07T06:55:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nc.nc</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of New-Caledonia</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCElEQVQoz22Ry09TQRTGz5yZe+eCLbcPbGlTCwsSUCMpxhgTNT4g8RVXbgyuXOofQCAxUTfu1IWJrsQVf4BGWRITsHGHQhAIRiI2tcXa9Lalvb2PGRa9KbZ4VmdOvt98M98hUkoAwDc/AQAA5q9FL/Zp8L/KlhbS36dYx9R1jfTmo0J1xa8lh2IT8cD55nyr8L5i/rqZmsOKud1SJ9R1t/w0HjzX6zuRLS28W7qR3pwCgI3cbI/WP5K4x5lOk2OvLcfo8Y9ljK+3+z4MJ5+kIseOhMeHYnfq1s637Mzf6gql2mDkVvNSNpK4v5x5eaV3OzVYnP7x7Ppxz40z/dLRV5zpksCpgenWK4iUciM3O7c6+Tw3k7GGD3768VKp2TwcDXgAAJx8+/tL0SIE5q9GL7QDrQDF3X4A8FJaLdmHGFEoYUg6ctMosYQU0jt6QJAjp4QjKJ16CHOsu7LmyDYgpKLGCEeiHHAIcVpzBaey06GLEo12Avm6G+TIHVDRA9ADVAxxDHPcqtj/Aov5RkjFoIq6gm0O43FtzbC7KX7aafgVPBPhALCYNz/mzABHhnA2qu7vAQAyu+6LtbKPoUaJgoAAroSGkDVHVm1ZtsWDlD7gY/sAACwXrc9/GowQFQkScIQ0XVl1pCXk5VjX6cPtDs2q2mLdcAqmiwRsAbu2iHTT0ZCqq9jS7AFb2suDvgWTpwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-nc.nc</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Users from the University of New-Caledonia</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de la Nouvelle-Calédonie</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les usagers de l'Université de la Nouvelle-Calédonie</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nc.nc</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of New-Caledonia</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCElEQVQoz22Ry09TQRTGz5yZe+eCLbcPbGlTCwsSUCMpxhgTNT4g8RVXbgyuXOofQCAxUTfu1IWJrsQVf4BGWRITsHGHQhAIRiI2tcXa9Lalvb2PGRa9KbZ4VmdOvt98M98hUkoAwDc/AQAA5q9FL/Zp8L/KlhbS36dYx9R1jfTmo0J1xa8lh2IT8cD55nyr8L5i/rqZmsOKud1SJ9R1t/w0HjzX6zuRLS28W7qR3pwCgI3cbI/WP5K4x5lOk2OvLcfo8Y9ljK+3+z4MJ5+kIseOhMeHYnfq1s637Mzf6gql2mDkVvNSNpK4v5x5eaV3OzVYnP7x7Ppxz40z/dLRV5zpksCpgenWK4iUciM3O7c6+Tw3k7GGD3768VKp2TwcDXgAAJx8+/tL0SIE5q9GL7QDrQDF3X4A8FJaLdmHGFEoYUg6ctMosYQU0jt6QJAjp4QjKJ16CHOsu7LmyDYgpKLGCEeiHHAIcVpzBaey06GLEo12Avm6G+TIHVDRA9ADVAxxDHPcqtj/Aov5RkjFoIq6gm0O43FtzbC7KX7aafgVPBPhALCYNz/mzABHhnA2qu7vAQAyu+6LtbKPoUaJgoAAroSGkDVHVm1ZtsWDlD7gY/sAACwXrc9/GowQFQkScIQ0XVl1pCXk5VjX6cPtDs2q2mLdcAqmiwRsAbu2iHTT0ZCqq9jS7AFb2suDvgWTpwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-nc.nc</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Users from the University of New-Caledonia</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de la Nouvelle-Calédonie</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Les usagers de l'Université de la Nouvelle-Calédonie</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKzCCAhOgAwIBAgIUKHSh1ylYLiRjTuGeUpFo+BFI/NswDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAwwQc2hpYjEudW5pdi1uYy5uYzAeFw0xNTA0MDcwMjU3NTda
 Fw0zNTA0MDcwMjU3NTdaMBsxGTAXBgNVBAMMEHNoaWIxLnVuaXYtbmMubmMwggEi
@@ -39,21 +39,21 @@ dZMZ4qfiTgpW69Qb1z6CGCouZC2ssxSc4YK6lDO9fKhnbE+9N0nFYrJNwONPy5Sv
 +XhkKPoxbZ2BMnwQZlbCzoJPt9mG1hcpxrjEDpu5MDl4Ma12ycSHOAjLedMvv2Xv
 IsXFZf9tlVP3B/KFbcFPpRJviR3uaiwWsahu7Zd0ojoS20riz5LOdWi8i281QUU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.univ-nc.nc/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.univ-nc.nc/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.univ-nc.nc/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de la Nouvelle-Calédonie</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de la Nouvelle-Calédonie</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-nc.nc</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi-srs@univ-nc.nc</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.univ-nc.nc/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.univ-nc.nc/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.univ-nc.nc/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de la Nouvelle-Calédonie</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de la Nouvelle-Calédonie</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-nc.nc</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi-srs@univ-nc.nc</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml
index 0737030a..4034eb4a 100644
--- a/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1.uwplatt.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwplatt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin - Platteville</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Wisconsin-Platteville Shibboleth IdP Server</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uwplatt.edu/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://kb.uwplatt.edu/page.php?id=36091</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="60" xml:lang="en">https://shib1.uwplatt.edu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwplatt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin - Platteville</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Wisconsin-Platteville Shibboleth IdP Server</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uwplatt.edu/about</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://kb.uwplatt.edu/page.php?id=36091</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="60" xml:lang="en">https://shib1.uwplatt.edu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAP8Xbwf1Tuc/Rp4EvdoU1gZkcvOrMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWIxLnV3cGxhdHQuZWR1MB4XDTE0MDUwOTE1MDcw
 MloXDTM0MDUwOTE1MDcwMlowHDEaMBgGA1UEAxMRc2hpYjEudXdwbGF0dC5lZHUw
@@ -42,23 +42,23 @@ o/7CBCSFgT8NxLha7tuxYka6zYh9CymL5hEEDDrE7+j/IqYdgNrnVQORMei3SsZR
 rJ5rLt9TKWB4CB+6csEOqQ0kMSk5t8Sqr2p+97SSv8Og+nXdrE9NabrSNFB3r0rG
 WmxXwg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.uwplatt.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.uwplatt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.uwplatt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwplatt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.uwplatt.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.uwplatt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.uwplatt.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwplatt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAP8Xbwf1Tuc/Rp4EvdoU1gZkcvOrMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWIxLnV3cGxhdHQuZWR1MB4XDTE0MDUwOTE1MDcw
 MloXDTM0MDUwOTE1MDcwMlowHDEaMBgGA1UEAxMRc2hpYjEudXdwbGF0dC5lZHUw
@@ -78,30 +78,30 @@ o/7CBCSFgT8NxLha7tuxYka6zYh9CymL5hEEDDrE7+j/IqYdgNrnVQORMei3SsZR
 rJ5rLt9TKWB4CB+6csEOqQ0kMSk5t8Sqr2p+97SSv8Og+nXdrE9NabrSNFB3r0rG
 WmxXwg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin - Platteville</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Platteville</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwplatt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mike Sherer</md:GivenName>
-      <md:EmailAddress>sherer@uwplatt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UW-Platteville Help desk</md:GivenName>
-      <md:EmailAddress>helpdesk@uwplatt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Mike Perkins</md:GivenName>
-      <md:EmailAddress>perkinsm@uwplatt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike Perkins</md:GivenName>
-      <md:EmailAddress>perkinsm@uwplatt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin - Platteville</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Platteville</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwplatt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mike Sherer</md:GivenName>
+    <md:EmailAddress>sherer@uwplatt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UW-Platteville Help desk</md:GivenName>
+    <md:EmailAddress>helpdesk@uwplatt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Mike Perkins</md:GivenName>
+    <md:EmailAddress>perkinsm@uwplatt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike Perkins</md:GivenName>
+    <md:EmailAddress>perkinsm@uwplatt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml
index 85ed1606..8e2605b9 100644
--- a/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib1snc.suffolk.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:48:13Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:48:13Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suffolk.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suffolk.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUfzCoW57XmoYd7vMlxp5dQBZ3IlswDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYjFzbmMuc3VmZm9say5hYy51azAeFw0xMjA4MTYx
 						MDQxNTlaFw0zMjA4MTYxMDQxNTlaMCExHzAdBgNVBAMTFnNoaWIxc25jLnN1ZmZv
@@ -30,26 +30,26 @@
 						oTvLS1eWkipkwLD7bfT+cFix5ADRu35TL+OSXiONhIcS/JYk6SLsEk1tAbvBfXoW
 						DPvOr2BNReNY3ljjUNFUUmRke9HXoqk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1snc.suffolk.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suffolk.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1snc.suffolk.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suffolk.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUfzCoW57XmoYd7vMlxp5dQBZ3IlswDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYjFzbmMuc3VmZm9say5hYy51azAeFw0xMjA4MTYx
 						MDQxNTlaFw0zMjA4MTYxMDQxNTlaMCExHzAdBgNVBAMTFnNoaWIxc25jLnN1ZmZv
@@ -69,27 +69,27 @@
 						oTvLS1eWkipkwLD7bfT+cFix5ADRu35TL+OSXiONhIcS/JYk6SLsEk1tAbvBfXoW
 						DPvOr2BNReNY3ljjUNFUUmRke9HXoqk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Suffolk New College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Suffolk New College (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.suffolk.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Burhan</md:GivenName>
-      <md:SurName>Loqueman</md:SurName>
-      <md:EmailAddress>mailto:burhanloqueman@suffolk.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Burhan</md:GivenName>
-      <md:SurName>Loqueman</md:SurName>
-      <md:EmailAddress>mailto:burhanloqueman@suffolk.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Suffolk New College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Suffolk New College (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.suffolk.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Burhan</md:GivenName>
+    <md:SurName>Loqueman</md:SurName>
+    <md:EmailAddress>mailto:burhanloqueman@suffolk.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Burhan</md:GivenName>
+    <md:SurName>Loqueman</md:SurName>
+    <md:EmailAddress>mailto:burhanloqueman@suffolk.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml
index 4e00cec6..3d18e180 100644
--- a/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.blackpool.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Blackpool and The Fylde College (Development)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shib2.blackpool.ac.uk/gif/BFC-Logo-80x60.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib2.blackpool.ac.uk/gif/BFC-Logo-16x16.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
+        <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
+        <mdui:DomainHint>blackpool.ac.uk</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Blackpool and The Fylde College (Development)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shib2.blackpool.ac.uk/gif/BFC-Logo-80x60.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib2.blackpool.ac.uk/gif/BFC-Logo-16x16.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
-          <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
-          <mdui:DomainHint>blackpool.ac.uk</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHjCCAwagAwIBAgIJAIbJGsXAMFHuMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
 						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
@@ -54,26 +54,26 @@
 						ilVW760JMDOt2zkUwScTpKdDksPm/BqlTMZxfE+nFGu9xK7pgO39GmXYudXj1jFL
 						TpE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.blackpool.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.blackpool.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">blackpool.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHjCCAwagAwIBAgIJAIbJGsXAMFHuMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
 						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
@@ -98,25 +98,25 @@
 						ilVW760JMDOt2zkUwScTpKdDksPm/BqlTMZxfE+nFGu9xK7pgO39GmXYudXj1jFL
 						TpE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Blackpool and The Fylde College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Blackpool and The Fylde College (Development)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.blackpool.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@blackpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical support</md:GivenName>
-      <md:EmailAddress>mailto:shib-tech@blackpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Blackpool and The Fylde College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Blackpool and The Fylde College (Development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.blackpool.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@blackpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical support</md:GivenName>
+    <md:EmailAddress>mailto:shib-tech@blackpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml
index 54e46e59..58a01bf3 100644
--- a/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.its.rochester.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shib2.its.rochester.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Rochester</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.rochester.edu/aboutus/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shib2.its.rochester.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Rochester</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.rochester.edu/aboutus/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAM8nPCRk50aihh9jR5hpm0QebIz8MA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWIyLml0cy5yb2NoZXN0ZXIuZWR1MB4XDTEwMDUw
 MzE3Mzk0NloXDTMwMDUwMzE3Mzk0NlowIjEgMB4GA1UEAxMXc2hpYjIuaXRzLnJv
@@ -42,23 +42,23 @@ XfUt2z0ezqr2o+rDRnkBZLiizpHQcaIycAEoOsQpjg1tQE7Uc/uk4pah/eHu1f1C
 bkmTAMBCJrx8UG038vZR+ylLz1i+I2UI7AmhvNfuh84TdMZH85Sf5G8mPz+Krwib
 5iANvMct2zX06MsOylywfcDKALrij57mN3ZP+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.its.rochester.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.its.rochester.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.its.rochester.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.its.rochester.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAM8nPCRk50aihh9jR5hpm0QebIz8MA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWIyLml0cy5yb2NoZXN0ZXIuZWR1MB4XDTEwMDUw
 MzE3Mzk0NloXDTMwMDUwMzE3Mzk0NlowIjEgMB4GA1UEAxMXc2hpYjIuaXRzLnJv
@@ -78,27 +78,27 @@ XfUt2z0ezqr2o+rDRnkBZLiizpHQcaIycAEoOsQpjg1tQE7Uc/uk4pah/eHu1f1C
 bkmTAMBCJrx8UG038vZR+ylLz1i+I2UI7AmhvNfuh84TdMZH85Sf5G8mPz+Krwib
 5iANvMct2zX06MsOylywfcDKALrij57mN3ZP+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.its.rochester.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Rochester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Rochester</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rochester.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sean Singh</md:GivenName>
-      <md:EmailAddress>sean.singh@rochester.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sean Singh</md:GivenName>
-      <md:EmailAddress>sean.singh@rochester.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Lisa Sprague</md:GivenName>
-      <md:EmailAddress>lisa.sprague@rochester.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.its.rochester.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Rochester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Rochester</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rochester.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sean Singh</md:GivenName>
+    <md:EmailAddress>sean.singh@rochester.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sean Singh</md:GivenName>
+    <md:EmailAddress>sean.singh@rochester.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Lisa Sprague</md:GivenName>
+    <md:EmailAddress>lisa.sprague@rochester.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
index 8e4804ef..077dc951 100644
--- a/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.qmu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:46:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:46:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Queen Margaret University, Edinburgh</mdui:DisplayName>
+        <mdui:Logo height="47" width="50">https://shib2.qmu.ac.uk/qmu_logo.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib2.qmu.ac.uk/qmu_icon.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>194.83.92.0/23</mdui:IPHint>
+        <mdui:IPHint>193.62.47.0/24</mdui:IPHint>
+        <mdui:IPHint>194.83.30.0/24</mdui:IPHint>
+        <mdui:IPHint>212.219.89.0/25</mdui:IPHint>
+        <mdui:DomainHint>qmu.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.931696,-3.073457</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0         urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Queen Margaret University, Edinburgh</mdui:DisplayName>
-          <mdui:Logo height="47" width="50">https://shib2.qmu.ac.uk/qmu_logo.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib2.qmu.ac.uk/qmu_icon.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>194.83.92.0/23</mdui:IPHint>
-          <mdui:IPHint>193.62.47.0/24</mdui:IPHint>
-          <mdui:IPHint>194.83.30.0/24</mdui:IPHint>
-          <mdui:IPHint>212.219.89.0/25</mdui:IPHint>
-          <mdui:DomainHint>qmu.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:55.931696,-3.073457</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
 						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -44,13 +44,13 @@
 						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
 						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
 						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -69,13 +69,13 @@
 						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
 						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIURpdjTjwcGImbW/r7Ao0+z0pBc3IwDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMB4XDTE2MDUxNjA5MzQwMloX
 						DTM2MDUxNjA5MzQwMlowGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMIIBIjAN
@@ -94,26 +94,26 @@
 						z37vNMXQier73zDk2HVG5WcWiaES3PTfNl079s0nxaAM0rDPXj5oiz+f1R5qrRav
 						XO4oH51Nh8eXR90oA0t+1LhpLw5tCg5UNDCRJU3YcvxVXZf14DhcyQVZvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
 						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -132,13 +132,13 @@
 						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
 						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
 						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
 						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
@@ -157,13 +157,13 @@
 						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
 						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIURpdjTjwcGImbW/r7Ao0+z0pBc3IwDQYJKoZIhvcNAQEL
 						BQAwGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMB4XDTE2MDUxNjA5MzQwMloX
 						DTM2MDUxNjA5MzQwMlowGjEYMBYGA1UEAwwPc2hpYjIucW11LmFjLnVrMIIBIjAN
@@ -182,27 +182,27 @@
 						z37vNMXQier73zDk2HVG5WcWiaES3PTfNl079s0nxaAM0rDPXj5oiz+f1R5qrRav
 						XO4oH51Nh8eXR90oA0t+1LhpLw5tCg5UNDCRJU3YcvxVXZf14DhcyQVZvg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Garry</md:GivenName>
-      <md:SurName>Haining</md:SurName>
-      <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Garry</md:GivenName>
-      <md:SurName>Haining</md:SurName>
-      <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Haining</md:SurName>
+    <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Garry</md:GivenName>
+    <md:SurName>Haining</md:SurName>
+    <md:EmailAddress>mailto:ghaining@qmu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml
index 190751e5..2ef566a4 100644
--- a/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.swmed.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.utsouthwestern.edu/about-us/administrative-offices/information-resources/index.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsouthwestern.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Logon service for The University of Texas Southwestern Medical Center</mdui:Description>
+        <mdui:Logo height="103" width="75" xml:lang="en">https://idm.utsystem.edu/images/utswmc-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.utsouthwestern.edu/about-us/administrative-offices/information-resources/index.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsouthwestern.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Logon service for The University of Texas Southwestern Medical Center</mdui:Description>
-          <mdui:Logo height="103" width="75" xml:lang="en">https://idm.utsystem.edu/images/utswmc-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGkTCCBHmgAwIBAgIJANAN4Fnb5GaDMA0GCSqGSIb3DQEBBQUAMIHeMQswCQYD
 VQQGEwJVUzEOMAwGA1UEEQwFNzUzOTAxCzAJBgNVBAgMAlRYMQ8wDQYDVQQHDAZE
 YWxsYXMxIzAhBgNVBAkMGjUzMjMgSGFycnkgSGluZXMgQm91bGV2YXJkMTwwOgYD
@@ -58,23 +58,23 @@ O35IIGQHv2FgFQKMjjVRdJjquwzTPQRF8XnE6HlrVXxBF0SQsOQgsfvbl/XXrccQ
 X4aHLDhWmas7794s9j8vWMaeLdzuc4MVKuUioCoMbx0NFtQtF/yTunNTAvBGlykT
 +3mYgUw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.swmed.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.swmed.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.swmed.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.swmed.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.swmed.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsouthwestern.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.swmed.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.swmed.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.swmed.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.swmed.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.swmed.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsouthwestern.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGkTCCBHmgAwIBAgIJANAN4Fnb5GaDMA0GCSqGSIb3DQEBBQUAMIHeMQswCQYD
 VQQGEwJVUzEOMAwGA1UEEQwFNzUzOTAxCzAJBgNVBAgMAlRYMQ8wDQYDVQQHDAZE
 YWxsYXMxIzAhBgNVBAkMGjUzMjMgSGFycnkgSGluZXMgQm91bGV2YXJkMTwwOgYD
@@ -112,18 +112,18 @@ O35IIGQHv2FgFQKMjjVRdJjquwzTPQRF8XnE6HlrVXxBF0SQsOQgsfvbl/XXrccQ
 X4aHLDhWmas7794s9j8vWMaeLdzuc4MVKuUioCoMbx0NFtQtF/yTunNTAvBGlykT
 +3mYgUw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.swmed.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www3.utsouthwestern.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter Smith</md:GivenName>
-      <md:EmailAddress>Peter.Smith@UTSouthwestern.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.swmed.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www3.utsouthwestern.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter Smith</md:GivenName>
+    <md:EmailAddress>Peter.Smith@UTSouthwestern.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml
index 9813b39f..60a1d886 100644
--- a/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.utep.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utep.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas at El Paso</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Logon service for The University of Texas at El Paso</mdui:Description>
+        <mdui:Logo height="100" width="75" xml:lang="en">https://idm.utsystem.edu/images/utep-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utep.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas at El Paso</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Logon service for The University of Texas at El Paso</mdui:Description>
-          <mdui:Logo height="100" width="75" xml:lang="en">https://idm.utsystem.edu/images/utep-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUSDSYO+BRB2O9LZP6/yb56FSVeZAwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYjIudXRlcC5lZHUwHhcNMTAwNDI5MjE1NTM1WhcN
 MzAwNDI5MjE1NTM1WjAZMRcwFQYDVQQDEw5zaGliMi51dGVwLmVkdTCCASIwDQYJ
@@ -39,23 +39,23 @@ rOHQE4QHJpgt05WsxsrN5dslpg3NChR90uxgS1SaYvHk2PfLqLsWY0MX438ScgY5
 bFEBNN3InSuW4rFBadZRNZsFgfejnw5apBHDW5EGlZKYrtAHFQCjliAVhOmA711U
 N0vWPiofU45Ka1EWdfwhlEuVQW2UzUcogTJreXpCBhj61gExq6FZ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.utep.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.utep.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.utep.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.utep.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.utep.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utep.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.utep.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.utep.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.utep.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.utep.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.utep.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utep.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUSDSYO+BRB2O9LZP6/yb56FSVeZAwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYjIudXRlcC5lZHUwHhcNMTAwNDI5MjE1NTM1WhcN
 MzAwNDI5MjE1NTM1WjAZMRcwFQYDVQQDEw5zaGliMi51dGVwLmVkdTCCASIwDQYJ
@@ -74,27 +74,27 @@ rOHQE4QHJpgt05WsxsrN5dslpg3NChR90uxgS1SaYvHk2PfLqLsWY0MX438ScgY5
 bFEBNN3InSuW4rFBadZRNZsFgfejnw5apBHDW5EGlZKYrtAHFQCjliAVhOmA711U
 N0vWPiofU45Ka1EWdfwhlEuVQW2UzUcogTJreXpCBhj61gExq6FZ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.utep.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.utep.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas at El Paso</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas at El Paso</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utep.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Gerard Cochrane</md:GivenName>
-      <md:EmailAddress>gdcochrane@utep.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Information Security Office</md:GivenName>
-      <md:EmailAddress>security@utep.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@utep.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.utep.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.utep.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas at El Paso</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas at El Paso</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utep.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gerard Cochrane</md:GivenName>
+    <md:EmailAddress>gdcochrane@utep.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Information Security Office</md:GivenName>
+    <md:EmailAddress>security@utep.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@utep.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml
index 0e1e8f2d..7da17da1 100644
--- a/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2idp-2.rgu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-27T13:00:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-27T13:00:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEozCCA4ugAwIBAgIRAKWfpZdh7g9wz9mxzKXmeEMwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -44,26 +44,26 @@
 						KTjfii2gfRVj3nY0/gfyOeGB2zuQbz+npQYHqVzALIrWbFqwvMErl+sww2vN3lcw
 						QJ781d5laJnxYr9a1fWShNVgPZB2fQvl3DglKN/fnRBY6xb96bpV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEozCCA4ugAwIBAgIRAKWfpZdh7g9wz9mxzKXmeEMwDQYJKoZIhvcNAQELBQAw
 						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -90,27 +90,27 @@
 						KTjfii2gfRVj3nY0/gfyOeGB2zuQbz+npQYHqVzALIrWbFqwvMErl+sww2vN3lcw
 						QJ781d5laJnxYr9a1fWShNVgPZB2fQvl3DglKN/fnRBY6xb96bpV
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Robert Gordon University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Robert Gordon University - TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Milne</md:SurName>
-      <md:EmailAddress>mailto:r.milne@rgu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Cunningham</md:SurName>
-      <md:EmailAddress>mailto:m.cunningham@rgu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Robert Gordon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Robert Gordon University - TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Milne</md:SurName>
+    <md:EmailAddress>mailto:r.milne@rgu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Cunningham</md:SurName>
+    <md:EmailAddress>mailto:m.cunningham@rgu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
index 41a74678..fad71707 100644
--- a/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2idp.ntu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nottingham Trent University</mdui:DisplayName>
+        <mdui:Logo height="33" width="38">https://shib2idp.ntu.ac.uk/cas/themes/ntu/ntushib-v2.PNG</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nottingham Trent University</mdui:DisplayName>
-          <mdui:Logo height="33" width="38">https://shib2idp.ntu.ac.uk/cas/themes/ntu/ntushib-v2.PNG</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFETCCA/mgAwIBAgIUf6ORiSVI2C32bVc/pw0qlk211l4wDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTEwMzEyMDQy
@@ -44,26 +44,26 @@
 						Jxl/t3PafEIUbWMpcSWZinaLGZ/2nZ9cRH3fgu45o1co8CjjrDHTGSrWdjhKrmgM
 						fjw7AVA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2idp.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2idp.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFETCCA/mgAwIBAgIUf6ORiSVI2C32bVc/pw0qlk211l4wDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTEwMzEyMDQy
@@ -93,27 +93,27 @@
 						Jxl/t3PafEIUbWMpcSWZinaLGZ/2nZ9cRH3fgu45o1co8CjjrDHTGSrWdjhKrmgM
 						fjw7AVA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nottingham Trent University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Cross</md:SurName>
-      <md:EmailAddress>mailto:richard.cross@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Hallam</md:SurName>
-      <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nottingham Trent University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Cross</md:SurName>
+    <md:EmailAddress>mailto:richard.cross@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Hallam</md:SurName>
+    <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml
index 877f8501..bfbc5941 100644
--- a/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2idp.rgu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-15T14:21:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-15T14:21:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYDCCA0igAwIBAgIJANG+SOhVkyPLMA0GCSqGSIb3DQEBCwUAMIGwMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
 						ZW4xITAfBgNVBAoTGFJvYmVydCBHb3Jkb24gVW5pdmVyc2l0eTEUMBIGA1UECxML
@@ -38,26 +38,26 @@
 						Xz2bbxGztusvVUYAr75X+daVeh+/9N9SEybqeOuk99VSHBDwwaVkFiul2LzZRi0V
 						XyNCrBFWNSC7s6MHLPcmlrG8YdY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.rgu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.rgu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYDCCA0igAwIBAgIJANG+SOhVkyPLMA0GCSqGSIb3DQEBCwUAMIGwMQswCQYD
 						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
 						ZW4xITAfBgNVBAoTGFJvYmVydCBHb3Jkb24gVW5pdmVyc2l0eTEUMBIGA1UECxML
@@ -83,27 +83,27 @@
 						Xz2bbxGztusvVUYAr75X+daVeh+/9N9SEybqeOuk99VSHBDwwaVkFiul2LzZRi0V
 						XyNCrBFWNSC7s6MHLPcmlrG8YdY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Robert Gordon University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Robert Gordon University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Milne</md:SurName>
-      <md:EmailAddress>mailto:r.milne@rgu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Cunningham</md:SurName>
-      <md:EmailAddress>mailto:m.cunningham@rgu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Robert Gordon University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Robert Gordon University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Milne</md:SurName>
+    <md:EmailAddress>mailto:r.milne@rgu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Cunningham</md:SurName>
+    <md:EmailAddress>mailto:m.cunningham@rgu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml
index e02e87b0..57cb1fba 100644
--- a/swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shib4.rowan.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib4.rowan.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rowan University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Rowan University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rowan University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Rowan University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDBzCCAe+gAwIBAgIJAKC0AtYYd0CFMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMMD3NoaWI0LnJvd2FuLmVkdTAeFw0xNjAzMjExODA2MjVaFw0yNjAzMTkxODA2
 MjVaMBoxGDAWBgNVBAMMD3NoaWI0LnJvd2FuLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -38,19 +38,19 @@ NdBJLXZ5ANl4eeeLvWwPtmXco9C7lD6K9f4AukHZy5isb98dzy38F9zAcceaSJB8
 jFOTfTqZ3gaY/iMM80r/D+BrficUUKE00N/OOU8fToIohseWg/0t8GDOtz+TwQQB
 Vy/iNeK/cyCyf8I=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib4.rowan.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib4.rowan.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rowan University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rowan University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rowan.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Grochowski</md:GivenName>
-      <md:EmailAddress>grochowski@rowan.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib4.rowan.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib4.rowan.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rowan University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rowan University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rowan.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Grochowski</md:GivenName>
+    <md:EmailAddress>grochowski@rowan.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml
index 191de19e..acd0c702 100644
--- a/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb-idp.cymoedd.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-20T15:44:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-20T15:44:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cymoedd.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Coleg y Cymoedd</mdui:DisplayName>
+        <mdui:Logo height="40" width="80">https://sam.cymoedd.ac.uk/shibbolethlogos/cymoeddlogo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://sam.cymoedd.ac.uk/shibbolethlogos/cymoeddlogo.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cymoedd.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Coleg y Cymoedd</mdui:DisplayName>
-          <mdui:Logo height="40" width="80">https://sam.cymoedd.ac.uk/shibbolethlogos/cymoeddlogo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://sam.cymoedd.ac.uk/shibbolethlogos/cymoeddlogo.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIULRO7ZHUs0SJDRM62ZW0iCOUY4fQwDQYJKoZIhvcNAQEF
 						BQAwIjEgMB4GA1UEAxMXc2hpYmItaWRwLmN5bW9lZGQuYWMudWswHhcNMTMxMjE4
 						MTMyNTQ2WhcNMzMxMjE4MTMyNTQ2WjAiMSAwHgYDVQQDExdzaGliYi1pZHAuY3lt
@@ -37,29 +37,29 @@
 						ZFTP7dCtcvT15Mg9ASKN2e6jNKbZm5YaAPPY8NJMZ88jcCvqk6t/r+qD1OU8fcFM
 						lBlhGNippVT4jOwxY47G+V1Xc7aPz6F/X6Tm
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cymoedd.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cymoedd.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIULRO7ZHUs0SJDRM62ZW0iCOUY4fQwDQYJKoZIhvcNAQEF
 						BQAwIjEgMB4GA1UEAxMXc2hpYmItaWRwLmN5bW9lZGQuYWMudWswHhcNMTMxMjE4
 						MTMyNTQ2WhcNMzMxMjE4MTMyNTQ2WjAiMSAwHgYDVQQDExdzaGliYi1pZHAuY3lt
@@ -79,27 +79,27 @@
 						ZFTP7dCtcvT15Mg9ASKN2e6jNKbZm5YaAPPY8NJMZ88jcCvqk6t/r+qD1OU8fcFM
 						lBlhGNippVT4jOwxY47G+V1Xc7aPz6F/X6Tm
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coleg y Cymoedd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg y Cymoedd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cymoedd.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Joseph</md:SurName>
-      <md:EmailAddress>mailto:Chris.Joseph@cymoedd.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Joseph</md:SurName>
-      <md:EmailAddress>mailto:Chris.Joseph@cymoedd.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coleg y Cymoedd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg y Cymoedd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cymoedd.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Joseph</md:SurName>
+    <md:EmailAddress>mailto:Chris.Joseph@cymoedd.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Joseph</md:SurName>
+    <md:EmailAddress>mailto:Chris.Joseph@cymoedd.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml
index 1a9c0d92..d8f64a51 100644
--- a/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb-idp.georgetown.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgetown.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Georgetown University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgetown.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Georgetown University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVAK6Lh23lIaSgXAUl1GG/B1nM7SKjMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5nZW9yZ2V0b3duLmVkdTAeFw0xMDA2
 MTQxNjExNDZaFw0zMDA2MTQxNjExNDZaMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5n
@@ -38,23 +38,23 @@ cupokw76fdO6ik8BtdIUWzCoN5vpH94hg8QTW4BLg7Gh7ZXy6ymHytKCZqkgaoUk
 qeQASM800x93B3n6jr1GEq3m6r+MLEkVBlDmymZG9CWGBY6UOUsJt9U4Xe/r1DDI
 QN6kfDHIlXFhLmKYCtzxMjBf7TziEOIt2ZYrKM6CRI8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.georgetown.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.georgetown.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.georgetown.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgetown.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.georgetown.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.georgetown.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.georgetown.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgetown.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVAK6Lh23lIaSgXAUl1GG/B1nM7SKjMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5nZW9yZ2V0b3duLmVkdTAeFw0xMDA2
 MTQxNjExNDZaFw0zMDA2MTQxNjExNDZaMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5n
@@ -74,31 +74,31 @@ cupokw76fdO6ik8BtdIUWzCoN5vpH94hg8QTW4BLg7Gh7ZXy6ymHytKCZqkgaoUk
 qeQASM800x93B3n6jr1GEq3m6r+MLEkVBlDmymZG9CWGBY6UOUsJt9U4Xe/r1DDI
 QN6kfDHIlXFhLmKYCtzxMjBf7TziEOIt2ZYrKM6CRI8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Georgetown University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Georgetown University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.georgetown.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marty Johnson</md:GivenName>
-      <md:EmailAddress>es-collaboration@georgetown.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Suresh Veliveli</md:GivenName>
-      <md:EmailAddress>es-collaboration@georgetown.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>help@georgetown.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>University Information Security Officer</md:GivenName>
-      <md:EmailAddress>security@georgetown.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Georgetown University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Georgetown University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.georgetown.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marty Johnson</md:GivenName>
+    <md:EmailAddress>es-collaboration@georgetown.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Suresh Veliveli</md:GivenName>
+    <md:EmailAddress>es-collaboration@georgetown.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>help@georgetown.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>University Information Security Officer</md:GivenName>
+    <md:EmailAddress>security@georgetown.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
index 6bb489de..bf7b55ad 100644
--- a/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb-prod.eseo.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-11T17:24:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-11T17:24:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eseo.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Groupe ESEO</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjklEQVQoz22PW0iTYRzGn/f9Pr/t29lDzkxZWDdF4rEiCKQIw1AMjIiitMKoSK3AqGsvQgoxyA7eNMIIBLsyM89JmTp1GlPLnJOZ20xt2pzTbd/eLhxh0v/yx/Pj+T9gjPVbZm2zbrtrubnPyhh70zEelCS7Y8nuXAoEgvWto4yx1s/WYFBijPEAIjVyEKKQR+wxRAOIj1VTQkAJz1FCyNHMnQAS9BrGAIACSIzTWGw/u0fsPEf7xx3Lq+sA1gPB3rHZtgGbWinUtVrUKoHnKQAeQG3jcNnTdkJQfSXrnrFnzR/orDx9ubrV6nQbopUXspMrXvemJW3re1zIcRwFsLDsKz+ZOvWiWKtSHNkXV5qf0W6e/uXxDVSd6a4699HiqL+T41j0zrs94QYAWpXMEB/FjztFGa9Vy/2+NQA79NrYGJ0UYvooJaXUa/6yYpsIC5uv/NQBSZKevx/dwkM+r5if8x9BIQpbiORysWW3LHM/p4+hG6jhk/Xus3ZKYPo+X/zwnd21FGIoe9LZYpoEsNbWBVGxkQwLMwuewYnZg15HAl1rNE0am4cBZppw/phbAiDmHieC7B/hZn5q043DUWMj3S9vXc1NW/cHKCE91Wcv5WYCoLrIv++FBcaY11inuV1KCAUQ/PaVra4CkBbmQ7apzXvCo/2DZkVhbvPQTJd5SqEU+V27iXV8xWgU5heJPnGzQAEgFBJSkoWM9N8+v83lBkAiIsBxqqIiXWUFVarCUUoA8J5HNaTP+WA1urZjsiQvpWlopmXEUXMtS+C59JJXhhhVclJswf23Ik+jNAoAvDwv+/r57YEGkz8QPJZukMtk9rnFgqy9WrXqg3lapxQunkgLSKGCQ0miKAfwB8CbFDy3w6N2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwck/JggAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMSswMjowMAMScT4AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.eseo.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Groupe ESEO</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">École d'ingénieurs</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eseo.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Groupe ESEO</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjklEQVQoz22PW0iTYRzGn/f9Pr/t29lDzkxZWDdF4rEiCKQIw1AMjIiitMKoSK3AqGsvQgoxyA7eNMIIBLsyM89JmTp1GlPLnJOZ20xt2pzTbd/eLhxh0v/yx/Pj+T9gjPVbZm2zbrtrubnPyhh70zEelCS7Y8nuXAoEgvWto4yx1s/WYFBijPEAIjVyEKKQR+wxRAOIj1VTQkAJz1FCyNHMnQAS9BrGAIACSIzTWGw/u0fsPEf7xx3Lq+sA1gPB3rHZtgGbWinUtVrUKoHnKQAeQG3jcNnTdkJQfSXrnrFnzR/orDx9ubrV6nQbopUXspMrXvemJW3re1zIcRwFsLDsKz+ZOvWiWKtSHNkXV5qf0W6e/uXxDVSd6a4699HiqL+T41j0zrs94QYAWpXMEB/FjztFGa9Vy/2+NQA79NrYGJ0UYvooJaXUa/6yYpsIC5uv/NQBSZKevx/dwkM+r5if8x9BIQpbiORysWW3LHM/p4+hG6jhk/Xus3ZKYPo+X/zwnd21FGIoe9LZYpoEsNbWBVGxkQwLMwuewYnZg15HAl1rNE0am4cBZppw/phbAiDmHieC7B/hZn5q043DUWMj3S9vXc1NW/cHKCE91Wcv5WYCoLrIv++FBcaY11inuV1KCAUQ/PaVra4CkBbmQ7apzXvCo/2DZkVhbvPQTJd5SqEU+V27iXV8xWgU5heJPnGzQAEgFBJSkoWM9N8+v83lBkAiIsBxqqIiXWUFVarCUUoA8J5HNaTP+WA1urZjsiQvpWlopmXEUXMtS+C59JJXhhhVclJswf23Ik+jNAoAvDwv+/r57YEGkz8QPJZukMtk9rnFgqy9WrXqg3lapxQunkgLSKGCQ0miKAfwB8CbFDy3w6N2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwck/JggAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMSswMjowMAMScT4AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.eseo.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Groupe ESEO</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">École d'ingénieurs</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAPKv3AMhxdHV3jWXxqMbNKHYz0KVMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib3VsZXRoLmVzZW8uZnIwHhcNMTQwNTEzMTI0
 NDQ4WhcNMzQwNTEzMTI0NDQ4WjAeMRwwGgYDVQQDExNzaGliYm91bGV0aC5lc2Vv
@@ -39,26 +39,26 @@ BtBvR1BzklAZ6sLrXQMWerGNHAQIyQ8+SInFpqtbB9yJuWuc9oVaoGYIm3TI2N8S
 om24YGvt8hL3ZCb5y2+jFCIZyCf853CuTiEjLyT7c1KZzUPzvDVqf0gL5n3twqxj
 cE2NlFME1N0tqRVC
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-prod.eseo.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Groupe ESEO</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Groupe ESEO</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eseo.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Duclos Philippe</md:SurName>
-      <md:EmailAddress>philippe.duclos@eseo.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Tessier Fabien</md:SurName>
-      <md:EmailAddress>fabien.tessier@eseo.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-prod.eseo.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Groupe ESEO</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Groupe ESEO</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eseo.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Duclos Philippe</md:SurName>
+    <md:EmailAddress>philippe.duclos@eseo.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Tessier Fabien</md:SurName>
+    <md:EmailAddress>fabien.tessier@eseo.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
index 6d06eb8c..1fa942fe 100644
--- a/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.crous-amiens.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-24T10:29:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-24T10:29:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-amiens.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Amiens Picardie</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-amiens.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">staff of CROUS d'Amiens</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Amiens Picardie</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnels du CROUS d'Amiens</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-amiens.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Amiens Picardie</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-amiens.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">staff of CROUS d'Amiens</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CROUS Amiens Picardie</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnels du CROUS d'Amiens</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
 MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
@@ -40,23 +40,23 @@ MYiVo4dAlHPpZiCwfqSFmcYwWpv2wn2YOHQXwHW/IOoH4xRTe46OEEWMH4bnEaxF
 J5bzSDrmEU61MbWAP5bXoDLg1GwsD1Ii7W4OSj8NWCOSJfCcBssgu79muvxoxReh
 pext0rl4HCXbrR0ZoRaS0vDaIg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.crous-amiens.fr/idp/profile/shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-amiens.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.crous-amiens.fr/idp/profile/shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-amiens.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
 MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
@@ -76,19 +76,19 @@ MYiVo4dAlHPpZiCwfqSFmcYwWpv2wn2YOHQXwHW/IOoH4xRTe46OEEWMH4bnEaxF
 J5bzSDrmEU61MbWAP5bXoDLg1GwsD1Ii7W4OSj8NWCOSJfCcBssgu79muvxoxReh
 pext0rl4HCXbrR0ZoRaS0vDaIg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.crous-amiens.fr/idp/AA"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Amiens Picardie</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Amiens Picardie</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-amiens.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@crous-amiens.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.crous-amiens.fr/idp/AA"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Amiens Picardie</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Amiens Picardie</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-amiens.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@crous-amiens.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
index f9d6e24e..4438d7be 100644
--- a/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.hull-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-17T15:23:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-17T15:23:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hull College Group</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (Test)</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hull College Group</mdui:DisplayName>
-          <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (Test)</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -36,13 +36,13 @@
 						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
 						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -62,13 +62,13 @@
 						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
 						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
 						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
@@ -88,30 +88,30 @@
 						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
 						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -131,13 +131,13 @@
 						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
 						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
 						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
 						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
@@ -157,13 +157,13 @@
 						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
 						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
 						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
 						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
@@ -183,25 +183,25 @@
 						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
 						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hull College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hull College Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Skerrow</md:SurName>
-      <md:EmailAddress>mailto:Chris.Skerrow@hull-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Perry</md:SurName>
-      <md:EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hull College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hull College Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Skerrow</md:SurName>
+    <md:EmailAddress>mailto:Chris.Skerrow@hull-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Perry</md:SurName>
+    <md:EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml
index aa7279c2..257ae808 100644
--- a/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.stockport.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-20T11:53:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-20T11:53:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stockport.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stockport.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUM+WxIbWXv2I74/FnfG6jjwU+Ri0wDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0LmFjLnVrMB4XDTExMDUwNjE0
 						MDAyM1oXDTMxMDUwNjE0MDAyM1owIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0
@@ -32,26 +32,26 @@
 						DY9eQDYcEDia9hZgAs3FnwK2Cmwk6aqOIW3WlUMmVPCat764FOLrOMiAVtq4kFJq
 						ba0bpVtpnDdaJXtivnztmKRWPw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.stockport.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stockport.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.stockport.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stockport.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUM+WxIbWXv2I74/FnfG6jjwU+Ri0wDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0LmFjLnVrMB4XDTExMDUwNjE0
 						MDAyM1oXDTMxMDUwNjE0MDAyM1owIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0
@@ -71,37 +71,37 @@
 						DY9eQDYcEDia9hZgAs3FnwK2Cmwk6aqOIW3WlUMmVPCat764FOLrOMiAVtq4kFJq
 						ba0bpVtpnDdaJXtivnztmKRWPw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stockport College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stockport College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stockport.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nichole</md:GivenName>
-      <md:SurName>Bahrt</md:SurName>
-      <md:EmailAddress>mailto:nichole.bahrt@stockport.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:michael.smith@stockport.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Patrick</md:GivenName>
-      <md:SurName>Doherty</md:SurName>
-      <md:EmailAddress>mailto:Patrick.Doherty@Stockport.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Comer</md:SurName>
-      <md:EmailAddress>mailto:Robert.Comer@Stockport.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stockport College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockport College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stockport.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nichole</md:GivenName>
+    <md:SurName>Bahrt</md:SurName>
+    <md:EmailAddress>mailto:nichole.bahrt@stockport.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:michael.smith@stockport.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Patrick</md:GivenName>
+    <md:SurName>Doherty</md:SurName>
+    <md:EmailAddress>mailto:Patrick.Doherty@Stockport.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Comer</md:SurName>
+    <md:EmailAddress>mailto:Robert.Comer@Stockport.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml
index e6cd5e8f..cf3bb3c2 100644
--- a/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.utpb.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.utpb.edu/services/ird" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas of the Permian Basin</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.utpb.edu/services/ird" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas of the Permian Basin</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAP5tjp4Tow6cy5oFYmuYaqJvvh6kMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnNoaWJiLnV0cGIuZWR1MB4XDTA5MDIxNzIxMzQyOFoX
 DTI5MDIxNzIxMzQyOFowGTEXMBUGA1UEAxMOc2hpYmIudXRwYi5lZHUwggEiMA0G
@@ -37,23 +37,23 @@ qwf6ulhp0qtGtOXqrgA9eqll/g5fliDRS5Jn0LltriwYFq4FjSYIR5rnfOwQls6Y
 JCyQO8jWSKK5bulKzsYQL60j7C3WKzUdgG929H61rjkDREFZXMiPOkqsQvH17X5J
 YMaaG/t0+kQC2uFq/Kq9ruMjzOhSVywAO9St96lTyQhVB9JEmThZlw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.utpb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.utpb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.utpb.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.utpb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.utpb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.utpb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.utpb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.utpb.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.utpb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.utpb.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAP5tjp4Tow6cy5oFYmuYaqJvvh6kMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnNoaWJiLnV0cGIuZWR1MB4XDTA5MDIxNzIxMzQyOFoX
 DTI5MDIxNzIxMzQyOFowGTEXMBUGA1UEAxMOc2hpYmIudXRwYi5lZHUwggEiMA0G
@@ -72,18 +72,18 @@ qwf6ulhp0qtGtOXqrgA9eqll/g5fliDRS5Jn0LltriwYFq4FjSYIR5rnfOwQls6Y
 JCyQO8jWSKK5bulKzsYQL60j7C3WKzUdgG929H61rjkDREFZXMiPOkqsQvH17X5J
 YMaaG/t0+kQC2uFq/Kq9ruMjzOhSVywAO9St96lTyQhVB9JEmThZlw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.utpb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas of the Permian Basin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas of the Permian Basin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utpb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO Support</md:GivenName>
-      <md:EmailAddress>sso_support@utpb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.utpb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas of the Permian Basin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas of the Permian Basin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utpb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO Support</md:GivenName>
+    <md:EmailAddress>sso_support@utpb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml b/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml
index 5625e52f..d7c5f086 100644
--- a/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.ws.seemis.gov.scot/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
 						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
 						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
@@ -25,13 +25,13 @@
 						l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
 						mCaszq2WwCToAw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
 						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
 						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
@@ -49,24 +49,24 @@
 						l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
 						mCaszq2WwCToAw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML/POST" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SEEMIS Group LLP</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SEEMIS Group LLP: Glow Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.seemis.gov.scot/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SEEMIS Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:letters@seemis.gov.scot</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Mountfort</md:SurName>
-      <md:EmailAddress>mailto:ian.mountfort@seemis.gov.scot</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SEEMIS Group LLP</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SEEMIS Group LLP: Glow Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.seemis.gov.scot/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SEEMIS Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:letters@seemis.gov.scot</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Mountfort</md:SurName>
+    <md:EmailAddress>mailto:ian.mountfort@seemis.gov.scot</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
index 1e31c02c..327e7328 100644
--- a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb1.hj.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hj.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
+        <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="84" width="749">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="84" width="749">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://hj.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://hj.se/en/it-helpdesk/ju-faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hj.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hj.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
-          <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="84" width="749">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="84" width="749">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://hj.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://hj.se/en/it-helpdesk/ju-faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>hj.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
 MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
@@ -55,26 +55,26 @@ Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
 nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hj.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hj.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
 MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
@@ -94,36 +94,36 @@ Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
 nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HJ</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hj.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Jönköping University</md:Company>
-      <md:SurName>Joakim Danielsson</md:SurName>
-      <md:EmailAddress>mailto:Joakim.Danielsson@hj.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 36 101116</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Jönköping University</md:Company>
-      <md:SurName>Stefan Kindh</md:SurName>
-      <md:EmailAddress>mailto:Stefan.Kindh@hj.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 36 101170</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Jönköping University</md:Company>
-      <md:SurName>IT-Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@hj.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 36 101112</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HJ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hj.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Jönköping University</md:Company>
+    <md:SurName>Joakim Danielsson</md:SurName>
+    <md:EmailAddress>mailto:Joakim.Danielsson@hj.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 36 101116</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Jönköping University</md:Company>
+    <md:SurName>Stefan Kindh</md:SurName>
+    <md:EmailAddress>mailto:Stefan.Kindh@hj.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 36 101170</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Jönköping University</md:Company>
+    <md:SurName>IT-Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@hj.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 36 101112</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo-test.ec-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo-test.ec-lyon.fr-idp-shibboleth.xml
index ec845bb4..6a2b4a5b 100644
--- a/swamid-interfederations-2.0/shibbo-test.ec-lyon.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo-test.ec-lyon.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo-test.ec-lyon.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-12T12:27:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-12T12:27:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ECL TEST SHIBBOLETH 3</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98KBw0LB42T+3kAAAITSURBVDjLdZNBaBNREIa/3QatJeoeBL0UUxFKUEJQKejBxj0JElvFq1hyeCAqih6VHgpexaIi+w6lLfXioQ3koocuwYi0QuretBfNIqFgBTcRaiyh8eBseUYdeCwz+7//zfwzY3U6HQvDtNZZIAJSgC9hF6gBKaVU2cRbJoHWegoYi8H8aXFsWilViIOJLlB8yQEeAq/EPy3EANm/MpCXs3KmgdtKqairNAd4IEQBECilCpbneWeMWstKKdfvG9wauHuDqLIMQDKT5vPjGdyNVVtr7QO5WJuefD5vASOSdqparYZH9h0YGbh3Hbu3l2Qmzf5L52g3miysfQyBm4YmkwmpOwUUhXl8bW6Bb5W3tKPvv4VydtMK63Dizrh0qAyMAinbSH8WOAYEyUyaU+99hpaKZJ4/of/alViKQDCz4vuW53kdcS4qpYoAft/g1tBSkWQmDUArrPMm7eJurNoi6CgwD2DLkMSt2rb10iIA7UaTT/cfkdi7x/wdY92EiFEDxrTWE8DUoV07t19uN5qslxbZ3PyJ1noeKBjDVjNFBFgBitHwcbeun40DuaiyjL0jUY5OHp0AzgvGibvWUyqVwmq1elDUzQIffhzun7kw99R7d/ZyoxXWXw5/Da6+bnyJpN05EfOFUmqyexdWhCSSieweZScetv/tQmAQ3JJjLpMj339vo2SRMzave50dpVRg4n8Bxo3SMex00ZQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ec-lyon.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">try idp</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ECL TEST SHIBBOLETH 3</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">test idp</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lyon.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ECL TEST SHIBBOLETH 3</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98KBw0LB42T+3kAAAITSURBVDjLdZNBaBNREIa/3QatJeoeBL0UUxFKUEJQKejBxj0JElvFq1hyeCAqih6VHgpexaIi+w6lLfXioQ3koocuwYi0QuretBfNIqFgBTcRaiyh8eBseUYdeCwz+7//zfwzY3U6HQvDtNZZIAJSgC9hF6gBKaVU2cRbJoHWegoYi8H8aXFsWilViIOJLlB8yQEeAq/EPy3EANm/MpCXs3KmgdtKqairNAd4IEQBECilCpbneWeMWstKKdfvG9wauHuDqLIMQDKT5vPjGdyNVVtr7QO5WJuefD5vASOSdqparYZH9h0YGbh3Hbu3l2Qmzf5L52g3miysfQyBm4YmkwmpOwUUhXl8bW6Bb5W3tKPvv4VydtMK63Dizrh0qAyMAinbSH8WOAYEyUyaU+99hpaKZJ4/of/alViKQDCz4vuW53kdcS4qpYoAft/g1tBSkWQmDUArrPMm7eJurNoi6CgwD2DLkMSt2rb10iIA7UaTT/cfkdi7x/wdY92EiFEDxrTWE8DUoV07t19uN5qslxbZ3PyJ1noeKBjDVjNFBFgBitHwcbeun40DuaiyjL0jUY5OHp0AzgvGibvWUyqVwmq1elDUzQIffhzun7kw99R7d/ZyoxXWXw5/Da6+bnyJpN05EfOFUmqyexdWhCSSieweZScetv/tQmAQ3JJjLpMj339vo2SRMzave50dpVRg4n8Bxo3SMex00ZQAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ec-lyon.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">try idp</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ECL TEST SHIBBOLETH 3</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">test idp</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRDCCAiygAwIBAgIVAKVBoqwe5Fm8hSvwSLdpFm2shhtQMA0GCSqGSIb3DQEB
 CwUAMCExHzAdBgNVBAMMFnNoaWJiby10ZXN0LmVjLWx5b24uZnIwHhcNMTYwNDEy
 MDg0ODI0WhcNMzYwNDEyMDg0ODI0WjAhMR8wHQYDVQQDDBZzaGliYm8tdGVzdC5l
@@ -40,21 +40,21 @@ ibSxFhDIOBF9/pf1HIQBJqztrYzAk2q8rStsUlBnowufQlWTp0qQO4aDmM+ZLsQf
 CmaQ4JnCBxjNrn9J785FSzzPd+/6UgsZ3rhGaHMijQ3nXbVx+pkB2PQblT/lOIT0
 Q19ckbBi08THnfYxSSAm9NP92JvkvU2s
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo-test.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo-test.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo-test.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ECL TEST SHIBBOLETH 3</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ECL TEST SHIBBOLETH 3</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ec-lyon.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri.support@listes.ec-lyon.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo-test.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo-test.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo-test.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ECL TEST SHIBBOLETH 3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ECL TEST SHIBBOLETH 3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ec-lyon.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri.support@listes.ec-lyon.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
index ac32c0dc..c59baf0b 100644
--- a/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ec-nantes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-08T10:59:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-08T10:59:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-nantes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Centrale de Nantes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAAFNSURBVCjPPdCxS5RxHIDxz/f3vr52lYSaoQWhRUlQSzTUJA0txTm02NAuTf07+QcEDk0dhdAUNQVC0SCNXhyGQXjCXV7d+/4alJ71eaYnHs6njWiLrGVCXyhlDeTcadaL5Zflag7G7rnvs7/WTOpKIsrlfD1Fu0ah9sM5ax67idqUpBbtUmSn3DIy45IVDC1JLnunL6KEcM2qgV/2LDjtqeSFQ41CggOvfVEbWzBWS7KBWYsos7PuumDKyHkjP834rfLItJ6uksoVdyzqqdDDkZF9e7aRwoE3Pgi1gUnTthUqm96rhUStr1FoDHHVSMcZN7QEUjbrmQdCaYjCbd+90nVMGYY+2vVE6Q+4aM5bEwIkjnzyVWNCBcZqTjRJzpY8N+tIC3yzqzjRcsqdyowdm7bsy9j5HxRyJ1bmpza0c2Qha5lzqH88OOdOs/4P2YNzUjZh7G4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTQrMDI6MDCHVYN/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU0KzAyOjAw9gg7wwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ec-nantes.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Nantes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-nantes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Centrale de Nantes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAAFNSURBVCjPPdCxS5RxHIDxz/f3vr52lYSaoQWhRUlQSzTUJA0txTm02NAuTf07+QcEDk0dhdAUNQVC0SCNXhyGQXjCXV7d+/4alJ71eaYnHs6njWiLrGVCXyhlDeTcadaL5Zflag7G7rnvs7/WTOpKIsrlfD1Fu0ah9sM5ax67idqUpBbtUmSn3DIy45IVDC1JLnunL6KEcM2qgV/2LDjtqeSFQ41CggOvfVEbWzBWS7KBWYsos7PuumDKyHkjP834rfLItJ6uksoVdyzqqdDDkZF9e7aRwoE3Pgi1gUnTthUqm96rhUStr1FoDHHVSMcZN7QEUjbrmQdCaYjCbd+90nVMGYY+2vVE6Q+4aM5bEwIkjnzyVWNCBcZqTjRJzpY8N+tIC3yzqzjRcsqdyowdm7bsy9j5HxRyJ1bmpza0c2Qha5lzqH88OOdOs/4P2YNzUjZh7G4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTQrMDI6MDCHVYN/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU0KzAyOjAw9gg7wwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ec-nantes.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole Centrale de Nantes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAJo2ABzrdqEuYQPEMg3AUqxh974mMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJiby5lYy1uYW50ZXMuZnIwHhcNMDkwNjIzMTUy
 MzQ4WhcNMjkwNjIzMTUyMzQ4WjAeMRwwGgYDVQQDExNzaGliYm8uZWMtbmFudGVz
@@ -38,21 +38,21 @@ tuTqkhqTxNCAnLzSCtBB/QB36Ao/0hwAHxo6AbFVGQDd2BRhsqQpcApZpb1oDFEh
 bhRZNLT/IXdDvj9i4zhAYNSRRVQ1vmyZOCoyk8wHLcWSRnurt8bbK2V2DxI0TKZh
 +LPVwWXes1OQooJD
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ec-nantes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Centrale de Nantes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Nantes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ec-nantes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri-sys@ec-nantes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ec-nantes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Centrale de Nantes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Nantes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ec-nantes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri-sys@ec-nantes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
index aba3871a..17ae5c7f 100644
--- a/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.emse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-24T19:45:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-24T19:45:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB4UlEQVQ4y9WSX0hTARTGv3Pv9U9x53Ut72zgqFybJkhloA0RsQeJgojooWAbEj34IELQQxE9BdJDQaOwQeG2FJFMfInoJXHRzc2REIjNdM5h01zZDFviWqenhaK9+BJ9b9+B38c5hw/470XbBaOvmUiA4a8BXge3EcH0C8hMLWpHLKr9FjEOAlAADAOoZEJc3AIUVJ0lUqavdksiPo4nXl6oMDa8DcX6LhfmycL052CtUWeZBVD8I7Ncv2mDjtPvu0062xAETDHjEID+D0nNIxcYUpFPgaa1n2m9JOZ/P25rPeXy04iw4S6NDyx8i1hYxGNijBKhjwiyVbXf31Nke3bjziVraZE13GRtPeHy08jmx2h89O65hGedVwGgy8mG3Oz22fijqMa1OS+tD3j1AOJ0MnQ4qnFhoBPXAp144XNyJYCYz8kSEVKjs4PVQNnXHPPnBK+DW8LxwXvlJXVj19vdX5IrM+ZwfMDNjMZMNtMOQJEE6Pcaat7tt9NkjhOjGu8wpy56duYpQZNSsbaUnjOWyPsmE8sTthrzma6JhaFmo668B4AajD19ePP5sZMbiuRz8nmXn3q9Dr4KYA5AFRFCWcJYenXpipy/a56RVQQSgy4/PdmyNDNvePd2G/nv9Rtal7AqsQkV4AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OSswMjowMOaC4r8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDCX31oDAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.emse.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB4UlEQVQ4y9WSX0hTARTGv3Pv9U9x53Ut72zgqFybJkhloA0RsQeJgojooWAbEj34IELQQxE9BdJDQaOwQeG2FJFMfInoJXHRzc2REIjNdM5h01zZDFviWqenhaK9+BJ9b9+B38c5hw/470XbBaOvmUiA4a8BXge3EcH0C8hMLWpHLKr9FjEOAlAADAOoZEJc3AIUVJ0lUqavdksiPo4nXl6oMDa8DcX6LhfmycL052CtUWeZBVD8I7Ncv2mDjtPvu0062xAETDHjEID+D0nNIxcYUpFPgaa1n2m9JOZ/P25rPeXy04iw4S6NDyx8i1hYxGNijBKhjwiyVbXf31Nke3bjziVraZE13GRtPeHy08jmx2h89O65hGedVwGgy8mG3Oz22fijqMa1OS+tD3j1AOJ0MnQ4qnFhoBPXAp144XNyJYCYz8kSEVKjs4PVQNnXHPPnBK+DW8LxwXvlJXVj19vdX5IrM+ZwfMDNjMZMNtMOQJEE6Pcaat7tt9NkjhOjGu8wpy56duYpQZNSsbaUnjOWyPsmE8sTthrzma6JhaFmo668B4AajD19ePP5sZMbiuRz8nmXn3q9Dr4KYA5AFRFCWcJYenXpipy/a56RVQQSgy4/PdmyNDNvePd2G/nv9Rtal7AqsQkV4AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OSswMjowMOaC4r8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDCX31oDAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.emse.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDIzCCAgugAwIBAgIUWG4OdOHMXs/jWUMbrVKK/qGFpQgwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmJvLmVtc2UuZnIwHhcNMTEwMTI1MTUxOTAzWhcN
 MzEwMTI1MTUxOTAzWjAZMRcwFQYDVQQDEw5zaGliYm8uZW1zZS5mcjCCASIwDQYJ
@@ -37,21 +37,21 @@ bpyOZ6qLHkuuEPoYgtyn0h/mFudb/XGDD8exhidz7CkuO6IWfT/HB9RC4nf7IAHW
 060v4YqkJ/y5F87gyOTwsLlNA1vWuJ4L90/fgzhJ15sp3l38Dr8XPnaegFYRVyAM
 mG4EGyP6qUE1uSrPxMk9GFtp+QkIXdDDGi5u9iIkLzHPYUMB4IfI
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.emse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.emse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.emse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole des Mines de Saint-Etienne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.emse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi-admin@emse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.emse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.emse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.emse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole des Mines de Saint-Etienne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi-admin@emse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
index 1e7e05da..870e80f7 100644
--- a/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.enise.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-09T10:47:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-09T10:47:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enise.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENISE</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJUlEQVQoz02ST0hVQRTGzzkzc692yRJsISQRGNgiSAoKadGuctVWSFdtovYtXLRp0aYgNy0i+0NU4sKNFC0ikqIokkzBwkwfKfjC93g+e+++O3fmnBbjU7/VLH7fN98wH87PzxtjtNbGmHBQSiEiIjIzM3vvnXN5UzqgURTFcRzORLTbwMx5nocUANihoygyxiilCBEQ12uVA0k7CzNziAAAESGtdRRFOzQREt18dX/wyTAgEBHRFhM6k25qi0Zcqfx9ufDxwtHznwt/ilW77dkqrJravrdrZOj1lZFjHad//c7ezKwAACISUWB0CAgoADz4MHG7b6CW7hn/8iOJVe7F49LgmcMAEAxQLpfTNHXOiUipXoXrJ0RkI83Xa7ZUs6WaXas26tYJs7V2c3NTh7eH+HP3rk1ffQoAc8ulxdUNIgQA5/ns8YOHOpJAamYWEaXU5Pd33e2dvV091YZ79L7Q1qqhqamJuTuXelsViAgWi8UkSUTR3uHef7e+JaalkuZeAJu0AIiId7K/Rer1VHvvY2WGnt0YG7ibmBYAmF3aWFythD4AIAIK8cXC9OTli1XntHienJ16PjPW331q9O04Ihit4gQBEEQAgVkU0lz54eNPuv9IHxaWlr+u/czYCYEioubyQhsW1qTaW9uYGRm693Xqhs1OdvZEURz2obUmUqGPiIS12jy31tosS7OGds6l0Mi9y/LMWLP967sNYd7OOefcf6osMhcjak7pAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAwhJ20dgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMPXADMoAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enise.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENISE</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enise.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENISE</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJUlEQVQoz02ST0hVQRTGzzkzc692yRJsISQRGNgiSAoKadGuctVWSFdtovYtXLRp0aYgNy0i+0NU4sKNFC0ikqIokkzBwkwfKfjC93g+e+++O3fmnBbjU7/VLH7fN98wH87PzxtjtNbGmHBQSiEiIjIzM3vvnXN5UzqgURTFcRzORLTbwMx5nocUANihoygyxiilCBEQ12uVA0k7CzNziAAAESGtdRRFOzQREt18dX/wyTAgEBHRFhM6k25qi0Zcqfx9ufDxwtHznwt/ilW77dkqrJravrdrZOj1lZFjHad//c7ezKwAACISUWB0CAgoADz4MHG7b6CW7hn/8iOJVe7F49LgmcMAEAxQLpfTNHXOiUipXoXrJ0RkI83Xa7ZUs6WaXas26tYJs7V2c3NTh7eH+HP3rk1ffQoAc8ulxdUNIgQA5/ns8YOHOpJAamYWEaXU5Pd33e2dvV091YZ79L7Q1qqhqamJuTuXelsViAgWi8UkSUTR3uHef7e+JaalkuZeAJu0AIiId7K/Rer1VHvvY2WGnt0YG7ibmBYAmF3aWFythD4AIAIK8cXC9OTli1XntHienJ16PjPW331q9O04Ihit4gQBEEQAgVkU0lz54eNPuv9IHxaWlr+u/czYCYEioubyQhsW1qTaW9uYGRm693Xqhs1OdvZEURz2obUmUqGPiIS12jy31tosS7OGds6l0Mi9y/LMWLP967sNYd7OOefcf6osMhcjak7pAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAwhJ20dgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMPXADMoAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enise.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENISE</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKDCCAhCgAwIBAgIVAKRfdU8KUsLMr6sENGNF8GhmyStGMA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjAeFw0xMTA1MjcwOTIxNTZa
 Fw0zMTA1MjcwOTIxNTZaMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjCCASIw
@@ -37,26 +37,26 @@ S7B6tOHfCbl2dH4soGpfxa7lhqH8xu3JzJKOi+CHBL8q5zxzbiU2Q417gLeswhQ5
 +5cw3Bhz4p5olulTzUsIa1wfae+tSM7YemTCaR1VEKM3JvwHIbMKMeOuL8BCo6o5
 6GIWvBQQJOEbInHSvCFd41vN8us0nDsiislr1Bp26bXXME6ZX7MYct6LQgk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.enise.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enise.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enise.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENISE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENISE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enise.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Guy Dantony</md:SurName>
-      <md:EmailAddress>dantony@enise.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Garcia</md:SurName>
-      <md:EmailAddress>mathieu.garcia@enise.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.enise.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enise.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enise.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENISE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENISE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enise.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Guy Dantony</md:SurName>
+    <md:EmailAddress>dantony@enise.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Garcia</md:SurName>
+    <md:EmailAddress>mathieu.garcia@enise.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
index ec9d6bc7..2a61ec90 100644
--- a/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ephe.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T13:42:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T13:42:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ephe.sorbonne.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.ephe.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACkklEQVQ4y52SW0jTARjFv79bzXssG9Vo5aKlCUNiaoFJUPSQSpqsotIU8RqIBoWZF8gghUjCQIQi5oOEVoLKrGneW0Imal5Q25xuLt3mvambu5yeFCoS7Tydh/M7fHwcon9IBRAaG/rxczGG/kfoaBlsIT56g0/CDFzaGaxRP8bKYtJI9m3MKOrnB4oL1zE+8mp78IS6uEscgKHMJDQRF63EhargLjrJE9Bryv/MszfMChzk3tEqI7ddhgOXoyzM0cO7BXmeLpbJKbL4+5HtTpxV+aEpEaphFnMsIPm3lhkHCEDpQHj46kRZCcYS4pfn+rvX2kmAofQ0KMkXnalpljbi4wsRrLDnbV6gdYD2D/Z0vQ8MOn1RPWAgLu/t+MJs3PLEd/KrfULDCgV5kStpDHqO3+tiGK02RvcgN98Ou5zNsHsJBm1tPREmy4rQSARNUQGaiYeu4BDoKyvQRlxUnTuL9qeF+CQUOw11lc6u4xIMSG8AsEW4mHmCqHB5zZKxWk6H0lOIJTxi5F4IdZD7XjI4zeR6QkQizh4a15vIjdhMU+lLxu3WeWK5gnIKH/ozREQ6B8ijRzllnjGuz6uHfDyMJs/JALGLoK+fnBw2tap0FBN2hryuSJsdn9vEpplZrsybl/UoNraM2XiGHXbfHwnxGjPZSF+hIGHGVTL26YnGp8kUKiQfb3cSSa9PL74oP8iprgv0ZTHf/t7A8px0sKFmYTTxGlqflyzYFO8m3qTGQSt7hmoPESwf5XotHJKthzRvSO2OjoSuSrak9JPg6z5/yDOTMJafvca3gr+9NVpXU6AerVXlZqIuIxk2OGMpIkKyLXizxLx4s/dUGEbvZ61RQFDIjuDNEoctP/peTuRWmV+ezla3AwA+jQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ephe.sorbonne.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Administratifs , enseignants chercheurs et étudiants EPHE.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ephe.sorbonne.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.ephe.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACkklEQVQ4y52SW0jTARjFv79bzXssG9Vo5aKlCUNiaoFJUPSQSpqsotIU8RqIBoWZF8gghUjCQIQi5oOEVoLKrGneW0Imal5Q25xuLt3mvambu5yeFCoS7Tydh/M7fHwcon9IBRAaG/rxczGG/kfoaBlsIT56g0/CDFzaGaxRP8bKYtJI9m3MKOrnB4oL1zE+8mp78IS6uEscgKHMJDQRF63EhargLjrJE9Bryv/MszfMChzk3tEqI7ddhgOXoyzM0cO7BXmeLpbJKbL4+5HtTpxV+aEpEaphFnMsIPm3lhkHCEDpQHj46kRZCcYS4pfn+rvX2kmAofQ0KMkXnalpljbi4wsRrLDnbV6gdYD2D/Z0vQ8MOn1RPWAgLu/t+MJs3PLEd/KrfULDCgV5kStpDHqO3+tiGK02RvcgN98Ou5zNsHsJBm1tPREmy4rQSARNUQGaiYeu4BDoKyvQRlxUnTuL9qeF+CQUOw11lc6u4xIMSG8AsEW4mHmCqHB5zZKxWk6H0lOIJTxi5F4IdZD7XjI4zeR6QkQizh4a15vIjdhMU+lLxu3WeWK5gnIKH/ozREQ6B8ijRzllnjGuz6uHfDyMJs/JALGLoK+fnBw2tap0FBN2hryuSJsdn9vEpplZrsybl/UoNraM2XiGHXbfHwnxGjPZSF+hIGHGVTL26YnGp8kUKiQfb3cSSa9PL74oP8iprgv0ZTHf/t7A8px0sKFmYTTxGlqflyzYFO8m3qTGQSt7hmoPESwf5XotHJKthzRvSO2OjoSuSrak9JPg6z5/yDOTMJafvca3gr+9NVpXU6AerVXlZqIuIxk2OGMpIkKyLXizxLx4s/dUGEbvZ61RQFDIjuDNEoctP/peTuRWmV+ezla3AwA+jQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ephe.sorbonne.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Administratifs , enseignants chercheurs et étudiants EPHE.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJDCCAgygAwIBAgIVANOJEmB/RSq08vn3PcA/H7ukbajAMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnNoaWJiby5lcGhlLmZyMB4XDTE0MDUxOTA4MjI1N1oX
 DTM0MDUxOTA4MjI1N1owGTEXMBUGA1UEAxMOc2hpYmJvLmVwaGUuZnIwggEiMA0G
@@ -40,21 +40,21 @@ bjbOwp1K3V2q3i5Ai2k7FiOSvIuFAXK4KrIW7UQVlYz3K/m6owj1O9B0+IIG+HYG
 3KvObCZRk1aMAA6yTWAsBcVbaHueSvl2K2zW0HhXo8JvWz+LRRQRjTOagvBJoK1q
 hq79XpeV3MhLDgRkfc7tH1jHHeyUZUrOtcPvPmbLRySPxSB7WBtOqA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ephe.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ephe.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ephe.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ephe.sorbonne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>interv@ephe.sorbonne.Fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ephe.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ephe.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ephe.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ephe.sorbonne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>interv@ephe.sorbonne.Fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
index ea140152..2e2cae05 100644
--- a/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ltu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ltu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ltu.se</mdui:DomainHint>
+        <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ltu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
-          <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>ltu.se</mdui:DomainHint>
-          <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
 OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
@@ -51,26 +51,26 @@ w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
 B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ltu.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ltu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
 OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
@@ -90,36 +90,36 @@ w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
 B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LTU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ltu.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Lulea University of Technology</md:Company>
-      <md:SurName>LTU Servicedesk</md:SurName>
-      <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Lulea University of Technology</md:Company>
-      <md:SurName>LTU Servicedesk</md:SurName>
-      <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Lulea University of Technology</md:Company>
-      <md:SurName>LTU Servicedesk</md:SurName>
-      <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LTU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ltu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Lulea University of Technology</md:Company>
+    <md:SurName>LTU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Lulea University of Technology</md:Company>
+    <md:SurName>LTU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Lulea University of Technology</md:Company>
+    <md:SurName>LTU Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
index 41c8aef7..6c534b2d 100644
--- a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.tul.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-20T11:45:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-20T11:45:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tul.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technical University of Liberec</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Technická univerzita v Liberci</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Technical University of Liberec.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Technickou univerzitu v Liberci.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.tul.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.tul.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://liane.tul.cz/img/znak-tul.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tul.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Technical University of Liberec</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Technická univerzita v Liberci</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Technical University of Liberec.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro Technickou univerzitu v Liberci.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.tul.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.tul.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://liane.tul.cz/img/znak-tul.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                         MIID6jCCAtKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCQ1ox
                         EDAOBgNVBAcTB0xpYmVyZWMxKDAmBgNVBAoTH1RlY2huaWNhbCBVbml2ZXJzaXR5
                         IG9mIExpYmVyZWMxDjAMBgNVBAsTBUxpYW5lMSIwIAYDVQQDExlUVUwgQ2VydGlm
@@ -53,28 +53,28 @@
                         +UqvbZl6I4Rz3ZWHt8moGUGQF04kKGI3psHS6M0hxMQccNtbb269gFcuK5vb5AZa
                         nH0Q6NVuH5v93Y3fOM0wIgosOcrB90QrXq5BpWu+XL1VxhyPnSxTf/teOIy3hw==
                   </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.tul.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.tul.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tul.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.tul.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.tul.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tul.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                         MIID6jCCAtKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCQ1ox
                         EDAOBgNVBAcTB0xpYmVyZWMxKDAmBgNVBAoTH1RlY2huaWNhbCBVbml2ZXJzaXR5
                         IG9mIExpYmVyZWMxDjAMBgNVBAsTBUxpYW5lMSIwIAYDVQQDExlUVUwgQ2VydGlm
@@ -97,32 +97,32 @@
                         +UqvbZl6I4Rz3ZWHt8moGUGQF04kKGI3psHS6M0hxMQccNtbb269gFcuK5vb5AZa
                         nH0Q6NVuH5v93Y3fOM0wIgosOcrB90QrXq5BpWu+XL1VxhyPnSxTf/teOIy3hw==
                   </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Technical University of Liberec</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Technická univerzita v Liberci</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Technical University of Liberec</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Technická univerzita v Liberci</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tul.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.tul.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Adamec</md:SurName>
-      <md:EmailAddress>Petr.Adamec@tul.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Kmoch</md:SurName>
-      <md:EmailAddress>David.Kmoch@tul.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technical University of Liberec</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Technická univerzita v Liberci</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technical University of Liberec</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Technická univerzita v Liberci</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tul.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.tul.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Adamec</md:SurName>
+    <md:EmailAddress>Petr.Adamec@tul.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Kmoch</md:SurName>
+    <md:EmailAddress>David.Kmoch@tul.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml
index bac6aead..c3aa2f43 100644
--- a/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-2.baylor.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baylor.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Baylor University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baylor.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Baylor University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAJwrpZTSCIpBHJObNPrSziMptCxsMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGgtMi5iYXlsb3IuZWR1MB4XDTA4MTAx
 MDE1NTE1MloXDTI4MTAxMDE1NTE1MlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC0y
@@ -38,21 +38,21 @@ JtRoJmSugC0tc/E1FuSWyRkdzxra1ZZjakUbEZBYO0x5STmrFWZ0E6ewMLu6u/X2
 wp8io5JHRYH74kW3WeXaR0/hi2wiaVBsOACQ75dFrlJZTb4oMWGothemjzQV3K3Q
 xXawYVydT5jy18eqkAFFtBDOlRVFXEqY/oOetw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-2.baylor.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-2.baylor.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-2.baylor.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baylor.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-2.baylor.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-2.baylor.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-2.baylor.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baylor.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAJwrpZTSCIpBHJObNPrSziMptCxsMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGgtMi5iYXlsb3IuZWR1MB4XDTA4MTAx
 MDE1NTE1MloXDTI4MTAxMDE1NTE1MlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC0y
@@ -72,27 +72,27 @@ JtRoJmSugC0tc/E1FuSWyRkdzxra1ZZjakUbEZBYO0x5STmrFWZ0E6ewMLu6u/X2
 wp8io5JHRYH74kW3WeXaR0/hi2wiaVBsOACQ75dFrlJZTb4oMWGothemjzQV3K3Q
 xXawYVydT5jy18eqkAFFtBDOlRVFXEqY/oOetw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-2.baylor.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-2.baylor.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Baylor University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Baylor University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.baylor.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tommy Roberson</md:GivenName>
-      <md:EmailAddress>tommy_roberson@baylor.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Becky King</md:GivenName>
-      <md:EmailAddress>becky_king@baylor.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ray Nazzario</md:GivenName>
-      <md:EmailAddress>ray_nazzario@baylor.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-2.baylor.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-2.baylor.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Baylor University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Baylor University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.baylor.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tommy Roberson</md:GivenName>
+    <md:EmailAddress>tommy_roberson@baylor.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Becky King</md:GivenName>
+    <md:EmailAddress>becky_king@baylor.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ray Nazzario</md:GivenName>
+    <md:EmailAddress>ray_nazzario@baylor.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml b/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml
index 754a4827..2349283e 100644
--- a/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml
+++ b/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-dev-v.musc.edu/shibboleth-idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ztest_Medical University of South Carolina</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ztest_Medical University of South Carolina</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFZzCCBE+gAwIBAgIJAN5m0nACGtBMMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
 VQQGEwJVUzEXMBUGA1UECBMOU291dGggQ2Fyb2xpbmExEzARBgNVBAcTCkNoYXJs
 ZXN0b24xLTArBgNVBAoTJE1lZGljYWwgVW5pdmVyc2l0eSBvZiBTb3V0aCBDYXJv
@@ -50,24 +50,24 @@ OnY4wSmMr4fMM9XqZDkcZtCwaWJwmK6p1gHOkEUxkBUlT/LxWIUwShOATcsfFPmm
 QM9DHUw4fMzqiqGdj4gYPKb14f1ShAGCKnhzOH/ziiX1EuspJOIkLTWDdJhbMJ+a
 Fk6V6xmt1PTXZUnBvjYptaPWiVFHepuIdkaPr9Mvo7BvOc3CzwmmQUH5XA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">musc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFZzCCBE+gAwIBAgIJAN5m0nACGtBMMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
 VQQGEwJVUzEXMBUGA1UECBMOU291dGggQ2Fyb2xpbmExEzARBgNVBAcTCkNoYXJs
 ZXN0b24xLTArBgNVBAoTJE1lZGljYWwgVW5pdmVyc2l0eSBvZiBTb3V0aCBDYXJv
@@ -98,23 +98,23 @@ OnY4wSmMr4fMM9XqZDkcZtCwaWJwmK6p1gHOkEUxkBUlT/LxWIUwShOATcsfFPmm
 QM9DHUw4fMzqiqGdj4gYPKb14f1ShAGCKnhzOH/ziiX1EuspJOIkLTWDdJhbMJ+a
 Fk6V6xmt1PTXZUnBvjYptaPWiVFHepuIdkaPr9Mvo7BvOc3CzwmmQUH5XA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ztest_Medical University of South Carolina</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard Gadsden</md:GivenName>
-      <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vanna Vignesh</md:GivenName>
-      <md:EmailAddress>vignesh@musc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ztest_Medical University of South Carolina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard Gadsden</md:GivenName>
+    <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vanna Vignesh</md:GivenName>
+    <md:EmailAddress>vignesh@musc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml
index 6f0597cd..4b12decb 100644
--- a/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-dev.derby.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T12:03:26Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T12:03:26Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIVAIS5CSZypB0N/9WAdPoZcaHvhD9FMA0GCSqGSIb3DQEB
 						BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGgtZGV2LmRlcmJ5LmFjLnVrMB4XDTEz
 						MDYyMDExMjUxN1oXDTMzMDYyMDExMjUxN1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -35,26 +35,26 @@
 						0xKNdvCIJ2yeny2x5Bzm3aHXncUn6STA2SZYBOYHZjpFitBpAIc9oASCeMwu2Z18
 						Oa45E8Q95Tq7yvmGFuSBvH0K3ijY+V1yq+oNwRqKaX5QIvNAufFfMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIVAIS5CSZypB0N/9WAdPoZcaHvhD9FMA0GCSqGSIb3DQEB
 						BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGgtZGV2LmRlcmJ5LmFjLnVrMB4XDTEz
 						MDYyMDExMjUxN1oXDTMzMDYyMDExMjUxN1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -74,32 +74,32 @@
 						0xKNdvCIJ2yeny2x5Bzm3aHXncUn6STA2SZYBOYHZjpFitBpAIc9oASCeMwu2Z18
 						Oa45E8Q95Tq7yvmGFuSBvH0K3ijY+V1yq+oNwRqKaX5QIvNAufFfMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Derby</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Derby Shibboleth (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://ulib.derby.ac.uk/library/homelib.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Glenn</md:GivenName>
-      <md:SurName>Handley</md:SurName>
-      <md:EmailAddress>mailto:g.handley@derby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Glenn</md:GivenName>
-      <md:SurName>Handley</md:SurName>
-      <md:EmailAddress>mailto:g.handley@derby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Webb</md:SurName>
-      <md:EmailAddress>mailto:D.Webb@derby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Derby</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Derby Shibboleth (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ulib.derby.ac.uk/library/homelib.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Handley</md:SurName>
+    <md:EmailAddress>mailto:g.handley@derby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Handley</md:SurName>
+    <md:EmailAddress>mailto:g.handley@derby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Webb</md:SurName>
+    <md:EmailAddress>mailto:D.Webb@derby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml
index 253df5fb..ed275983 100644
--- a/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp-test.webbased.co.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-29T12:00:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-29T12:00:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">webbased.co.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">webbased.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdTCCAl2gAwIBAgIUU54vEjtKOOABUhSxZsk0VE1MwU0wDQYJKoZIhvcNAQEF
 						BQAwLTErMCkGA1UEAxMic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51
 						azAeFw0xMDA3MjAwODMzNDRaFw0zMDA3MjAwODMzNDRaMC0xKzApBgNVBAMTInNo
@@ -38,26 +38,26 @@
 						4b78OBcKNFBXX4xm/GfZOg0Uldru6AcXKOvImQ6X1+Ie+2eS9qOpVNYvQz5pJilu
 						bKl+hgG/XcLUN8kP64IgNZJDm/pt5zCyhA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">webbased.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">webbased.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdTCCAl2gAwIBAgIUU54vEjtKOOABUhSxZsk0VE1MwU0wDQYJKoZIhvcNAQEF
 						BQAwLTErMCkGA1UEAxMic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51
 						azAeFw0xMDA3MjAwODMzNDRaFw0zMDA3MjAwODMzNDRaMC0xKzApBgNVBAMTInNo
@@ -78,27 +78,27 @@
 						4b78OBcKNFBXX4xm/GfZOg0Uldru6AcXKOvImQ6X1+Ie+2eS9qOpVNYvQz5pJilu
 						bKl+hgG/XcLUN8kP64IgNZJDm/pt5zCyhA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">WebBased Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">WebBased Limited: Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.webbased.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martine</md:GivenName>
-      <md:SurName>Davies</md:SurName>
-      <md:EmailAddress>mailto:martine.davies@webbased.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg</md:GivenName>
-      <md:SurName>Hawkins</md:SurName>
-      <md:EmailAddress>mailto:greg.hawkins@webbased.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">WebBased Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">WebBased Limited: Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.webbased.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martine</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:martine.davies@webbased.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg</md:GivenName>
+    <md:SurName>Hawkins</md:SurName>
+    <md:EmailAddress>mailto:greg.hawkins@webbased.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml
index 3dd676c7..5fc52875 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.admin.furness.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-15T14:19:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-15T14:19:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furness.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furness.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdjCCAl6gAwIBAgIVALs/YE9npCxW3z5NMlKyKk2qevJIMA0GCSqGSIb3DQEB
 						BQUAMC0xKzApBgNVBAMTInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMu
 						dWswHhcNMTQwNTIxMDk1NzUxWhcNMzQwNTIxMDk1NzUxWjAtMSswKQYDVQQDEyJz
@@ -33,26 +33,26 @@
 						eJFu9qkoGg5sBBdGC+dblznwcM2elkboWjm4WxcoDWxvHt7zMpPuxZHaiZEQHhj0
 						cHC+YOw3ZjGPpkQyJ3Xyx343PaNgEOpxZ0s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furness.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furness.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdjCCAl6gAwIBAgIVALs/YE9npCxW3z5NMlKyKk2qevJIMA0GCSqGSIb3DQEB
 						BQUAMC0xKzApBgNVBAMTInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMu
 						dWswHhcNMTQwNTIxMDk1NzUxWhcNMzQwNTIxMDk1NzUxWjAtMSswKQYDVQQDEyJz
@@ -73,25 +73,25 @@
 						eJFu9qkoGg5sBBdGC+dblznwcM2elkboWjm4WxcoDWxvHt7zMpPuxZHaiZEQHhj0
 						cHC+YOw3ZjGPpkQyJ3Xyx343PaNgEOpxZ0s=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Furness College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Furness College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.furness.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Techies</md:GivenName>
-      <md:EmailAddress>mailto:techies@furness.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Techies</md:GivenName>
-      <md:EmailAddress>mailto:techies@furness.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Furness College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Furness College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.furness.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Techies</md:GivenName>
+    <md:EmailAddress>mailto:techies@furness.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Techies</md:GivenName>
+    <md:EmailAddress>mailto:techies@furness.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml
index 7566cd07..818ebc00 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.collegenet.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collegenet.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CollegeNET, Inc.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CollegeNET, Inc. is a leading developer of web-based systems for higher education and non-profit organizations, serving more than 1,300 clients worldwide.
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collegenet.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CollegeNET, Inc.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CollegeNET, Inc. is a leading developer of web-based systems for higher education and non-profit organizations, serving more than 1,300 clients worldwide.
 CollegeNET products include course and event scheduling, space and resource management, web calendar publishing, e-commerce and contributions, accounting, online admission application processing, online course evaluation, and commencement services.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://corp.collegenet.com/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://corp.collegenet.com/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="51" width="200" xml:lang="en">https://corp.collegenet.com/img-link/CN_blue-small.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:InformationURL xml:lang="en">https://corp.collegenet.com/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://corp.collegenet.com/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="51" width="200" xml:lang="en">https://corp.collegenet.com/img-link/CN_blue-small.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYDCCAkigAwIBAgIUE7bIe4hwDfwhSM8wn4E8Rza/AdEwDQYJKoZIhvcNAQEF
 BQAwKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC1pZHAuY29sbGVnZW5ldC5jb20wHhcN
 MTAwMjExMjMxNTMyWhcNMzAwMjExMjMxNTMyWjAoMSYwJAYDVQQDEx1zaGliYm9s
@@ -44,24 +44,24 @@ PjDjvSkxTTH3Mo4Lt7jVww76pgWRDa8L0eZ4sOREQVqMXEMcB3JNy7fFimunvxgw
 fIJN0Yk9uqeMFBoZiL8r0itI9BTt4gk2sYDbNnG6/pqoPS9mwmiM22XEeTeG1x3a
 WWeBDw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.collegenet.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collegenet.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.collegenet.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collegenet.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDYDCCAkigAwIBAgIUE7bIe4hwDfwhSM8wn4E8Rza/AdEwDQYJKoZIhvcNAQEF
 BQAwKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC1pZHAuY29sbGVnZW5ldC5jb20wHhcN
 MTAwMjExMjMxNTMyWhcNMzAwMjExMjMxNTMyWjAoMSYwJAYDVQQDEx1zaGliYm9s
@@ -82,23 +82,23 @@ PjDjvSkxTTH3Mo4Lt7jVww76pgWRDa8L0eZ4sOREQVqMXEMcB3JNy7fFimunvxgw
 fIJN0Yk9uqeMFBoZiL8r0itI9BTt4gk2sYDbNnG6/pqoPS9mwmiM22XEeTeG1x3a
 WWeBDw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CollegeNET, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CollegeNET, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://collegenet.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>CollegeNET IT Administrator</md:GivenName>
-      <md:EmailAddress>admins@collegenet.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CollegeNET Help Desk</md:GivenName>
-      <md:EmailAddress>maint@collegenet.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CollegeNET, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CollegeNET, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://collegenet.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>CollegeNET IT Administrator</md:GivenName>
+    <md:EmailAddress>admins@collegenet.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CollegeNET Help Desk</md:GivenName>
+    <md:EmailAddress>maint@collegenet.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml
index dd1b69f9..2c13793b 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.don.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-07T11:17:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-07T11:17:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">don.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">don.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAK8RPs/u00+SAcNWs4bMNfrk/CKcMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5kb24uYWMudWswHhcNMTUwNTE5MDkyODMyWhcN
 						MzUwNTE5MDkyODMyWjAYMRYwFAYDVQQDEw1pZHAuZG9uLmFjLnVrMIIBIjANBgkq
@@ -31,26 +31,26 @@
 						KvqnIkQMB3AcvJYLArP7zNO8S0DqvzvCDvOVHo+CyB5mSafRyZNgH4XG8gJ/T0xw
 						PbMaTnddQBczEWuq39LDslvq0BICEP8cCrrdPq0U/LyGeeg+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.don.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.don.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.don.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.don.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.don.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.don.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">don.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.don.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.don.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.don.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.don.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.don.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.don.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">don.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIVAK8RPs/u00+SAcNWs4bMNfrk/CKcMA0GCSqGSIb3DQEB
 						BQUAMBgxFjAUBgNVBAMTDWlkcC5kb24uYWMudWswHhcNMTUwNTE5MDkyODMyWhcN
 						MzUwNTE5MDkyODMyWjAYMRYwFAYDVQQDEw1pZHAuZG9uLmFjLnVrMIIBIjANBgkq
@@ -69,27 +69,27 @@
 						KvqnIkQMB3AcvJYLArP7zNO8S0DqvzvCDvOVHo+CyB5mSafRyZNgH4XG8gJ/T0xw
 						PbMaTnddQBczEWuq39LDslvq0BICEP8cCrrdPq0U/LyGeeg+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.don.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.don.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Doncaster College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Doncaster College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.don.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sue</md:GivenName>
-      <md:SurName>Gold</md:SurName>
-      <md:EmailAddress>mailto:sue.gold@don.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pete</md:GivenName>
-      <md:SurName>Lettin</md:SurName>
-      <md:EmailAddress>mailto:pete.lettin@don.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.don.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.don.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Doncaster College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Doncaster College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.don.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sue</md:GivenName>
+    <md:SurName>Gold</md:SurName>
+    <md:EmailAddress>mailto:sue.gold@don.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pete</md:GivenName>
+    <md:SurName>Lettin</md:SurName>
+    <md:EmailAddress>mailto:pete.lettin@don.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
index 90f9a0d5..c819515c 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.dti.ufv.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufv.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFV - universidade Federal de Vicosa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFV - universidade Federal de Vicosa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufv.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufv.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufv.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFV - universidade Federal de Vicosa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFV - universidade Federal de Vicosa</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufv.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufv.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
 ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
@@ -47,26 +47,26 @@ j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
 HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
 qTc5UxmPC7Yhv6hM
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufv.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufv.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
@@ -93,24 +93,24 @@ HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
 qTc5UxmPC7Yhv6hM
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFV - Universidade Federal de Vicosa</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFV - universidade Federal de Vicosa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufv.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufv.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Harley Balduino Saraiva</md:SurName>
-      <md:EmailAddress>harley.saraiva@ufv.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFV - Universidade Federal de Vicosa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFV - universidade Federal de Vicosa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufv.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufv.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Harley Balduino Saraiva</md:SurName>
+    <md:EmailAddress>harley.saraiva@ufv.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
index a730dd15..bf608871 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.gwdg.de/gwdg/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-16T13:09:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-16T13:09:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwdg.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
+        <mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shibboleth-idp.gwdg.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="72" width="240">https://shibboleth-idp.gwdg.de/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwdg.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
-          <mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://shibboleth-idp.gwdg.de/favicon.ico</mdui:Logo>
-          <mdui:Logo height="72" width="240">https://shibboleth-idp.gwdg.de/logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
 RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
 IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
@@ -61,32 +61,32 @@ l2effbyUP1UYDfJKFemgR4EOHxQXtxmaT8SBmNty6fwPXfTSBWznct0S00IhfiR+
 cDFaS6pm8B5T/9nfcBumf/rRSiIWrcNF9cBBVNL165qTpcJLB0cOP/PwdlugmZWo
 JpA2gfQhkeFqqwJRdF6UeVYRdtar
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwdg.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwdg.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
 RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
 IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
@@ -120,31 +120,31 @@ l2effbyUP1UYDfJKFemgR4EOHxQXtxmaT8SBmNty6fwPXfTSBWznct0S00IhfiR+
 cDFaS6pm8B5T/9nfcBumf/rRSiIWrcNF9cBBVNL165qTpcJLB0cOP/PwdlugmZWo
 JpA2gfQhkeFqqwJRdF6UeVYRdtar
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Adler</md:SurName>
-      <md:EmailAddress>mailto:daniel.adler@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christof</md:GivenName>
-      <md:SurName>Pohl</md:SurName>
-      <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Adler</md:SurName>
+    <md:EmailAddress>mailto:daniel.adler@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christof</md:GivenName>
+    <md:SurName>Pohl</md:SurName>
+    <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml b/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
index 11992646..a953b4d7 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.ics.forth.gr/idp/shibboleth/">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ics.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iesl.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imbb.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iacm.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceht.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pek.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ims.forth.gr</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ics.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iesl.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imbb.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iacm.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceht.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pek.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ims.forth.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIECTCCAvGgAwIBAgIJAIAFFNmTM96cMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
                             VQQGEwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwG
                             A1UECgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1p
@@ -51,34 +51,34 @@
                             AXf1z42E/mE/ELURJf75+xO8AShPK4Ua/5qsbnM=
                             
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ics.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iesl.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imbb.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iacm.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceht.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pek.forth.gr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ims.forth.gr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ics.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iesl.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imbb.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iacm.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceht.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pek.forth.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ims.forth.gr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
                             MIIECTCCAvGgAwIBAgIJAIAFFNmTM96cMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
                             VQQGEwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwG
                             A1UECgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1p
@@ -103,29 +103,29 @@
                             AXf1z42E/mE/ELURJf75+xO8AShPK4Ua/5qsbnM=
                             
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Foundation for Research and Technology - Hellas</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Ίδρυμα Τεχνολογίας και Έρευνας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Foundation for Research and Technology - Hellas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Ίδρυμα Τεχνολογίας και Έρευνας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.forth.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.forth.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Foundation for Research and Technology - Hellas</md:Company>
-      <md:EmailAddress>noc@ics.forth.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Foundation for Research and Technology - Hellas</md:Company>
-      <md:EmailAddress>noc@ics.forth.gr</md:EmailAddress>
-      <md:TelephoneNumber>+30-2810-391647</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Foundation for Research and Technology - Hellas</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Ίδρυμα Τεχνολογίας και Έρευνας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Foundation for Research and Technology - Hellas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ίδρυμα Τεχνολογίας και Έρευνας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.forth.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.forth.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Foundation for Research and Technology - Hellas</md:Company>
+    <md:EmailAddress>noc@ics.forth.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Foundation for Research and Technology - Hellas</md:Company>
+    <md:EmailAddress>noc@ics.forth.gr</md:EmailAddress>
+    <md:TelephoneNumber>+30-2810-391647</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
index a098cda7..5f7a3d57 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.mpg.de/mpg/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-10T14:26:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-10T14:26:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Max-Planck Institute (im MetaDir der GWDG)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max-Planck Institutes (in MetaDir of GWDG)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP für MPG Accounts in GWDG MetaDir</mdui:Description>
+        <mdui:Description xml:lang="en">Idp for MPG Accounts in GWDG MetaDir</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.mpg.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="163" width="300">https://shibboleth-idp.mpg.de/mpg/uApprove/logo-mpg.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.mpg.de/kurzportrait</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.mpg.de/183251/portrait</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.mpg.de/impressum</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mpg.de/imprint</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Max-Planck Institute (im MetaDir der GWDG)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Max-Planck Institutes (in MetaDir of GWDG)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">IdP für MPG Accounts in GWDG MetaDir</mdui:Description>
-          <mdui:Description xml:lang="en">Idp for MPG Accounts in GWDG MetaDir</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.mpg.de/favicon.ico</mdui:Logo>
-          <mdui:Logo height="163" width="300">https://shibboleth-idp.mpg.de/mpg/uApprove/logo-mpg.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://www.mpg.de/kurzportrait</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.mpg.de/183251/portrait</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.mpg.de/impressum</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.mpg.de/imprint</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
 Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNTA3MjAw
 NzI4MTdaFw0xODEwMTYwNzI4MTdaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECAwN
@@ -59,32 +59,32 @@ OW1hWyZdRMBMDQ8r2HOEa/+3/2fOA9fJPfopOO5LnYPOX254d7AP5p/KRlrre596
 HsbNUEVhOjgMmy4luhzK9AUWTDCyZSRRRHbuWpy1apUBn/fcEHXi+7UwYahx8PPA
 HQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.mpg.de/mpg/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.mpg.de/mpg/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
 Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNTA3MjAw
 NzI4MTdaFw0xODEwMTYwNzI4MTdaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECAwN
@@ -116,31 +116,31 @@ OW1hWyZdRMBMDQ8r2HOEa/+3/2fOA9fJPfopOO5LnYPOX254d7AP5p/KRlrre596
 HsbNUEVhOjgMmy4luhzK9AUWTDCyZSRRRHbuWpy1apUBn/fcEHXi+7UwYahx8PPA
 HQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e71</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e71</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.biochem.mpg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.biochem.mpg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Adler</md:SurName>
-      <md:EmailAddress>mailto:daniel.adler@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christof</md:GivenName>
-      <md:SurName>Pohl</md:SurName>
-      <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e71</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e71</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.biochem.mpg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.biochem.mpg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Adler</md:SurName>
+    <md:EmailAddress>mailto:daniel.adler@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christof</md:GivenName>
+    <md:SurName>Pohl</md:SurName>
+    <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
index 900bdb18..9eddfa7a 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.pucrs.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucrs.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.pucrs.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.pucrs.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucrs.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
-          <mdui:Description xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
-          <mdui:Description xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.pucrs.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.pucrs.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
 BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
 MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
@@ -40,26 +40,26 @@ we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
 OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
 Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.pucrs.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucrs.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.pucrs.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pucrs.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
 BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
@@ -79,24 +79,24 @@ OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
 Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pucrs.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.pucrs.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Dilermando Bueno</md:SurName>
-      <md:EmailAddress>dbueno@pucrs.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pucrs.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.pucrs.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dilermando Bueno</md:SurName>
+    <md:EmailAddress>dbueno@pucrs.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
index f06cdbed..54ee9881 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-goettingen.de/uni/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-14T07:54:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-14T07:54:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Georg-August Universität Göttingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Georg-August University Göttingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Georg-August Universität Göttingen</mdui:Description>
+        <mdui:Description xml:lang="en">Georg-August University Göttingen</mdui:Description>
+        <mdui:Logo height="16" width="19">https://www.uni-goettingen.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="98" width="126">https://www.uni-goettingen.de/img/logo_druck.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-goettingen.de/de/1.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-goettingen.de/en/1.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-goettingen.de/de/439479.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-goettingen.de/en/439479.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Georg-August Universität Göttingen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Georg-August University Göttingen</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Georg-August Universität Göttingen</mdui:Description>
-          <mdui:Description xml:lang="en">Georg-August University Göttingen</mdui:Description>
-          <mdui:Logo height="16" width="19">https://www.uni-goettingen.de/favicon.ico</mdui:Logo>
-          <mdui:Logo height="98" width="126">https://www.uni-goettingen.de/img/logo_druck.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-goettingen.de/de/1.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-goettingen.de/en/1.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-goettingen.de/de/439479.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-goettingen.de/en/439479.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -62,32 +62,32 @@ Q1bAHYn1v1OvosRmBJ94W+eJV35+rxMyak2KrAJ/PDHQ2nqY7m4hQ5g1w7W/kkia
 8D3IjupYe+uXdGC0tSUAh/p32hnnvG5kf0oQAVEydyhCawll2q1dG14yWCZENShq
 wDkP23Ru
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -122,31 +122,31 @@ Q1bAHYn1v1OvosRmBJ94W+eJV35+rxMyak2KrAJ/PDHQ2nqY7m4hQ5g1w7W/kkia
 8D3IjupYe+uXdGC0tSUAh/p32hnnvG5kf0oQAVEydyhCawll2q1dG14yWCZENShq
 wDkP23Ru
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e281</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e281</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Georg-August-Universität Göttingen</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Georg-August-Universität Göttingen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-goettingen.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-goettingen.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Adler</md:SurName>
-      <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christof</md:GivenName>
-      <md:SurName>Pohl</md:SurName>
-      <md:EmailAddress>mailto:cpohl@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e281</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e281</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Georg-August-Universität Göttingen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Georg-August-Universität Göttingen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-goettingen.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-goettingen.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Adler</md:SurName>
+    <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christof</md:GivenName>
+    <md:SurName>Pohl</md:SurName>
+    <md:EmailAddress>mailto:cpohl@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
index 19a30895..fb20d1e5 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-regensburg.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-06-25T09:17:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-06-25T09:17:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-regensburg.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Regensburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Regensburg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Universität Regensburg</mdui:Description>
+        <mdui:Description xml:lang="en">IdP der Universität Regensburg</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shibboleth-idp.uni-regensburg.de/logo_16x16.gif</mdui:Logo>
+        <mdui:Logo height="76" width="205">https://shibboleth-idp.uni-regensburg.de/loginlogo_205x76.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-regensburg.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-regensburg.de/datenschutz/index.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-regensburg.de/privacy/index.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-regensburg.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Regensburg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Regensburg</mdui:DisplayName>
-          <mdui:Description xml:lang="de">IdP der Universität Regensburg</mdui:Description>
-          <mdui:Description xml:lang="en">IdP der Universität Regensburg</mdui:Description>
-          <mdui:Logo height="16" width="16">https://shibboleth-idp.uni-regensburg.de/logo_16x16.gif</mdui:Logo>
-          <mdui:Logo height="76" width="205">https://shibboleth-idp.uni-regensburg.de/loginlogo_205x76.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-regensburg.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-regensburg.de/datenschutz/index.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-regensburg.de/privacy/index.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
 A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
 bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
@@ -65,30 +65,30 @@ m+fqaz3DlgdHL0vWjipIzOzODRo9R0t6OWnSFv5Yec6b4dZg3iSkf+pQavM7jGAi
 DX4hNvuSdqAQoshPOGkne5JWS+LZI7JffpNn+mWxdPb51iMUKTctcR/LGRPqQi5L
 p+8JChZ2pTZka2I2LRNae9c55NrpAChzn1jXzXtjCS8T5w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-regensburg.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-regensburg.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfjCCBWagAwIBAgIHGywrIcyZwTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
 A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
 bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
@@ -124,40 +124,40 @@ m+fqaz3DlgdHL0vWjipIzOzODRo9R0t6OWnSFv5Yec6b4dZg3iSkf+pQavM7jGAi
 DX4hNvuSdqAQoshPOGkne5JWS+LZI7JffpNn+mWxdPb51iMUKTctcR/LGRPqQi5L
 p+8JChZ2pTZka2I2LRNae9c55NrpAChzn1jXzXtjCS8T5w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e311</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e311</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Regensburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University Regensburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-regensburg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Wimmer</md:SurName>
-      <md:EmailAddress>mailto:martin.wimmer@rz.uni-regensburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Edmund</md:GivenName>
-      <md:SurName>Weber</md:SurName>
-      <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help</md:GivenName>
-      <md:SurName>Desk</md:SurName>
-      <md:EmailAddress>mailto:support@rz.uni-regensburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gerd</md:GivenName>
-      <md:SurName>Böhm</md:SurName>
-      <md:EmailAddress>mailto:gerd.boehm@rz.uni-regensburg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e311</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e311</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Regensburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University Regensburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-regensburg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Wimmer</md:SurName>
+    <md:EmailAddress>mailto:martin.wimmer@rz.uni-regensburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Edmund</md:GivenName>
+    <md:SurName>Weber</md:SurName>
+    <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help</md:GivenName>
+    <md:SurName>Desk</md:SurName>
+    <md:EmailAddress>mailto:support@rz.uni-regensburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gerd</md:GivenName>
+    <md:SurName>Böhm</md:SurName>
+    <md:EmailAddress>mailto:gerd.boehm@rz.uni-regensburg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml
index 2d345ab0..887e5d37 100644
--- a/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-sp-test.webbased.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-04T10:36:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-04T10:36:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/idp.merlin.swgfl.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/shibboleth.networcs.net"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/dev-shibboleth.networcs.net"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/embc.uk.com"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/idp.leedslearning.net"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/DS" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/idp.merlin.swgfl.org.uk"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/shibboleth.networcs.net"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/dev-shibboleth.networcs.net"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/embc.uk.com"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/idp.leedslearning.net"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFYjCCA0oCCQD/5vJ0PJIN6jANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
 						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMRUwEwYDVQQKEwxX
 						ZWJiYXNlZCBMdGQxKjAoBgNVBAMTIXNoaWJib2xldGgtc3AtdGVzdC53ZWJiYXNl
@@ -71,43 +71,43 @@
 						XnWLxI/wfb4ZP/ZbIPtSX9JTJZcOBX8MNmjmWiz7x0sVSSEUhb/+BVV2a5LJMPuo
 						g2Exwdg4BWnIcH1aUtuS2Q1pzhTVq5oAD77qFCZnLgI+9BHU80g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/ECP" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML/Artifact" index="10"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">WebBased Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">WebBased Ltd: Test service provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.webbased.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martine</md:GivenName>
-      <md:SurName>Davies</md:SurName>
-      <md:EmailAddress>mailto:martine.davies@webbased.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg</md:GivenName>
-      <md:SurName>Hawkins</md:SurName>
-      <md:EmailAddress>mailto:greg.hawkins@webbased.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML/Artifact" index="10"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">WebBased Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">WebBased Ltd: Test service provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.webbased.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martine</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:martine.davies@webbased.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg</md:GivenName>
+    <md:SurName>Hawkins</md:SurName>
+    <md:EmailAddress>mailto:greg.hawkins@webbased.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml
index 32dd83a4..e2b30015 100644
--- a/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-sp.pre.proquest.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-21T14:13:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-21T14:13:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/DS"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/DS"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJTCCAg2gAwIBAgIJALnScQHvrMirMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMMHnNoaWJib2xldGgtc3AucHJlLnByb3F1ZXN0LmNvbTAeFw0xNDA0MzAxNjM3
 						NThaFw0xNzA0MjkxNjM3NThaMCkxJzAlBgNVBAMMHnNoaWJib2xldGgtc3AucHJl
@@ -47,46 +47,46 @@
 						JP7HaWe7IriI2oWnBx5h9LcxFco6dRhVOVJ63duuPh32pNeRvNRCk4+KwTuEy9Z7
 						21I9IB6pfRoS4k/s/rB2Zt3JLJHgsZpRFhaqEmMTnKWi9xn2tdFd2gw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProQuest Pre-Production Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proquest.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ProQuest Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:tsupport@proquest.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anil</md:GivenName>
-      <md:SurName>Nair</md:SurName>
-      <md:EmailAddress>mailto:anil.nair@proquest.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProQuest Pre-Production Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proquest.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ProQuest Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:tsupport@proquest.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anil</md:GivenName>
+    <md:SurName>Nair</md:SurName>
+    <md:EmailAddress>mailto:anil.nair@proquest.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml
index 7693df47..1d3813e3 100644
--- a/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-sp.prod.proquest.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-14T16:15:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-14T16:15:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/DS"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/DS"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWTCCAkGgAwIBAgIJALUXgtUwAcW1MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH3NoaWJib2xldGgtc3AucHJvZC5wcm9xdWVzdC5jb20wHhcNMTQwODA0MTgx
 						NjMxWhcNMTcwODA0MTgxNjMxWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLXNwLnBy
@@ -48,46 +48,46 @@
 						QsWrBhm9Tb51QxpARIjlF8paFZ0h6ugS/thDOh50wvqJ8B0r3ozD6E2Mu3A0zF/o
 						J4Wfgn170Gts8ghZeFrntOIilzGjb13VgnUpVXqsMEkmYqtzmKOGxiVuIyXc
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProQuest</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proquest.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support Team</md:GivenName>
-      <md:EmailAddress>mailto:support@proquest.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Wilt</md:SurName>
-      <md:EmailAddress>mailto:pqshibbolethtech@proquest.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProQuest</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proquest.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support Team</md:GivenName>
+    <md:EmailAddress>mailto:support@proquest.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Wilt</md:SurName>
+    <md:EmailAddress>mailto:pqshibbolethtech@proquest.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
index 75382ec7..01b3b684 100644
--- a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
+++ b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aber.ac.uk/shibboleth-TST">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-09T12:16:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-09T12:16:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aberystwyth University IdP 3.1 Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
+        <mdui:Logo height="64" width="264">https://shibboleth.aber.ac.uk/mdui/pau_264x64.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibboleth.aber.ac.uk/mdui/pau_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>144.124.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aberystwyth University IdP 3.1 Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
-          <mdui:Logo height="64" width="264">https://shibboleth.aber.ac.uk/mdui/pau_264x64.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shibboleth.aber.ac.uk/mdui/pau_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>144.124.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
 						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
@@ -48,29 +48,29 @@
 						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
 						6tbiD66dhrK60oX7Sg2cPBc13Mo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.aber.ac.uk:447/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.aber.ac.uk:447/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
 						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
@@ -90,26 +90,26 @@
 						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
 						6tbiD66dhrK60oX7Sg2cPBc13Mo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aberystwyth University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aberystwyth University IdP 3.1 Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aber.ac.uk/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Services</md:GivenName>
-      <md:EmailAddress>mailto:is@aber.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Wiles</md:SurName>
-      <md:EmailAddress>mailto:aew@aber.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aberystwyth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aberystwyth University IdP 3.1 Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aber.ac.uk/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Services</md:GivenName>
+    <md:EmailAddress>mailto:is@aber.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Wiles</md:SurName>
+    <md:EmailAddress>mailto:aew@aber.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
index 40067540..7e1e1670 100644
--- a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aber.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-08T07:11:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-08T07:11:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aberystwyth University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
+        <mdui:Logo height="64" width="264">https://shibboleth.aber.ac.uk/mdui/pau_264x64.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibboleth.aber.ac.uk/mdui/pau_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>144.124.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aberystwyth University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
-          <mdui:Logo height="64" width="264">https://shibboleth.aber.ac.uk/mdui/pau_264x64.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shibboleth.aber.ac.uk/mdui/pau_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>144.124.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
 						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
@@ -43,29 +43,29 @@
 						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
 						6tbiD66dhrK60oX7Sg2cPBc13Mo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.aber.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.aber.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
 						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
@@ -85,27 +85,27 @@
 						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
 						6tbiD66dhrK60oX7Sg2cPBc13Mo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aberystwyth University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aberystwyth University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aber.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information</md:GivenName>
-      <md:SurName>Services</md:SurName>
-      <md:EmailAddress>mailto:is@aber.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Wiles</md:SurName>
-      <md:EmailAddress>mailto:aew@aber.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aberystwyth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aberystwyth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aber.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information</md:GivenName>
+    <md:SurName>Services</md:SurName>
+    <md:EmailAddress>mailto:is@aber.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Wiles</md:SurName>
+    <md:EmailAddress>mailto:aew@aber.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
index 36fec40e..d17f1974 100644
--- a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ac-limoges.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-06T15:34:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-06T15:34:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-limoges.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rectorat Limoges shib</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz32ST2iScRjHn9/vfdXXOfW113RJ09Y2xWXvDJLYkiIGRR1ih6AReIh1aF2COu1Q9Ic61W0xqE616LCglRdjh1ogdZhsWZTTzWzWmDLf+W5z6uvr++swoWbSc3y+z4fvA98vIoRAo5mKLGEEFMa93pa/97jhdTQh3Hsw/ex1nHeZ6yTU0GE+La6slg7xVvSPVA98SuQ+ziz/XN7AGO22Nvu6rV4n1xgQC5Xbo9OLqTxnaXK3myoVJZbM53ObjjbTtaGDRp1qG1AoyZduvqcxXDi7z9vJIYwojAiByNzK6FiUovDI9SM6hv4D3HkYiSWER3f7Xga/TUx+RwhVFbKxKY/cOqpntZdvTPH7LcODBwCABoCsUJqJZi4GeEaFCYCWofw+m92ml6Sq0aAxs0z/yfYXwXh21W0xMRgAFtIixrjbtbP2JaBiURbXpfxaWa2iAMDnsWKEFtJizaEsyQRA30RvARSFIp+zZUlZK1SO+fcY9BqdVkUAypJcA4wGDQKSyRUdu5oBoCxVBwc8fJe1IiscqwGArFBEhLB6ppa0p4NDGIfCiwBQrRIAePz8y9Dw5Pmrb+JJAQCCb5NYTXs6d9QcVBQaOO0cG//a1cEd9tksZmbrN0WBvXb21bvU7Gzm3Bk3jdG24O4/iYY/pI/3tZ3yO+wtOgUg9Wt9PDQ/HVnq6Wm9EuAbVCMUTj+diEklGTACAogQtVYV6Hed6G39X/nmfohCvggAHKt1Oox16m8MQ+kQHdNaCQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ac-limoges.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">any one</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Rectorat Limoges shib</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">tout personnel Académie</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-limoges.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rectorat Limoges shib</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz32ST2iScRjHn9/vfdXXOfW113RJ09Y2xWXvDJLYkiIGRR1ih6AReIh1aF2COu1Q9Ic61W0xqE616LCglRdjh1ogdZhsWZTTzWzWmDLf+W5z6uvr++swoWbSc3y+z4fvA98vIoRAo5mKLGEEFMa93pa/97jhdTQh3Hsw/ex1nHeZ6yTU0GE+La6slg7xVvSPVA98SuQ+ziz/XN7AGO22Nvu6rV4n1xgQC5Xbo9OLqTxnaXK3myoVJZbM53ObjjbTtaGDRp1qG1AoyZduvqcxXDi7z9vJIYwojAiByNzK6FiUovDI9SM6hv4D3HkYiSWER3f7Xga/TUx+RwhVFbKxKY/cOqpntZdvTPH7LcODBwCABoCsUJqJZi4GeEaFCYCWofw+m92ml6Sq0aAxs0z/yfYXwXh21W0xMRgAFtIixrjbtbP2JaBiURbXpfxaWa2iAMDnsWKEFtJizaEsyQRA30RvARSFIp+zZUlZK1SO+fcY9BqdVkUAypJcA4wGDQKSyRUdu5oBoCxVBwc8fJe1IiscqwGArFBEhLB6ppa0p4NDGIfCiwBQrRIAePz8y9Dw5Pmrb+JJAQCCb5NYTXs6d9QcVBQaOO0cG//a1cEd9tksZmbrN0WBvXb21bvU7Gzm3Bk3jdG24O4/iYY/pI/3tZ3yO+wtOgUg9Wt9PDQ/HVnq6Wm9EuAbVCMUTj+diEklGTACAogQtVYV6Hed6G39X/nmfohCvggAHKt1Oox16m8MQ+kQHdNaCQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ac-limoges.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">any one</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Rectorat Limoges shib</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">tout personnel Académie</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIGAzCCA+ugAwIBAgIRAODebMx5oGfvlJ1vAEw7CMkwDQYJKoZIhvcNAQEFBQAw
 cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
 aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
@@ -55,13 +55,13 @@ iMgzQTecoKiJSyWphw2mtvmECRKMXZbi8JGN4bYUwrlKlgqz2QEU/BTz6OlbfWIr
 nbdVWyfnw8CjCO0M+1LVBz5SRqr0esCDdSQzp2T++9Of5eO8LBdTdffWnY7vEMcN
 fbTj07Dtdw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAPI2OQnwEI796qTcWNc+EBU8y1vbMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5mcjAeFw0xNDA0
 MzAxNDIzMjFaFw0zNDA0MzAxNDIzMjFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -81,22 +81,22 @@ puYEzKtucKDG57f6KJ2EnO7kWCmtw/56d16JE069Ze7wr8BYHy3XON29UhdBGDZo
 gJ81iLD/uinQAju00xak32Ig/WMrnzCYBFotWMElnHnJkTeS6l3obIYg9JeS/Hgu
 9mMpytM+UUp81UdTXMv7RsTpHsroJoDN3OVfzKOmjnk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rectorat Limoges shib</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rectorat Limoges shib</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ac-limoges.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>cazarres thierry</md:SurName>
-      <md:EmailAddress>l.das-ie@ac-limoges.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rectorat Limoges shib</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rectorat Limoges shib</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ac-limoges.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>cazarres thierry</md:SurName>
+    <md:EmailAddress>l.das-ie@ac-limoges.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
index cd3de983..4f48dc97 100644
--- a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ad.cybera.ca/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-11T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-11T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.cybera.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cybera</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Cybera</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
+        <mdui:Description xml:lang="fr">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.cybera.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cybera</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">Cybera</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
-          <mdui:Description xml:lang="fr">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
 NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
@@ -42,29 +42,29 @@ X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
 z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ad.cybera.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.cybera.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ad.cybera.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.cybera.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
 NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
@@ -85,24 +85,24 @@ X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
 z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cybera</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">Cybera </md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cybera</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Cybera</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cybera.ca/about/cybera/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>System Admin</md:SurName>
-      <md:EmailAddress>sysadmin@cybera.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cybera</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">Cybera </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cybera</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Cybera</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cybera.ca/about/cybera/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>System Admin</md:SurName>
+    <md:EmailAddress>sysadmin@cybera.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml
index 7c159f13..81f3c80a 100644
--- a/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.allegheny.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">allegheny.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Allegheny College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The national liberal arts college where 2,100 students with unusual combinations of interests, skills and talents excel.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.allegheny.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://sites.allegheny.edu/resources/privacy-and-security-policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="120" width="460" xml:lang="en">https://shibboleth.allegheny.edu/ac-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">allegheny.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Allegheny College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The national liberal arts college where 2,100 students with unusual combinations of interests, skills and talents excel.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.allegheny.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://sites.allegheny.edu/resources/privacy-and-security-policy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="120" width="460" xml:lang="en">https://shibboleth.allegheny.edu/ac-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVANLyVjAX/Uk9Aso93bpHlCTpBTF8MA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWxsZWdoZW55LmVkdTAeFw0xMzA4
 MDUxNTIwNTlaFw0zMzA4MDUxNTIwNTlaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -42,23 +42,23 @@ pyyRdyQ5C0C4Cum5Y55M+G7tuVX4OF/KswTj/rezoajle87GK1TLsKJC6jGPcw9n
 vLJW4nZl0p17MW5zYAAX54lELuOUm9p8zf5Jzdfozd7a+zA2LMHtvyk/3JhdhJZn
 DnXrTH3xJSDEUPi4YHSx/BAVxJ7syEgEki9ayfTzJuU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.allegheny.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.allegheny.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.allegheny.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">allegheny.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.allegheny.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.allegheny.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.allegheny.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">allegheny.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIVANLyVjAX/Uk9Aso93bpHlCTpBTF8MA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWxsZWdoZW55LmVkdTAeFw0xMzA4
 MDUxNTIwNTlaFw0zMzA4MDUxNTIwNTlaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -78,30 +78,30 @@ pyyRdyQ5C0C4Cum5Y55M+G7tuVX4OF/KswTj/rezoajle87GK1TLsKJC6jGPcw9n
 vLJW4nZl0p17MW5zYAAX54lELuOUm9p8zf5Jzdfozd7a+zA2LMHtvyk/3JhdhJZn
 DnXrTH3xJSDEUPi4YHSx/BAVxJ7syEgEki9ayfTzJuU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Allegheny College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Allegheny College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.allegheny.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Doug Tomer</md:GivenName>
-      <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Doug Tomer</md:GivenName>
-      <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Doug Tomer</md:GivenName>
-      <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Doug Tomer</md:GivenName>
-      <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Allegheny College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Allegheny College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.allegheny.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Doug Tomer</md:GivenName>
+    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Doug Tomer</md:GivenName>
+    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Doug Tomer</md:GivenName>
+    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Doug Tomer</md:GivenName>
+    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml
index 0f7dabbd..b6880f86 100644
--- a/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aws.dev.progressivedigitalmedia.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-19T09:55:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-19T09:55:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/UKfederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/UKfederation" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/UKfederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/UKfederation" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJAJ0anKvb8NpwMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXBkbS1kZXYtd2ViMDEwHhcNMTYwMTIyMTcxMTQ4WhcNMjYwMTE5MTcxMTQ4
 						WjAYMRYwFAYDVQQDEw1wZG0tZGV2LXdlYjAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -49,73 +49,73 @@
 						ddwE8o3bWp7Nvl+OuquXBPI2dLrDHL6mYaKW1AJteYgpxSsj4jw4KlugOlrcaYum
 						lXL+Gte857dAAqPxxmXJdHnUDpWHAoIl9dSmoPTNpK9Yyw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Marketline Advantage</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dominique</md:GivenName>
-      <md:SurName>Wafo-Tapa</md:SurName>
-      <md:EmailAddress>mailto:Dominique.Wafo-Tapa@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Geoffrey</md:GivenName>
-      <md:SurName>Hogg</md:SurName>
-      <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Panagiotis</md:GivenName>
-      <md:SurName>Sfikas</md:SurName>
-      <md:EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dominique</md:GivenName>
-      <md:SurName>Wafo-Tapa</md:SurName>
-      <md:EmailAddress>mailto:Dominique.Wafo-Tapa@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Geoffrey</md:GivenName>
-      <md:SurName>Hogg</md:SurName>
-      <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Assad</md:GivenName>
-      <md:SurName>Imran</md:SurName>
-      <md:EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GlobalData PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Marketline Advantage</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dominique</md:GivenName>
+    <md:SurName>Wafo-Tapa</md:SurName>
+    <md:EmailAddress>mailto:Dominique.Wafo-Tapa@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Geoffrey</md:GivenName>
+    <md:SurName>Hogg</md:SurName>
+    <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panagiotis</md:GivenName>
+    <md:SurName>Sfikas</md:SurName>
+    <md:EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dominique</md:GivenName>
+    <md:SurName>Wafo-Tapa</md:SurName>
+    <md:EmailAddress>mailto:Dominique.Wafo-Tapa@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoffrey</md:GivenName>
+    <md:SurName>Hogg</md:SurName>
+    <md:EmailAddress>mailto:ghogg@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Assad</md:GivenName>
+    <md:SurName>Imran</md:SurName>
+    <md:EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
index 4145a8a0..3f090b11 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bbaw.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-03-13T16:23:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-03-13T16:23:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/DiscoJuice" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">BBAW - CLARIN Dienste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">BBAW - CLARIN services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</mdui:Description>
+        <mdui:Description xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</mdui:Description>
+        <mdui:Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.bbaw.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bbaw.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/DiscoJuice" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">BBAW - CLARIN Dienste</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">BBAW - CLARIN services</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</mdui:Description>
-          <mdui:Description xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</mdui:Description>
-          <mdui:Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.bbaw.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.bbaw.de</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
 BhMCREUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWll
 IGRlciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5v
 bG9naWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJh
@@ -65,15 +65,15 @@ jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
 gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
 WdNzDxmjE9EyFPvbQdfnOkE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
 BhMCREUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWll
 IGRlciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5v
 bG9naWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJh
@@ -106,53 +106,53 @@ jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
 gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
 WdNzDxmjE9EyFPvbQdfnOkE=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">BBAW - CLARIN Dienste</md:ServiceName>
-        <md:ServiceName xml:lang="en">BBAW - CLARIN services</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e209</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e209</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.bbaw.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.bbaw.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kai</md:GivenName>
-      <md:SurName>Zimmer</md:SurName>
-      <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Dr. Wolf-Hagen</md:GivenName>
-      <md:SurName>Krauth</md:SurName>
-      <md:EmailAddress>mailto:krauth@bbaw.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kai</md:GivenName>
-      <md:SurName>Zimmer</md:SurName>
-      <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">BBAW - CLARIN Dienste</md:ServiceName>
+      <md:ServiceName xml:lang="en">BBAW - CLARIN services</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e209</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e209</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.bbaw.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.bbaw.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kai</md:GivenName>
+    <md:SurName>Zimmer</md:SurName>
+    <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dr. Wolf-Hagen</md:GivenName>
+    <md:SurName>Krauth</md:SurName>
+    <md:EmailAddress>mailto:krauth@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kai</md:GivenName>
+    <md:SurName>Zimmer</md:SurName>
+    <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml
index bff4d316..6b3fb25b 100644
--- a/swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bca.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-07T14:59:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-07T14:59:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bca.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bca.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfjCCAmYCCQDx7t/Xm+vk2jANBgkqhkiG9w0BAQsFADCBgDELMAkGA1UEBhMC
 						R0IxEjAQBgNVBAgMCUJlcmtzaGlyZTETMBEGA1UEBwwKTWFpZGVuaGVhZDEpMCcG
 						A1UECgwgQmVya3NoaXJlIENvbGxlZ2Ugb2YgQWdyaWN1bHR1cmUxHTAbBgNVBAMM
@@ -33,26 +33,26 @@
 						g6jq1rxI6gl+gQh+D35UoNrGcjo2xdS0xqcKLNLdlHJe/WmVvr5lZORTj5rQxKr6
 						85G9KyAB1Ly2q4Vohbob+kcEb/5qtjq2hjgfMZbOGKj1ZA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bca.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bca.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bca.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bca.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfjCCAmYCCQDx7t/Xm+vk2jANBgkqhkiG9w0BAQsFADCBgDELMAkGA1UEBhMC
 						R0IxEjAQBgNVBAgMCUJlcmtzaGlyZTETMBEGA1UEBwwKTWFpZGVuaGVhZDEpMCcG
 						A1UECgwgQmVya3NoaXJlIENvbGxlZ2Ugb2YgQWdyaWN1bHR1cmUxHTAbBgNVBAMM
@@ -73,27 +73,27 @@
 						g6jq1rxI6gl+gQh+D35UoNrGcjo2xdS0xqcKLNLdlHJe/WmVvr5lZORTj5rQxKr6
 						85G9KyAB1Ly2q4Vohbob+kcEb/5qtjq2hjgfMZbOGKj1ZA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Berkshire College of Agriculture</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Berkshire College of Agriculture</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bca.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Ricketts</md:SurName>
-      <md:EmailAddress>mailto:cricketts@bca.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Prior</md:SurName>
-      <md:EmailAddress>mailto:NCPrior@bca.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Berkshire College of Agriculture</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Berkshire College of Agriculture</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bca.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Ricketts</md:SurName>
+    <md:EmailAddress>mailto:cricketts@bca.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Prior</md:SurName>
+    <md:EmailAddress>mailto:NCPrior@bca.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml
index 60dd6e9c..d4678a7a 100644
--- a/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bolton-sfc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-sfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-sfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIUWPJgrnNMjlbymBlvPaO34/X+UVswDQYJKoZIhvcNAQEF
 						BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC5ib2x0b24tc2ZjLmFjLnVrMB4XDTEz
 						MTExMTEzMDE1OFoXDTMzMTExMTEzMDE1OFowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
@@ -30,26 +30,26 @@
 						v16BqVBjhtbPhTq4MRodc625S0JJL6xdKuw7ieAP/ElEQV0nLGayyZQMdwpHQnfO
 						XcpfcLXmf8Vsttog01faahJDcIECJTYOmK9VlxRX2KSD60rDfqmUWFGbhQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-sfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolton-sfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIUWPJgrnNMjlbymBlvPaO34/X+UVswDQYJKoZIhvcNAQEF
 						BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC5ib2x0b24tc2ZjLmFjLnVrMB4XDTEz
 						MTExMTEzMDE1OFoXDTMzMTExMTEzMDE1OFowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
@@ -69,27 +69,27 @@
 						v16BqVBjhtbPhTq4MRodc625S0JJL6xdKuw7ieAP/ElEQV0nLGayyZQMdwpHQnfO
 						XcpfcLXmf8Vsttog01faahJDcIECJTYOmK9VlxRX2KSD60rDfqmUWFGbhQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bolton Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bolton Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bolton-sfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Ratcliffe</md:SurName>
-      <md:EmailAddress>mailto:kev@bolton-sfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Ratcliffe</md:SurName>
-      <md:EmailAddress>mailto:kev@bolton-sfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bolton Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bolton Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bolton-sfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Ratcliffe</md:SurName>
+    <md:EmailAddress>mailto:kev@bolton-sfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Ratcliffe</md:SurName>
+    <md:EmailAddress>mailto:kev@bolton-sfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml
index 2b30dcd8..da09e807 100644
--- a/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bradfordcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-08T11:00:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-08T11:00:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bradfordcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bradfordcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFCjCCA/KgAwIBAgIJALdslILT05qQMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJWW9ya3NoaXJlMREwDwYDVQQHEwhCcmFkZm9yZDEZ
 						MBcGA1UEChMQQnJhZGZvcmQgQ29sbGVnZTEpMCcGA1UEAxMgc2hpYmJvbGV0aC5i
@@ -41,26 +41,26 @@
 						KmEMreKHeMMbULtXfw1WAKyLveqxC2P6sm7r5RHmphlssqHzl6ga+5LWQMiQFUG2
 						ArKpUGwpk16lWUh1A+FJ7KMSP2BUQUp4NBku9sD8LUzMuey2zHMifjx3QxoFcQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bradfordcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bradfordcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFCjCCA/KgAwIBAgIJALdslILT05qQMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJWW9ya3NoaXJlMREwDwYDVQQHEwhCcmFkZm9yZDEZ
 						MBcGA1UEChMQQnJhZGZvcmQgQ29sbGVnZTEpMCcGA1UEAxMgc2hpYmJvbGV0aC5i
@@ -89,27 +89,27 @@
 						KmEMreKHeMMbULtXfw1WAKyLveqxC2P6sm7r5RHmphlssqHzl6ga+5LWQMiQFUG2
 						ArKpUGwpk16lWUh1A+FJ7KMSP2BUQUp4NBku9sD8LUzMuey2zHMifjx3QxoFcQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bradford College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bradford College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bradfordcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Deborah</md:GivenName>
-      <md:SurName>Duffy</md:SurName>
-      <md:EmailAddress>mailto:d.duffy@bradfordcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Belal</md:GivenName>
-      <md:SurName>Sayed</md:SurName>
-      <md:EmailAddress>mailto:b.sayed@bradfordcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bradford College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bradford College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bradfordcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Deborah</md:GivenName>
+    <md:SurName>Duffy</md:SurName>
+    <md:EmailAddress>mailto:d.duffy@bradfordcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Belal</md:GivenName>
+    <md:SurName>Sayed</md:SurName>
+    <md:EmailAddress>mailto:b.sayed@bradfordcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml
index d5025eb2..2185f697 100644
--- a/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.brandeis.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brandeis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brandeis University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brandeis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brandeis University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAJ07ki+U+Q1jeqL9/EKoyRbWCMAyMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYnJhbmRlaXMuZWR1MB4XDTEzMDMw
 ODIwMTczOVoXDTMzMDMwODIwMTczOVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5i
@@ -38,24 +38,24 @@ dTdUuhV14vl7PJt9y3EqXISJjwNG7wEF9wM0qUIG51qlp4f4MiNaNxJI/cYUC1cw
 7d/XK0tGHAwQxu/IeOIxUYbsUbTSua3u/Xc6WaTwfWxSl96NcOuTnyazB4hkSIYa
 C30ze3MSAph0HLqEHTWk8Ldt2Y3QWku9g5WNlA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.brandeis.edu/cgi-bin/logout"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.brandeis.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.brandeis.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.brandeis.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brandeis.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.brandeis.edu/cgi-bin/logout"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.brandeis.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.brandeis.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.brandeis.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brandeis.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAJ07ki+U+Q1jeqL9/EKoyRbWCMAyMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYnJhbmRlaXMuZWR1MB4XDTEzMDMw
 ODIwMTczOVoXDTMzMDMwODIwMTczOVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5i
@@ -75,30 +75,30 @@ dTdUuhV14vl7PJt9y3EqXISJjwNG7wEF9wM0qUIG51qlp4f4MiNaNxJI/cYUC1cw
 7d/XK0tGHAwQxu/IeOIxUYbsUbTSua3u/Xc6WaTwfWxSl96NcOuTnyazB4hkSIYa
 C30ze3MSAph0HLqEHTWk8Ldt2Y3QWku9g5WNlA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brandeis University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brandeis University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brandeis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Josh Wilson</md:GivenName>
-      <md:EmailAddress>jwilson@brandeis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian Rifkin</md:GivenName>
-      <md:EmailAddress>irifkin@brandeis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jim Lambert</md:GivenName>
-      <md:EmailAddress>jlambert@brandeis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library Systems</md:GivenName>
-      <md:EmailAddress>e-resources@brandeis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brandeis University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brandeis University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brandeis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Josh Wilson</md:GivenName>
+    <md:EmailAddress>jwilson@brandeis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian Rifkin</md:GivenName>
+    <md:EmailAddress>irifkin@brandeis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim Lambert</md:GivenName>
+    <md:EmailAddress>jlambert@brandeis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library Systems</md:GivenName>
+    <md:EmailAddress>e-resources@brandeis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml b/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml
index cc94f8b4..1ac219d6 100644
--- a/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml
+++ b/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.bsu.edu/sso">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://shibboleth.bsu.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ball State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://shibboleth.bsu.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ball State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAKAO80Hri578MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGguYnN1LmVkdTAeFw0xMTA0MTkxNzA3MjZaFw0yMTA0MTYx
 NzA3MjZaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguYnN1LmVkdTCCASIwDQYJKoZI
@@ -38,24 +38,24 @@ v0WxHdbpa3yELcIkIy7cHaEza80jhLNLX2P3BeWMXpTjAhyzRKqOgFw51C2NkI/T
 +mWS+cDSy+uOrGHD9NYCQdO0pynSeNVxNkQeobYBU8l3E7oS4ThlsxKHEJifjarX
 lXYN/Vp1V8upHuz8zaF7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ball State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ball State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://cms.bsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex Chalmers</md:GivenName>
-      <md:EmailAddress>abchalmers@bsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Todd Meister</md:GivenName>
-      <md:EmailAddress>tmeister@bsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ball State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ball State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://cms.bsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Chalmers</md:GivenName>
+    <md:EmailAddress>abchalmers@bsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Todd Meister</md:GivenName>
+    <md:EmailAddress>tmeister@bsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml
index 43c0db8d..b1e15fd4 100644
--- a/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.burnley.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burnley.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burnley.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYjCCAkoCCQC+CFHVE+EW0DANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHQnVybmxleTEVMBMGA1UEBxMMT3JtZXJvZCBSb2FkMRgwFgYD
 						VQQKEw9CdXJubGV5IENvbGxlZ2UxITAfBgNVBAMTGHNoaWJib2xldGguYnVybmxl
@@ -31,26 +31,26 @@
 						KoZv9294rqjpQG30+B3HvkNcQkTY0lZ9Bq9s56OLjzO6+/rwBAbAxQ1qjMYNn7iN
 						uWGfRnNT
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.burnley.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burnley.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.burnley.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burnley.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYjCCAkoCCQC+CFHVE+EW0DANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHQnVybmxleTEVMBMGA1UEBxMMT3JtZXJvZCBSb2FkMRgwFgYD
 						VQQKEw9CdXJubGV5IENvbGxlZ2UxITAfBgNVBAMTGHNoaWJib2xldGguYnVybmxl
@@ -71,32 +71,32 @@
 						KoZv9294rqjpQG30+B3HvkNcQkTY0lZ9Bq9s56OLjzO6+/rwBAbAxQ1qjMYNn7iN
 						uWGfRnNT
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Burnley College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Burnley College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.burnley.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:n.williams@burnley.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hamza</md:GivenName>
-      <md:SurName>Raziq</md:SurName>
-      <md:EmailAddress>mailto:h.raziq@burnley.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:n.williams@burnley.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Burnley College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Burnley College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.burnley.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:n.williams@burnley.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hamza</md:GivenName>
+    <md:SurName>Raziq</md:SurName>
+    <md:EmailAddress>mailto:h.raziq@burnley.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:n.williams@burnley.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
index 202fd723..bc88f31d 100644
--- a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.burycollege.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-21T15:13:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-21T15:13:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burycollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWjCCAkICCQC8tl6skoCc8zANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTWFuY2hlc3RlcjENMAsGA1UEBxMEQnVyeTEVMBMGA1UEChMM
 						QnVyeSBDb2xsZWdlMSUwIwYDVQQDExxzaGliYm9sZXRoLmJ1cnljb2xsZWdlLmFj
@@ -32,26 +32,26 @@
 						efQCQP3Hn4/00dV32OSfv/ZME7C+XyNGP9fCVV1tl44Po/3FhPEmhu0SmmF5DIIx
 						AMJshMgl/n/2lWhtoezBSuHSoLRtboKXS54Jqzf9Z7PcuPbOLsYMymfdR1vsqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.burycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burycollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.burycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">burycollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWjCCAkICCQC8tl6skoCc8zANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTWFuY2hlc3RlcjENMAsGA1UEBxMEQnVyeTEVMBMGA1UEChMM
 						QnVyeSBDb2xsZWdlMSUwIwYDVQQDExxzaGliYm9sZXRoLmJ1cnljb2xsZWdlLmFj
@@ -71,27 +71,27 @@
 						efQCQP3Hn4/00dV32OSfv/ZME7C+XyNGP9fCVV1tl44Po/3FhPEmhu0SmmF5DIIx
 						AMJshMgl/n/2lWhtoezBSuHSoLRtboKXS54Jqzf9Z7PcuPbOLsYMymfdR1vsqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bury College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bury College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.burycollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Louise</md:GivenName>
-      <md:SurName>Minta</md:SurName>
-      <md:EmailAddress>mailto:louise.minta@burycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dominic</md:GivenName>
-      <md:SurName>Garner</md:SurName>
-      <md:EmailAddress>mailto:dominic.garner@burycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bury College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bury College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.burycollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Louise</md:GivenName>
+    <md:SurName>Minta</md:SurName>
+    <md:EmailAddress>mailto:louise.minta@burycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dominic</md:GivenName>
+    <md:SurName>Garner</md:SurName>
+    <md:EmailAddress>mailto:dominic.garner@burycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
index 4bd2023e..a7911efa 100644
--- a/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.c2kqa.net/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-08T12:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-08T12:31:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMVdsRzaFcLg3tqUb2Yqh6VErKz2MA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwNVoXDTM2MDQxNDA5NTYwNVowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -37,13 +37,13 @@
 						y2qtbQEXy26ZQ+BPuTN3Cw82xlSh1r265xYyVL1cgHxPkPJ53svI3g/O6tXGnVIs
 						kM1g8SzQfI8T1ImqqXxphg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJLnh2DoKCqjbJY+li5EloIoNgPWMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwM1oXDTM2MDQxNDA5NTYwM1owHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -63,13 +63,13 @@
 						e6qWoUgdreAwxA82WruvyERft5N7p4WlRy7Ot3S351lMFUze7iXR8U1EefCCPEaK
 						+bNUZQjUbiUE1a0xGim4bA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIURucd3pg44Ox1UB55Oe0lcWESH5UwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTYwNDE0MDk1
 						NjAzWhcNMzYwNDE0MDk1NjAzWjAfMR0wGwYDVQQDDBRzaGliYm9sZXRoLmMya3Fh
@@ -89,26 +89,26 @@
 						5V4y5Reso+8gVvTh7C2AAkEkG56J9l1+iURDYjEKAxiwgJeQcnmmIAAeQubCFru1
 						Dw+3tzN2G2l2VW+6eNf6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.c2kqa.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.c2kqa.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">c2kqa.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAMVdsRzaFcLg3tqUb2Yqh6VErKz2MA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwNVoXDTM2MDQxNDA5NTYwNVowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -128,13 +128,13 @@
 						y2qtbQEXy26ZQ+BPuTN3Cw82xlSh1r265xYyVL1cgHxPkPJ53svI3g/O6tXGnVIs
 						kM1g8SzQfI8T1ImqqXxphg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVAJLnh2DoKCqjbJY+li5EloIoNgPWMA0GCSqGSIb3DQEB
 						CwUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGguYzJrcWEubmV0MB4XDTE2MDQxNDA5
 						NTYwM1oXDTM2MDQxNDA5NTYwM1owHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtx
@@ -154,13 +154,13 @@
 						e6qWoUgdreAwxA82WruvyERft5N7p4WlRy7Ot3S351lMFUze7iXR8U1EefCCPEaK
 						+bNUZQjUbiUE1a0xGim4bA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIURucd3pg44Ox1UB55Oe0lcWESH5UwDQYJKoZIhvcNAQEL
 						BQAwHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTYwNDE0MDk1
 						NjAzWhcNMzYwNDE0MDk1NjAzWjAfMR0wGwYDVQQDDBRzaGliYm9sZXRoLmMya3Fh
@@ -180,24 +180,24 @@
 						5V4y5Reso+8gVvTh7C2AAkEkG56J9l1+iURDYjEKAxiwgJeQcnmmIAAeQubCFru1
 						Dw+3tzN2G2l2VW+6eNf6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Western Education and Library Board</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">C2k</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Marley</md:SurName>
-      <md:EmailAddress>mailto:stephen.marley@capita.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joe</md:GivenName>
-      <md:SurName>Boyle</md:SurName>
-      <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Western Education and Library Board</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">C2k</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Marley</md:SurName>
+    <md:EmailAddress>mailto:stephen.marley@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Boyle</md:SurName>
+    <md:EmailAddress>mailto:joe.boyle@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml
index 6cede4bc..e7201b3c 100644
--- a/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cambridge.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T12:20:34Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T12:20:34Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.cambridge.org/Shibboleth.sso/discovery"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.cambridge.org/Shibboleth.sso/discovery"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFVTCCBD2gAwIBAgIQO9N4D50Dc9cwSe8N1yLYVzANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -41,48 +41,48 @@
 						B8G5M+isJBCf4hLchnl21QR0Q9MxeIujkL1sa7p5Ve6mgdL6YtCPRnPj017ixuVZ
 						4UP5qHJN1g34tRozzMPE0TOTpLcVHULwIQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cambridge Journals Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cambridge.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Phillips</md:SurName>
-      <md:EmailAddress>mailto:sysadmin@cambridge.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jarvy</md:GivenName>
-      <md:SurName>Alvarez</md:SurName>
-      <md:EmailAddress>mailto:jalvarez@cambridge.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Godofredo</md:GivenName>
-      <md:SurName>Avena</md:SurName>
-      <md:EmailAddress>mailto:gavena@cambridge.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jarvy</md:GivenName>
-      <md:SurName>Alvarez</md:SurName>
-      <md:EmailAddress>mailto:jalvarez@cambridge.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cambridge Journals Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cambridge.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Phillips</md:SurName>
+    <md:EmailAddress>mailto:sysadmin@cambridge.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jarvy</md:GivenName>
+    <md:SurName>Alvarez</md:SurName>
+    <md:EmailAddress>mailto:jalvarez@cambridge.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Godofredo</md:GivenName>
+    <md:SurName>Avena</md:SurName>
+    <md:EmailAddress>mailto:gavena@cambridge.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jarvy</md:GivenName>
+    <md:SurName>Alvarez</md:SurName>
+    <md:EmailAddress>mailto:jalvarez@cambridge.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml
index 84f781e1..b8606182 100644
--- a/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.camsfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-11-06T15:35:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-11-06T15:35:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camsfc.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Cheadle and Marple College Network</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://shibboleth.camsfc.ac.uk/idp/images/icon.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://shibboleth.camsfc.ac.uk/idp/images/ukfed_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camsfc.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Cheadle and Marple College Network</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://shibboleth.camsfc.ac.uk/idp/images/icon.jpg</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://shibboleth.camsfc.ac.uk/idp/images/ukfed_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqDCCApACCQDwANC11k/QRTANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0NoZWFkbGUxETAPBgNVBAcTCENoZXNoaXJlMS4wLAYDVQQK
 						EyVDaGVhZGxlIGFuZCBNYXJwbGUgU2l4dGggRm9ybSBDb2xsZWdlMQ8wDQYDVQQL
@@ -39,26 +39,26 @@
 						GtwdAL6pvnDrDqZiYuoIOgKg3X0rcF0RQ5mmCIbYK372Bnl6z8DuIvioorFAXNCW
 						5pqnOi9PIkOlE6R66aTytHCMJeQCdlufJ3etaQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.camsfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.camsfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camsfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqDCCApACCQDwANC11k/QRTANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0NoZWFkbGUxETAPBgNVBAcTCENoZXNoaXJlMS4wLAYDVQQK
 						EyVDaGVhZGxlIGFuZCBNYXJwbGUgU2l4dGggRm9ybSBDb2xsZWdlMQ8wDQYDVQQL
@@ -80,37 +80,37 @@
 						GtwdAL6pvnDrDqZiYuoIOgKg3X0rcF0RQ5mmCIbYK372Bnl6z8DuIvioorFAXNCW
 						5pqnOi9PIkOlE6R66aTytHCMJeQCdlufJ3etaQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cheadle and Marple Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Cheadle and Marple College Network</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.camsfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bobby</md:GivenName>
-      <md:SurName>Ricardo</md:SurName>
-      <md:EmailAddress>mailto:Bobby.Ricardo@camsfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Green</md:SurName>
-      <md:EmailAddress>mailto:Chris.Green@camsfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Colin</md:GivenName>
-      <md:SurName>Thorley</md:SurName>
-      <md:EmailAddress>mailto:colin.thorley@camsfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Green</md:SurName>
-      <md:EmailAddress>mailto:Chris.Green@camsfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cheadle and Marple Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Cheadle and Marple College Network</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.camsfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bobby</md:GivenName>
+    <md:SurName>Ricardo</md:SurName>
+    <md:EmailAddress>mailto:Bobby.Ricardo@camsfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Green</md:SurName>
+    <md:EmailAddress>mailto:Chris.Green@camsfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Thorley</md:SurName>
+    <md:EmailAddress>mailto:colin.thorley@camsfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Green</md:SurName>
+    <md:EmailAddress>mailto:Chris.Green@camsfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
index 9e001137..329abd0b 100644
--- a/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cant-col.ac.uk-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cant-col.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-04T14:23:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-04T14:23:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="274" width="88">https://shibboleth.cant-col.ac.uk/canterbury-college-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-icon.png</mdui:Logo>
+        <mdui:Logo height="80" width="60">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-cds.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Canterbury College (test)</mdui:DisplayName>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="274" width="88">https://shibboleth.cant-col.ac.uk/canterbury-college-logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-icon.png</mdui:Logo>
-          <mdui:Logo height="80" width="60">https://shibboleth.cant-col.ac.uk/canterbury-college-logo-cds.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">Canterbury College (test)</mdui:DisplayName>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
 						VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
 						EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
@@ -46,26 +46,26 @@
 						U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
 						eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cant-col.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsYCCQD4z6zira6C7TANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
 						VUsxDTALBgNVBAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoM
 						EkNhbnRlcmJ1cnkgQ29sbGVnZTEaMBgGA1UECwwRQ29tcHV0aW5nIFN1cHBvcnQx
@@ -88,27 +88,27 @@
 						U2lDsbpM9CoKDz+VeQbwhx4sIgu04JezZDJrtLEVWaf8Yx/CS7HoMNHrpH3bh+/O
 						eOGSNd/fcIupfbOlmBneWAsTPWNhQqts16hoEnHbf5t+3A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Canterbury College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Canterbury College (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nathan</md:GivenName>
-      <md:SurName>Friend</md:SurName>
-      <md:EmailAddress>mailto:n.friend@canterburycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nathan</md:GivenName>
-      <md:SurName>Friend</md:SurName>
-      <md:EmailAddress>mailto:n.friend@canterburycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Canterbury College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Canterbury College (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nathan</md:GivenName>
+    <md:SurName>Friend</md:SurName>
+    <md:EmailAddress>mailto:n.friend@canterburycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nathan</md:GivenName>
+    <md:SurName>Friend</md:SurName>
+    <md:EmailAddress>mailto:n.friend@canterburycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml
index 36a11c0b..859fa211 100644
--- a/swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.carshalton.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-11T09:15:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-11T09:15:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Carshalton College UK</mdui:DisplayName>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carshalton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Carshalton College UK</mdui:DisplayName>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carshalton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIVAK9zq/AGPCsO/yVh6eCXxG1GorxSMA0GCSqGSIb3DQEB
 						BQUAMCYxJDAiBgNVBAMMG3NoaWJib2xldGguY2Fyc2hhbHRvbi5hYy51azAeFw0x
 						NTAzMjAyMTE0MjlaFw0zNTAzMjAyMTE0MjlaMCYxJDAiBgNVBAMMG3NoaWJib2xl
@@ -35,29 +35,29 @@
 						TvmDIyDspkoPMxW1M2dUl+g+nIZSqY1gUKdE+4wgvWZ64giL4VqmqsCpf1WmQuok
 						aZ/E2PZAbR5KW3lPYXM3YF/ym2KBQM0F95HSTqAYWjiMbSVoBVhvRDtt+u0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.carshalton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carshalton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.carshalton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carshalton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWDCCAkCgAwIBAgIVAK9zq/AGPCsO/yVh6eCXxG1GorxSMA0GCSqGSIb3DQEB
 						BQUAMCYxJDAiBgNVBAMMG3NoaWJib2xldGguY2Fyc2hhbHRvbi5hYy51azAeFw0x
 						NTAzMjAyMTE0MjlaFw0zNTAzMjAyMTE0MjlaMCYxJDAiBgNVBAMMG3NoaWJib2xl
@@ -77,25 +77,25 @@
 						TvmDIyDspkoPMxW1M2dUl+g+nIZSqY1gUKdE+4wgvWZ64giL4VqmqsCpf1WmQuok
 						aZ/E2PZAbR5KW3lPYXM3YF/ym2KBQM0F95HSTqAYWjiMbSVoBVhvRDtt+u0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Carshalton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Carshalton College UK</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.carshalton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpline</md:GivenName>
-      <md:EmailAddress>mailto:helpline@carshalton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpline</md:GivenName>
-      <md:EmailAddress>mailto:helpline@carshalton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Carshalton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carshalton College UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.carshalton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpline</md:GivenName>
+    <md:EmailAddress>mailto:helpline@carshalton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpline</md:GivenName>
+    <md:EmailAddress>mailto:helpline@carshalton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml
index bbce63b7..071e6933 100644
--- a/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cavc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-13T15:08:56Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-13T15:08:56Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cavc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cavc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUH99VjfXgjcBNReQ0wEed9egxoRQwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZjLmFjLnVrMB4XDTEzMDgwNjEw
 						MzcxM1oXDTMzMDgwNjEwMzcxM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZj
@@ -30,26 +30,26 @@
 						SMLkcYgNqvg8nqco5vKv6v9pkdh1MV40pOAWeaHT1FHJGW2UhuZpwK4MbbChbev2
 						oBcKoqYIcHYU0kK+KQpGb6qBIw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cavc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cavc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cavc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cavc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUH99VjfXgjcBNReQ0wEed9egxoRQwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZjLmFjLnVrMB4XDTEzMDgwNjEw
 						MzcxM1oXDTMzMDgwNjEwMzcxM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZj
@@ -69,27 +69,27 @@
 						SMLkcYgNqvg8nqco5vKv6v9pkdh1MV40pOAWeaHT1FHJGW2UhuZpwK4MbbChbev2
 						oBcKoqYIcHYU0kK+KQpGb6qBIw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff and Vale College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff and Vale College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cavc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Evan</md:GivenName>
-      <md:SurName>Davies</md:SurName>
-      <md:EmailAddress>mailto:EDavies@cavc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Evan</md:GivenName>
-      <md:SurName>Davies</md:SurName>
-      <md:EmailAddress>mailto:EDavies@cavc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff and Vale College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff and Vale College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cavc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Evan</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:EDavies@cavc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Evan</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:EDavies@cavc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
index 775bec64..029c28c0 100644
--- a/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cbpf.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbpf.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://portal.cbpf.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://portal.cbpf.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbpf.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
-          <mdui:Description xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://portal.cbpf.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://portal.cbpf.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxNjA0BgNVBAoTLUNCUEYgLSBD
 ZW50cm8gQnJhc2lsZWlybyBkZSBQZXNxdWlzYXMgRmlzaWNhczEMMAoGA1UECxMD
 Q0FUMRwwGgYJKoZIhvcNAQkBFg1sYW5uYUBjYnBmLmJyMRcwFQYDVQQHEw5SaW8g
@@ -46,26 +46,26 @@ mtit3VgXMl3KNv9IcRISBY9oyZdOTzHP/676+HwNYB888FApyKlmLnTvMtxCwuI8
 p2bQTau4MNCPHLB6bYabI5bb21dowUM2UHgRMMQ3KtX9QADp8jQquqO10GIciPe4
 XQmKkysRlE2Thg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cbpf.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbpf.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cbpf.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbpf.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxNjA0BgNVBAoTLUNCUEYgLSBD
 ZW50cm8gQnJhc2lsZWlybyBkZSBQZXNxdWlzYXMgRmlzaWNhczEMMAoGA1UECxMD
@@ -92,24 +92,24 @@ XQmKkysRlE2Thg==
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://portal.cbpf.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://portal.cbpf.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Orlanna Oliveira</md:SurName>
-      <md:EmailAddress>lanna@cbpf.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://portal.cbpf.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://portal.cbpf.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Orlanna Oliveira</md:SurName>
+    <md:EmailAddress>lanna@cbpf.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
index d74498c0..123b7bfe 100644
--- a/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cefet-rj.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefet-rj.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
+        <mdui:Description xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cefet-rj.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.cefet-rj.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefet-rj.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
-          <mdui:Description xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.cefet-rj.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.cefet-rj.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIELDCCAxQCAQAwDQYJKoZIhvcNAQEFBQAwgdsxRzBFBgNVBAoUPkNlbnRybyBG
 ZWRlcmFsIGRlIEVkdWNh5+NvIFRlY25vbPNnaWNhIENlbHNvIFN1Y2tvdyBkYSBG
 b25zZWNhMQ4wDAYDVQQLEwVEVElORjEgMB4GCSqGSIb3DQEJARYRZHRpbmZAY2Vm
@@ -47,26 +47,26 @@ m1mKJBRLjIPxc3jYovdSBJDvTwWzT16Jh4xls+mHXK2NQtObPIAMjkFUYZKYNFTf
 ed0HOE+rbfcdak8uDdywV4Fqbi6IkKGo/mTO/OImm9aMqHMoG05HzRFDqPjn3Uv8
 fVFA8m9TqEvrRbsw1wmqyg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cefet-rj.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefet-rj.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cefet-rj.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cefet-rj.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIELDCCAxQCAQAwDQYJKoZIhvcNAQEFBQAwgdsxRzBFBgNVBAoUPkNlbnRybyBG
 ZWRlcmFsIGRlIEVkdWNh5+NvIFRlY25vbPNnaWNhIENlbHNvIFN1Y2tvdyBkYSBG
@@ -93,24 +93,24 @@ ed0HOE+rbfcdak8uDdywV4Fqbi6IkKGo/mTO/OImm9aMqHMoG05HzRFDqPjn3Uv8
 fVFA8m9TqEvrRbsw1wmqyg==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cefet-rj.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.cefet-rj.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Cesar Gama</md:SurName>
-      <md:EmailAddress>cesar.gama@cefet-rj.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cefet-rj.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.cefet-rj.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Cesar Gama</md:SurName>
+    <md:EmailAddress>cesar.gama@cefet-rj.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
index d7cab8c8..f1ec92fa 100644
--- a/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cetem.gov.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:Description>
+        <mdui:Description xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cetem.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.cetem.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:Description>
-          <mdui:Description xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.cetem.gov.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.cetem.gov.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxLTArBgNVBAoTJENFVEVNIC0g
 Q2VudHJvIGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQG
 CSqGSIb3DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJp
@@ -46,26 +46,26 @@ BHl7OWkgGmgUWrtS1JRBpYxRbnhlOGngoLVrzmBhCo5eCrWLp2hb2whzDuu8if/1
 d5oA+IrrKlrbLyUsagA3Zb6lakPsmZNayxV+GBi5QdEEzQQ/9xet0Ugq1R0P7u6x
 iEcPQigOKOCHgUO5rjTwYd5NkRpzYgnw
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cetem.gov.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cetem.gov.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gov.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxLTArBgNVBAoTJENFVEVNIC0g
 Q2VudHJvIGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQG
@@ -91,24 +91,24 @@ d5oA+IrrKlrbLyUsagA3Zb6lakPsmZNayxV+GBi5QdEEzQQ/9xet0Ugq1R0P7u6x
 iEcPQigOKOCHgUO5rjTwYd5NkRpzYgnw
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cetem.gov.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.cetem.gov.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Carlos Silva</md:SurName>
-      <md:EmailAddress>sein-redes@cetem.gov.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cetem.gov.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.cetem.gov.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Silva</md:SurName>
+    <md:EmailAddress>sein-redes@cetem.gov.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
index 24944440..81f57d07 100644
--- a/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.clickview.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-26T10:28:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-26T10:28:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/TestShibLoginSahan"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ClickView</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ClickView is the market leader in digital video solutions for education</mdui:Description>
+        <mdui:Logo height="64" width="350">https://downloads.clickview.co.uk/www/images/Clickviewlogo350px.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/TestShibLoginSahan"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ClickView</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ClickView is the market leader in digital video solutions for education</mdui:Description>
-          <mdui:Logo height="64" width="350">https://downloads.clickview.co.uk/www/images/Clickviewlogo350px.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC5TCCAc2gAwIBAgIJAPVbJWGWsfPlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTCmN2LXNoaWJiaWUwHhcNMTQwMjAzMjIzMjQ3WhcNMjQwMjAxMjIzMjQ3WjAV
 						MRMwEQYDVQQDEwpjdi1zaGliYmllMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -53,38 +53,38 @@
 						qkdD2iAPnL0dvkY3D5snTUOl5b/1jyE7h4wCBCYTYQ2dBjPtdtcxRHUg1Lca0cFg
 						BGi6QxxdSG6OiTxeuWPZr3NkD4YI4RB0Yg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ClickView Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ClickView Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.clickview.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sahan</md:GivenName>
-      <md:SurName>Wimalasiri</md:SurName>
-      <md:EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sahan</md:GivenName>
-      <md:SurName>Wimalasiri</md:SurName>
-      <md:EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ClickView Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ClickView Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.clickview.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sahan</md:GivenName>
+    <md:SurName>Wimalasiri</md:SurName>
+    <md:EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sahan</md:GivenName>
+    <md:SurName>Wimalasiri</md:SurName>
+    <md:EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
index e3961506..ef3f7861 100644
--- a/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cndp.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-31T15:08:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-31T15:08:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cndp.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.cndp.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cndp.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.cndp.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVAPGwxNIFT88TgM2ndmBAqxnLIgA6MA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5mcjAeFw0xMzEwMzEwODE0
 MTJaFw0zMzEwMzEwODE0MTJaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5m
@@ -37,26 +37,26 @@ Rk5+4EQFr07QmhKWuVCb73np6gGnQfI5qs2cUeDEwKSnw9yJfpiuwlGPakiFrfpI
 AUNVNoq0d2wvNKP1kf4vaGmG1/S/s5cBKDp7z5amg6TauBbDwnoKGyoIY9602jMK
 k93krCoGtSQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cndp.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cndp.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alexandre LUCAS</md:SurName>
-      <md:EmailAddress>alexandre.lucas@cndp.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Simon BIGOT</md:SurName>
-      <md:EmailAddress>simon.bigot@cndp.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cndp.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cndp.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alexandre LUCAS</md:SurName>
+    <md:EmailAddress>alexandre.lucas@cndp.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Simon BIGOT</md:SurName>
+    <md:EmailAddress>simon.bigot@cndp.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml
index e57fb07f..c65aa797 100644
--- a/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.coconino.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://oldsite.coconino.edu/ssoerror/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coconino.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Coconino County Community College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://oldsite.coconino.edu/ssoerror/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coconino.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Coconino County Community College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNjCCAh6gAwIBAgIVAPSwsQHYPvqzpEH56syv5GkMl9dXMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcDEuY29jb25pbm8uZWR1MB4XDTE1MDkxNjIwNTMx
 NFoXDTM1MDkxNjIwNTMxNFowHDEaMBgGA1UEAwwRaWRwMS5jb2Nvbmluby5lZHUw
@@ -38,24 +38,24 @@ Q3rrWXbSexe8/ibVAXfQvNC8luMfCcPkgnMq3oQgfHeNbDAYVz9GM2Y5nIbNWizk
 G/8n5DP/9K8IsilSsISKTTkI3pdWsyCmHx+ejHkp9TtgZYTmgq3TDhHc8wsV8CMS
 A+Gg2c5GuR3TCg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.coconino.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coconino.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.coconino.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coconino.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNjCCAh6gAwIBAgIVAPSwsQHYPvqzpEH56syv5GkMl9dXMA0GCSqGSIb3DQEB
 CwUAMBwxGjAYBgNVBAMMEWlkcDEuY29jb25pbm8uZWR1MB4XDTE1MDkxNjIwNTMx
 NFoXDTM1MDkxNjIwNTMxNFowHDEaMBgGA1UEAwwRaWRwMS5jb2Nvbmluby5lZHUw
@@ -75,19 +75,19 @@ Q3rrWXbSexe8/ibVAXfQvNC8luMfCcPkgnMq3oQgfHeNbDAYVz9GM2Y5nIbNWizk
 G/8n5DP/9K8IsilSsISKTTkI3pdWsyCmHx+ejHkp9TtgZYTmgq3TDhHc8wsV8CMS
 A+Gg2c5GuR3TCg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coconino County Community College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coconino County Community College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.coconino.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS Infrastructure</md:GivenName>
-      <md:EmailAddress>its-infrastructure@coconino.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coconino County Community College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coconino County Community College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.coconino.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Infrastructure</md:GivenName>
+    <md:EmailAddress>its-infrastructure@coconino.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml
index f780e1c4..9c018047 100644
--- a/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cranfield.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEeDCCA2CgAwIBAgIJAMVh01FmcQItMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
 						VQQGEwJHQjEVMBMGA1UECBMMQmVkZm9yZHNoaXJlMRIwEAYDVQQHEwlDcmFuZmll
 						bGQxHTAbBgNVBAoTFENyYW5maWVsZCBVbml2ZXJzaXR5MRYwFAYDVQQLEw1JVCBE
@@ -36,26 +36,26 @@
 						SakTjEGtEtO+tk8yoI8HXHjsWa1M/Fu0e1n8vAu8Af2Aqlelq39loO7SmrCzYPJ1
 						Axewsjzk+IZbXd39dF6YzYNvWn7+yy/My9TwHaGSTywPR+yJ0NcOJ40PyQo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cranfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cranfield.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEeDCCA2CgAwIBAgIJAMVh01FmcQItMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
 						VQQGEwJHQjEVMBMGA1UECBMMQmVkZm9yZHNoaXJlMRIwEAYDVQQHEwlDcmFuZmll
 						bGQxHTAbBgNVBAoTFENyYW5maWVsZCBVbml2ZXJzaXR5MRYwFAYDVQQLEw1JVCBE
@@ -81,32 +81,32 @@
 						SakTjEGtEtO+tk8yoI8HXHjsWa1M/Fu0e1n8vAu8Af2Aqlelq39loO7SmrCzYPJ1
 						Axewsjzk+IZbXd39dF6YzYNvWn7+yy/My9TwHaGSTywPR+yJ0NcOJ40PyQo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cranfield University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cranfield University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Haynes</md:SurName>
-      <md:EmailAddress>mailto:j.haynes@cranfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kenneth</md:GivenName>
-      <md:SurName>Caines</md:SurName>
-      <md:EmailAddress>mailto:Kenneth.Caines@Cranfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Haynes</md:SurName>
-      <md:EmailAddress>mailto:j.haynes@cranfield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cranfield University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cranfield University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Haynes</md:SurName>
+    <md:EmailAddress>mailto:j.haynes@cranfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kenneth</md:GivenName>
+    <md:SurName>Caines</md:SurName>
+    <md:EmailAddress>mailto:Kenneth.Caines@Cranfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Haynes</md:SurName>
+    <md:EmailAddress>mailto:j.haynes@cranfield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml
index 942609d3..fcaee5ef 100644
--- a/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.csuchico.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuchico.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Chico</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Provides authentication and authorization functions for federated applications used by faculty, staff, and students at California State University, Chico.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.csuchico.edu/isec/incommonpop.shtml</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.csuchico.edu/isec/incommonpop.shtml</mdui:PrivacyStatementURL>
+        <mdui:Logo height="154" width="154" xml:lang="en">https://www.csuchico.edu/weblogos/logos/seal154r.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuchico.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Chico</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Provides authentication and authorization functions for federated applications used by faculty, staff, and students at California State University, Chico.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.csuchico.edu/isec/incommonpop.shtml</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.csuchico.edu/isec/incommonpop.shtml</mdui:PrivacyStatementURL>
-          <mdui:Logo height="154" width="154" xml:lang="en">https://www.csuchico.edu/weblogos/logos/seal154r.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAIEEdq+4nDzx9lzoLHgf0Lhl3d8BMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTE0MDQx
 ODE2MzY1M1oXDTM0MDQxODE2MzY1M1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5j
@@ -42,13 +42,13 @@ elF6prjEAvRxdRHg3O1TQoo6xdxR/Iod+wPTgmg9G0gKQPL/4++eiUvotCMMraUR
 C4mfTA0pqKLnIIqgfW7AathlVBdQnDhubTVT1OEp7E7TgG4U6uzsx4qvEkA66C4l
 hERQRKfoE96zHmakc8SmiMASUbUzxjbMYVyJ3g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIJANla2HUGoCmtMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTExMDQxMzE3MzIyMloXDTIx
 MDQxMDE3MzIyMlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jc3VjaGljby5lZHUw
@@ -68,24 +68,24 @@ IfvBrCjTxarHxA+2wGD0CLrYXcFj7yo3NjQClmhkMTxquTSq6LBgeRuJyNcUnA8L
 /TudO9r//xU7h/rrRz+WhUH7KCNk/fkZDNiriqfj90yExFeDILr5g0G9swLYZoqU
 OkvoU7bZUozGMD6b/VOon3gG54/d9WM2+vQ+hP282rM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csuchico.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuchico.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csuchico.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csuchico.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAIEEdq+4nDzx9lzoLHgf0Lhl3d8BMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTE0MDQx
 ODE2MzY1M1oXDTM0MDQxODE2MzY1M1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5j
@@ -105,13 +105,13 @@ elF6prjEAvRxdRHg3O1TQoo6xdxR/Iod+wPTgmg9G0gKQPL/4++eiUvotCMMraUR
 C4mfTA0pqKLnIIqgfW7AathlVBdQnDhubTVT1OEp7E7TgG4U6uzsx4qvEkA66C4l
 hERQRKfoE96zHmakc8SmiMASUbUzxjbMYVyJ3g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIJANla2HUGoCmtMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTExMDQxMzE3MzIyMloXDTIx
 MDQxMDE3MzIyMlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jc3VjaGljby5lZHUw
@@ -131,27 +131,27 @@ IfvBrCjTxarHxA+2wGD0CLrYXcFj7yo3NjQClmhkMTxquTSq6LBgeRuJyNcUnA8L
 /TudO9r//xU7h/rrRz+WhUH7KCNk/fkZDNiriqfj90yExFeDILr5g0G9swLYZoqU
 OkvoU7bZUozGMD6b/VOon3gG54/d9WM2+vQ+hP282rM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Chico</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Chico</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csuchico.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Fuhs</md:GivenName>
-      <md:EmailAddress>dfuhs@csuchico.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David Fuhs</md:GivenName>
-      <md:EmailAddress>dfuhs@csuchico.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Andy Miller</md:GivenName>
-      <md:EmailAddress>lamiller@csuchico.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Chico</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Chico</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csuchico.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Fuhs</md:GivenName>
+    <md:EmailAddress>dfuhs@csuchico.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David Fuhs</md:GivenName>
+    <md:EmailAddress>dfuhs@csuchico.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andy Miller</md:GivenName>
+    <md:EmailAddress>lamiller@csuchico.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml
index 310bcd39..99d10987 100644
--- a/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.csustan.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csustan.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Stanislaus</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csustan.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Stanislaus</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUGMBL/KES+CItQJGiZd2xZSh8rJkwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5jc3VzdGFuLmVkdTAeFw0wOTA5MDEy
 MTExMDlaFw0yOTA5MDEyMTExMDlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguY3N1
@@ -38,24 +38,24 @@ EiG0dCIfR86g8fLLIKB2T6NExYY6yYJHobC9h8G9IiR+2QAf/UxuC6hEGAQAnUWj
 NqWgMu7TiZy0oedXYZYYaAHmWQDJWXt2SGC11bB8qtEU2tcccppV75MWjC7SYqko
 +1hpIr+zlLqhBIi73qZPIVggyEH8HpE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csustan.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csustan.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csustan.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csustan.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUGMBL/KES+CItQJGiZd2xZSh8rJkwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5jc3VzdGFuLmVkdTAeFw0wOTA5MDEy
 MTExMDlaFw0yOTA5MDEyMTExMDlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguY3N1
@@ -75,23 +75,23 @@ EiG0dCIfR86g8fLLIKB2T6NExYY6yYJHobC9h8G9IiR+2QAf/UxuC6hEGAQAnUWj
 NqWgMu7TiZy0oedXYZYYaAHmWQDJWXt2SGC11bB8qtEU2tcccppV75MWjC7SYqko
 +1hpIr+zlLqhBIi73qZPIVggyEH8HpE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Stanislaus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Stanislaus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csustan.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Wincentsen</md:GivenName>
-      <md:EmailAddress>CWincentsen@csustan.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Corey Cardoza</md:GivenName>
-      <md:EmailAddress>CCardoza@csustan.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Stanislaus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Stanislaus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csustan.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Wincentsen</md:GivenName>
+    <md:EmailAddress>CWincentsen@csustan.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Corey Cardoza</md:GivenName>
+    <md:EmailAddress>CCardoza@csustan.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
index be181fd7..74858953 100644
--- a/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.derby.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:51:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:51:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Derby</mdui:DisplayName>
+        <mdui:Logo height="80" width="60">https://ulib.derby.ac.uk/library/images/uni_logo_80_60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://ulib.derby.ac.uk/library/images/uni_logo_16_16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Derby</mdui:DisplayName>
-          <mdui:Logo height="80" width="60">https://ulib.derby.ac.uk/library/images/uni_logo_80_60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://ulib.derby.ac.uk/library/images/uni_logo_16_16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDjDCCAnQCCQDB/+b3WBJu4jANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRwwGgYDVQQK
 						DBNVbml2ZXJzaXR5IG9mIERlcmJ5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEfMB0G
@@ -38,26 +38,26 @@
 						ZFoqx/T0VhoKIh0ijqp2RcJOhN4/xi2W9Do1+NsWq2vqdFrwFrGtn1vyiEVt/CPd
 						qVuqWTRreMPKmJ0kUDZIHygko4iKmYXxlRXwKfyDo+/bHP2xCRTFQtlS/KtMkWxn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.derby.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.derby.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">derby.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDjDCCAnQCCQDB/+b3WBJu4jANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRwwGgYDVQQK
 						DBNVbml2ZXJzaXR5IG9mIERlcmJ5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEfMB0G
@@ -78,27 +78,27 @@
 						ZFoqx/T0VhoKIh0ijqp2RcJOhN4/xi2W9Do1+NsWq2vqdFrwFrGtn1vyiEVt/CPd
 						qVuqWTRreMPKmJ0kUDZIHygko4iKmYXxlRXwKfyDo+/bHP2xCRTFQtlS/KtMkWxn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Derby</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Derby</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.derby.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Glenn</md:GivenName>
-      <md:SurName>Handley</md:SurName>
-      <md:EmailAddress>mailto:G.Handley@derby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Glenn</md:GivenName>
-      <md:SurName>Handley</md:SurName>
-      <md:EmailAddress>mailto:G.Handley@derby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Derby</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Derby</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.derby.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Handley</md:SurName>
+    <md:EmailAddress>mailto:G.Handley@derby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Handley</md:SurName>
+    <md:EmailAddress>mailto:G.Handley@derby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml b/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml
index a5e6a9cf..15c516e1 100644
--- a/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml
+++ b/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.digiknihovna.cz/metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-01T16:55:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-01T16:55:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">digiknihovna.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Municipal Library of Česká Třebová</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Městská knihovna Česká Třebová</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Municipal Library Česká Třebová</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Městské knihovny Česká Třebová</mdui:Description>
+        <mdui:Logo height="40" width="40">https://shibboleth.digiknihovna.cz/logo.png</mdui:Logo>
+        <mdui:Logo height="40" width="231" xml:lang="cs">https://shibboleth.digiknihovna.cz/logo_c.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">digiknihovna.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Municipal Library of Česká Třebová</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Městská knihovna Česká Třebová</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Municipal Library Česká Třebová</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Městské knihovny Česká Třebová</mdui:Description>
-          <mdui:Logo height="40" width="40">https://shibboleth.digiknihovna.cz/logo.png</mdui:Logo>
-          <mdui:Logo height="40" width="231" xml:lang="cs">https://shibboleth.digiknihovna.cz/logo_c.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://knihovna.ceska-trebova.cz/index.php/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://knihovna.ceska-trebova.cz/index.php/cs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jiří</md:GivenName>
-      <md:SurName>Kozlovský</md:SurName>
-      <md:EmailAddress>Jiri.Kozlovsky@mzk.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://knihovna.ceska-trebova.cz/index.php/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://knihovna.ceska-trebova.cz/index.php/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jiří</md:GivenName>
+    <md:SurName>Kozlovský</md:SurName>
+    <md:EmailAddress>Jiri.Kozlovsky@mzk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
index c4ed5f07..f49774fd 100644
--- a/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.dundeeandangus.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-06T16:06:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-06T16:06:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundeeandangus.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dundee and Angus College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundeeandangus.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dundee and Angus College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaTCCAlGgAwIBAgIUOOzCa1peQPJkYnPUCVHoA+pzk+UwDQYJKoZIhvcNAQEF
 						BQAwKjEoMCYGA1UEAxMfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51azAe
 						Fw0xNDAzMDQyMTIxNDlaFw0zNDAzMDQyMTIxNDlaMCoxKDAmBgNVBAMTH3NoaWJi
@@ -36,29 +36,29 @@
 						loP/MEWE2eokIFQvB6DKN6kSUUxOM8iKyfaHf99YWXbqdfcRNqPPE/itq2VeWZ9d
 						uQHJCbKISTdD5+fZjQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundeeandangus.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dundeeandangus.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaTCCAlGgAwIBAgIUOOzCa1peQPJkYnPUCVHoA+pzk+UwDQYJKoZIhvcNAQEF
 						BQAwKjEoMCYGA1UEAxMfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51azAe
 						Fw0xNDAzMDQyMTIxNDlaFw0zNDAzMDQyMTIxNDlaMCoxKDAmBgNVBAMTH3NoaWJi
@@ -79,47 +79,47 @@
 						loP/MEWE2eokIFQvB6DKN6kSUUxOM8iKyfaHf99YWXbqdfcRNqPPE/itq2VeWZ9d
 						uQHJCbKISTdD5+fZjQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dundee and Angus College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dundee and Angus College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dundeeandangus.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Sinclair</md:SurName>
-      <md:EmailAddress>mailto:brian.sinclair@dundeeandangus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Findlater</md:SurName>
-      <md:EmailAddress>mailto:ian.findlater@dundeeandangus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Dingwall</md:SurName>
-      <md:EmailAddress>mailto:g.dingwall@dundeeandangus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Sinclair</md:SurName>
-      <md:EmailAddress>mailto:brian.sinclair@dundeeandangus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Findlater</md:SurName>
-      <md:EmailAddress>mailto:ian.findlater@dundeeandangus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Dingwall</md:SurName>
-      <md:EmailAddress>mailto:g.dingwall@dundeeandangus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dundee and Angus College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dundee and Angus College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dundeeandangus.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Sinclair</md:SurName>
+    <md:EmailAddress>mailto:brian.sinclair@dundeeandangus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Findlater</md:SurName>
+    <md:EmailAddress>mailto:ian.findlater@dundeeandangus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Dingwall</md:SurName>
+    <md:EmailAddress>mailto:g.dingwall@dundeeandangus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Sinclair</md:SurName>
+    <md:EmailAddress>mailto:brian.sinclair@dundeeandangus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Findlater</md:SurName>
+    <md:EmailAddress>mailto:ian.findlater@dundeeandangus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Dingwall</md:SurName>
+    <md:EmailAddress>mailto:g.dingwall@dundeeandangus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml b/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml
index 8aef2b9f..931a0431 100644
--- a/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml
+++ b/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.eb.com/sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T10:13:12Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T10:13:12Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.eb.com/shibboleth.sso/kidder"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.eb.com/shibboleth.sso/WAYF"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.eb.com/shibboleth.sso/kidder"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.eb.com/shibboleth.sso/WAYF"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYzCCAksCAQwwDQYJKoZIhvcNAQEFBQAwZzELMAkGA1UEBhMCVVMxCzAJBgNV
 						BAgTAklMMRAwDgYDVQQHEwdDaGljYWdvMQswCQYDVQQKEwJFQjEPMA0GA1UEAxMG
 						ZWJjZXJ0MRswGQYJKoZIhvcNAQkBFgxqbWFyc0BlYi5jb20wHhcNMTMwNjIwMTY0
@@ -53,46 +53,46 @@
 						t36zi8dK/SAbGysPEPvHrsoU38zo7s/WA9I6gA4ZyKWXlx6k3xnR6R2GNuh1Vjio
 						urVZD7P8AKbj+2gFol6KaUOrLk7t7QQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Post-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.eb.com/shibboleth.sso/SAML/Post" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.eb.com/shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Encyclopaedia Britannica (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Britannica Online School Edition</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.britannica.co.uk/BritannicaCoUK_Info_History.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Service</md:GivenName>
-      <md:EmailAddress>mailto:ukcustomerservice@britannica.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shawn</md:GivenName>
-      <md:SurName>McCullars</md:SurName>
-      <md:EmailAddress>mailto:smcculla@us.britannica.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Post-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.eb.com/shibboleth.sso/SAML/Post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.eb.com/shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Encyclopaedia Britannica (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Britannica Online School Edition</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.britannica.co.uk/BritannicaCoUK_Info_History.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Service</md:GivenName>
+    <md:EmailAddress>mailto:ukcustomerservice@britannica.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shawn</md:GivenName>
+    <md:SurName>McCullars</md:SurName>
+    <md:EmailAddress>mailto:smcculla@us.britannica.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
index f07f514e..f550cc7c 100644
--- a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
+++ b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-06-12T13:07:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-06-12T13:07:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFjzCCBHegAwIBAgIJALgyIfD0A59WMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
 						VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
 						MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
@@ -61,22 +61,22 @@
 						FhWhQnewAV8knm60yrMTxcG0VGqbsxiLqacCKuNJvSZIGuCwGwCqWTVPza+7k7Xa
 						GXN6t76L1hd4Ant9KFynMa+RET9Mf26Fffpuhk09MVUJqcc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAMyOzC7Vc+89MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTAeFw0xNDA0MjQxMzE4MTFaFw0y
 						NDA0MjExMzE4MTFaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZWJzY29ob3N0LmNv
@@ -95,35 +95,35 @@
 						mFeekTOCi/QauZiSNwywKFssG1xmQ/0F0hVkHSu4TnycZ+ebE6tng3fux7JIrWiX
 						GU/FKl6h+yb9xow2u6V8+fkKEQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">EBSCO Publishing, Inc</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EBSCO Publishing, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EBSCO Publishing, Inc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ebsco.com/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EBSCO Customer Satisfaction</md:GivenName>
-      <md:EmailAddress>mailto:shib-tech@ebscohost.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>EBSCO Shibboleth Tech</md:GivenName>
-      <md:EmailAddress>mailto:shib-tech@ebscohost.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EBSCO Publishing, Inc</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EBSCO Publishing, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EBSCO Publishing, Inc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ebsco.com/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EBSCO Customer Satisfaction</md:GivenName>
+    <md:EmailAddress>mailto:shib-tech@ebscohost.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>EBSCO Shibboleth Tech</md:GivenName>
+    <md:EmailAddress>mailto:shib-tech@ebscohost.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
index 3678b6f2..1ebfb439 100644
--- a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.edgehill.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-02T12:16:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-02T12:16:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edgehill.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edgehill.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFCTCCA/GgAwIBAgIUZAJxK/aWhFu1wZNKpSMFkRznQnQwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYyOTEyNDI1
@@ -41,26 +41,26 @@
 						P1S6otiApfA6xJE2P4+uxbmmvLQguzbdoqMYI4oV55j5btMuZv2YSPtwnFXVaEbw
 						9z3NGpOKrko0OWCZ4AKIGYb83kg8k4zbZnLrOh/VAzR3cpPU6e5jQ9A0C4lE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.edgehill.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edgehill.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.edgehill.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edgehill.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFCTCCA/GgAwIBAgIUZAJxK/aWhFu1wZNKpSMFkRznQnQwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYyOTEyNDI1
@@ -89,27 +89,27 @@
 						P1S6otiApfA6xJE2P4+uxbmmvLQguzbdoqMYI4oV55j5btMuZv2YSPtwnFXVaEbw
 						9z3NGpOKrko0OWCZ4AKIGYb83kg8k4zbZnLrOh/VAzR3cpPU6e5jQ9A0C4lE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Edge Hill University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edge Hill University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.edgehill.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Malcolm</md:SurName>
-      <md:EmailAddress>mailto:neil.malcolm@edgehill.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>Malcolm</md:SurName>
-      <md:EmailAddress>mailto:neil.malcolm@edgehill.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Edge Hill University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edge Hill University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.edgehill.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Malcolm</md:SurName>
+    <md:EmailAddress>mailto:neil.malcolm@edgehill.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>Malcolm</md:SurName>
+    <md:EmailAddress>mailto:neil.malcolm@edgehill.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml
index 2b22a504..7e1cbf27 100644
--- a/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.editure.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-25T13:47:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-25T13:47:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIJALzAXoogu0OFMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWJib2xldGguZWRpdHVyZS5jby51azAeFw0xMjA0MTMxNDE1NDFaFw0y
 						MjA0MTExNDE1NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZWRpdHVyZS5jby51
@@ -32,36 +32,36 @@
 						rT64LLFKB468UlpfdpVyosQ6Fi5L5lG5SLtmmMgF+1vK+vAGHmR47hZLt+iKnmfw
 						mZTLX4Py/Vl94v6sULZDtw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New Era Education Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New Era Education Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.editure.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Support</md:GivenName>
-      <md:EmailAddress>mailto:customersupport@neweraed.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Team</md:GivenName>
-      <md:EmailAddress>mailto:systems@neweraed.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New Era Education Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New Era Education Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.editure.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:customersupport@neweraed.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:systems@neweraed.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
index 64bb7de0..82bd09cd 100644
--- a/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.enc.sorbonne.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-02T14:31:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-02T14:31:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enc.sorbonne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Nationale des Chartes production</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz5WSTU8TURSGz507czvTaacfFlCioEATAwkLEEgMK9iYuNKNiX/ExJ1/wYWJP4DEjTGRmLAwJn7ECCaopCja0hSKpdChH8x07nz03uMCgkZXvrtz3ufkbB6CiPA/Uf5dFasNAFgtVADA5eHfNf6RH5VDiVg/ck5Gxws6Dne8wHH5GXP6oWYfd/2eAHn/4dOMZSytrK0WKnbLffD4efWglTD1cq15QhJEbHZ4KqE/e7WeSZkSUQihx5gQMuoJCch5oMf0m/MTQiClREFEy2SuH3zfqdft40jI/NBAOplIW+al8+d0Ve3PWp+2Km433No5QETScTwkZOnFh7nJUcvQx4ZyEmDfbuuMGUzTNOp2/ZrdWtvcvXtjtid6is40KQQAVOtHRlz1goj7kdMN7LYLIP0gkhKXX28Ud/bbxx4FII7LPxerrQ6fn86HYVQo1abGhwGAqZoQ0cq7rwuz+XQy/ma9hADXJ0cUSpXxkcHtvcajJy+/lWtMo5QQRgmgRATT1DbL9Tv3Hi+/3ZgYG5QoVYkSQBnszwqR3Dto9WUtBUAhClEUABmGIqTR7cWZjBWPqRQlEs65w3t+EL7/Ui7/PDSY5ofRhVxapaRUbfRlE5Vac/Ri38LceMYyEjFVBYC4TgHYQC6VSuq5TPKo7Xo89MPo1uJUtd60O3x2ciRjGQajAEA8zwMAKSEUUtPoZrHW7vJeL5JSMQ0WCjF9dZhphNFTJ4jruqcaUgqIQkoeiLYTBGF0eTAFiJRSKeWZe78PbIeXdhszE1c+Frb3DzuUEhbTmKqaeqzrBwvX8ifYL1UkZ1awU1oLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwKXrYNQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OToxMyswMjowMFgnYIkAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.enc.sorbonne.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Idp test école nationale des Chartes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale des Chartes production</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Idp test école nationale des Chartes</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enc.sorbonne.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Nationale des Chartes production</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz5WSTU8TURSGz507czvTaacfFlCioEATAwkLEEgMK9iYuNKNiX/ExJ1/wYWJP4DEjTGRmLAwJn7ECCaopCja0hSKpdChH8x07nz03uMCgkZXvrtz3ufkbB6CiPA/Uf5dFasNAFgtVADA5eHfNf6RH5VDiVg/ck5Gxws6Dne8wHH5GXP6oWYfd/2eAHn/4dOMZSytrK0WKnbLffD4efWglTD1cq15QhJEbHZ4KqE/e7WeSZkSUQihx5gQMuoJCch5oMf0m/MTQiClREFEy2SuH3zfqdft40jI/NBAOplIW+al8+d0Ve3PWp+2Km433No5QETScTwkZOnFh7nJUcvQx4ZyEmDfbuuMGUzTNOp2/ZrdWtvcvXtjtid6is40KQQAVOtHRlz1goj7kdMN7LYLIP0gkhKXX28Ud/bbxx4FII7LPxerrQ6fn86HYVQo1abGhwGAqZoQ0cq7rwuz+XQy/ma9hADXJ0cUSpXxkcHtvcajJy+/lWtMo5QQRgmgRATT1DbL9Tv3Hi+/3ZgYG5QoVYkSQBnszwqR3Dto9WUtBUAhClEUABmGIqTR7cWZjBWPqRQlEs65w3t+EL7/Ui7/PDSY5ofRhVxapaRUbfRlE5Vac/Ri38LceMYyEjFVBYC4TgHYQC6VSuq5TPKo7Xo89MPo1uJUtd60O3x2ciRjGQajAEA8zwMAKSEUUtPoZrHW7vJeL5JSMQ0WCjF9dZhphNFTJ4jruqcaUgqIQkoeiLYTBGF0eTAFiJRSKeWZe78PbIeXdhszE1c+Frb3DzuUEhbTmKqaeqzrBwvX8ifYL1UkZ1awU1oLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwKXrYNQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OToxMyswMjowMFgnYIkAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enc.sorbonne.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Idp test école nationale des Chartes</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale des Chartes production</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Idp test école nationale des Chartes</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUzCCAjugAwIBAgIUHHNR9K1ZuuDTVcVyeRLx99mFDa8wDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC5lbmMuc29yYm9ubmUuZnIwHhcNMTQx
 MTE0MTUxMjMzWhcNMzQxMTE0MTUxMjMzWjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
@@ -40,21 +40,21 @@ tkIZrrOz69LB6f8BFngBo/+gbUshNKRW7LE8KvCu2qLJJlCh3hUs6dHtYi8qt/xk
 fJHF1BDZX2A5KV8UzZ4NO8HQrBdMW/tVBZvBCCqAzrZreQY+fBv8se9HkR5M83Rr
 K+rXM7jkNQmgfZEZYJwccXuA+Ugd0UMtXh6qTpXcf8hNrCZEj9jQ
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enc.sorbonne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@enc.sorbonne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.enc.sorbonne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>informatique@enc.sorbonne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
index 714b9070..1a443825 100644
--- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ensi-bourges.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-08-23T14:24:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-08-23T14:24:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensi-bourges.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensi-bourges.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
 MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -37,26 +37,26 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
 3TPgmBFpVZdI9KCcB4/vz7mqHhA/iT8H51eU2uHV9SfnDjeLW3nB/XfxiBjP5Loe
 2RYyHguWnRCRk0/thc1XVaS0X/CFun8xq053SrDgxgZNINKS+En2yg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensi-bourges.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Frédéric AURAMBOUT</md:SurName>
-      <md:EmailAddress>frederic.aurambout@ensi-bourges.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Sylvain LESAGE</md:SurName>
-      <md:EmailAddress>sylvain.lesage@ensi-bourges.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensi-bourges.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frédéric AURAMBOUT</md:SurName>
+    <md:EmailAddress>frederic.aurambout@ensi-bourges.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sylvain LESAGE</md:SurName>
+    <md:EmailAddress>sylvain.lesage@ensi-bourges.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
index 2dedec3f..4c076999 100644
--- a/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ensicaen.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T23:00:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T23:00:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensicaen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSICAEN</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABCFBMVEUAFFIAdbUYRXMAqtZSnr0AUZwAjrUAKFp7qsYAZaWlvs4AgrUANGNCbYwAjtYIMFoASYwAbbXGy9YAIFK1vs4AgsYAos4AWYwAXZwAba0QMFoAecacssatw9Z7lq0ALGMAZa0AUZQAIFoAis4Amt4AHFIAfb1ars4AWZxKlr0ALFqErs4AirUAls4AMGMATZQAcb21w84Ags4AVZQAYa0QMGMAGFIAebUARYRSosYAVZwAjsaErsYAaaWUvtYAhrUAOGtKbYwAktYATYwAcbW9z94AJFIAntYAYaUAca0YMFoAfcacts61w9aUnrUAaa0AJFoAot5jstYILFoIMGO9w84Ahs4AWZRhldOjAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAxUlEQVQY01WP2w7BUBBFp25TNAZtKMrRRtCENERDUEXqcgjihf//E6MJIbPOetjZOZmBk/8/wO/LW6D59MHXWCBIe4OEDBGB0AgdfV0NZHRr9z0CcmCTSg6nigyOT29GgNed6g4O2zAKTA58QKO5dMP8olB4NErtOTeM3IoDRcpa1rRndQ6sVS/Mx3/07SI3Lpbaq2S6UmbNp+1xY2QtU5V7Z7sYn5VJmhvl1iaB+h6RoXUdhO4gCd5WsAR9josnFvxcHusFvMopDOdNWeIAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzgrMDI6MDCGmuCMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM4KzAyOjAw98dYMAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ensicaen.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSICAEN</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensicaen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSICAEN</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABCFBMVEUAFFIAdbUYRXMAqtZSnr0AUZwAjrUAKFp7qsYAZaWlvs4AgrUANGNCbYwAjtYIMFoASYwAbbXGy9YAIFK1vs4AgsYAos4AWYwAXZwAba0QMFoAecacssatw9Z7lq0ALGMAZa0AUZQAIFoAis4Amt4AHFIAfb1ars4AWZxKlr0ALFqErs4AirUAls4AMGMATZQAcb21w84Ags4AVZQAYa0QMGMAGFIAebUARYRSosYAVZwAjsaErsYAaaWUvtYAhrUAOGtKbYwAktYATYwAcbW9z94AJFIAntYAYaUAca0YMFoAfcacts61w9aUnrUAaa0AJFoAot5jstYILFoIMGO9w84Ahs4AWZRhldOjAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAxUlEQVQY01WP2w7BUBBFp25TNAZtKMrRRtCENERDUEXqcgjihf//E6MJIbPOetjZOZmBk/8/wO/LW6D59MHXWCBIe4OEDBGB0AgdfV0NZHRr9z0CcmCTSg6nigyOT29GgNed6g4O2zAKTA58QKO5dMP8olB4NErtOTeM3IoDRcpa1rRndQ6sVS/Mx3/07SI3Lpbaq2S6UmbNp+1xY2QtU5V7Z7sYn5VJmhvl1iaB+h6RoXUdhO4gCd5WsAR9josnFvxcHusFvMopDOdNWeIAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzgrMDI6MDCGmuCMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM4KzAyOjAw98dYMAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ensicaen.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSICAEN</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUWJlRFhwGwMk4lj3M8MGZi+WUiKQwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnNpY2Flbi5mcjAeFw0xMDAzMTUw
 OTI0MzlaFw0zMDAzMTUwOTI0MzlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguZW5z
@@ -38,26 +38,26 @@ jdfJTflIFXumBysheVxnDGXqfaIcl9s4s1PC45Ekvfn0KjA8mHU6OOgR6822HvUo
 mNhb2f0nJQSmsahxi2OvvzkuegbrCzMH/55Wb51w8oHcXF/2IUHgKdIXEXa7HtMT
 fM3qXap8JFtk63lFp9nrjdR9nwduKnM=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensicaen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSICAEN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSICAEN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensicaen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>LEPLANQUAIS ARNAUD</md:SurName>
-      <md:EmailAddress>arnaud.leplanquais@ensicaen.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>LEVEE FREDDY</md:SurName>
-      <md:EmailAddress>freddy.levee@ensicaen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensicaen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSICAEN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSICAEN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensicaen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LEPLANQUAIS ARNAUD</md:SurName>
+    <md:EmailAddress>arnaud.leplanquais@ensicaen.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LEVEE FREDDY</md:SurName>
+    <md:EmailAddress>freddy.levee@ensicaen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
index 6fd87079..9d6dd029 100644
--- a/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ensiie.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-01T11:47:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-01T11:47:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensiie.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSIIE</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.ensiie.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ENSIIE</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensiie.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSIIE</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.ensiie.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ENSIIE</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDPDCCAiSgAwIBAgIVAJhRpKXWoL4ec82/4p6JsfCsvqKyMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguZW5zaWllLmZyMB4XDTExMDEyMDA5
 MTQ0OVoXDTMxMDEyMDA5MTQ0OVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNp
@@ -37,22 +37,22 @@ vrHxCMUO/ZzbFqeDNVTakzahgQ9yAkjDXUVMuvUgAVnfijxKalijRKcUjZQd2CD8
 OcxQqlta3BMFNJvyeGMEx+OTkwl4aBjXweyhhJjRvEbgDHQDiwciDyfhUMjgAXas
 2SsRh/A6XGOz0FDi5j0Qzw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensiie.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSIIE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSIIE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensiie.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>THOMAS Gael</md:SurName>
-      <md:EmailAddress>gael.thomas@ensiie.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensiie.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSIIE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSIIE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensiie.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>THOMAS Gael</md:SurName>
+    <md:EmailAddress>gael.thomas@ensiie.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
index 532fb98f..f78202a3 100644
--- a/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.envt.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-15T15:58:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-15T15:58:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">envt.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
+        <mdui:Logo height="7" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAHCAYAAAABIM1CAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAABwBZRSlVAAABaElEQVQY002Qv0tVYQCGn+9WJ26ZmqgpUpLIHRUadBAaG3KpNRAKp/4NQRuiJaE1cHBRlwgHGzIQRZwkvBVG5vHHufijo95b537nfud7WxTvs77P8PIYSdQxgnePsXEP+bb7eN+Sbhdzwc1bp7R3h8AmsCp4fVSBtqIBSUh6Kyl1qXQyhSpzyEZ7Ohi9ocMXqPQUufhYklQrn8jFf6TPMx/W9oWR9F7wHMAANtokWy6QGyphv8xBTuQfPsHZCrWD35igmca+wYvH34w9DuUW71FreEnTo3d4QbI8Rna6hEtvI+cx9idBRz/X+l9xvbWT6tEh/6bbuVp4hpH00Yarw8HdAYwxlL+uYHyVoLWDXEMXZ2lCFJboNZ/w0RvywxEAWXLGlXzjDluxUHV3Ni39UHljXS75q3p+bRS1uxUq+b6geOZB/bQiCRTvoAnQ9hKSxiXNy/t9770yay91l8WZ1aKkSUl3zuPzH5plBAlWtfmlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.envt.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">envt.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
-          <mdui:Logo height="7" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAHCAYAAAABIM1CAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAABwBZRSlVAAABaElEQVQY002Qv0tVYQCGn+9WJ26ZmqgpUpLIHRUadBAaG3KpNRAKp/4NQRuiJaE1cHBRlwgHGzIQRZwkvBVG5vHHufijo95b537nfud7WxTvs77P8PIYSdQxgnePsXEP+bb7eN+Sbhdzwc1bp7R3h8AmsCp4fVSBtqIBSUh6Kyl1qXQyhSpzyEZ7Ohi9ocMXqPQUufhYklQrn8jFf6TPMx/W9oWR9F7wHMAANtokWy6QGyphv8xBTuQfPsHZCrWD35igmca+wYvH34w9DuUW71FreEnTo3d4QbI8Rna6hEtvI+cx9idBRz/X+l9xvbWT6tEh/6bbuVp4hpH00Yarw8HdAYwxlL+uYHyVoLWDXEMXZ2lCFJboNZ/w0RvywxEAWXLGlXzjDluxUHV3Ni39UHljXS75q3p+bRS1uxUq+b6geOZB/bQiCRTvoAnQ9hKSxiXNy/t9770yay91l8WZ1aKkSUl3zuPzH5plBAlWtfmlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.envt.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNDCCAhygAwIBAgIVALbIAX96KL3MHHLOC3iIdPBazQtRMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5mcjAeFw0xMzA2MjYwNzQ1
 MjhaFw0zMzA2MjYwNzQ1MjhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5m
@@ -38,22 +38,22 @@ iowguqDTs4Es0C9ynTwu/wWLb1GWoIRtBHq7BR1yUCnefmDlZ1dP5sNCShVALvie
 ba49eIXgBqBxpQGrsHsgBR0UlekV5SmAQxH42PmEzeOpLCRTvlmOn2SYTJd4gJ1a
 JZ1pqUirmzM=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.envt.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.envt.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.envt.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.envt.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ARNOUX Jean-Baptiste</md:SurName>
-      <md:EmailAddress>jb.arnoux@envt.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.envt.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.envt.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.envt.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.envt.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ARNOUX Jean-Baptiste</md:SurName>
+    <md:EmailAddress>jb.arnoux@envt.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml
index 5521cf20..05ed1c90 100644
--- a/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.falmouth.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-15T17:28:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-15T17:28:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
 						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -32,26 +32,26 @@
 						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
 						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
 						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -71,28 +71,28 @@
 						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
 						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Falmouth Exeter plus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Falmouth University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Pellow</md:SurName>
-      <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Pellow</md:SurName>
-      <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Falmouth Exeter plus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Falmouth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Pellow</md:SurName>
+    <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Pellow</md:SurName>
+    <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
index 1deb16a8..ee0acece 100644
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fhwn.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
+        <mdui:Logo width="125" height="85">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>2001:628:2270::/48</mdui:IPHint>
+        <mdui:DomainHint>fhwn.ac.at</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
-          <mdui:Logo width="125" height="85">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>2001:628:2270::/48</mdui:IPHint>
-          <mdui:DomainHint>fhwn.ac.at</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
 MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
 LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
@@ -46,29 +46,29 @@ HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
 I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
 BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
 aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fhwn.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fhwn.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
 MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
 LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
@@ -86,30 +86,30 @@ HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
 I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
 BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
 aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">FH Wiener Neustadt für Wirtschaft und Technik GesmbH</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Applied Sciences Wiener Neustadt for Business and Engineering Ltd., Austria</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">FH Wiener Neustadt</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fhwn.ac.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fhwn.ac.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zentraler</md:GivenName>
-      <md:SurName>Service-Desk</md:SurName>
-      <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Zentraler</md:GivenName>
-      <md:SurName>Service-Desk</md:SurName>
-      <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">FH Wiener Neustadt für Wirtschaft und Technik GesmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Applied Sciences Wiener Neustadt for Business and Engineering Ltd., Austria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FH Wiener Neustadt</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhwn.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhwn.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zentraler</md:GivenName>
+    <md:SurName>Service-Desk</md:SurName>
+    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zentraler</md:GivenName>
+    <md:SurName>Service-Desk</md:SurName>
+    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml
index 40790192..1b66f666 100644
--- a/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fucape.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fucape.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fucape.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.fucape.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fucape.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:Description>
-          <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fucape.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.fucape.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xMDAuBgNVBAoTJ0Z1bmRhY2Fv
 IEluc3RpdHV0byBDYXBpeGFiYSBkZSBQZXNxdWlzYTELMAkGA1UECxMCVEkxJTAj
 BgkqhkiG9w0BCQEWFmNhcmxvc3JlbmF0b0BmdWNhcGUuYnIxEjAQBgNVBAcTCUJv
@@ -46,26 +46,26 @@ IvP3upcjS45jcMl3zBVljsVayHR/OWH7n6UJowexBLHmSiAcbrimdedQJkhlO55q
 fH4ipdpb88WsxqPvxI40KormMp6Cp39pyQtMm5JzztVWLeP/pBjUMixByeDbwY4d
 HTlVjz7ufx0=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fucape.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fucape.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fucape.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fucape.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fucape.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fucape.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fucape.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fucape.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xMDAuBgNVBAoTJ0Z1bmRhY2Fv
 IEluc3RpdHV0byBDYXBpeGFiYSBkZSBQZXNxdWlzYTELMAkGA1UECxMCVEkxJTAj
@@ -92,24 +92,24 @@ HTlVjz7ufx0=
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fucape.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.fucape.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Carlos Renato Souza</md:SurName>
-      <md:EmailAddress>carlosrenato@fucape.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fucape.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.fucape.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Renato Souza</md:SurName>
+    <md:EmailAddress>carlosrenato@fucape.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml
index ddc9fe5a..e643fef0 100644
--- a/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fullerton.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shibboleth.fullerton.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullerton.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Fullerton</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shibboleth.fullerton.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullerton.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Fullerton</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE7jCCA9agAwIBAgIJAKJvT9iELa2jMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJRnVsbGVydG9u
 MS4wLAYDVQQKEyVDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkgRnVsbGVydG9u
@@ -50,25 +50,25 @@ R8QDOdsOKEbGAe5VpfIADW8Ld+Lf8H3EyUACMmS39QrlLOsliv+caAAMfzMYaLZv
 XWs1h62037Zvh7EB/R1xe50WroBer+UaY/wYHGI/3fvNGL+kqLPTr4/AlvQqxvy3
 Gc2F/ykKIjW0nT9SvOyCxjGw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullerton.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullerton.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE7jCCA9agAwIBAgIJAKJvT9iELa2jMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJRnVsbGVydG9u
 MS4wLAYDVQQKEyVDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkgRnVsbGVydG9u
@@ -97,18 +97,18 @@ R8QDOdsOKEbGAe5VpfIADW8Ld+Lf8H3EyUACMmS39QrlLOsliv+caAAMfzMYaLZv
 XWs1h62037Zvh7EB/R1xe50WroBer+UaY/wYHGI/3fvNGL+kqLPTr4/AlvQqxvy3
 Gc2F/ykKIjW0nT9SvOyCxjGw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Fullerton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Fullerton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fullerton.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James O'Dell</md:GivenName>
-      <md:EmailAddress>jodell@fullerton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Fullerton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Fullerton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fullerton.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James O'Dell</md:GivenName>
+    <md:EmailAddress>jodell@fullerton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml
index 2efe6227..5297e1c5 100644
--- a/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.globaldata.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
 						MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
@@ -30,38 +30,38 @@
 						Rt8vBK4vYP16FHxWHw9TNnlQ93w4ozWNtnUHOrvoXghavIUg7MTOIQZ5awgMKr8U
 						KRmv+oFXiBHlwyDVz3wIPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GlobalData Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GlobalData Ltd SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.globaldata.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jeevan Kumar</md:GivenName>
-      <md:SurName>Pinnireddy</md:SurName>
-      <md:EmailAddress>mailto:jpinnireddy@globaldata.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeevan Kumar</md:GivenName>
-      <md:SurName>Pinnireddy</md:SurName>
-      <md:EmailAddress>mailto:jpinnireddy@globaldata.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GlobalData Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GlobalData Ltd SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.globaldata.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jeevan Kumar</md:GivenName>
+    <md:SurName>Pinnireddy</md:SurName>
+    <md:EmailAddress>mailto:jpinnireddy@globaldata.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeevan Kumar</md:GivenName>
+    <md:SurName>Pinnireddy</md:SurName>
+    <md:EmailAddress>mailto:jpinnireddy@globaldata.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml
index fa732235..ccb321a1 100644
--- a/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.gmu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">George Mason University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">George Mason University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUepAw2N9+pmX9TWoDp/ZsdB/L1yEwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1MB4XDTEwMDYyNDE0NTMy
 MVoXDTMwMDYyNDE0NTMyMVowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1
@@ -41,22 +41,22 @@ IHEk7lPD0ggHR2Rp8nKE5xbCnL0j6WLTi+MbyMSZKlaNijMJJsybnB7L7dTXOR0z
 07DA0lAnAjYsa5Y/+xYddE7hlz3BkcttcuOgsEuLUtpd2wrWUGmJcOR7GUBTYfm4
 g750I0EPsQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.gmu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.gmu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.gmu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.gmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.gmu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.gmu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.gmu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.gmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUepAw2N9+pmX9TWoDp/ZsdB/L1yEwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1MB4XDTEwMDYyNDE0NTMy
 MVoXDTMwMDYyNDE0NTMyMVowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1
@@ -76,22 +76,22 @@ IHEk7lPD0ggHR2Rp8nKE5xbCnL0j6WLTi+MbyMSZKlaNijMJJsybnB7L7dTXOR0z
 07DA0lAnAjYsa5Y/+xYddE7hlz3BkcttcuOgsEuLUtpd2wrWUGmJcOR7GUBTYfm4
 g750I0EPsQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.gmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">George Mason University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">George Mason University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gmu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tracy Holt</md:GivenName>
-      <md:EmailAddress>holt@gmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Wally Grotophorst</md:GivenName>
-      <md:EmailAddress>wallyg@gmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.gmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">George Mason University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">George Mason University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gmu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tracy Holt</md:GivenName>
+    <md:EmailAddress>holt@gmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Wally Grotophorst</md:GivenName>
+    <md:EmailAddress>wallyg@gmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
index bd05a0c7..a6ea46db 100644
--- a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.grenoble-inp.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-11T10:36:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-11T10:36:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grenoble-inp.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACG0lEQVQ4y4WTv2sUQRTHPzO7s5fd5LyQxGgEtZDTNjZBtBVBTSOif4F/g4U/QMFCCIggabQTbIKNxMKkEBLJtUaQkKAEUROSIN6dSfZyuZt5Frt7d3pF3rDsY9h97/s+M18FKMAAEdAHhICf7neGAE0gBnbTdwMgB4zMzs4+2tzc/CoHxNra2vL09PQDYATIKaB/cXFxYtscufX83TJXLtwFFVG/cwkzEPBq/Cp5o3nRuA0mYvXTCU5ev8YX3OTY2Ng9H8gXi8Ublx++R2mF8QsYbxA93IvX69FnNDlPQdMH2+Dn3Dwb8x84P/P2JvDYB8IoigpRj08hMuS8AZSO0KGH8jQI/KjU2f82A7ZO+XNI7/BhgiDIAz1+Coy+HkNoNCiDiGL7V4Xf37eYOnSWyChcXEGZEBFB2mB9P8s8DbvxPuuVj1RqW/yZu4gf+iCS8E8fgWQvq5Alb0qrBDhGR1cRQhwOJw6cIKLApUX+C50le3sNxFqaTnAiiDgka+kyFUK2ugrgLDiLdYlCh0NwHT8foABnkabFuqR+a4RsdtdmIJ0U0+uZKFBp939GkJYK6VbR1EAtjuPq0f4IsTb5NhuhQ0H7FIRwaIh6vV4F9jSws7Ky8vrl/XFOHR9MmSWgHNkptDkMnjnNuScTLC0tTQE7mZmOlUqlZ9VqdeMgM5XL5fWFhYWnnWZSQJDaOLOz6ebdsnMt7VwD9v8C3mZSAcLTEj0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.grenoble-inp.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grenoble-inp.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACG0lEQVQ4y4WTv2sUQRTHPzO7s5fd5LyQxGgEtZDTNjZBtBVBTSOif4F/g4U/QMFCCIggabQTbIKNxMKkEBLJtUaQkKAEUROSIN6dSfZyuZt5Frt7d3pF3rDsY9h97/s+M18FKMAAEdAHhICf7neGAE0gBnbTdwMgB4zMzs4+2tzc/CoHxNra2vL09PQDYATIKaB/cXFxYtscufX83TJXLtwFFVG/cwkzEPBq/Cp5o3nRuA0mYvXTCU5ev8YX3OTY2Ng9H8gXi8Ublx++R2mF8QsYbxA93IvX69FnNDlPQdMH2+Dn3Dwb8x84P/P2JvDYB8IoigpRj08hMuS8AZSO0KGH8jQI/KjU2f82A7ZO+XNI7/BhgiDIAz1+Coy+HkNoNCiDiGL7V4Xf37eYOnSWyChcXEGZEBFB2mB9P8s8DbvxPuuVj1RqW/yZu4gf+iCS8E8fgWQvq5Alb0qrBDhGR1cRQhwOJw6cIKLApUX+C50le3sNxFqaTnAiiDgka+kyFUK2ugrgLDiLdYlCh0NwHT8foABnkabFuqR+a4RsdtdmIJ0U0+uZKFBp939GkJYK6VbR1EAtjuPq0f4IsTb5NhuhQ0H7FIRwaIh6vV4F9jSws7Ky8vrl/XFOHR9MmSWgHNkptDkMnjnNuScTLC0tTQE7mZmOlUqlZ9VqdeMgM5XL5fWFhYWnnWZSQJDaOLOz6ebdsnMt7VwD9v8C3mZSAcLTEj0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.grenoble-inp.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVDCCAjygAwIBAgIVAO/QaN+dR8TZXZ6cNFwn8jJiB3QdMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZ3Jlbm9ibGUtaW5wLmZyMB4XDTEy
 MDEwOTA5MzY1NVoXDTMyMDEwOTA5MzY1NVowJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -38,21 +38,21 @@ xVox8mkoixLKQpOZ20xTOK41X+bAockt816dkuSR2ZV+v8fwE4BZbFunf9XZRJmD
 eyd91K5Q48y3V66rM3lnwlbdRFcBD9QC8vL+kHL1L5RIUSiClWuSm4J6adU29spC
 OXNNpafFw7y4uune6Y8Jq542pO0I1Hlx1rcd9u0vZ3P+ewZdQP5kkw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.grenoble-inp.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.grenoble-inp.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>federation.sos@grenoble-inp.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.grenoble-inp.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.grenoble-inp.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation.sos@grenoble-inp.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml
index f2fc3fce..1652eee7 100644
--- a/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.hamilton.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://my.hamilton.edu/its/rc/federated-id-error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamilton.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hamilton College</mdui:DisplayName>
+        <mdui:Logo height="49" width="212" xml:lang="en">https://my.hamilton.edu/images/wordmark.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://my.hamilton.edu/its/rc/federated-id-error" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamilton.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hamilton College</mdui:DisplayName>
-          <mdui:Logo height="49" width="212" xml:lang="en">https://my.hamilton.edu/images/wordmark.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEKTCCAxGgAwIBAgIJAO0MvS2Wg11NMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxEDAOBgNVBAcMB0NsaW50b24xGTAX
 BgNVBAoMEEhhbWlsdG9uIENvbGxlZ2UxGTAXBgNVBAsMEE5ldHdvcmsgU2Vydmlj
@@ -44,26 +44,26 @@ ACgQ8OKvEkmgwC8wlILRke7h2kTgGQ2RXC/MAum5X1058aO+MCUoJR2FKdrs90Il
 M9tbUfHRaiJJwVKXJJpy9PfIGa7+daGyDEv1TXEx+8uqI2Gwr870NJKTtGp/uxP0
 b2vzKnRygo55b/VJxw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hamilton.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamilton.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hamilton.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamilton.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEKTCCAxGgAwIBAgIJAO0MvS2Wg11NMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxEDAOBgNVBAcMB0NsaW50b24xGTAX
 BgNVBAoMEEhhbWlsdG9uIENvbGxlZ2UxGTAXBgNVBAsMEE5ldHdvcmsgU2Vydmlj
@@ -88,22 +88,22 @@ ACgQ8OKvEkmgwC8wlILRke7h2kTgGQ2RXC/MAum5X1058aO+MCUoJR2FKdrs90Il
 M9tbUfHRaiJJwVKXJJpy9PfIGa7+daGyDEv1TXEx+8uqI2Gwr870NJKTtGp/uxP0
 b2vzKnRygo55b/VJxw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hamilton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hamilton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hamilton.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Smallen</md:GivenName>
-      <md:EmailAddress>dsmallen@hamilton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Swartz</md:GivenName>
-      <md:EmailAddress>dswartz@hamilton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hamilton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hamilton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hamilton.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Smallen</md:GivenName>
+    <md:EmailAddress>dsmallen@hamilton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Swartz</md:GivenName>
+    <md:EmailAddress>dswartz@hamilton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml
index 089b4f36..29db8565 100644
--- a/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.hartpury.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-15T09:56:09Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-15T09:56:09Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartpury.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartpury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVALyl0dbpeXfYuEe49LYtPN8+LpmNMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51azAeFw0xMjA4MTQxODM2
 						MjlaFw0zMjA4MTQxODM2MjlaMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51
@@ -30,26 +30,26 @@
 						HHeZlWhHsM3MJuEK39lp1ZVtncv94hFKo2WUNfC59Hz8arKr4w3KFYQ107v3KG81
 						IGu3QwNTGBs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hartpury.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartpury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hartpury.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartpury.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVALyl0dbpeXfYuEe49LYtPN8+LpmNMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51azAeFw0xMjA4MTQxODM2
 						MjlaFw0zMjA4MTQxODM2MjlaMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51
@@ -69,26 +69,26 @@
 						HHeZlWhHsM3MJuEK39lp1ZVtncv94hFKo2WUNfC59Hz8arKr4w3KFYQ107v3KG81
 						IGu3QwNTGBs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hartpury College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hartpury College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hartpury.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@hartpury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>West</md:SurName>
-      <md:EmailAddress>mailto:nick.west@hartpury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hartpury College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hartpury College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hartpury.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@hartpury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>West</md:SurName>
+    <md:EmailAddress>mailto:nick.west@hartpury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml
index 03021600..ecd382e5 100644
--- a/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.hct.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-12T15:47:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-12T15:47:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hct.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hct.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdjCCAl4CCQDfc3alqzccaDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZvbGx5IExhbmUxJzAlBgNV
 						BAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEdMBsGA1UEAxMUc2hp
@@ -31,26 +31,26 @@
 						c4KXdtRkv2kke2tteJOByaXt54uFj+NNJVic/IMJCVik7RFLyY+P5ut+1Gs90OIS
 						1smsVkYPhj+xDQZ/npJN8HkOaB0rPVtrDmg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hct.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hct.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hct.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hct.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdjCCAl4CCQDfc3alqzccaDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
 						QjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZvbGx5IExhbmUxJzAlBgNV
 						BAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEdMBsGA1UEAxMUc2hp
@@ -71,27 +71,27 @@
 						c4KXdtRkv2kke2tteJOByaXt54uFj+NNJVic/IMJCVik7RFLyY+P5ut+1Gs90OIS
 						1smsVkYPhj+xDQZ/npJN8HkOaB0rPVtrDmg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Herefordshire and Ludlow College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Herefordshire and Ludlow College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hct.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tony</md:GivenName>
-      <md:SurName>Darch</md:SurName>
-      <md:EmailAddress>mailto:DarchT@hlcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Cooley</md:SurName>
-      <md:EmailAddress>mailto:CooleyD@hlcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Herefordshire and Ludlow College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Herefordshire and Ludlow College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hct.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tony</md:GivenName>
+    <md:SurName>Darch</md:SurName>
+    <md:EmailAddress>mailto:DarchT@hlcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Cooley</md:SurName>
+    <md:EmailAddress>mailto:CooleyD@hlcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
index 5d505e1f..efa20547 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/asmjournals">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">American Society for Microbiology Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://journals.asm.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">American Society for Microbiology Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://journals.asm.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml
index cfb84c2e..e7accdf0 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/asnjnls">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:42:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:42:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University: Journals of the American Society of Nephrology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://asnjournals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University: Journals of the American Society of Nephrology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://asnjournals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml
index d2a706f9..1d40fde1 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/cobjnls">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-08T14:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-08T14:05:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University: Company of Biologists Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.biologists.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University: Company of Biologists Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.biologists.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml
index 3e1b3e88..0271b72f 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/dupjnls">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-21T13:03:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-21T13:03:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University: Duke University Press Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://dukejournals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University: Duke University Press Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://dukejournals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
index fa3eda49..6aa9c56d 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/ecspubs">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Electrochemical Society</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ecsdl.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Electrochemical Society</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ecsdl.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml
index 49406a7d..ef0ce8c9 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/jbjsbrumb">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-14T11:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-14T11:45:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University: Journal of Bone and Joint Surgery</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jbjs.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University: Journal of Bone and Joint Surgery</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jbjs.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml
index 1d3de461..72a88d55 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/lcgsl">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-08-05T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-08-05T10:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lyell Collection: The Geological Society of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lyellcollection.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lyell Collection: The Geological Society of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lyellcollection.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml
index bd1c31b1..ed8161f4 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/oupacademic">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:36:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:36:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University: Oxford Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oxfordmedicine.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University: Oxford Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oxfordmedicine.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml
index 1d3a7966..6d8b775f 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/oxfordservices">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-14T15:23:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-14T15:23:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oxford Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oxfordonline.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oxford Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oxfordonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml
index bdfb2b2b..6f28e617 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/physiology">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">American Physiology Society</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.physiology.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">American Physiology Society</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.physiology.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml
index 832f274f..af85f771 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/rupjnls">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-22T16:56:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-22T16:56:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University: Rockefeller University Press Organization</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rupress.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University: Rockefeller University Press Organization</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rupress.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml
index c914be3c..84082cb9 100644
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/secure-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-26T17:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">HighWire Press Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://highwire.stanford.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HighWire Press Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://highwire.stanford.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
index c66e9734..6342607f 100644
--- a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.hillcroft.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-09T10:50:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-09T10:50:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hillcroft.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hillcroft College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shibboleth.hillcroft.ac.uk/logo.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibboleth.hillcroft.ac.uk/icon.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hillcroft.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hillcroft College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shibboleth.hillcroft.ac.uk/logo.jpg</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shibboleth.hillcroft.ac.uk/icon.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUY+dzAdJP4F29WhYMkIYWVz7OXIkwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC5oaWxsY3JvZnQuYWMudWswHhcNMTUw
 						NjMwMTQ0OTE2WhcNMzUwNjMwMTQ0OTE2WjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
@@ -37,29 +37,29 @@
 						EninOSrPVYCTYu2Ye0uNMjUJLcaWG/4Bg4KHjCcw0ElUB6gAAozzBGg4YWuYIX69
 						khh8QXuVbtNdLDflq8uEmlwtw92SweSEsLZpZrF/dTPMjmy9XzP7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hillcroft.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hillcroft.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUY+dzAdJP4F29WhYMkIYWVz7OXIkwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC5oaWxsY3JvZnQuYWMudWswHhcNMTUw
 						NjMwMTQ0OTE2WhcNMzUwNjMwMTQ0OTE2WjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
@@ -79,26 +79,26 @@
 						EninOSrPVYCTYu2Ye0uNMjUJLcaWG/4Bg4KHjCcw0ElUB6gAAozzBGg4YWuYIX69
 						khh8QXuVbtNdLDflq8uEmlwtw92SweSEsLZpZrF/dTPMjmy9XzP7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hillcroft College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hillcroft College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hillcroft.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Overt Software Solutions</md:GivenName>
-      <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Frary</md:SurName>
-      <md:EmailAddress>mailto:pfrary@hillcroft.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hillcroft College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hillcroft College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hillcroft.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Overt Software Solutions</md:GivenName>
+    <md:EmailAddress>mailto:support@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Frary</md:SurName>
+    <md:EmailAddress>mailto:pfrary@hillcroft.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml b/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml
index 2ba08eb1..4b528c95 100644
--- a/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml
+++ b/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.hrc.ac.uk/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-01T15:04:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-01T15:04:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
 						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
@@ -32,29 +32,29 @@
 						6YExHZsPvcbWhVk8bZEn1bBKjXlozIL46pATE/ApTj955UAocZs/0HeTbPTszOjM
 						2+lio+vkIsRiGCzd1QgB/JmMbZ3I0016UR31P7+M5AaOiJ0s
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federatedaccess.hrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federatedaccess.hrc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
 						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
@@ -74,27 +74,27 @@
 						6YExHZsPvcbWhVk8bZEn1bBKjXlozIL46pATE/ApTj955UAocZs/0HeTbPTszOjM
 						2+lio+vkIsRiGCzd1QgB/JmMbZ3I0016UR31P7+M5AaOiJ0s
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hertford Regional College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hertford Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hrc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Denis</md:GivenName>
-      <md:SurName>Featherstone</md:SurName>
-      <md:EmailAddress>mailto:dfeatherstone@hrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Denis</md:GivenName>
-      <md:SurName>Featherstone</md:SurName>
-      <md:EmailAddress>mailto:dfeatherstone@hrc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hertford Regional College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hertford Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hrc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Denis</md:GivenName>
+    <md:SurName>Featherstone</md:SurName>
+    <md:EmailAddress>mailto:dfeatherstone@hrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Denis</md:GivenName>
+    <md:SurName>Featherstone</md:SurName>
+    <md:EmailAddress>mailto:dfeatherstone@hrc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml
index 4e17274d..90f1e5e2 100644
--- a/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.huddnewcoll.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-12T13:35:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-12T13:35:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huddnewcoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huddnewcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID1jCCAr4CCQDipzubEmV65TANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMC
 						R0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UEBxMMTmV3IEhleSBSb2Fk
 						MSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxlZ2UxJTAjBgNVBAsTHHNo
@@ -35,26 +35,26 @@
 						Eku18ndqAe3yyTTtYjzBC8yz03J49x8OcJoBmjF1TldyfjE25y/23juUoT7o3UT0
 						6KDdLZLQpW7ZoCPDM22iFArIEPpajNu8tVU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huddnewcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huddnewcoll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID1jCCAr4CCQDipzubEmV65TANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMC
 						R0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UEBxMMTmV3IEhleSBSb2Fk
 						MSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxlZ2UxJTAjBgNVBAsTHHNo
@@ -77,27 +77,27 @@
 						Eku18ndqAe3yyTTtYjzBC8yz03J49x8OcJoBmjF1TldyfjE25y/23juUoT7o3UT0
 						6KDdLZLQpW7ZoCPDM22iFArIEPpajNu8tVU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Huddersfield New College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Huddersfield New College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.huddnewcoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Andre</md:SurName>
-      <md:EmailAddress>mailto:candre@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Andre</md:SurName>
-      <md:EmailAddress>mailto:candre@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Huddersfield New College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Huddersfield New College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.huddnewcoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Andre</md:SurName>
+    <md:EmailAddress>mailto:candre@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Andre</md:SurName>
+    <md:EmailAddress>mailto:candre@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
index 8af7e14f..17adc19d 100644
--- a/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ifac.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAC - Instituto Federal do Acre</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAC - Instituto Federal do Acre</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifac.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifac.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFAC - Instituto Federal do Acre</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFAC - Instituto Federal do Acre</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifac.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifac.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKTAnBgNVBAoTIElGQUMgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYDVQQLEwVEU0dUSTEgMB4GCSqG
 SIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzARBgNVBAcTClJpbyBCcmFuY28x
@@ -45,26 +45,26 @@ Zpc18pLXEiGimtu1mtMwJWFiEPyYnRp8ls0PwAhDMy/ZwdGJ29xtnl9DLfTuBx5c
 ilBQMwsWRA4QgnDig1I1Lf2dhEQC6ccEez6yOMSpkH/1Dy95S9G85svsuF2PWRtP
 BN+Ko78mWuJWJz4hCcf0LfkUuWTZHuiu
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifac.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifac.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKTAnBgNVBAoTIElGQUMgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYDVQQLEwVEU0dUSTEgMB4GCSqG
@@ -90,24 +90,24 @@ BN+Ko78mWuJWJz4hCcf0LfkUuWTZHuiu
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFAC - Instituto Federal do Acre</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifac.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifac.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Kellyton Azevedo</md:SurName>
-      <md:EmailAddress>cored@ifac.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFAC - Instituto Federal do Acre</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifac.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifac.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Kellyton Azevedo</md:SurName>
+    <md:EmailAddress>cored@ifac.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
index f741ecd4..417d769e 100644
--- a/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ifam.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifam.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifam.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifam.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifam.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoTJElGQU0gLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWF6b25hczENMAsGA1UECxMEREdUSTEqMCgG
 CSqGSIb3DQEJARYbamFuZGVyc29uX3NpbHZhQGlmYW0uZWR1LmJyMQ8wDQYDVQQH
@@ -46,26 +46,26 @@ FsMYsy832J83v55+TWqMNSwG9Y6usOm/UqHyxh1/PKldHTCpr9bMY5Pba0ko++0B
 3HzXQpIvueRNQ4uKUw6CxbyFZBv5oosN399A0zqYQGNSYRJIx66T7UcsW1MoNM5f
 gl0=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifam.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifam.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoTJElGQU0gLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWF6b25hczENMAsGA1UECxMEREdUSTEqMCgG
@@ -92,24 +92,24 @@ gl0=
 
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifam.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifam.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Janderson Silva</md:SurName>
-      <md:EmailAddress>janderson_silva@ifam.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifam.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifam.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Janderson Silva</md:SurName>
+    <md:EmailAddress>janderson_silva@ifam.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml
index 2ed97805..918e4020 100644
--- a/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ifes.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifes.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifes.edu.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
 BgNVBAsTA0RUSTEeMBwGCSqGSIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMREwDwYD
 VQQHFAhWaXTDs3JpYTEYMBYGA1UECBQPRXNww61yaXRvIFNhbnRvMQswCQYDVQQG
@@ -44,26 +44,26 @@ EaTESvRwpXEyKVBtEY2cgikp52pDD/KyH99GJ3XLU5rdrwpmmiCa9bGvABQH8hhd
 uhuDc4RigznHLvlxoiALH/EH1rglIPpdv8MG2FaUEAdtGgc4GIeBNpsEdKkR/7a4
 znp/YgyE1kJOxcCrcbaV9OaXAQvXe72je1g=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
 BgNVBAsTA0RUSTEeMBwGCSqGSIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMREwDwYD
@@ -87,24 +87,24 @@ uhuDc4RigznHLvlxoiALH/EH1rglIPpdv8MG2FaUEAdtGgc4GIeBNpsEdKkR/7a4
 znp/YgyE1kJOxcCrcbaV9OaXAQvXe72je1g=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifes.edu.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Ramon Ramos</md:SurName>
-      <md:EmailAddress>ramon.ramos@ifes.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifes.edu.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Ramon Ramos</md:SurName>
+    <md:EmailAddress>ramon.ramos@ifes.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
index cca87f9a..ad627369 100644
--- a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ifpr.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFPR - Instituto Federal do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPR - Instituto Federal do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifpr.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpr.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFPR - Instituto Federal do Parana</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFPR - Instituto Federal do Parana</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifpr.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifpr.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
 hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
@@ -45,26 +45,26 @@ CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
 kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
 aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifpr.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifpr.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
@@ -89,24 +89,24 @@ kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
 aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFPR - Instituto Federal do Parana</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFPR - Instituto Federal do Parana</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFPR - Instituto Federal do Parana</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifpr.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifpr.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jefferson</md:SurName>
-      <md:EmailAddress>cinfra@ifpr.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFPR - Instituto Federal do Parana</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFPR - Instituto Federal do Parana</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFPR - Instituto Federal do Parana</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifpr.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifpr.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jefferson</md:SurName>
+    <md:EmailAddress>cinfra@ifpr.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
index 83fb4ded..8b30e4d4 100644
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.im.jku.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-08-11T10:50:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-08-11T10:50:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Johannes Kepler Universität Linz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Johannes Kepler University Linz</mdui:DisplayName>
+        <mdui:Logo width="385" height="183">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
+        <mdui:Logo width="80" height="40">https://shibboleth.im.jku.at/logos/jku_logo_80x40.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://shibboleth.im.jku.at/logos/jku_logo_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Johannes Kepler Universität Linz</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Johannes Kepler University Linz</mdui:DisplayName>
-          <mdui:Logo width="385" height="183">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
-          <mdui:Logo width="80" height="40">https://shibboleth.im.jku.at/logos/jku_logo_80x40.png</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://shibboleth.im.jku.at/logos/jku_logo_16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
 Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
@@ -44,30 +44,30 @@ j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
 AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
 lkm+eYJRFwZraUdycAffqQ==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.im.jku.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.im.jku.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
 Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
@@ -87,26 +87,26 @@ j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
 AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
 lkm+eYJRFwZraUdycAffqQ==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Universität Linz</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University Linz</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Johannes Kepler Universität Linz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Johannes Kepler University Linz</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.jku.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.jku.at/setCookieFromQuery?language=en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Server</md:GivenName>
-      <md:SurName>Systems</md:SurName>
-      <md:EmailAddress>mailto:serveradmin@jku.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Linz</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University Linz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Johannes Kepler Universität Linz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Johannes Kepler University Linz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.jku.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.jku.at/setCookieFromQuery?language=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Server</md:GivenName>
+    <md:SurName>Systems</md:SurName>
+    <md:EmailAddress>mailto:serveradmin@jku.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml
index ec3a8b9d..c592bd8b 100644
--- a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.imperial.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-07T15:04:06Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-07T15:04:06Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
 						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
@@ -36,26 +36,26 @@
 						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
 						LPc7Eg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbotest.imperial.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbotest.imperial.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
 						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
@@ -76,27 +76,27 @@
 						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
 						LPc7Eg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imperial College of Science, Technology and Medicine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imperial College London TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>McLennan</md:SurName>
-      <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>McLennan</md:SurName>
-      <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imperial College of Science, Technology and Medicine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imperial College London TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>McLennan</md:SurName>
+    <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>McLennan</md:SurName>
+    <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml
index 9b3f7e18..609f24af 100644
--- a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.imperial.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-07T15:04:06Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-07T15:04:06Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
 						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
@@ -31,26 +31,26 @@
 						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
 						LPc7Eg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.imperial.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.imperial.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imperial.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
 						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
@@ -71,27 +71,27 @@
 						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
 						LPc7Eg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imperial College of Science, Technology and Medicine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imperial College London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>McLennan</md:SurName>
-      <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Neil</md:GivenName>
-      <md:SurName>McLennan</md:SurName>
-      <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imperial College of Science, Technology and Medicine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imperial College London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>McLennan</md:SurName>
+    <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Neil</md:GivenName>
+    <md:SurName>McLennan</md:SurName>
+    <md:EmailAddress>mailto:n.mclennan@imperial.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
index f489fc80..c755e49f 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.insa-cvl.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T10:24:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T10:24:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-cvl.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA CENTRE VAL DE LOIRE</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INSA Centre Val de Loire</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-cvl.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSA CENTRE VAL DE LOIRE</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INSA Centre Val de Loire</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
 MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -37,21 +37,21 @@ xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
 3TPgmBFpVZdI9KCcB4/vz7mqHhA/iT8H51eU2uHV9SfnDjeLW3nB/XfxiBjP5Loe
 2RYyHguWnRCRk0/thc1XVaS0X/CFun8xq053SrDgxgZNINKS+En2yg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-cvl.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSA Centre Val de Loire</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSA Centre Val de Loire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>service-info@listes.insa-cvl.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-cvl.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSA Centre Val de Loire</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA Centre Val de Loire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>service-info@listes.insa-cvl.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
index 7cd3bdd4..6311a20b 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.insa-rouen.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-02T14:41:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-02T14:41:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rouen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA de Rouen</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABaUlEQVQoz92SyytEcRzFz+/6XeMRRs2DHQtpIhYiC1KKDWmKnZS9NKX8B4rsUSws2MjKe5aSx4KFjcewIDUznnPnjnn43d+9v68FKXY2Fs76fOqc02FEhN9I+5X77wClIARsCcsCgFwOACUNFY99uoSAbVtSAgARic31BJAeCyUAubf7AojtjQSQALJTE+rp6RlQvd19/QNEpAFgLpdW7WduNwHO5blW7ZfhHR7sKb2O8M4u5+KMN9WLu9tgext96+Ao3tUhw1vIpgpHQ07kLFVTi0zaOtjPHxq2/ZV1afMH4PDmFpXNgetOLFaysuaanswMBtVVRMzP2adHVbatfQAkhLp5UGaS8jhvaVXRlH1ybDY0WgszBT39anGpbHa+aGS8eHUZACMiSEm5LLjONAauU/qVucvp8Z4x7TAaV9Jiit6E8Hg9jYEABwBdZ3rZVzTmLgfAfBUAvIZpGG+MaR6f92NW9g++9A7Bdq8oKAVBaAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMCB35iUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDBRKl6ZAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-rouen.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">INSA de Rouen</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rouen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSA de Rouen</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABaUlEQVQoz92SyytEcRzFz+/6XeMRRs2DHQtpIhYiC1KKDWmKnZS9NKX8B4rsUSws2MjKe5aSx4KFjcewIDUznnPnjnn43d+9v68FKXY2Fs76fOqc02FEhN9I+5X77wClIARsCcsCgFwOACUNFY99uoSAbVtSAgARic31BJAeCyUAubf7AojtjQSQALJTE+rp6RlQvd19/QNEpAFgLpdW7WduNwHO5blW7ZfhHR7sKb2O8M4u5+KMN9WLu9tgext96+Ao3tUhw1vIpgpHQ07kLFVTi0zaOtjPHxq2/ZV1afMH4PDmFpXNgetOLFaysuaanswMBtVVRMzP2adHVbatfQAkhLp5UGaS8jhvaVXRlH1ybDY0WgszBT39anGpbHa+aGS8eHUZACMiSEm5LLjONAauU/qVucvp8Z4x7TAaV9Jiit6E8Hg9jYEABwBdZ3rZVzTmLgfAfBUAvIZpGG+MaR6f92NW9g++9A7Bdq8oKAVBaAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMCB35iUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDBRKl6ZAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-rouen.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">INSA de Rouen</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
 MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -38,23 +38,23 @@ VZrWGgkPWyDKh3foQ7Olh9eiySh1jSl55uJE4ze1yopOiFyLfe4PHYnsfanu9F0k
 2VITeNSh7Epbl3wutJnfXFpa4XpmWMIzeQD7Eowrs5Oewk1peM6kl2fzn4gKcFXo
 u1n3Fa3LxTYXo8TB+XbBKdEFD+MdaGILc/H8Gb5EEak=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-rouen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rouen.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-rouen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rouen.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
 MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -74,24 +74,24 @@ VZrWGgkPWyDKh3foQ7Olh9eiySh1jSl55uJE4ze1yopOiFyLfe4PHYnsfanu9F0k
 2VITeNSh7Epbl3wutJnfXFpa4XpmWMIzeQD7Eowrs5Oewk1peM6kl2fzn4gKcFXo
 u1n3Fa3LxTYXo8TB+XbBKdEFD+MdaGILc/H8Gb5EEak=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSA de Rouen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSA de Rouen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-rouen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>LE GUILLOUS Franck</md:SurName>
-      <md:EmailAddress>franck.le-guillous@insa-rouen.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Kesraoui Nadir</md:SurName>
-      <md:EmailAddress>nadir.kesraoui@insa-rouen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSA de Rouen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA de Rouen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-rouen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>LE GUILLOUS Franck</md:SurName>
+    <md:EmailAddress>franck.le-guillous@insa-rouen.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Kesraoui Nadir</md:SurName>
+    <md:EmailAddress>nadir.kesraoui@insa-rouen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml
index 61c1e8a9..5388f641 100644
--- a/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.its.msstate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mississippi State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mississippi State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVANqzVBR0Ub2osTQEQ2V2uRrFt0GPMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguaXRzLm1zc3RhdGUuZWR1MB4XDTEz
 MDExNTE3MTU0MFoXDTMzMDExNTE3MTU0MFowJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -38,24 +38,24 @@ wqjNtO9uC2kPB65jwrfvR4Eujy6e/wmYtdDgBOdOyjp0rDsNahJTHIyC1kzmZlPK
 Hw4g1sKAIewhtdzA1GPcBp4kuEf8aibTacVSgcihfol036K/BdzBQoQRKGhxD2Kv
 UohgYrFSnjdlhb1yEAXtpAsc8HTum2zkA4NGo3R+9J8rXL6lS6oozA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.its.msstate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msstate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.its.msstate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msstate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVANqzVBR0Ub2osTQEQ2V2uRrFt0GPMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguaXRzLm1zc3RhdGUuZWR1MB4XDTEz
 MDExNTE3MTU0MFoXDTMzMDExNTE3MTU0MFowJTEjMCEGA1UEAxMac2hpYmJvbGV0
@@ -75,26 +75,26 @@ wqjNtO9uC2kPB65jwrfvR4Eujy6e/wmYtdDgBOdOyjp0rDsNahJTHIyC1kzmZlPK
 Hw4g1sKAIewhtdzA1GPcBp4kuEf8aibTacVSgcihfol036K/BdzBQoQRKGhxD2Kv
 UohgYrFSnjdlhb1yEAXtpAsc8HTum2zkA4NGo3R+9J8rXL6lS6oozA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mississippi State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mississippi State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.msstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSU ITS Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@msstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>MSU ITS Network Services</md:GivenName>
-      <md:EmailAddress>ns@its.msstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Timothy Griffin</md:GivenName>
-      <md:EmailAddress>timothy.griffin@msstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mississippi State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mississippi State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.msstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSU ITS Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@msstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>MSU ITS Network Services</md:GivenName>
+    <md:EmailAddress>ns@its.msstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Timothy Griffin</md:GivenName>
+    <md:EmailAddress>timothy.griffin@msstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml
index 64e247dc..ab7db8fc 100644
--- a/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.iwcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-12T12:31:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-12T12:31:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iwcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iwcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUU3AARW5EezCLsq9ZxfkceNTJVYEwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5pd2NvbGxlZ2UuYWMudWswHhcNMTQw
 						MjEwMTQ0MDEzWhcNMzQwMjEwMTQ0MDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
@@ -32,26 +32,26 @@
 						rMTyTBDwBP+18XGlbE3LMu/ZjoIUcpuVfoDsFUG6yZSsE8gVTh1IutH33K0Y7ikx
 						ZBo49q3f1kRNl5PRuqWPA3U/tG5LsoStLJ+SxD2xbc4q3D9A6YBZ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iwcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iwcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUzCCAjugAwIBAgIUU3AARW5EezCLsq9ZxfkceNTJVYEwDQYJKoZIhvcNAQEF
 						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5pd2NvbGxlZ2UuYWMudWswHhcNMTQw
 						MjEwMTQ0MDEzWhcNMzQwMjEwMTQ0MDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
@@ -71,27 +71,27 @@
 						rMTyTBDwBP+18XGlbE3LMu/ZjoIUcpuVfoDsFUG6yZSsE8gVTh1IutH33K0Y7ikx
 						ZBo49q3f1kRNl5PRuqWPA3U/tG5LsoStLJ+SxD2xbc4q3D9A6YBZ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Isle of Wight College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Isle of Wight College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://iwcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Violaris</md:SurName>
-      <md:EmailAddress>mailto:Steve.Violaris@iwcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Annetts</md:SurName>
-      <md:EmailAddress>mailto:simon@ateb.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Isle of Wight College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Isle of Wight College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://iwcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Violaris</md:SurName>
+    <md:EmailAddress>mailto:Steve.Violaris@iwcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Annetts</md:SurName>
+    <md:EmailAddress>mailto:simon@ateb.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml
index 7fd78858..beeed70a 100644
--- a/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.kcollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-08T17:52:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-08T17:52:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcollege.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEVDCCAzygAwIBAgIJAIt8JpQ7ds27MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 						VQQGEwJHQjENMAsGA1UECBMES2VudDESMBAGA1UEBxMJVG9uYnJpZGdlMRIwEAYD
 						VQQKEwlLIENvbGxlZ2UxFjAUBgNVBAsTDUlUIERlcGFydG1lbnQxIjAgBgNVBAMT
@@ -38,26 +38,26 @@
 						TGHu0K6ZOPVhjPVgBOVGFbmVDx9WrGCSliwiYBc8hzurYDhZFH323wiUja7yrCUs
 						zGCgMnWgl18=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.kcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.kcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEVDCCAzygAwIBAgIJAIt8JpQ7ds27MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 						VQQGEwJHQjENMAsGA1UECBMES2VudDESMBAGA1UEBxMJVG9uYnJpZGdlMRIwEAYD
 						VQQKEwlLIENvbGxlZ2UxFjAUBgNVBAsTDUlUIERlcGFydG1lbnQxIjAgBgNVBAMT
@@ -83,27 +83,27 @@
 						TGHu0K6ZOPVhjPVgBOVGFbmVDx9WrGCSliwiYBc8hzurYDhZFH323wiUja7yrCUs
 						zGCgMnWgl18=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Kent and Ashford College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">K College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kcollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:garethmitchell@kcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Mitchell</md:SurName>
-      <md:EmailAddress>mailto:garethmitchell@kcollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Kent and Ashford College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">K College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kcollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:garethmitchell@kcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Mitchell</md:SurName>
+    <md:EmailAddress>mailto:garethmitchell@kcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml
index 42c8a5a5..3f26eec1 100644
--- a/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.knovel.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T16:52:54Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T16:52:54Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.knovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Knovel Corporation: Production</mdui:DisplayName>
+        <mdui:Logo height="115" width="350">https://content.knovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.knovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
-          <mdui:DisplayName xml:lang="en">Knovel Corporation: Production</mdui:DisplayName>
-          <mdui:Logo height="115" width="350">https://content.knovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGDCCAwCgAwIBAgIJAPOXUUi71HxhMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
 						VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
 						dmVsIENvcnAxCzAJBgNVBAsMAklUMR8wHQYDVQQDDBZodHRwczovL3Nzby5rbm92
@@ -39,13 +39,13 @@
 						mTMHFxRkoi2aJF+B3KjGkOKSMQLDvsxYwbengNEmH8GE1j/vSLWMt2uAuGNOVjO+
 						X788brUQmk13D8HngKAkCA5GLH4TKsfbNOmD28c8fkYf2tZhOddOdXNjNm0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGDCCAwCgAwIBAgIJAPOXUUi71HxhMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
 						VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
 						dmVsIENvcnAxCzAJBgNVBAsMAklUMR8wHQYDVQQDDBZodHRwczovL3Nzby5rbm92
@@ -69,13 +69,13 @@
 						mTMHFxRkoi2aJF+B3KjGkOKSMQLDvsxYwbengNEmH8GE1j/vSLWMt2uAuGNOVjO+
 						X788brUQmk13D8HngKAkCA5GLH4TKsfbNOmD28c8fkYf2tZhOddOdXNjNm0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDujCCAqKgAwIBAgIJANDf/KbdI37xMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
 						BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
 						ZWwgQ29ycG9yYXRpb24xFzAVBgNVBAMTDnNzby5rbm92ZWwuY29tMB4XDTE0MDQx
@@ -97,28 +97,28 @@
 						dMhYTbb+4y+nzT090QiHVgHltgGXTdmhtJo+WPRqMB4Ph+vadtYkQHEHZZiIdjqX
 						/Zic8mF3byatILMfu6OlNXJpueeEC1uAhgScLuk92REdd7PipJ0Dum8QWgwzlg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Knovel Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Knovel Corporation: Production</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.knovel.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Crisler</md:SurName>
-      <md:EmailAddress>mailto:mcrisler@knovel.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Johnny</md:GivenName>
-      <md:SurName>Cheung</md:SurName>
-      <md:EmailAddress>mailto:jcheung@knovel.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Knovel Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Knovel Corporation: Production</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.knovel.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Crisler</md:SurName>
+    <md:EmailAddress>mailto:mcrisler@knovel.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johnny</md:GivenName>
+    <md:SurName>Cheung</md:SurName>
+    <md:EmailAddress>mailto:jcheung@knovel.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml
index 7e385c12..18a76c2c 100644
--- a/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.lib.uh.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.uh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Houston Libraries</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Shibboleth identity provider for the University of Houston Libraries. </mdui:Description>
+        <mdui:Logo height="150" width="379" xml:lang="en">https://shibboleth.lib.uh.edu/idp/images2/uhl.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.uh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Houston Libraries</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Shibboleth identity provider for the University of Houston Libraries. </mdui:Description>
-          <mdui:Logo height="150" width="379" xml:lang="en">https://shibboleth.lib.uh.edu/idp/images2/uhl.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIULlNaR/yPtpIHLsg043vHlyUUb9owDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIudWguZWR1MB4XDTA5MTEwNjIx
 NTEwOVoXDTI5MTEwNjIxNTEwOVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIu
@@ -43,24 +43,24 @@ E9I51v3x2TJs8SbOPJN87OyKEAilTSERUgXLxPKpGdL/3D3fZTB2cg35/EbDsAHd
 YBqltouvVCvEIi4TGm2qwqj8+X+JwbZ+ZHyLsy6u0GTBDQtMAvij6n17rKlM7DOv
 asKcVxzFt1IOY7qRu811/rvH7A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.lib.uh.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.uh.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.lib.uh.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lib.uh.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIULlNaR/yPtpIHLsg043vHlyUUb9owDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIudWguZWR1MB4XDTA5MTEwNjIx
 NTEwOVoXDTI5MTEwNjIxNTEwOVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIu
@@ -80,27 +80,27 @@ E9I51v3x2TJs8SbOPJN87OyKEAilTSERUgXLxPKpGdL/3D3fZTB2cg35/EbDsAHd
 YBqltouvVCvEIi4TGm2qwqj8+X+JwbZ+ZHyLsy6u0GTBDQtMAvij6n17rKlM7DOv
 asKcVxzFt1IOY7qRu811/rvH7A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.lib.uh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.lib.uh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Houston Libraries</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Houston Libraries</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://info.lib.uh.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert Spragg</md:GivenName>
-      <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Robert Spragg</md:GivenName>
-      <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert Spragg</md:GivenName>
-      <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.lib.uh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.lib.uh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Houston Libraries</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Houston Libraries</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://info.lib.uh.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert Spragg</md:GivenName>
+    <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Robert Spragg</md:GivenName>
+    <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert Spragg</md:GivenName>
+    <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml b/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml
index 12727d49..0941ee6e 100644
--- a/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml
+++ b/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.louisville.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">louisville.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Louisville</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">louisville.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Louisville</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIJALDu/ry2L6bqMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 BAMMGXNoaWJib2xldGgubG91aXN2aWxsZS5lZHUwHhcNMTUwNjE3MTczNDA1WhcN
 MjUwNjE0MTczNDA1WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRoLmxvdWlzdmlsbGUu
@@ -37,23 +37,23 @@ RTALxWh4QJeN4ctico/5cLn0U1jFfmTIHpmrdShCyj62uXP1sxXGktIDnYLL6HJ1
 qeO+hQCk0ogILP/3WDJe8nkDLGsjy4aQguui//rgJu5R975bmdBmMwuXYo7ZJGOM
 /RUeiSUWA/0+u7DLASHh+VR3fG5e1XEH8YDch0/sjA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.louisville.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.louisville.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.louisville.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">louisville.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.louisville.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.louisville.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.louisville.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">louisville.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIJALDu/ry2L6bqMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 BAMMGXNoaWJib2xldGgubG91aXN2aWxsZS5lZHUwHhcNMTUwNjE3MTczNDA1WhcN
 MjUwNjE0MTczNDA1WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRoLmxvdWlzdmlsbGUu
@@ -72,18 +72,18 @@ RTALxWh4QJeN4ctico/5cLn0U1jFfmTIHpmrdShCyj62uXP1sxXGktIDnYLL6HJ1
 qeO+hQCk0ogILP/3WDJe8nkDLGsjy4aQguui//rgJu5R975bmdBmMwuXYo7ZJGOM
 /RUeiSUWA/0+u7DLASHh+VR3fG5e1XEH8YDch0/sjA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Louisville</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Louisville</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://louisville.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Derick Hill</md:GivenName>
-      <md:EmailAddress>dwhill06@exchange.louisville.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Louisville</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Louisville</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://louisville.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Derick Hill</md:GivenName>
+    <md:EmailAddress>dwhill06@exchange.louisville.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml
index de4fb7bd..ad675878 100644
--- a/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.lsbu.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T10:42:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T10:42:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London South Bank University</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London South Bank University</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUPksCn3BruNlalmPU1+Y/4zBDRkEwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIubHNidS5hYy51azAeFw0xMjAyMTMx
 						MzI5NDJaFw0zMjAyMTMxMzI5NDJaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmxz
@@ -37,26 +37,26 @@
 						c913IcBFtazSONYlpG9+EtOOCn1vFzjZu3PelE4Z6aYu/AVWvhZlV6EzhXwdCyQt
 						k9BFBpOxm483cpLiiSFTLULEw7NvYzs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUPksCn3BruNlalmPU1+Y/4zBDRkEwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIubHNidS5hYy51azAeFw0xMjAyMTMx
 						MzI5NDJaFw0zMjAyMTMxMzI5NDJaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmxz
@@ -76,26 +76,26 @@
 						c913IcBFtazSONYlpG9+EtOOCn1vFzjZu3PelE4Z6aYu/AVWvhZlV6EzhXwdCyQt
 						k9BFBpOxm483cpLiiSFTLULEw7NvYzs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London South Bank University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London South Bank University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ICT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@lsbu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Swigg</md:SurName>
-      <md:EmailAddress>mailto:swiggtc@lsbu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London South Bank University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London South Bank University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@lsbu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Swigg</md:SurName>
+    <md:EmailAddress>mailto:swiggtc@lsbu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
index 0b913780..04d42631 100644
--- a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:elab="http://eduserv.org.uk/labels" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mcgill.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-07T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-07T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcgill.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:InformationURL xml:lang="en">http://www.mcgill.ca/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcgill.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:InformationURL xml:lang="en">http://www.mcgill.ca/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKFxePPwNhoZCU/fBrDudUYkci5yMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgubWNnaWxsLmNhMB4XDTEwMDkyNzE0
 NTQyMloXDTMwMDkyNzE0NTQyMlowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5tY2dp
@@ -35,24 +35,24 @@ F7qiMg3a4zpfvypZOGjtkXyJMBanaLc9UiGBGBE/t4b+fbJP1HQn085EvQPW3tin
 f7FLtBGjplM/vCklFh57cHLjew1y1vud5iMVWqVgKdPJH0EZbbnR7Xa2tt8MKWWs
 yiqk26yLVKsf3etilKA7Jw==
      </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mcgill.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcgill.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mcgill.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcgill.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKFxePPwNhoZCU/fBrDudUYkci5yMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgubWNnaWxsLmNhMB4XDTEwMDkyNzE0
 NTQyMloXDTMwMDkyNzE0NTQyMlowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5tY2dp
@@ -72,22 +72,22 @@ F7qiMg3a4zpfvypZOGjtkXyJMBanaLc9UiGBGBE/t4b+fbJP1HQn085EvQPW3tin
 f7FLtBGjplM/vCklFh57cHLjew1y1vud5iMVWqVgKdPJH0EZbbnR7Xa2tt8MKWWs
 yiqk26yLVKsf3etilKA7Jw==
      </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">McGill University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">McGill University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mcgill.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>McGill</md:GivenName>
-      <md:SurName>Shibboleth Support</md:SurName>
-      <md:EmailAddress>mailto:isrdbateam@campus.mcgill.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">McGill University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">McGill University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mcgill.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>McGill</md:GivenName>
+    <md:SurName>Shibboleth Support</md:SurName>
+    <md:EmailAddress>mailto:isrdbateam@campus.mcgill.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml
index caa27326..ebae5ca9 100644
--- a/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.metapress.com/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPjCCAiagAwIBAgIJAKTDQvdm67vhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNvbTAeFw0xMjA2MjUxNTI5NDFaFw0y
 						MjA2MjMxNTI5NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNv
@@ -27,13 +27,13 @@
 						w4MgU2zatZCHJjjn+lIwK4I5nJ36/jGx9bMJS7j0LxkEu1ITvZkaNre256n8JQKB
 						ZO4eKkKd2NI2Sm3qkNxfiLv6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPjCCAiagAwIBAgIJAKTDQvdm67vhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNvbTAeFw0xMjA2MjUxNTI5NDFaFw0y
 						MjA2MjMxNTI5NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNv
@@ -53,35 +53,35 @@
 						w4MgU2zatZCHJjjn+lIwK4I5nJ36/jGx9bMJS7j0LxkEu1ITvZkaNre256n8JQKB
 						ZO4eKkKd2NI2Sm3qkNxfiLv6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EBSCO Industries, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MetaPress</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.metapress.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MetaPress Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@metapress.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>MetaPress Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@metapress.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EBSCO Industries, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MetaPress</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.metapress.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MetaPress Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@metapress.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>MetaPress Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@metapress.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
index b42363db..c25eb66f 100644
--- a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mh-hannover.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-26T13:58:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-26T13:58:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mh-hannover.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Medizinische Hochschule Hannover</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hannover Medical School</mdui:DisplayName>
+        <mdui:Description xml:lang="de">MHH-IdP - Produktiv</mdui:Description>
+        <mdui:Description xml:lang="en">MHH IdP - Productive</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shibboleth.mh-hannover.de/idp/images/mhh_icon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="250">https://shibboleth.mh-hannover.de/idp/images/mhh_logo.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mh-hannover.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Medizinische Hochschule Hannover</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Hannover Medical School</mdui:DisplayName>
-          <mdui:Description xml:lang="de">MHH-IdP - Produktiv</mdui:Description>
-          <mdui:Description xml:lang="en">MHH IdP - Productive</mdui:Description>
-          <mdui:Logo height="16" width="16">https://shibboleth.mh-hannover.de/idp/images/mhh_icon.ico</mdui:Logo>
-          <mdui:Logo height="60" width="250">https://shibboleth.mh-hannover.de/idp/images/mhh_logo.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG3TCCBcWgAwIBAgIHGvZE4CF75jANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG3TCCBcWgAwIBAgIHGvZE4CF75jANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
 EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
 DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
 LmRlMB4XDTE2MDMwMjEwNTgyNVoXDTE5MDUzMDEwNTgyNVowgZYxCzAJBgNVBAYT
@@ -65,32 +65,32 @@ gGOxXvIX4DGKN33KbQaXm4Nvwb63ZVHY/yGJwwngLhEkiwJlMQXZlb+tSuUXc3do
 nV7NxVX7Z4bYVrAHEH888RpjLoe7xZ2FkUKomCjsXkZR2oF3IOTHvNAIMdLGEGr5
 QY/7H6BkFIcQNvPvYzC+9TFcToDuWme6BOnCwxAt2dEw
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mh-hannover.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mh-hannover.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG3TCCBcWgAwIBAgIHGvZE4CF75jANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mh-hannover.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mh-hannover.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG3TCCBcWgAwIBAgIHGvZE4CF75jANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
 EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
 DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
 LmRlMB4XDTE2MDMwMjEwNTgyNVoXDTE5MDUzMDEwNTgyNVowgZYxCzAJBgNVBAYT
@@ -128,31 +128,31 @@ gGOxXvIX4DGKN33KbQaXm4Nvwb63ZVHY/yGJwwngLhEkiwJlMQXZlb+tSuUXc3do
 nV7NxVX7Z4bYVrAHEH888RpjLoe7xZ2FkUKomCjsXkZR2oF3IOTHvNAIMdLGEGr5
 QY/7H6BkFIcQNvPvYzC+9TFcToDuWme6BOnCwxAt2dEw
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e435</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e435</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Medizinischen Hochschule Hannover</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hannover Medical School (MHH)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.mh-hannover.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.mh-hannover.de/index.php?id=2</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benjamin</md:GivenName>
-      <md:SurName>Tetzlaff</md:SurName>
-      <md:EmailAddress>mailto:Tetzlaff.Benjamin@mh-hannover.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benjamin</md:GivenName>
-      <md:SurName>Tetzlaff</md:SurName>
-      <md:EmailAddress>mailto:Tetzlaff.Benjamin@mh-hannover.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e435</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e435</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Medizinischen Hochschule Hannover</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hannover Medical School (MHH)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.mh-hannover.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.mh-hannover.de/index.php?id=2</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benjamin</md:GivenName>
+    <md:SurName>Tetzlaff</md:SurName>
+    <md:EmailAddress>mailto:Tetzlaff.Benjamin@mh-hannover.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benjamin</md:GivenName>
+    <md:SurName>Tetzlaff</md:SurName>
+    <md:EmailAddress>mailto:Tetzlaff.Benjamin@mh-hannover.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml
index 98e54b8a..d7e4db85 100644
--- a/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.midkent.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-02T15:56:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-02T15:56:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midkent.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midkent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUNoEJdB/0XMNzrx6TpF9l+vmgmH0wDQYJKoZIhvcNAQEF
 						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aDIubWlka2VudC5hYy51azAeFw0xNDA1
 						MDYxMzEzNTVaFw0zNDA1MDYxMzEzNTVaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgy
@@ -32,26 +32,26 @@
 						dTJO4nNaoq6TBit1NCGIlKxCzhYMZFPLEsLSqW7D+CVZurqOaLlr5EyIHVNpx4ai
 						vNAdDLuB+XgGcIT+ib/E14TMVg3qCAbW6YqD9N2ZywV41Wk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.midkent.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midkent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.midkent.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midkent.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUNoEJdB/0XMNzrx6TpF9l+vmgmH0wDQYJKoZIhvcNAQEF
 						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aDIubWlka2VudC5hYy51azAeFw0xNDA1
 						MDYxMzEzNTVaFw0zNDA1MDYxMzEzNTVaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgy
@@ -71,25 +71,25 @@
 						dTJO4nNaoq6TBit1NCGIlKxCzhYMZFPLEsLSqW7D+CVZurqOaLlr5EyIHVNpx4ai
 						vNAdDLuB+XgGcIT+ib/E14TMVg3qCAbW6YqD9N2ZywV41Wk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mid-Kent College of Higher and Further Education</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mid-Kent College of Higher and Further Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.midkent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ICT Help</md:GivenName>
-      <md:EmailAddress>mailto:ict.helpdesk@midkent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ICT Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:ict.helpdesk@midkent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mid-Kent College of Higher and Further Education</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mid-Kent College of Higher and Further Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.midkent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICT Help</md:GivenName>
+    <md:EmailAddress>mailto:ict.helpdesk@midkent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ICT Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:ict.helpdesk@midkent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
index f85f500d..7191475c 100644
--- a/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mines-ales.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-16T12:03:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-16T12:03:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-ales.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ecole des Mines d'Alès</mdui:DisplayName>
+        <mdui:Logo height="7" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAHCAIAAACOQloVAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAABwBZRSlVAAABCklEQVQY04WPPU7DMBhA/dlxfprWQGgliNSlAwJxAgYOwB24E/dgZWFATAghdUZVVSZEA6JVSps4duLYH0OZEBJvedLbHiAi+QuHSAFqYz0GhACjsO3eVsa6p+m7CFle1itphklwPc4uz4b3k+WoH1lnL05FtJMSQgARW6OKUt5N1ucnB0rr0Oe7Xa4aiEPetJZR6lNDKdNy3REDsG2z+niJ+yPf91tLCFqwlbFUfs2TwyNnDaHcOWRYy81nby+ljS6S9Jiga7SqywWacjmfBoG/yGamyh9urqr8NZs9Po9vm1pRxkHJHLweZ66SJedeEIlf963Ruiq6Yp8A/Xko8jcexM62HTEg//ENvWiKwEtcZq0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDBA9ekLAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwMahRtwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.mines-ales.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Ecole des Mines d'Alès</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Permanents et Etudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-ales.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole des Mines d'Alès</mdui:DisplayName>
-          <mdui:Logo height="7" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAHCAIAAACOQloVAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAABwBZRSlVAAABCklEQVQY04WPPU7DMBhA/dlxfprWQGgliNSlAwJxAgYOwB24E/dgZWFATAghdUZVVSZEA6JVSps4duLYH0OZEBJvedLbHiAi+QuHSAFqYz0GhACjsO3eVsa6p+m7CFle1itphklwPc4uz4b3k+WoH1lnL05FtJMSQgARW6OKUt5N1ucnB0rr0Oe7Xa4aiEPetJZR6lNDKdNy3REDsG2z+niJ+yPf91tLCFqwlbFUfs2TwyNnDaHcOWRYy81nby+ljS6S9Jiga7SqywWacjmfBoG/yGamyh9urqr8NZs9Po9vm1pRxkHJHLweZ66SJedeEIlf963Ruiq6Yp8A/Xko8jcexM62HTEg//ENvWiKwEtcZq0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDBA9ekLAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwMahRtwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.mines-ales.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Ecole des Mines d'Alès</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Permanents et Etudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
 MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -39,23 +39,23 @@ HTU084KFhXJ+hhq+HTvPIxAm6xS0SJI9lM5E2OaSh+Twy0+ItMFcF5dHl9BpfiZI
 E3TaYCTUy81TNeHR1G8FxfdCea+Dz1w5jT+mX9l3ZsIZ36HXX6avx+go0MlzEa8d
 BArDDouye8IrssgKRMfPT0sQ0b+Nw56O2B4u/+48w4A=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mines-ales.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-ales.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mines-ales.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-ales.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
 MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
@@ -75,24 +75,24 @@ HTU084KFhXJ+hhq+HTvPIxAm6xS0SJI9lM5E2OaSh+Twy0+ItMFcF5dHl9BpfiZI
 E3TaYCTUy81TNeHR1G8FxfdCea+Dz1w5jT+mX9l3ZsIZ36HXX6avx+go0MlzEa8d
 BArDDouye8IrssgKRMfPT0sQ0b+Nw56O2B4u/+48w4A=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole des Mines d'Alès</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole des Mines d'Alès</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mines-ales.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>cisana</md:SurName>
-      <md:EmailAddress>pascal.cisana@mines-ales.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>pellissier</md:SurName>
-      <md:EmailAddress>laurent.pellissier@mines-ales.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole des Mines d'Alès</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines d'Alès</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mines-ales.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>cisana</md:SurName>
+    <md:EmailAddress>pascal.cisana@mines-ales.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>pellissier</md:SurName>
+    <md:EmailAddress>laurent.pellissier@mines-ales.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
index 92876315..efbbec38 100644
--- a/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.msacademicverify.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-15T18:17:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-15T18:17:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXTCCAkWgAwIBAgIJAIPNJpzdV/nXMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH3NoaWJib2xldGgubXNhY2FkZW1pY3ZlcmlmeS5jb20wHhcNMTMwNzEyMDc0
 						ODEwWhcNMTYwNzExMDc0ODEwWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLm1zYWNh
@@ -37,52 +37,52 @@
 						oqv/H3FB0kYoLtSxthUd1GcV2kgO0brHNSobuzYi4yePTH9rkY8Kn/ZF5pDVu4SK
 						/Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Microsoft Academic Verification Engine</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Microsoft Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Microsoft Academic Verification Engine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>AVE Support</md:GivenName>
-      <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AVE Support</md:GivenName>
-      <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Microsoft Academic Verification Engine</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Microsoft Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Microsoft Academic Verification Engine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AVE Support</md:GivenName>
+    <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AVE Support</md:GivenName>
+    <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
index 7f0950c2..e443e094 100644
--- a/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
+++ b/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mzk.cz/simplesaml/metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-08-10T11:54:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-08-10T11:54:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Moravian Library in Brno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravská zemská knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Moravian Library in Brno</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Moravské zemské knihovny</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mzk.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mzk.cz/</mdui:InformationURL>
+        <mdui:Logo height="68" width="92">https://www2.eduid.cz/idp-loga/mzk.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzk.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Moravian Library in Brno</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Moravská zemská knihovna</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Moravian Library in Brno</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Moravské zemské knihovny</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.mzk.cz/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.mzk.cz/</mdui:InformationURL>
-          <mdui:Logo height="68" width="92">https://www2.eduid.cz/idp-loga/mzk.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFQTCCBCmgAwIBAgIQCRROBPt6REfjjtwwkS8W6jANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAxMjYwMDAwMDBaFw0xOTAxMzAxMjAwMDBaMIGGMQswCQYDVQQGEwJDWjEbMBkGA1UECAwSSmlob21vcmF2c2vDvSBrcmFqMRQwEgYDVQQHDAtCcm5vLXN0xZllZDEoMCYGA1UEChMfTW9yYXZza2EgemVtc2thIGtuaWhvdm5hIHYgQnJuZTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwHAYDVR0RBBUwE4IRc2hpYmJvbGV0aC5temsuY3owDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACMBDa3dxPDOqR9S+dS6/7vr2YhwNsVS5ye0t3bHW1merdMpcjcLRter2YXHjr54DQ4OjjU6LxHEShdxcwoeHRW1bDX7AA+HN/dUkNArPM2Oc4KtDaIuLVKReQoCabE/XijvVL7g4Xb0xFPpgG4oA/TvhnQVig29RLBsK3MdYuGu4HrJ4av179Z5gWIWx0tk8mcTUW0tDhOQGyIRAHF1RLA/QW7MXbIe5q1NF5AXZYTxbnGga9NWZHljL8pNwoww+Akr3XCeXGJldVDj7jPfyFgoc5sOY8vUPBn7n6GToJeRVLinUfLfm5BHbkNvtI23GPtEiJKkg3zxWiGqNRAoSM4=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFQTCCBCmgAwIBAgIQCRROBPt6REfjjtwwkS8W6jANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAxMjYwMDAwMDBaFw0xOTAxMzAxMjAwMDBaMIGGMQswCQYDVQQGEwJDWjEbMBkGA1UECAwSSmlob21vcmF2c2vDvSBrcmFqMRQwEgYDVQQHDAtCcm5vLXN0xZllZDEoMCYGA1UEChMfTW9yYXZza2EgemVtc2thIGtuaWhvdm5hIHYgQnJuZTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwHAYDVR0RBBUwE4IRc2hpYmJvbGV0aC5temsuY3owDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACMBDa3dxPDOqR9S+dS6/7vr2YhwNsVS5ye0t3bHW1merdMpcjcLRter2YXHjr54DQ4OjjU6LxHEShdxcwoeHRW1bDX7AA+HN/dUkNArPM2Oc4KtDaIuLVKReQoCabE/XijvVL7g4Xb0xFPpgG4oA/TvhnQVig29RLBsK3MdYuGu4HrJ4av179Z5gWIWx0tk8mcTUW0tDhOQGyIRAHF1RLA/QW7MXbIe5q1NF5AXZYTxbnGga9NWZHljL8pNwoww+Akr3XCeXGJldVDj7jPfyFgoc5sOY8vUPBn7n6GToJeRVLinUfLfm5BHbkNvtI23GPtEiJKkg3zxWiGqNRAoSM4=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mzk.cz/simplesaml/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Moravian Library</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Moravská zemská knihovna</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Moravian Library</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Moravská zemská knihovna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mzk.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.mzk.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Administrator</md:SurName>
-      <md:EmailAddress>shibboleth@mzk.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mzk.cz/simplesaml/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Moravian Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Moravská zemská knihovna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moravian Library</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Moravská zemská knihovna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mzk.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mzk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>shibboleth@mzk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml
index 9cad2365..6e76027c 100644
--- a/swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ncgrp.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T14:53:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T14:53:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncgrp.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncgrp.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUG4ZxkzS9IGpdhHMn1TzQI90BY4kwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC5uY2dycC5hYy51azAeFw0xNTAzMDUw
 						OTM3MDFaFw0zNTAzMDUwOTM3MDFaMCExHzAdBgNVBAMMFnNoaWJib2xldGgubmNn
@@ -32,29 +32,29 @@
 						cVn9MS6oTJVbl8DIp3Ayoqv79OlnQ/Z2nGN6N1naD9GsysYkMdVIunQYEbrrL94K
 						efCFXXYuNe739AqEH2Glv2zttZHiRPQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncgrp.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncgrp.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUG4ZxkzS9IGpdhHMn1TzQI90BY4kwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC5uY2dycC5hYy51azAeFw0xNTAzMDUw
 						OTM3MDFaFw0zNTAzMDUwOTM3MDFaMCExHzAdBgNVBAMMFnNoaWJib2xldGgubmNn
@@ -74,27 +74,27 @@
 						cVn9MS6oTJVbl8DIp3Ayoqv79OlnQ/Z2nGN6N1naD9GsysYkMdVIunQYEbrrL94K
 						efCFXXYuNe739AqEH2Glv2zttZHiRPQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NCG Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle College Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncgrp.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helen</md:GivenName>
-      <md:SurName>Ashton</md:SurName>
-      <md:EmailAddress>mailto:helen.ashton@ncl-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:Phil.Robinson@ncgrp.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NCG Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle College Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncgrp.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helen</md:GivenName>
+    <md:SurName>Ashton</md:SurName>
+    <md:EmailAddress>mailto:helen.ashton@ncl-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:Phil.Robinson@ncgrp.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml
index fdb26430..d6e5c3c1 100644
--- a/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ncl-coll.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl-coll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl-coll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID7DCCAtSgAwIBAgIJAKVaXHtxIPVVMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
 						BAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJTmV3Y2FzdGxl
 						MRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0
@@ -38,26 +38,26 @@
 						LMVRiDmLop/2ClZVnivv8L7giJ7BG1bCQK2iEfaMURdRyGSPODq5ljGiLIBTuEa3
 						TfeD5m39qepGwMTVxG4qCelOhTtTkjGwSNBN0zXNPr5JZCO/3pv5lPM2uCjtL30Y
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl-coll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl-coll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID7DCCAtSgAwIBAgIJAKVaXHtxIPVVMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
 						BAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJTmV3Y2FzdGxl
 						MRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0
@@ -80,27 +80,27 @@
 						LMVRiDmLop/2ClZVnivv8L7giJ7BG1bCQK2iEfaMURdRyGSPODq5ljGiLIBTuEa3
 						TfeD5m39qepGwMTVxG4qCelOhTtTkjGwSNBN0zXNPr5JZCO/3pv5lPM2uCjtL30Y
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NCG Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncl-coll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Wardhaugh</md:SurName>
-      <md:EmailAddress>mailto:david.wardhaugh@ncl-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Wardhaugh</md:SurName>
-      <md:EmailAddress>mailto:david.wardhaugh@ncl-coll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NCG Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncl-coll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Wardhaugh</md:SurName>
+    <md:EmailAddress>mailto:david.wardhaugh@ncl-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Wardhaugh</md:SurName>
+    <md:EmailAddress>mailto:david.wardhaugh@ncl-coll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
index ced4ca1a..bef7d3c7 100644
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.nkp.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:29:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:29:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nkp.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">Identity provider for employees the National Library of the Czech Republic</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity provider pro zaměstnance Národní knihovnu České republiky</mdui:Description>
+        <mdui:DisplayName xml:lang="en">The National Library of the Czech Republic</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní knihovna České republiky</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.en.nkp.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.nkp.cz/</mdui:InformationURL>
+        <mdui:Logo height="472" width="500">https://www2.eduid.cz/idp-loga/nkp.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nkp.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">Identity provider for employees the National Library of the Czech Republic</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity provider pro zaměstnance Národní knihovnu České republiky</mdui:Description>
-          <mdui:DisplayName xml:lang="en">The National Library of the Czech Republic</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Národní knihovna České republiky</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.en.nkp.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.nkp.cz/</mdui:InformationURL>
-          <mdui:Logo height="472" width="500">https://www2.eduid.cz/idp-loga/nkp.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFZDCCBEygAwIBAgIQBX7gcQUh/KCJXiApMy1ANTANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -61,13 +61,13 @@ VeD3nbwewrypJ7FhDqn42y+FcN3rZJYmwM2WLOWEyAFY6/NGUs9UJand39hR9tcq
 UC1T4fjlKFOc+BRuahdBg15hm3eWR5Aa+23z6kePOezjf5vzBqPTVQWERwXECJlX
 n81sTHIJBu0U+KA0p2PUB/v3CW/lT0NBwOCCADwTtB98dddMxvzyTg==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIVAM9WIOQ/kjO9uiQWw85qkax0STh2MA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEnNoaWJib2xldGgzLm5rcC5jejAeFw0xNTEwMjEwNzQ4
 MTFaFw0zNTEwMjEwNzQ4MTFaMB0xGzAZBgNVBAMMEnNoaWJib2xldGgzLm5rcC5j
@@ -87,13 +87,13 @@ PliQ4xTE9YZavr9nQmUTItqBL8Kc5r5HffD9jLUIjJEgaybp3hHPt36cCEQPSziM
 qrLMiJgW7pRc3VsCZUwI7NLjZ1XpBQZ5rqc6Hugi5pJFT6G9sU1UDHvOcs2Hz87n
 0AEwqObc0A==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIUdHRSTk2XSr5bqG19DVwbK1ZyAfwwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6MB4XDTE1MTAyMTA3NDgw
 OVoXDTM1MTAyMTA3NDgwOVowHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6
@@ -113,13 +113,13 @@ uoGQ2Mxr0ddIIcw0Q1H8ADhoR9aIcl5b4tTfZA5sAG0t4jvGm2+uhA1Z7e8ste9L
 qZqs9ckld7KXuj4Zkz7ksytmf8+mBkEeXzbLDl1WV88Q8H+1Dq972UvWRqtlsspu
 gVdzOIwY
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIUAMFp+bph5n/u8OoIw4dYB+HwI9cwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6MB4XDTE1MTAyMTA3NDgx
 MFoXDTM1MTAyMTA3NDgxMFowHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6
@@ -139,26 +139,26 @@ kLhgEY0+M21GfoFzUiiNclIaVklHoePZltlZDEejPaMKBlLAgeWRS8+3LTaVTHb7
 PwgX57rtr69Fwaup9s8NId2QAu8GVQLnafugcQPTl2wQU67TtfQYWUZaTxOduyb9
 ugzT90Pl
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nkp.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nkp.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nkp.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nkp.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFZDCCBEygAwIBAgIQBX7gcQUh/KCJXiApMy1ANTANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -189,13 +189,13 @@ VeD3nbwewrypJ7FhDqn42y+FcN3rZJYmwM2WLOWEyAFY6/NGUs9UJand39hR9tcq
 UC1T4fjlKFOc+BRuahdBg15hm3eWR5Aa+23z6kePOezjf5vzBqPTVQWERwXECJlX
 n81sTHIJBu0U+KA0p2PUB/v3CW/lT0NBwOCCADwTtB98dddMxvzyTg==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIVAM9WIOQ/kjO9uiQWw85qkax0STh2MA0GCSqGSIb3DQEB
 CwUAMB0xGzAZBgNVBAMMEnNoaWJib2xldGgzLm5rcC5jejAeFw0xNTEwMjEwNzQ4
 MTFaFw0zNTEwMjEwNzQ4MTFaMB0xGzAZBgNVBAMMEnNoaWJib2xldGgzLm5rcC5j
@@ -215,13 +215,13 @@ PliQ4xTE9YZavr9nQmUTItqBL8Kc5r5HffD9jLUIjJEgaybp3hHPt36cCEQPSziM
 qrLMiJgW7pRc3VsCZUwI7NLjZ1XpBQZ5rqc6Hugi5pJFT6G9sU1UDHvOcs2Hz87n
 0AEwqObc0A==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIUdHRSTk2XSr5bqG19DVwbK1ZyAfwwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6MB4XDTE1MTAyMTA3NDgw
 OVoXDTM1MTAyMTA3NDgwOVowHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6
@@ -241,13 +241,13 @@ uoGQ2Mxr0ddIIcw0Q1H8ADhoR9aIcl5b4tTfZA5sAG0t4jvGm2+uhA1Z7e8ste9L
 qZqs9ckld7KXuj4Zkz7ksytmf8+mBkEeXzbLDl1WV88Q8H+1Dq972UvWRqtlsspu
 gVdzOIwY
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIUAMFp+bph5n/u8OoIw4dYB+HwI9cwDQYJKoZIhvcNAQEL
 BQAwHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6MB4XDTE1MTAyMTA3NDgx
 MFoXDTM1MTAyMTA3NDgxMFowHTEbMBkGA1UEAwwSc2hpYmJvbGV0aDMubmtwLmN6
@@ -267,25 +267,25 @@ kLhgEY0+M21GfoFzUiiNclIaVklHoePZltlZDEejPaMKBlLAgeWRS8+3LTaVTHb7
 PwgX57rtr69Fwaup9s8NId2QAu8GVQLnafugcQPTl2wQU67TtfQYWUZaTxOduyb9
 ugzT90Pl
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The National Library of the Czech Republic</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Národní knihovna České republiky</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The National Library of the Czech Republic</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Národní knihovna České republiky</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.en.nkp.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.nkp.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pavel</md:GivenName>
-      <md:SurName>Kotrba</md:SurName>
-      <md:EmailAddress>Pavel.Kotrba@nkp.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The National Library of the Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Národní knihovna České republiky</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The National Library of the Czech Republic</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Národní knihovna České republiky</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.en.nkp.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.nkp.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Kotrba</md:SurName>
+    <md:EmailAddress>Pavel.Kotrba@nkp.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
index ad22a5b8..0be31fe6 100644
--- a/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.nptc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T09:00:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T09:00:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nptc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nptc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAOuMhJPh+PUsyjWCDIkMwY77mV8nMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0Yy5hYy51azAeFw0xNDA3MzEx
 						MzM4MTRaFw0zNDA3MzExMzM4MTRaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0
@@ -32,29 +32,29 @@
 						1tPtzpQSWBjOGsjeFOI5IK0TbyX3e6GK8NjypAX0gjSqO70v6o2ZFm5svXDHyUl/
 						rhxiSLK1U13f5Z1zFhi15dJ7tLE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nptc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nptc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nptc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nptc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAOuMhJPh+PUsyjWCDIkMwY77mV8nMA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0Yy5hYy51azAeFw0xNDA3MzEx
 						MzM4MTRaFw0zNDA3MzExMzM4MTRaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0
@@ -74,27 +74,27 @@
 						1tPtzpQSWBjOGsjeFOI5IK0TbyX3e6GK8NjypAX0gjSqO70v6o2ZFm5svXDHyUl/
 						rhxiSLK1U13f5Z1zFhi15dJ7tLE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Neath Port Talbot College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NPTC Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nptc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Lewis</md:SurName>
-      <md:EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Lewis</md:SurName>
-      <md:EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Neath Port Talbot College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NPTC Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nptc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Lewis</md:SurName>
+    <md:EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Lewis</md:SurName>
+    <md:EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
index 65a4780e..eba75e8c 100644
--- a/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.obspm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T12:03:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T12:03:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obspm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Observatoire de Paris</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACLElEQVQoz3WSX2hScRTHv/fen9drOo0Wm0X0UEFvPRSM6C+x0Vr0UA/Z6kFczdSYijMYEdRDQWON/Y3KMRKaQS0oiSAX4qC9RS8Re5EaCAMTG7Pcvd57vd5fD7qQub4P5+V8P5zDOV+GUooGFX6tEZ6zWE2NLdA6ZZbyIV8MCAM+wAuEQ75YZilf72H+TZianPcEXgJGnieEMAA0jaqqBqiTwxf6wp1VWw2Ymkh5glGg2byF27CCTlEqFSMTjuv+DgAsgNzPgtXOJeaC3Y69oqSJklIPsAwEweIJvFnOrNSA6cfzly+9ONMZ6ek9BjAfEi5REkWpUiVFSZFlHcD4wzkABMDzp18BM1BWVMUK08FDe/w32lZ/l1xXj3S0jyZTodevPhPCSZpUA9L5VUHgZBkAY2a5VOrb0ZP7LE3C+EgqNnOt3xu/P9JVklRFpgBlAQCqLCuAzBs4lkAQDISw586OunoPn+46sHvXtuijL2aL0emMqmqFBRCPu969dy586n9w96PepCVmv9tM1j5/O8pc2/7h4O3jVKfJ5CKP7TxPGErpnYHZe0NJwADwRiOjKBVAAwzrtQwQQB0Inhgc62Yopblswb7zliCYOJbBZtIpSqW1XHaoxW5jAbTu2PrsiUOWizr9n7sYmbjYYrfVrgSgx3tKFFX/zbcAz/PEQBgA5fVojA2er755Y/h+pLMB7wwQBtyAGwi7r0ynF5c3D1+9VnJ/ADS3WhtbfwHf4Ru+52sb3QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.obspm.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Observatoire de Paris</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obspm.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Observatoire de Paris</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACLElEQVQoz3WSX2hScRTHv/fen9drOo0Wm0X0UEFvPRSM6C+x0Vr0UA/Z6kFczdSYijMYEdRDQWON/Y3KMRKaQS0oiSAX4qC9RS8Re5EaCAMTG7Pcvd57vd5fD7qQub4P5+V8P5zDOV+GUooGFX6tEZ6zWE2NLdA6ZZbyIV8MCAM+wAuEQ75YZilf72H+TZianPcEXgJGnieEMAA0jaqqBqiTwxf6wp1VWw2Ymkh5glGg2byF27CCTlEqFSMTjuv+DgAsgNzPgtXOJeaC3Y69oqSJklIPsAwEweIJvFnOrNSA6cfzly+9ONMZ6ek9BjAfEi5REkWpUiVFSZFlHcD4wzkABMDzp18BM1BWVMUK08FDe/w32lZ/l1xXj3S0jyZTodevPhPCSZpUA9L5VUHgZBkAY2a5VOrb0ZP7LE3C+EgqNnOt3xu/P9JVklRFpgBlAQCqLCuAzBs4lkAQDISw586OunoPn+46sHvXtuijL2aL0emMqmqFBRCPu969dy586n9w96PepCVmv9tM1j5/O8pc2/7h4O3jVKfJ5CKP7TxPGErpnYHZe0NJwADwRiOjKBVAAwzrtQwQQB0Inhgc62Yopblswb7zliCYOJbBZtIpSqW1XHaoxW5jAbTu2PrsiUOWizr9n7sYmbjYYrfVrgSgx3tKFFX/zbcAz/PEQBgA5fVojA2er755Y/h+pLMB7wwQBtyAGwi7r0ynF5c3D1+9VnJ/ADS3WhtbfwHf4Ru+52sb3QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.obspm.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Observatoire de Paris</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAN6NefE7MNV1gsFFJM6ZXxl7ricmMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgub2JzcG0uZnIwHhcNMTEwMjAzMTYx
 NTIwWhcNMzEwMjAzMTYxNTIwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm9ic3Bt
@@ -38,21 +38,21 @@ Z95J8KjcXSTo7FeOLgY4AxTb4F4feNLZmFD0q06+CZLVZ46ZJBx4ISSobKypu6qE
 wOVcvEXq+Zt5q2+IQgg0Pxk+XEaEj0qq1JmZPrOGOq8wZES2ObjMbnFPwuoNZLMN
 4JZ1jEbeKm7bdK4P
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.obspm.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Observatoire de Paris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Observatoire de Paris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.obspm.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>interne.admin.DIO@obspm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.obspm.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Observatoire de Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Observatoire de Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.obspm.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>interne.admin.DIO@obspm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml
index 9e78b7ea..921a0149 100644
--- a/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.oldham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-31T13:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-31T13:45:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oldham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oldham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAMcHtIGAOBG7Xl/x6OlCvx8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzExMjAwMDAwMDBaFw0xNjExMTkyMzU5NTlaMEUxITAfBgNV
@@ -38,26 +38,26 @@
 						uRqaKvbYt5qYseXcbOrwBvyERQ3j+j+g4tLRWo/k1QJxilBbXtqo22L4e8AjOMN7
 						SvdjM8XejBUGw++3ZzPbg/v0meOi2EidA5m5mHbAvLV248hMsLUCJxA9qYJ5DebU
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.oldham.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oldham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.oldham.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oldham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIRAMcHtIGAOBG7Xl/x6OlCvx8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzExMjAwMDAwMDBaFw0xNjExMTkyMzU5NTlaMEUxITAfBgNV
@@ -83,37 +83,37 @@
 						uRqaKvbYt5qYseXcbOrwBvyERQ3j+j+g4tLRWo/k1QJxilBbXtqo22L4e8AjOMN7
 						SvdjM8XejBUGw++3ZzPbg/v0meOi2EidA5m5mHbAvLV248hMsLUCJxA9qYJ5DebU
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Oldham College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oldham College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oldham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stuart</md:GivenName>
-      <md:SurName>Catterall</md:SurName>
-      <md:EmailAddress>mailto:stuart.catterall@oldham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Hough</md:SurName>
-      <md:EmailAddress>mailto:robert.hough@oldham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stuart</md:GivenName>
-      <md:SurName>Catterall</md:SurName>
-      <md:EmailAddress>mailto:stuart.catterall@oldham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Hough</md:SurName>
-      <md:EmailAddress>mailto:robert.hough@oldham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Oldham College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oldham College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oldham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stuart</md:GivenName>
+    <md:SurName>Catterall</md:SurName>
+    <md:EmailAddress>mailto:stuart.catterall@oldham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Hough</md:SurName>
+    <md:EmailAddress>mailto:robert.hough@oldham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stuart</md:GivenName>
+    <md:SurName>Catterall</md:SurName>
+    <md:EmailAddress>mailto:stuart.catterall@oldham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Hough</md:SurName>
+    <md:EmailAddress>mailto:robert.hough@oldham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml b/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml
index 9dcb2554..2363cb86 100644
--- a/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml
+++ b/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ovid.com/entity">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-22T17:06:00Z">
-		</mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-22T17:06:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAITuZd98PRlHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3NoaWJib2xldGgub3ZpZC5jb20wHhcNMTUwMzE2MjAwNzE2WhcNMjUwMzEz
 						MjAwNzE2WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm92aWQuY29tMIIBIjANBgkq
@@ -27,37 +26,37 @@
 						x417jKQy4/M0qnccp7uu2Yn8xvCH13BpqfvginDhdWTXHnZ03fFpXovteyHdPeWU
 						egg3ug==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8397/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8397/Shibboleth.sso/SAML/Artifact" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/shib/post" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/shib/art" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/saml2/post" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/saml2/art" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiboa-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shiboa-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathens.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="15"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ovid Technologies, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ovid</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ovid.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Team</md:GivenName>
-      <md:EmailAddress>mailto:support@ovid.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Global Online Operations</md:GivenName>
-      <md:EmailAddress>mailto:GOOSandy@ovid.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8397/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8397/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/shib/post" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/shib/art" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/saml2/post" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/saml2/art" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiboa-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shiboa-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathens.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="15"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ovid Technologies, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ovid</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ovid.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Team</md:GivenName>
+    <md:EmailAddress>mailto:support@ovid.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Global Online Operations</md:GivenName>
+    <md:EmailAddress>mailto:GOOSandy@ovid.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml
index 812e567b..86b66e80 100644
--- a/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.pace.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pace.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Pace University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pace.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Pace University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAIDwMFVZHLZMtA9SpNTVZQT/s2QcMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgucGFjZS5lZHUwHhcNMTIwOTIxMTkz
 NDU1WhcNMzIwOTIxMTkzNDU1WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnBhY2Uu
@@ -38,23 +38,23 @@ kM0iPsZNWC1xrNnNUUzrrsj2fXH3gvPuXFL1Qwrily6BtY3VekYsv4jqmM59kodg
 xe9+xuSYTj/nMFJWA8UN83T6id0A3tYIRr66BLWWQhfoNopfJPHmO7CaCJQz+16A
 908GmV+NLASTJTXX
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.pace.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.pace.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.pace.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pace.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.pace.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.pace.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.pace.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pace.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAIDwMFVZHLZMtA9SpNTVZQT/s2QcMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgucGFjZS5lZHUwHhcNMTIwOTIxMTkz
 NDU1WhcNMzIwOTIxMTkzNDU1WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnBhY2Uu
@@ -74,22 +74,22 @@ kM0iPsZNWC1xrNnNUUzrrsj2fXH3gvPuXFL1Qwrily6BtY3VekYsv4jqmM59kodg
 xe9+xuSYTj/nMFJWA8UN83T6id0A3tYIRr66BLWWQhfoNopfJPHmO7CaCJQz+16A
 908GmV+NLASTJTXX
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pace University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pace University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pace.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lauren Valiente</md:GivenName>
-      <md:EmailAddress>lvaliente@pace.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Donna Scarano</md:GivenName>
-      <md:EmailAddress>dscarano@pace.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pace University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pace University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pace.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lauren Valiente</md:GivenName>
+    <md:EmailAddress>lvaliente@pace.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Donna Scarano</md:GivenName>
+    <md:EmailAddress>dscarano@pace.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml
index 05c4a560..2e2b8db8 100644
--- a/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.plumpton.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T13:18:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T13:18:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plumpton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plumpton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAJgtMhzTWBfgn2Mz2ywEeOKpkBfcMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMMGXNoaWJib2xldGgucGx1bXB0b24uYWMudWswHhcNMTUw
 						NTE0MDgyNjU0WhcNMzUwNTE0MDgyNjU0WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRo
@@ -37,29 +37,29 @@
 						BZmeXBv22v17AxYxHXh22k0X1za7CqNt3UVGhafqrPZeNCNMGcX+S8BSa5rAKsop
 						tWP38Ae6DWHxNP91fg5Ojh9o0ae5hYTYukEBySuMj2ZJ2HPx
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.plumpton.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plumpton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.plumpton.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plumpton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAJgtMhzTWBfgn2Mz2ywEeOKpkBfcMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMMGXNoaWJib2xldGgucGx1bXB0b24uYWMudWswHhcNMTUw
 						NTE0MDgyNjU0WhcNMzUwNTE0MDgyNjU0WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRo
@@ -79,26 +79,26 @@
 						BZmeXBv22v17AxYxHXh22k0X1za7CqNt3UVGhafqrPZeNCNMGcX+S8BSa5rAKsop
 						tWP38Ae6DWHxNP91fg5Ojh9o0ae5hYTYukEBySuMj2ZJ2HPx
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Plumpton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Plumpton College Shibboleth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.plumpton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Plumpton College IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@plumpton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Howe</md:SurName>
-      <md:EmailAddress>mailto:sam.howe@plumpton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Plumpton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Plumpton College Shibboleth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.plumpton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Plumpton College IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@plumpton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Howe</md:SurName>
+    <md:EmailAddress>mailto:sam.howe@plumpton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml
index bc7c52fa..18ed78c1 100644
--- a/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.plymouth.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-21T13:42:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-21T13:42:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAKyHcygxYWHKhPBwJxtAsM65mkppMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgucGx5bW91dGguYWMudWswHhcNMTMx
 						MDAzMTQyOTA0WhcNMzMxMDAzMTQyOTA0WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -32,29 +32,29 @@
 						NbllXNhng/oE/3YWDzcLCj9tPB8xJaw2FdiH9vPmx06F2e3jxOBxOxCeOkx1N6hU
 						RC5QBAnV84/JkA5Y1mD35/HCdF0B0gA38D2X6sTkFISlTYCM
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.plymouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.plymouth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVAKyHcygxYWHKhPBwJxtAsM65mkppMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgucGx5bW91dGguYWMudWswHhcNMTMx
 						MDAzMTQyOTA0WhcNMzMxMDAzMTQyOTA0WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -74,31 +74,31 @@
 						NbllXNhng/oE/3YWDzcLCj9tPB8xJaw2FdiH9vPmx06F2e3jxOBxOxCeOkx1N6hU
 						RC5QBAnV84/JkA5Y1mD35/HCdF0B0gA38D2X6sTkFISlTYCM
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Plymouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Plymouth University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.plymouth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@plymouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Olly</md:GivenName>
-      <md:SurName>Morgan</md:SurName>
-      <md:EmailAddress>mailto:olly.morgan@plymouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Horne</md:SurName>
-      <md:EmailAddress>mailto:john.horne@plymouth.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Plymouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Plymouth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.plymouth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@plymouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olly</md:GivenName>
+    <md:SurName>Morgan</md:SurName>
+    <md:EmailAddress>mailto:olly.morgan@plymouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Horne</md:SurName>
+    <md:EmailAddress>mailto:john.horne@plymouth.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml
index fb1f56de..4069e705 100644
--- a/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.rcn.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-24T08:40:57Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-24T08:40:57Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcn.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcn.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUXswXhO6uDK4MV7I9aly5vnD77ZcwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24ub3JnLnVrMB4XDTEyMDgxNTE1
 						MTcwM1oXDTMyMDgxNTE1MTcwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24u
@@ -30,26 +30,26 @@
 						ZKFO8alq69naYWxQ8zjYygPSpM3wZ+U+ympl8A/SWz2nAYYAMHeRiHy5+HxqtRoH
 						vGxcw0jItQ4SQ9/nHEbArNfwkQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.rcn.org.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcn.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.rcn.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcn.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUXswXhO6uDK4MV7I9aly5vnD77ZcwDQYJKoZIhvcNAQEF
 						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24ub3JnLnVrMB4XDTEyMDgxNTE1
 						MTcwM1oXDTMyMDgxNTE1MTcwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24u
@@ -69,27 +69,27 @@
 						ZKFO8alq69naYWxQ8zjYygPSpM3wZ+U+ympl8A/SWz2nAYYAMHeRiHy5+HxqtRoH
 						vGxcw0jItQ4SQ9/nHEbArNfwkQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal College of Nursing</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcn.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Jacklin</md:SurName>
-      <md:EmailAddress>mailto:ian.jacklin@rcn.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Forsyth</md:SurName>
-      <md:EmailAddress>mailto:service.desk@rcn.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal College of Nursing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal College of Nursing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcn.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Jacklin</md:SurName>
+    <md:EmailAddress>mailto:ian.jacklin@rcn.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Forsyth</md:SurName>
+    <md:EmailAddress>mailto:service.desk@rcn.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml
index 59b3d54e..c8958c0b 100644
--- a/swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.riversidecollege.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-22T11:36:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-22T11:36:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riversidecollege.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Riverside College Cheshire</mdui:DisplayName>
+        <mdui:Logo height="100" width="392">https://shibboleth.riversidecollege.ac.uk/emailbanner.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riversidecollege.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Riverside College Cheshire</mdui:DisplayName>
-          <mdui:Logo height="100" width="392">https://shibboleth.riversidecollege.ac.uk/emailbanner.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcjCCAlqgAwIBAgIVAOacRZG9aw8yzfhRZ2EE+v/4e/VVMA0GCSqGSIb3DQEB
 						BQUAMCwxKjAoBgNVBAMMIXNoaWJib2xldGgucml2ZXJzaWRlY29sbGVnZS5hYy51
 						azAeFw0xNTA0MTYxMDAwMDJaFw0zNTA0MTYxMDAwMDJaMCwxKjAoBgNVBAMMIXNo
@@ -37,29 +37,29 @@
 						bYt83NovYbGf35MeoODWhvVDeXHBzMXvta8bkJFFmdFD4skSDBROiK5mXnIZGkWC
 						0Icw2lNC4PD5sF3IRKHqG3frOfQxzw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riversidecollege.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riversidecollege.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcjCCAlqgAwIBAgIVAOacRZG9aw8yzfhRZ2EE+v/4e/VVMA0GCSqGSIb3DQEB
 						BQUAMCwxKjAoBgNVBAMMIXNoaWJib2xldGgucml2ZXJzaWRlY29sbGVnZS5hYy51
 						azAeFw0xNTA0MTYxMDAwMDJaFw0zNTA0MTYxMDAwMDJaMCwxKjAoBgNVBAMMIXNo
@@ -80,27 +80,27 @@
 						bYt83NovYbGf35MeoODWhvVDeXHBzMXvta8bkJFFmdFD4skSDBROiK5mXnIZGkWC
 						0Icw2lNC4PD5sF3IRKHqG3frOfQxzw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Riverside College Halton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Riverside College Cheshire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.riversidecollege.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Brown</md:SurName>
-      <md:EmailAddress>mailto:matthew.brown@riversidecollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Brown</md:SurName>
-      <md:EmailAddress>mailto:matthew.brown@riversidecollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Riverside College Halton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Riverside College Cheshire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.riversidecollege.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:matthew.brown@riversidecollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Brown</md:SurName>
+    <md:EmailAddress>mailto:matthew.brown@riversidecollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml
index 92adfacf..aa1ad0b6 100644
--- a/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.runshaw.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-20T09:52:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-20T09:52:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">runshaw.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">runshaw.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVANxclogryqwYGu19nKOzmdP84Ca0MA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMMGHNoaWJib2xldGgucnVuc2hhdy5hYy51azAeFw0xNTA0
 						MjMxMDIyNThaFw0zNTA0MjMxMDIyNThaMCMxITAfBgNVBAMMGHNoaWJib2xldGgu
@@ -32,29 +32,29 @@
 						0sSweNlLsJ2jVGZ0v/LK1nTjT8d34alzVwYHrX7A9d1PhudmBIG9lzRIJxxHznSp
 						kpaorlZ3en0Z1zG6x6U452/g5wbB9vkinE+NNpc6XBI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.runshaw.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">runshaw.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.runshaw.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">runshaw.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVANxclogryqwYGu19nKOzmdP84Ca0MA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMMGHNoaWJib2xldGgucnVuc2hhdy5hYy51azAeFw0xNTA0
 						MjMxMDIyNThaFw0zNTA0MjMxMDIyNThaMCMxITAfBgNVBAMMGHNoaWJib2xldGgu
@@ -74,25 +74,25 @@
 						0sSweNlLsJ2jVGZ0v/LK1nTjT8d34alzVwYHrX7A9d1PhudmBIG9lzRIJxxHznSp
 						kpaorlZ3en0Z1zG6x6U452/g5wbB9vkinE+NNpc6XBI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Runshaw College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Runshaw College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.runshaw.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Runshaw College Servicedesk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@runshaw.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Runshaw College Servicedesk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@runshaw.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Runshaw College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Runshaw College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.runshaw.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Runshaw College Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@runshaw.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Runshaw College Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@runshaw.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml
index fb91bc1c..ecdca28e 100644
--- a/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.salisbury.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salisbury.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Salisbury University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Salisbury University Shibboleth Identity Provider allows SU faculty, staff and students to access external service providers using their SU NetID.</mdui:Description>
+        <mdui:Logo height="72" width="228" xml:lang="en">https://shibboleth.salisbury.edu/idp/images/sulogobig.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salisbury.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Salisbury University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Salisbury University Shibboleth Identity Provider allows SU faculty, staff and students to access external service providers using their SU NetID.</mdui:Description>
-          <mdui:Logo height="72" width="228" xml:lang="en">https://shibboleth.salisbury.edu/idp/images/sulogobig.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSzCCAjOgAwIBAgIUY64S0cXi06fxxH8FDOgtO3uuMFAwDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC5zYWxpc2J1cnkuZWR1MB4XDTEzMDYy
 ODEzMDA1M1oXDTMzMDYyODEzMDA1M1owIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC5z
@@ -40,33 +40,33 @@ bCpHxVJ1k3zEgA3KI1K7Dp6n8pAVA35ZVP0EO1i7Wjae+pThMCzm8XVQ/9q8AuKy
 gYLlfmoR7oW8554uAku/74AnF7W89rMyaWcsv3mjTpLvYTNaD6BIRmG8ykuCRPq3
 kqmLDZGykto7PgAKNYbdUf1tzfrYMVhNBrGkMBv1QA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.salisbury.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.salisbury.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.salisbury.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Salisbury University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Salisbury University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.salisbury.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.salisbury.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.salisbury.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.salisbury.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Salisbury University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Salisbury University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.salisbury.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
index 7c4c686c..64740030 100644
--- a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.sciencespo-grenoble.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-08T15:18:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-08T15:18:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-grenoble.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sciences Po Grenoble</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABm0lEQVQ4y6WSr28UURRGz32vM7vbyU73pUMIP0JqMSiCw+BQOBCEhD+ABIciqUGgseBqCAqBoBoECo8gKYImDWlnp7s7s8zOexfRATbZbSnw2fty7ndPnjjnlP+IOWnogVwD4V8AHoiBl4NzTOA4iB4LONTAZj/jameV2/EqhS6/dClgBmyYFW72+tSqiPzlCePgeZqe4UG+SxE8M9XTA6Yo16IufWN5Ox3xuakpVYmXt1h0UIXA4zTj2WgfxDIKnrEG7GkaTFBuxD3WjGW7LkGEABQasMifAXUIPEoztsZDkKORAj2EwKIHnQfkqtzqJFy0ES+qgkGrvtbAlahDOSeyad8PNcw5UM/D/jpvqhGItIWFT03N/cSxbix58OTB48SwmTheuwtGnHOaq3K3m/Bk7SzXv+0wVCVqKw418D67xHkbsesbUmPY8w2vyoLnZeFbgOdDtsEXP+POwVec+e3cA4eq3OsmCLBdV+z5BsTgRPyKBy7bmI91xbvv5S95P2OBgQhb0wkAqcj8AhXnnB5tCYDgTvq3i2l+ABwLse0z7diPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjM1KzAyOjAwCI/qcgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTozNSswMjowMHnSUs4AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.sciencespo-grenoble.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Sciences Po Grenoble</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-grenoble.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sciences Po Grenoble</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABm0lEQVQ4y6WSr28UURRGz32vM7vbyU73pUMIP0JqMSiCw+BQOBCEhD+ABIciqUGgseBqCAqBoBoECo8gKYImDWlnp7s7s8zOexfRATbZbSnw2fty7ndPnjjnlP+IOWnogVwD4V8AHoiBl4NzTOA4iB4LONTAZj/jameV2/EqhS6/dClgBmyYFW72+tSqiPzlCePgeZqe4UG+SxE8M9XTA6Yo16IufWN5Ox3xuakpVYmXt1h0UIXA4zTj2WgfxDIKnrEG7GkaTFBuxD3WjGW7LkGEABQasMifAXUIPEoztsZDkKORAj2EwKIHnQfkqtzqJFy0ES+qgkGrvtbAlahDOSeyad8PNcw5UM/D/jpvqhGItIWFT03N/cSxbix58OTB48SwmTheuwtGnHOaq3K3m/Bk7SzXv+0wVCVqKw418D67xHkbsesbUmPY8w2vyoLnZeFbgOdDtsEXP+POwVec+e3cA4eq3OsmCLBdV+z5BsTgRPyKBy7bmI91xbvv5S95P2OBgQhb0wkAqcj8AhXnnB5tCYDgTvq3i2l+ABwLse0z7diPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjM1KzAyOjAwCI/qcgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTozNSswMjowMHnSUs4AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.sciencespo-grenoble.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Sciences Po Grenoble</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDcTCCAlmgAwIBAgIURqMsHzlG8fMfvT+cOJR2geBiBKYwDQYJKoZIhvcNAQEF
 BQAwLDEqMCgGA1UEAxMhc2hpYmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZy
 MB4XDTEyMDEyMDA3NTIyN1oXDTMyMDEyMDA3NTIyN1owLDEqMCgGA1UEAxMhc2hp
@@ -39,26 +39,26 @@ qo5xryJDCS9U9/9fzKL6bSJH6D1gQcqShNQgQa7DxH3PlT5R17zw2zMBJTbmtBV7
 otA0xiEkUOufFx8+5EHk/7Hc9XnR7MolLH6WDVHVXytu2/8pq922i63pGATJ3ssL
 GbEcopedt4Tn5cP+TYMtHXCewhgi
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Sciences Po Grenoble</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sciences Po Grenoble</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sciencespo-grenoble.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Damien Limoges</md:SurName>
-      <md:EmailAddress>damien.limoges@sciencespo-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Frank Boussagol</md:SurName>
-      <md:EmailAddress>frank.boussagol@sciencespo-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sciences Po Grenoble</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sciences Po Grenoble</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sciencespo-grenoble.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Damien Limoges</md:SurName>
+    <md:EmailAddress>damien.limoges@sciencespo-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Frank Boussagol</md:SurName>
+    <md:EmailAddress>frank.boussagol@sciencespo-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml
index 98278366..f06bf160 100644
--- a/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.selby.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-18T11:19:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-18T11:19:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selby.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selby.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFKzCCBBOgAwIBAgIJAIGAdYhCdXOTMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQHEwVTZWxi
 						eTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBTZXJ2
@@ -42,26 +42,26 @@
 						SgGHbK7rJ0ywnr5qIwrjpfXkyNDUobGdGcrccynBSJoUNwR9dNLFZ8funAukMR4W
 						6sm3KNXOyBTi8GzW+r6Ray34zb5DUo1CSfO5fCWRsA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.selby.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selby.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.selby.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selby.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFKzCCBBOgAwIBAgIJAIGAdYhCdXOTMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQHEwVTZWxi
 						eTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBTZXJ2
@@ -91,27 +91,27 @@
 						SgGHbK7rJ0ywnr5qIwrjpfXkyNDUobGdGcrccynBSJoUNwR9dNLFZ8funAukMR4W
 						6sm3KNXOyBTi8GzW+r6Ray34zb5DUo1CSfO5fCWRsA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Selby College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Selby College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.selby.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Pilling</md:SurName>
-      <md:EmailAddress>mailto:pillingm@selby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Pilling</md:SurName>
-      <md:EmailAddress>mailto:pillingm@selby.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Selby College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Selby College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.selby.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Pilling</md:SurName>
+    <md:EmailAddress>mailto:pillingm@selby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Pilling</md:SurName>
+    <md:EmailAddress>mailto:pillingm@selby.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml
index 42907809..4d620193 100644
--- a/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.serc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-18T10:34:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-18T10:34:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">serc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">serc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdjCCAl4CCQCag8g+o0iWVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcTBkJhbmdvcjEnMCUGA1UE
 						ChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdlMR4wHAYDVQQDExVzaGli
@@ -33,26 +33,26 @@
 						Q6PnTqInoOWw8Nbb9h640tVD/hxkUJcvfM+2bwOi5JSB4oRWCTgNeKxuf3K9YGYG
 						/d3Km0PXmZriNGP8T6lbBW5Hx3qcVGcfoL8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.serc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">serc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.serc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">serc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdjCCAl4CCQCag8g+o0iWVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcTBkJhbmdvcjEnMCUGA1UE
 						ChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdlMR4wHAYDVQQDExVzaGli
@@ -73,27 +73,27 @@
 						Q6PnTqInoOWw8Nbb9h640tVD/hxkUJcvfM+2bwOi5JSB4oRWCTgNeKxuf3K9YGYG
 						/d3Km0PXmZriNGP8T6lbBW5Hx3qcVGcfoL8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South Eastern Regional College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South Eastern Regional College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.serc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Elaine</md:GivenName>
-      <md:SurName>Mulholland</md:SurName>
-      <md:EmailAddress>mailto:emulholland@serc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Francis</md:SurName>
-      <md:EmailAddress>mailto:mfrancis@serc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South Eastern Regional College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South Eastern Regional College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.serc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elaine</md:GivenName>
+    <md:SurName>Mulholland</md:SurName>
+    <md:EmailAddress>mailto:emulholland@serc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Francis</md:SurName>
+    <md:EmailAddress>mailto:mfrancis@serc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
index 665da787..dc7c097a 100644
--- a/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.simplyvoting.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-18T02:54:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-18T02:54:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Simply Voting</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Simply Voting - Shibboleth</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.simplyvoting.com/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Simply Voting</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Simply Voting - Shibboleth</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.simplyvoting.com/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>*.simplyvoting.com</ds:KeyName>
-          <ds:KeyName>https://shibboleth.simplyvoting.com/shibboleth-sp</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.simplyvoting.com</ds:KeyName>
+        <ds:KeyName>https://shibboleth.simplyvoting.com/shibboleth-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKTCCAhGgAwIBAgIJAPuqVV3UDY+GMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMUEiouc2ltcGx5dm90aW5nLmNvbTAeFw0xMzA1MDIxNDMxNDZaFw0zMzA1MDIx
 NDMxNDZaMB0xGzAZBgNVBAMUEiouc2ltcGx5dm90aW5nLmNvbTCCASIwDQYJKoZI
@@ -38,29 +38,29 @@ hBP2VdDCNba45G0vDUbJXU+XR0F4Xb1XKKoqdI6RSMkzegtbCJoEpi38XqQpQIne
 VDTcV8JaXroxakWgnfj7ARXlchH0tkOP2T8P8WN+SqnuXS9RRQa6GDx4HSoc+lLn
 0obwKRPux6UP6dtWT9gj3nih8ie1XstmErfBW1vLS0+AvfR8cY6KJLkFMZFP
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simply Voting</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Simply Voting - Shibboleth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simplyvoting.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Lack</md:SurName>
-      <md:EmailAddress>mailto:black@simplyvoting.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simply Voting</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Simply Voting - Shibboleth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simplyvoting.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Lack</md:SurName>
+    <md:EmailAddress>mailto:black@simplyvoting.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml
index a4e4aea0..17dcd58d 100644
--- a/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.staffs.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T11:53:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T11:53:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Staffordshire University (Login)</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.staffs.ac.uk/images/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.staffs.ac.uk/images/logo16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Staffordshire University (Login)</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.staffs.ac.uk/images/logo80x60.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.staffs.ac.uk/images/logo16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUM4eMQ3ZvFUQU7+tPiztqHDYE9F8wDQYJKoZIhvcNAQEF
 						BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5zdGFmZnMuYWMudWswHhcNMTMwOTAz
 						MTQzNzA3WhcNMzMwOTAzMTQzNzA3WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnN0
@@ -37,26 +37,26 @@
 						q/65YEeFV/EGtf8b57F53TCRBNwBq/wml+y5ey6hSerDlVVteiGM91pMXepKs3Mg
 						E6q5FqulkMAFTPXvsX84S8A1mX3pCQwv3Puk
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.staffs.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.staffs.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staffs.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUM4eMQ3ZvFUQU7+tPiztqHDYE9F8wDQYJKoZIhvcNAQEF
 						BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5zdGFmZnMuYWMudWswHhcNMTMwOTAz
 						MTQzNzA3WhcNMzMwOTAzMTQzNzA3WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnN0
@@ -76,25 +76,25 @@
 						q/65YEeFV/EGtf8b57F53TCRBNwBq/wml+y5ey6hSerDlVVteiGM91pMXepKs3Mg
 						E6q5FqulkMAFTPXvsX84S8A1mX3pCQwv3Puk
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Staffordshire University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Staffordshire University (Login)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.staffs.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Services customer support</md:GivenName>
-      <md:EmailAddress>mailto:3800@staffs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Client Technology &amp; Applications Group</md:GivenName>
-      <md:EmailAddress>mailto:isitcta@staffs.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Staffordshire University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Staffordshire University (Login)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.staffs.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Services customer support</md:GivenName>
+    <md:EmailAddress>mailto:3800@staffs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Client Technology &amp; Applications Group</md:GivenName>
+    <md:EmailAddress>mailto:isitcta@staffs.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml
index 736f9b43..8eaddba0 100644
--- a/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.stamford.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stamford.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stamford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEeDCCA2CgAwIBAgIJAK+NSDEsMrPuMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
 						VQQGEwJHQjEVMBMGA1UECBMMTGluY29sbnNoaXJlMREwDwYDVQQHEwhTdGFtZm9y
 						ZDEdMBsGA1UEChMUTmV3IENvbGxlZ2UgU3RhbWZvcmQxEzARBgNVBAsTCklUIFN1
@@ -36,26 +36,26 @@
 						dgcT7aAQbRSmDIuqhN8vjZzDyzXeBvtrHAhfRZh3QRbKoHeXtRCNAZbGxPPi9X64
 						/puoYMet3mzYin0PEI6zw1AAZly79koe0tQZtjeybnmvvGrN6PrqCEWs2KY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stamford.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stamford.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stamford.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stamford.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEeDCCA2CgAwIBAgIJAK+NSDEsMrPuMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
 						VQQGEwJHQjEVMBMGA1UECBMMTGluY29sbnNoaXJlMREwDwYDVQQHEwhTdGFtZm9y
 						ZDEdMBsGA1UEChMUTmV3IENvbGxlZ2UgU3RhbWZvcmQxEzARBgNVBAsTCklUIFN1
@@ -81,26 +81,26 @@
 						dgcT7aAQbRSmDIuqhN8vjZzDyzXeBvtrHAhfRZh3QRbKoHeXtRCNAZbGxPPi9X64
 						/puoYMet3mzYin0PEI6zw1AAZly79koe0tQZtjeybnmvvGrN6PrqCEWs2KY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New College Stamford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New College Stamford</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stamford.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>The IT Department</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@stamford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob</md:GivenName>
-      <md:SurName>Cottrell</md:SurName>
-      <md:EmailAddress>mailto:rob.cottrell@stamford.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New College Stamford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New College Stamford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stamford.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>The IT Department</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@stamford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Cottrell</md:SurName>
+    <md:EmailAddress>mailto:rob.cottrell@stamford.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.statista.com.xml b/swamid-interfederations-2.0/shibboleth.statista.com.xml
index 0ecdfa3c..f0d24658 100644
--- a/swamid-interfederations-2.0/shibboleth.statista.com.xml
+++ b/swamid-interfederations-2.0/shibboleth.statista.com.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.statista.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-28T13:51:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-28T13:51:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.statista.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Statista</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Statista</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Zugriff auf Premium-Statistiken des Statistik-Portals für Universitäten mit Campuslizenzen.</mdui:Description>
+        <mdui:Description xml:lang="en">Access to paid statistics from statistic portal Statista for universities that have a campus license</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://de.statista.com</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.statista.com</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.statista.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Statista</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Statista</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Zugriff auf Premium-Statistiken des Statistik-Portals für Universitäten mit Campuslizenzen.</mdui:Description>
-          <mdui:Description xml:lang="en">Access to paid statistics from statistic portal Statista for universities that have a campus license</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://de.statista.com</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.statista.com</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>de.statista.com</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=de.statista.com,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>de.statista.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=de.statista.com,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
 A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMTA5MDEwODAxMThaFw0x
 NjA4MzAwODAxMThaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWlu
@@ -51,43 +51,43 @@ LW8dBcS4uGBLwmZ5Tq4zIAbppwwoqV81YwY+IaW9ObNpYJUMPhyxxW6ydTxF4yuT
 qZL8C8tvRqJtGUxFqPs4xImg3b9WLPThwMkFkuH/xzQqmN+xeoD3LvL/2DF88T3y
 l/xjGBYl
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Statista</md:ServiceName>
-        <md:ServiceName xml:lang="en">Statista</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Zugriff auf Premium-Statistiken des Statistik-Portals für Universitäten mit Campuslizenzen.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Access to paid statistics from statistic portal Statista for universities that have a campus license</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e243</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e243</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Statista GmbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Statista GmbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://de.statista.com</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.statista.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Leidinger</md:SurName>
-      <md:EmailAddress>mailto:technik@statista.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Leidinger</md:SurName>
-      <md:EmailAddress>mailto:technik@statista.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Statista</md:ServiceName>
+      <md:ServiceName xml:lang="en">Statista</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Zugriff auf Premium-Statistiken des Statistik-Portals für Universitäten mit Campuslizenzen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Access to paid statistics from statistic portal Statista for universities that have a campus license</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e243</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e243</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Statista GmbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Statista GmbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://de.statista.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.statista.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Leidinger</md:SurName>
+    <md:EmailAddress>mailto:technik@statista.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Leidinger</md:SurName>
+    <md:EmailAddress>mailto:technik@statista.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml
index e9e36dab..354a056f 100644
--- a/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.strode-college.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strode-college.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strode-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUeUrwfn8eV7wMAKUc07ZGmgkYLlEwDQYJKoZIhvcNAQEL
 						BQAwKjEoMCYGA1UEAwwfc2hpYmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azAe
 						Fw0xNjAzMDIxMDUwMDhaFw0zNjAzMDIxMDUwMDhaMCoxKDAmBgNVBAMMH3NoaWJi
@@ -30,13 +30,13 @@
 						WkzUxvLjtpBwGm1bOfM3XPYJBoJWqoqjRmoDtR6SBSqOgmO7vjNtl8kjZLlTRZdk
 						eYG8
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaTCCAlGgAwIBAgIUIeN5jZsSzAcb2LW8bTcrPpssrAMwDQYJKoZIhvcNAQEL
 						BQAwKjEoMCYGA1UEAwwfc2hpYmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azAe
 						Fw0xNTEyMTUxNDA0MzFaFw0zNTEyMTUxNDA0MzFaMCoxKDAmBgNVBAMMH3NoaWJi
@@ -57,13 +57,13 @@
 						wTtNRcQka7nM0CXKQPgUP+zULpUqtk47s2x+uhefQ+qVhTmutZCBVEAXixGIHFMO
 						K8hBbbWUiyxS+GybHw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAPqmCT0Ahju+ep1NWBHcl7O+rWdGMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH3NoaWJib2xldGguc3Ryb2RlLWNvbGxlZ2UuYWMudWsw
 						HhcNMTUxMjE1MTQwNDMyWhcNMzUxMjE1MTQwNDMyWjAqMSgwJgYDVQQDDB9zaGli
@@ -84,26 +84,26 @@
 						eFvAhZ8A0yWIjBQBrNoSioh3J6VSw7HSuxu0m1JBffFpNDLhL5sJAyXhFJkydt2q
 						PU3ATsD9UnzXDoGJ498=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.strode-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strode-college.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.strode-college.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strode-college.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAJntQd3zmX8WBC+SNhfvwsTDxfNlMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH3NoaWJib2xldGguc3Ryb2RlLWNvbGxlZ2UuYWMudWsw
 						HhcNMTUxMjE1MTQwNDMyWhcNMzUxMjE1MTQwNDMyWjAqMSgwJgYDVQQDDB9zaGli
@@ -124,13 +124,13 @@
 						tGBNOAqYBQNxnHBnz/6rD+BYlxhu/V3uZ9SCu3UXZs5W4vhTCkGiFRQcAP/SxVsf
 						3B5akr7dC/bb7T2KJ9A=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaTCCAlGgAwIBAgIUIeN5jZsSzAcb2LW8bTcrPpssrAMwDQYJKoZIhvcNAQEL
 						BQAwKjEoMCYGA1UEAwwfc2hpYmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azAe
 						Fw0xNTEyMTUxNDA0MzFaFw0zNTEyMTUxNDA0MzFaMCoxKDAmBgNVBAMMH3NoaWJi
@@ -151,13 +151,13 @@
 						wTtNRcQka7nM0CXKQPgUP+zULpUqtk47s2x+uhefQ+qVhTmutZCBVEAXixGIHFMO
 						K8hBbbWUiyxS+GybHw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDajCCAlKgAwIBAgIVAPqmCT0Ahju+ep1NWBHcl7O+rWdGMA0GCSqGSIb3DQEB
 						CwUAMCoxKDAmBgNVBAMMH3NoaWJib2xldGguc3Ryb2RlLWNvbGxlZ2UuYWMudWsw
 						HhcNMTUxMjE1MTQwNDMyWhcNMzUxMjE1MTQwNDMyWjAqMSgwJgYDVQQDDB9zaGli
@@ -178,27 +178,27 @@
 						eFvAhZ8A0yWIjBQBrNoSioh3J6VSw7HSuxu0m1JBffFpNDLhL5sJAyXhFJkydt2q
 						PU3ATsD9UnzXDoGJ498=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Strode College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Strode College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.strode-college.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Seymour</md:SurName>
-      <md:EmailAddress>mailto:mseymour@strode-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Seymour</md:SurName>
-      <md:EmailAddress>mailto:mseymour@strode-college.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Strode College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Strode College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.strode-college.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Seymour</md:SurName>
+    <md:EmailAddress>mailto:mseymour@strode-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Seymour</md:SurName>
+    <md:EmailAddress>mailto:mseymour@strode-college.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml
index 3494e62d..f15c9653 100644
--- a/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.stvincent.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-16T17:32:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-16T17:32:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stvincent.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stvincent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+zCCAuOgAwIBAgIJAPVJaPGZ6hp0MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRAwDgYDVQQHDAdHb3Nwb3J0MRww
 						GgYDVQQKDBNTdC4gVmluY2VudCBDb2xsZWdlMRswGQYDVQQLDBJDb21wdXRpbmcg
@@ -36,26 +36,26 @@
 						FKaMmHp4zIQhAhM6MoWEzMJloMkRZjwa85MIVdCr7Ffyi4qhd/SlMgEsjP8Aqtih
 						Xptt+IaBrxyoISOIgH+z
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stvincent.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stvincent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stvincent.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stvincent.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+zCCAuOgAwIBAgIJAPVJaPGZ6hp0MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRAwDgYDVQQHDAdHb3Nwb3J0MRww
 						GgYDVQQKDBNTdC4gVmluY2VudCBDb2xsZWdlMRswGQYDVQQLDBJDb21wdXRpbmcg
@@ -79,27 +79,27 @@
 						FKaMmHp4zIQhAhM6MoWEzMJloMkRZjwa85MIVdCr7Ffyi4qhd/SlMgEsjP8Aqtih
 						Xptt+IaBrxyoISOIgH+z
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St Vincent College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St Vincent College: Computing Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stvincent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lukasz</md:GivenName>
-      <md:SurName>Grochowicz</md:SurName>
-      <md:EmailAddress>mailto:lukasz@stvincent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lukasz</md:GivenName>
-      <md:SurName>Grochowicz</md:SurName>
-      <md:EmailAddress>mailto:lukasz@stvincent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St Vincent College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St Vincent College: Computing Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stvincent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lukasz</md:GivenName>
+    <md:SurName>Grochowicz</md:SurName>
+    <md:EmailAddress>mailto:lukasz@stvincent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lukasz</md:GivenName>
+    <md:SurName>Grochowicz</md:SurName>
+    <md:EmailAddress>mailto:lukasz@stvincent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
index 51d9492a..f48418b7 100644
--- a/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.techlib.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-05T12:59:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-05T12:59:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">techlib.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for National Library of Technology in Prague.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Národní technickou knihovnu v Praze.</mdui:Description>
+        <mdui:Logo height="40" width="67">https://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">techlib.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for National Library of Technology in Prague.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro Národní technickou knihovnu v Praze.</mdui:Description>
-          <mdui:Logo height="40" width="67">https://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
 MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
 bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
@@ -46,32 +46,32 @@ CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
 X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
 cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
 mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.techlib.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">techlib.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
-          <mdui:Logo height="40" width="67">http://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.techlib.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">techlib.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
+        <mdui:Logo height="40" width="67">http://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
 MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
 bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
@@ -89,26 +89,26 @@ CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
 X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
 cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
 mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Library of Technology</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Narodni technicka knihovna</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Library of Technology</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.techlib.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ondrej</md:GivenName>
-      <md:SurName>Koch</md:SurName>
-      <md:EmailAddress>ondrej.koch@techlib.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Library of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Narodni technicka knihovna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Library of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.techlib.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ondrej</md:GivenName>
+    <md:SurName>Koch</md:SurName>
+    <md:EmailAddress>ondrej.koch@techlib.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml
index 32c365f4..5b2c4726 100644
--- a/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.truro-penwith.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-24T12:37:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-24T12:37:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">truro-penwith.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">truro-penwith.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZTCCAk2gAwIBAgIUVIqVGTLdOThvAs45mIha28LOG0cwDQYJKoZIhvcNAQEF
 						BQAwKTEnMCUGA1UEAxMec2hpYmJvbGV0aC50cnVyby1wZW53aXRoLmFjLnVrMB4X
 						DTEzMDcyNTA5MjU1OFoXDTMzMDcyNTA5MjU1OFowKTEnMCUGA1UEAxMec2hpYmJv
@@ -33,26 +33,26 @@
 						kUAJtuR24UgajKJGGInWVDBNlXJMCNyAVoSevzXTO6Dp+XDyDdOY/Dt8MMSvKPc4
 						SZjtHVMDghth
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">truro-penwith.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">truro-penwith.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZTCCAk2gAwIBAgIUVIqVGTLdOThvAs45mIha28LOG0cwDQYJKoZIhvcNAQEF
 						BQAwKTEnMCUGA1UEAxMec2hpYmJvbGV0aC50cnVyby1wZW53aXRoLmFjLnVrMB4X
 						DTEzMDcyNTA5MjU1OFoXDTMzMDcyNTA5MjU1OFowKTEnMCUGA1UEAxMec2hpYmJv
@@ -73,27 +73,27 @@
 						kUAJtuR24UgajKJGGInWVDBNlXJMCNyAVoSevzXTO6Dp+XDyDdOY/Dt8MMSvKPc4
 						SZjtHVMDghth
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Truro and Penwith College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Truro and Penwith College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.truro-penwith.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Stephens</md:SurName>
-      <md:EmailAddress>mailto:roberts@truro-penwith.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Stephens</md:SurName>
-      <md:EmailAddress>mailto:roberts@truro-penwith.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Truro and Penwith College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Truro and Penwith College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.truro-penwith.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Stephens</md:SurName>
+    <md:EmailAddress>mailto:roberts@truro-penwith.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Stephens</md:SurName>
+    <md:EmailAddress>mailto:roberts@truro-penwith.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
index 266d51ab..1556b8da 100644
--- a/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.turnitinuk.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-18T10:58:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-18T10:58:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEJDCCAwygAwIBAgIJANNCqdS5T/uTMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
 						VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDET
 						MBEGA1UECgwKaVBhcmFkaWdtczEgMB4GA1UEAwwXc2hpYmJvbGV0aC5zdWJtaXQu
@@ -39,42 +39,42 @@
 						Q/KYFVKd7S68jRoJ05AH/RvuEL7Fr8hSYJHhs26lgTM9MFU79jjzfhH4OvYyjoK5
 						Bqox791QdCs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">TurnitinUK</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">iParadigms Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">iParadigms: TurnitinUK</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.turnitinuk.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth admin</md:GivenName>
-      <md:EmailAddress>mailto:shibadmin@turnitin.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth admin</md:GivenName>
-      <md:EmailAddress>mailto:shibadmin@turnitin.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TurnitinUK</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">iParadigms Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">iParadigms: TurnitinUK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.turnitinuk.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth admin</md:GivenName>
+    <md:EmailAddress>mailto:shibadmin@turnitin.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth admin</md:GivenName>
+    <md:EmailAddress>mailto:shibadmin@turnitin.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml
index 34263a23..fa698083 100644
--- a/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.twu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.twu.edu/tis/InCommon_help.asp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">twu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Texas Woman's University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Texas Woman's University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.twu.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.twu.edu/privacy.asp</mdui:PrivacyStatementURL>
+        <mdui:Logo height="536" width="1001" xml:lang="en">https://www.twu.edu/webguide/images/twu-logo-screen.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.twu.edu/tis/InCommon_help.asp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">twu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Texas Woman's University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Texas Woman's University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.twu.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.twu.edu/privacy.asp</mdui:PrivacyStatementURL>
-          <mdui:Logo height="536" width="1001" xml:lang="en">https://www.twu.edu/webguide/images/twu-logo-screen.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAI0T7xzZIygfVuYxMru5q5nZHShqMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVkdTAeFw0xNDA0MDcyMjEw
 MDZaFw0zNDA0MDcyMjEwMDZaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVk
@@ -42,24 +42,24 @@ BTKp7zGJR7u+0fClzPPD0eNrB+Xm/EVxKiy974O3LxRtdM7f1Y+PajUVqEmCrfA8
 liI+dPkY6jYTEUJ5o8LqDH2gOs/p5xDeNllYxA2hcA4ap4RI3SVsKyyJHGLaLyjJ
 epclpLX4uwE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.twu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.twu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.twu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.twu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">twu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.twu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.twu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.twu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.twu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">twu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAI0T7xzZIygfVuYxMru5q5nZHShqMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVkdTAeFw0xNDA0MDcyMjEw
 MDZaFw0zNDA0MDcyMjEwMDZaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVk
@@ -79,30 +79,30 @@ BTKp7zGJR7u+0fClzPPD0eNrB+Xm/EVxKiy974O3LxRtdM7f1Y+PajUVqEmCrfA8
 liI+dPkY6jYTEUJ5o8LqDH2gOs/p5xDeNllYxA2hcA4ap4RI3SVsKyyJHGLaLyjJ
 epclpLX4uwE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Texas Woman's University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Texas Woman's University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.twu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Kerry Williams</md:GivenName>
-      <md:EmailAddress>kwilliams1@twu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Svetlana Galuzinschii</md:GivenName>
-      <md:EmailAddress>sgaluzinschii@twu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Julie Muller</md:GivenName>
-      <md:EmailAddress>jmuller@twu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Svetlana Galuzinschii</md:GivenName>
-      <md:EmailAddress>sgaluzinschii@twu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Texas Woman's University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Texas Woman's University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.twu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Kerry Williams</md:GivenName>
+    <md:EmailAddress>kwilliams1@twu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Svetlana Galuzinschii</md:GivenName>
+    <md:EmailAddress>sgaluzinschii@twu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Julie Muller</md:GivenName>
+    <md:EmailAddress>jmuller@twu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Svetlana Galuzinschii</md:GivenName>
+    <md:EmailAddress>sgaluzinschii@twu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
index 34c1aed6..bb23ea8c 100644
--- a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.u-bourgogne.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T17:33:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T17:33:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bourgogne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Bourgogne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuklEQVQ4y72Sz2sTURDHP29/ZAlZGyMqogaxFENB6KV6UygIgqdeBE8eRcGDlIJHexUR8eYf4CngQWyL6EEUvHgwJ5U2YiFRqkKISXaTvLf7djzIQhXRQ2kHBma+zHznO8MoEWE75myre1cIvse8HKZ0jKWjUzpxQqenWTaWwwCIyD890tIQEdEmkeFYS24/xrIiInhPmtzvG4qZhTPHqFeKtFabLALM17iVKxmJ99x3uB4ZeRMWVFkppgAI5xYk91ctufF5IHN53h3LdK4gMvKpp6U+NonVJpHuWG6KCM7m07u1ykSY/O8WJZ/jEwUuBr7njIxNHMUmgBMWWPdcL8sLswzvbwR9TWNguKpTeuVS4AN3gN+L44SDr79waguk8kAgAjZSwQSAtWkAHkpEOH3tQfvDWvPon1Mr5T2jh0uXnbMzk8FWPMuEfqLu7Q1YcK8sLp2vTs/ue7z67CTA/IVz79c/bhxwXYfhSPtTR/Z7qbW0v3Vpfe3ydq2dmdKhFc+lPjBMqku3l9/N1qooFMXAJ9YGY1KG2uA6Dr1oxMyJKt1+TKlYwKZCYlPCYsCjF41fK+zoK+84wU8yPvqBB/K5mgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowME/UPYgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDErMDI6MDA+iYU0AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-bourgogne.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Bourgogne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bourgogne.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Bourgogne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuklEQVQ4y72Sz2sTURDHP29/ZAlZGyMqogaxFENB6KV6UygIgqdeBE8eRcGDlIJHexUR8eYf4CngQWyL6EEUvHgwJ5U2YiFRqkKISXaTvLf7djzIQhXRQ2kHBma+zHznO8MoEWE75myre1cIvse8HKZ0jKWjUzpxQqenWTaWwwCIyD890tIQEdEmkeFYS24/xrIiInhPmtzvG4qZhTPHqFeKtFabLALM17iVKxmJ99x3uB4ZeRMWVFkppgAI5xYk91ctufF5IHN53h3LdK4gMvKpp6U+NonVJpHuWG6KCM7m07u1ykSY/O8WJZ/jEwUuBr7njIxNHMUmgBMWWPdcL8sLswzvbwR9TWNguKpTeuVS4AN3gN+L44SDr79waguk8kAgAjZSwQSAtWkAHkpEOH3tQfvDWvPon1Mr5T2jh0uXnbMzk8FWPMuEfqLu7Q1YcK8sLp2vTs/ue7z67CTA/IVz79c/bhxwXYfhSPtTR/Z7qbW0v3Vpfe3ydq2dmdKhFc+lPjBMqku3l9/N1qooFMXAJ9YGY1KG2uA6Dr1oxMyJKt1+TKlYwKZCYlPCYsCjF41fK+zoK+84wU8yPvqBB/K5mgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowME/UPYgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDErMDI6MDA+iYU0AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-bourgogne.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Bourgogne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUDCCAjigAwIBAgIVAIeNiIDKvgtvFqf45aiuB8pnYHO3MA0GCSqGSIb3DQEB
 BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudS1ib3VyZ29nbmUuZnIwHhcNMTMw
 MzA0MTQwODU5WhcNMzMwMzA0MTQwODU5WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -38,21 +38,21 @@ vK4DxIEhIEeNjucQ1nOS0k1U1Yz/vjQ0BtSxOj+ULknjrXLlA+LKXtvi5se+1xu2
 fIZ7HFB/k2F6vh0EBz5mpkF3wzax185buQRXhVht8HNm6NBoORp/QxhZmG5RUT5T
 yV61jCIPDC1n3CFjzdLHuvT82V/1Rus0mDey+D8kXZygQRbs
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-bourgogne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Bourgogne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Bourgogne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-bourgogne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@u-bourgogne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-bourgogne.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Bourgogne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bourgogne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-bourgogne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@u-bourgogne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
index c18f4c36..7b1b08b4 100644
--- a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.u-grenoble3.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-04T17:11:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-04T17:11:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-grenoble3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université  Stendhal - Grenoble 3</mdui:DisplayName>
+        <mdui:Logo height="16" width="15">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAPAAAAEACuRh2NAAABz0lEQVQoz5WRzWpTQRTHf2dmMvcmN21abxs0sQZRBBH8WAnizpfQh8gD1IVLHyBv4Kr4Crp278aNtkKsFLQLadp83Ll3ZlykbVqKtP7hMMPh/Ob8zxwZDAav+/3+pp9M9xGEyxSJulFfeb+1tWViw7b5vN389OR503ILLvACxONTcOzx+M0m8rTbMSI6UsyY8AvP0iVthYIfuMMRonrBzHMKjUGRXgprckTVgIA6O8xVFM/UqSsR/9B/wufdmcXVH8fJDy/K5TR3sst4Fo4ISyT3bgKBMJqB0UhtHmE8IxYe3cqodg6I8YJtjUkzdJrNDTiPeNA6QWlLdBWCOoeYhT2HpDVqrQydpaAUptVEZw3KPyNC6ZAgsPP1dKj5M8FTMiEWU5AA4rFryyTddfRSHaUD6fUcnRkq9gjV9Lhz6SG/RvvZS2o32hhbQ63mEAPF8DeynKHydYLWmLWU9otXJA/vg6sw0Tm406Xz7i1HkzH56iqzsqQYHdLaP2DcSJDOOsXRmKzZpNlooBILHz9gfFVZlNC5e/v8SkOk/PKNvNOGfOXixqsqEeBBr9d79HM4nNl6HTedoq1F1+tMvcNqi3YOAOcc3ns2Njbs7u7u97/He58iedZbTQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MyswMjowMGGa1lEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDMrMDI6MDAQx27tAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.u-grenoble3.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université  Stendhal - Grenoble 3</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-grenoble3.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université  Stendhal - Grenoble 3</mdui:DisplayName>
-          <mdui:Logo height="16" width="15">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAPAAAAEACuRh2NAAABz0lEQVQoz5WRzWpTQRTHf2dmMvcmN21abxs0sQZRBBH8WAnizpfQh8gD1IVLHyBv4Kr4Crp278aNtkKsFLQLadp83Ll3ZlykbVqKtP7hMMPh/Ob8zxwZDAav+/3+pp9M9xGEyxSJulFfeb+1tWViw7b5vN389OR503ILLvACxONTcOzx+M0m8rTbMSI6UsyY8AvP0iVthYIfuMMRonrBzHMKjUGRXgprckTVgIA6O8xVFM/UqSsR/9B/wufdmcXVH8fJDy/K5TR3sst4Fo4ISyT3bgKBMJqB0UhtHmE8IxYe3cqodg6I8YJtjUkzdJrNDTiPeNA6QWlLdBWCOoeYhT2HpDVqrQydpaAUptVEZw3KPyNC6ZAgsPP1dKj5M8FTMiEWU5AA4rFryyTddfRSHaUD6fUcnRkq9gjV9Lhz6SG/RvvZS2o32hhbQ63mEAPF8DeynKHydYLWmLWU9otXJA/vg6sw0Tm406Xz7i1HkzH56iqzsqQYHdLaP2DcSJDOOsXRmKzZpNlooBILHz9gfFVZlNC5e/v8SkOk/PKNvNOGfOXixqsqEeBBr9d79HM4nNl6HTedoq1F1+tMvcNqi3YOAOcc3ns2Njbs7u7u97/He58iedZbTQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MyswMjowMGGa1lEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDMrMDI6MDAQx27tAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.u-grenoble3.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université  Stendhal - Grenoble 3</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTzCCAjegAwIBAgIUO6lqrfWSVSjaNN+/XubYFEzq/2wwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5mcjAeFw0xMjEw
 MDgxNTIyMjNaFw0zMjEwMDgxNTIyMjNaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
@@ -38,26 +38,26 @@ LyfZM9UG3qLF7Q9UlHIOCpDOjYYXlD2zvXOtLTzmAX5H7fOPB5XKVfjbIR/WWXQY
 H7UnPfxPl4S6DAIEqMYzLudE8UTRTFkH71vWltAiy0ToSd6CVZsTk/Cn8mxfF0fv
 7AfOWGusEGvE6fUm9UEo+KJ1uM2hXH6+WCuSYIeYj7YWKS8=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-grenoble3.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université  Stendhal - Grenoble 3</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université  Stendhal - Grenoble 3</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.u-grenoble3.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Yoann MITAINE</md:SurName>
-      <md:EmailAddress>yoann.mitaine@u-grenoble3.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Nicolay DIMITROV</md:SurName>
-      <md:EmailAddress>nicolay.dimitrov@u-grenoble3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-grenoble3.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université  Stendhal - Grenoble 3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université  Stendhal - Grenoble 3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.u-grenoble3.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Yoann MITAINE</md:SurName>
+    <md:EmailAddress>yoann.mitaine@u-grenoble3.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Nicolay DIMITROV</md:SurName>
+    <md:EmailAddress>nicolay.dimitrov@u-grenoble3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml
index 0365e53f..e527b867 100644
--- a/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uams.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uams.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Arkansas for Medical Sciences</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uams.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Arkansas for Medical Sciences</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIF6DCCA9ACAQEwDQYJKoZIhvcNAQEFBQAwgbkxCzAJBgNVBAYTAlVTMREwDwYD
 VQQIEwhBcmthbnNhczEUMBIGA1UEBxMLTGl0dGxlIFJvY2sxNDAyBgNVBAoTK1Vu
 aXZlcnNpdHkgb2YgQXJrYW5zYXMgZm9yIE1lZGljYWwgU2NpZW5jZXMxCzAJBgNV
@@ -52,22 +52,22 @@ jPT8ic+thGwdiyXVouxToFoDS+IHHhQXkH4tNTZSVK8g8do5V5mxSJLq2QiySAKj
 /oQmUfmngWJ89KOYIv/FBO1yVwq3LUuwc1bDS+6zYsmOTIdNTjl+HGmq07Nu5IEV
 5CGF3Xf3OCIcIPuFxeF6aJA+h9o82twJq3mwpw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uams.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uams.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uams.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uams.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uams.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uams.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uams.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uams.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uams.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uams.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIF6DCCA9ACAQEwDQYJKoZIhvcNAQEFBQAwgbkxCzAJBgNVBAYTAlVTMREwDwYD
 VQQIEwhBcmthbnNhczEUMBIGA1UEBxMLTGl0dGxlIFJvY2sxNDAyBgNVBAoTK1Vu
 aXZlcnNpdHkgb2YgQXJrYW5zYXMgZm9yIE1lZGljYWwgU2NpZW5jZXMxCzAJBgNV
@@ -101,22 +101,22 @@ jPT8ic+thGwdiyXVouxToFoDS+IHHhQXkH4tNTZSVK8g8do5V5mxSJLq2QiySAKj
 /oQmUfmngWJ89KOYIv/FBO1yVwq3LUuwc1bDS+6zYsmOTIdNTjl+HGmq07Nu5IEV
 5CGF3Xf3OCIcIPuFxeF6aJA+h9o82twJq3mwpw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uams.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Arkansas for Medical Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Arkansas for Medical Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uams.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Keith A. Powell</md:GivenName>
-      <md:EmailAddress>kapowell@uams.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Steve W. Cochran</md:GivenName>
-      <md:EmailAddress>CochranStephenW@uams.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uams.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Arkansas for Medical Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Arkansas for Medical Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uams.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Keith A. Powell</md:GivenName>
+    <md:EmailAddress>kapowell@uams.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Steve W. Cochran</md:GivenName>
+    <md:EmailAddress>CochranStephenW@uams.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml
index f46650ae..4a211a30 100644
--- a/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uchastings.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchastings.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California Hastings College of the Law</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchastings.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California Hastings College of the Law</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTzCCAjegAwIBAgIULgOAs/Tf+A5icFcGA4Rhib2qyiIwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51Y2hhc3RpbmdzLmVkdTAeFw0xMjEx
 MjAwMjUzMTRaFw0zMjExMjAwMjUzMTRaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
@@ -38,23 +38,23 @@ lrY2fAeErFDqKpITwtKShev1mjxe/XdvgkWhSudryLi6KAiXZVAI58YJjDvnenXq
 cNfywjmUvtBaLs4PBLUGOdECvQ9b/yAV4OrVAkQhJmv2Qa8SRVCLVzhs9pui8DlJ
 Bd22SCSfMLz0OSX/8PQPqMyFNzt+pG3rP4r+8yHg/8wjgtE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uchastings.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uchastings.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uchastings.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchastings.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uchastings.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uchastings.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uchastings.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchastings.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTzCCAjegAwIBAgIULgOAs/Tf+A5icFcGA4Rhib2qyiIwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51Y2hhc3RpbmdzLmVkdTAeFw0xMjEx
 MjAwMjUzMTRaFw0zMjExMjAwMjUzMTRaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
@@ -74,22 +74,22 @@ lrY2fAeErFDqKpITwtKShev1mjxe/XdvgkWhSudryLi6KAiXZVAI58YJjDvnenXq
 cNfywjmUvtBaLs4PBLUGOdECvQ9b/yAV4OrVAkQhJmv2Qa8SRVCLVzhs9pui8DlJ
 Bd22SCSfMLz0OSX/8PQPqMyFNzt+pG3rP4r+8yHg/8wjgtE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California Hastings College of the Law</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California Hastings College of the Law</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uchastings.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ronald Proschan</md:GivenName>
-      <md:EmailAddress>proschan@uchastings.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ronald Proschan</md:GivenName>
-      <md:EmailAddress>proschan@uchastings.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California Hastings College of the Law</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California Hastings College of the Law</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uchastings.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ronald Proschan</md:GivenName>
+    <md:EmailAddress>proschan@uchastings.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ronald Proschan</md:GivenName>
+    <md:EmailAddress>proschan@uchastings.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml
index f2e5a2a9..8eaa576d 100644
--- a/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uconn.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uconn.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Connecticut</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uconn.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Connecticut</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAM0bjDh08PO/4qtkatg7X4k6+BN1MA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudWNvbm4uZWR1MB4XDTExMTIwNzE2
 MTIzMFoXDTMxMTIwNzE2MTIzMFowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51Y29u
@@ -38,24 +38,24 @@ SPGQ7Db04FPcLLncNwkIeT0h235ZPOo6wM0Utwa6e+n2hhV4AVKj/r4U/F6CAPuC
 +7lvO1Xvsty0e7ruYk84+USBla8u5Iq8tJokQk8dboLLJQViygVpiVdS6oCwZDG7
 K1bUJ0l1vnaNfRNJ/rLFgg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uconn.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uconn.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uconn.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uconn.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAM0bjDh08PO/4qtkatg7X4k6+BN1MA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudWNvbm4uZWR1MB4XDTExMTIwNzE2
 MTIzMFoXDTMxMTIwNzE2MTIzMFowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51Y29u
@@ -75,31 +75,31 @@ SPGQ7Db04FPcLLncNwkIeT0h235ZPOo6wM0Utwa6e+n2hhV4AVKj/r4U/F6CAPuC
 +7lvO1Xvsty0e7ruYk84+USBla8u5Iq8tJokQk8dboLLJQViygVpiVdS6oCwZDG7
 K1bUJ0l1vnaNfRNJ/rLFgg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Connecticut</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Connecticut</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uconn.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marc Jones</md:GivenName>
-      <md:EmailAddress>marc.jones@uconn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marc Jones</md:GivenName>
-      <md:EmailAddress>marc.jones@uconn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Center</md:GivenName>
-      <md:EmailAddress>helpcenter@uconn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Information Security</md:GivenName>
-      <md:EmailAddress>security@uconn.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Connecticut</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Connecticut</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uconn.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc Jones</md:GivenName>
+    <md:EmailAddress>marc.jones@uconn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marc Jones</md:GivenName>
+    <md:EmailAddress>marc.jones@uconn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Center</md:GivenName>
+    <md:EmailAddress>helpcenter@uconn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Information Security</md:GivenName>
+    <md:EmailAddress>security@uconn.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
index b0b33640..8b65ed9a 100644
--- a/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ucs.org.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-27T12:19:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-27T12:19:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.org.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUXs62jEnH5FsW4cjbIFYDsu/rYeUwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
 						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
@@ -32,13 +32,13 @@
 						y9uFaB1FlLq7QvRs9Nqqos8621+YaSci+fS3lJbSoQM8UKwolsl3DNcPh4QtOOBT
 						zs3XPrEtTuaOzNRQRXwFfO0baA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAK5lpCtEt0YEj/CJZgaG7dPZIw7xMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNzLm9yZy51azAeFw0xNTEwMjcw
 						NzU5MTZaFw0zNTEwMjcwNjU5MTZaMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNz
@@ -58,13 +58,13 @@
 						iw8/udM/e21y7rZAThdDQn6RfrEkdcfKHEt4mhT9sltGkj47/ijjJoO4SLIMn2gy
 						7x54O572tP8flTqE+GyCEuwQj0w=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUAdfxtpW8SR/vWxMYD8AA9FJnV9AwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
 						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
@@ -84,26 +84,26 @@
 						itkouztW7o137ACQFkenM95VyKqQm5/dBdQ71j0XR2ZKCypd6n2aa5HlVfAsa9R5
 						pI6zE5tbN6oDkV62/80Ft22n6A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucs.org.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.org.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucs.org.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucs.org.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUXs62jEnH5FsW4cjbIFYDsu/rYeUwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
 						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
@@ -123,13 +123,13 @@
 						y9uFaB1FlLq7QvRs9Nqqos8621+YaSci+fS3lJbSoQM8UKwolsl3DNcPh4QtOOBT
 						zs3XPrEtTuaOzNRQRXwFfO0baA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAK5lpCtEt0YEj/CJZgaG7dPZIw7xMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNzLm9yZy51azAeFw0xNTEwMjcw
 						NzU5MTZaFw0zNTEwMjcwNjU5MTZaMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNz
@@ -149,13 +149,13 @@
 						iw8/udM/e21y7rZAThdDQn6RfrEkdcfKHEt4mhT9sltGkj47/ijjJoO4SLIMn2gy
 						7x54O572tP8flTqE+GyCEuwQj0w=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUAdfxtpW8SR/vWxMYD8AA9FJnV9AwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
 						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
@@ -175,24 +175,24 @@
 						itkouztW7o137ACQFkenM95VyKqQm5/dBdQ71j0XR2ZKCypd6n2aa5HlVfAsa9R5
 						pI6zE5tbN6oDkV62/80Ft22n6A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College School</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucs.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Meilack</md:SurName>
-      <md:EmailAddress>mailto:matt.meilack@ucs.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Meilack</md:SurName>
-      <md:EmailAddress>mailto:matt.meilack@ucs.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucs.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Meilack</md:SurName>
+    <md:EmailAddress>mailto:matt.meilack@ucs.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Meilack</md:SurName>
+    <md:EmailAddress>mailto:matt.meilack@ucs.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
index 0128508d..2444a21f 100644
--- a/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ufsc.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufsc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufsc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsc.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufsc.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufsc.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
 BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
 VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
@@ -44,26 +44,26 @@ sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
 0Zsj1b736wkbB0weh6x+SjGFDGvN0Pqy6oMe1Up1GltN2e2mwU//UUWTp7hwgRuK
 O/t+U9FZLkeIH0u6xb0pl+3M4vupjleTToU=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ufsc.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsc.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ufsc.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufsc.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
 BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
@@ -87,24 +87,24 @@ sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
 O/t+U9FZLkeIH0u6xb0pl+3M4vupjleTToU=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufsc.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufsc.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Marcio Clemes</md:SurName>
-      <md:EmailAddress>marcio@npd.ufsc.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufsc.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufsc.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marcio Clemes</md:SurName>
+    <md:EmailAddress>marcio@npd.ufsc.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml
index 3512d419..ded54aa2 100644
--- a/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uic.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shibboleth.uic.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uic.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Illinois at Chicago</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shibboleth.uic.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uic.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Illinois at Chicago</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAMnh1KsacvUeMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudWljLmVkdTAeFw0xMTA3MTgxNjQzNDdaFw0yMTA3MTUx
 NjQzNDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudWljLmVkdTCCASIwDQYJKoZI
@@ -41,25 +41,25 @@ I7vNFfld6a9DYkGUK59mwUwfVU1syUk0Eht25bNa4wKkWGf4OYV83x36xWMyN2Yy
 9fvlUHzM13HdEFvfPytJ2z1wpDUVZaGJ5LWb13cSpTZ2yEyllrRW8we9Paoac8js
 Ej+l4a6PybN1ttx/R08j
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uic.edu/idp/cgi-bin/shib-logout.cgi?return=https://shibboleth.uic.edu/shibboleth-logout.html"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uic.edu/shibboleth-idp/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uic.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uic.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uic.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uic.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uic.edu/idp/cgi-bin/shib-logout.cgi?return=https://shibboleth.uic.edu/shibboleth-logout.html"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uic.edu/shibboleth-idp/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uic.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uic.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uic.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uic.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAMnh1KsacvUeMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudWljLmVkdTAeFw0xMTA3MTgxNjQzNDdaFw0yMTA3MTUx
 NjQzNDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudWljLmVkdTCCASIwDQYJKoZI
@@ -79,31 +79,31 @@ I7vNFfld6a9DYkGUK59mwUwfVU1syUk0Eht25bNa4wKkWGf4OYV83x36xWMyN2Yy
 9fvlUHzM13HdEFvfPytJ2z1wpDUVZaGJ5LWb13cSpTZ2yEyllrRW8we9Paoac8js
 Ej+l4a6PybN1ttx/R08j
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uic.edu:8443/shibboleth-idp/AA"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Illinois at Chicago</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Illinois at Chicago</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uic.edu/index.html/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roberto Ullfig</md:GivenName>
-      <md:EmailAddress>rullfig@uic.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mathew Willis</md:GivenName>
-      <md:EmailAddress>mat@uic.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Johnathan Kupferer</md:GivenName>
-      <md:EmailAddress>jtk@uic.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Allen Randall</md:GivenName>
-      <md:EmailAddress>wallenr@uic.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uic.edu:8443/shibboleth-idp/AA"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Illinois at Chicago</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Illinois at Chicago</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uic.edu/index.html/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roberto Ullfig</md:GivenName>
+    <md:EmailAddress>rullfig@uic.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mathew Willis</md:GivenName>
+    <md:EmailAddress>mat@uic.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johnathan Kupferer</md:GivenName>
+    <md:EmailAddress>jtk@uic.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Allen Randall</md:GivenName>
+    <md:EmailAddress>wallenr@uic.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
index 09a0c1e8..2f6431d4 100644
--- a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ujf-grenoble.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-13T14:58:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-13T14:58:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf-grenoble.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACoElEQVQozwXBy4tbVRwH8O8593fOfeTeO5kkN036SK3FgjLi/AGiKAhuxOnKhSAuBFfiRpD+FV3qxoUrN8Jsu7DduLAiVuoDtAqOw+Qyk8lkktzkvs7Lz4e15Vb4NVxYIoz4wp4ccPd9Pb9y+PizM9NVgX4z/+tmMRus+4+z7HyckmCRtdGFZzyGEFUZRKxC4wcP/niqS9q/3Kr8aLupf9gdPsl6l/OIwNEQAnhJsUF+FBdDp+/weoTOztVq+dZ8/ULFHHrH49E6jrxQkGELi15it8svv2oPHxL9eR7mK6vivf29RXF7s2ylebKb/N2NSyYyxcjjJAC0upyd6umqS8lu+twgnqStful8K2x5lMbf3ewUJJWzNeeEJhUBtO/TO28kg0nx86P5v790bd2v6mHd1CTzTnocx3FlFVcXAREI2qAWbOe11/29V7Wb6emv1rK98w3X6iLw/+l0mfGdq8JWVdanS9l2YDxsgD48X1R+UoSJ6++72nBeyOhkJwkMtUKPqtZvGAlIaSyZkFdAhIWaboJyl51qZ0pySeDu/vdbGXIRXBGffyLZVSIARtck/RRetV79/uwaT7erykspU7J9tsocN4kw42hw+2V0M+IAOAevPGfzB4ejy9oURiaZaReVjPQrLyq/o3xP7PQQhLAg4QAOgQKPfiy+/rZ/UZajQW84WT6duhu3bt2/h8k1xxgrVBMGvgK3Bo5zdTY/++Kb3k/HuXbX37+7SSUDNDgm12uRlhQj6SpjwcGtdQY8inpqUSkZP//Rh/Lg7Wa5DCm40R+DEwd8MGjEkHAgJw2BXNIfv3cwO5nFn36s9LyTL1ZNPUxT46EGJEAEcDiAHJxtUUjqfvDuWPinJNrpPJsVeUTWJw82bFrhSRhowhr4H08ZSnLvV/9qAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ujf-grenoble.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf-grenoble.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACoElEQVQozwXBy4tbVRwH8O8593fOfeTeO5kkN036SK3FgjLi/AGiKAhuxOnKhSAuBFfiRpD+FV3qxoUrN8Jsu7DduLAiVuoDtAqOw+Qyk8lkktzkvs7Lz4e15Vb4NVxYIoz4wp4ccPd9Pb9y+PizM9NVgX4z/+tmMRus+4+z7HyckmCRtdGFZzyGEFUZRKxC4wcP/niqS9q/3Kr8aLupf9gdPsl6l/OIwNEQAnhJsUF+FBdDp+/weoTOztVq+dZ8/ULFHHrH49E6jrxQkGELi15it8svv2oPHxL9eR7mK6vivf29RXF7s2ylebKb/N2NSyYyxcjjJAC0upyd6umqS8lu+twgnqStful8K2x5lMbf3ewUJJWzNeeEJhUBtO/TO28kg0nx86P5v790bd2v6mHd1CTzTnocx3FlFVcXAREI2qAWbOe11/29V7Wb6emv1rK98w3X6iLw/+l0mfGdq8JWVdanS9l2YDxsgD48X1R+UoSJ6++72nBeyOhkJwkMtUKPqtZvGAlIaSyZkFdAhIWaboJyl51qZ0pySeDu/vdbGXIRXBGffyLZVSIARtck/RRetV79/uwaT7erykspU7J9tsocN4kw42hw+2V0M+IAOAevPGfzB4ejy9oURiaZaReVjPQrLyq/o3xP7PQQhLAg4QAOgQKPfiy+/rZ/UZajQW84WT6duhu3bt2/h8k1xxgrVBMGvgK3Bo5zdTY/++Kb3k/HuXbX37+7SSUDNDgm12uRlhQj6SpjwcGtdQY8inpqUSkZP//Rh/Lg7Wa5DCm40R+DEwd8MGjEkHAgJw2BXNIfv3cwO5nFn36s9LyTL1ZNPUxT46EGJEAEcDiAHJxtUUjqfvDuWPinJNrpPJsVeUTWJw82bFrhSRhowhr4H08ZSnLvV/9qAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ujf-grenoble.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUzCCAjugAwIBAgIUIBrWKHsL8z9pJuwM6Xugq6gtHv0wDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC51amYtZ3Jlbm9ibGUuZnIwHhcNMTIw
 NTMwMTM1OTEwWhcNMzIwNTMwMTM1OTEwWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
@@ -38,21 +38,21 @@ gBnVXFgNP7+m+wjJ8l//EX2x8XGefCEobUFXP1g2xurqfr5Wvm7BlN2dKhhEVn3d
 k1xooEqccP2ldz2s7hAinmiTCGC3nKoSJUpFAkUUo3hEulRnd4KdIqV0Bat0I/qt
 Y8dlCvdx5k6fUjl8mF/ZLzQs6uX9XwCwlb60AKwi9uFRJpFzCX9e
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ujf-grenoble.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>disi-agalan@ujf-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ujf-grenoble.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>disi-agalan@ujf-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml
index 0752b61e..dea2913c 100644
--- a/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ulbra.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulbra.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ULBRA - Universidade Luterana do Brasil</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ULBRA - Universidade Luterana do Brasil</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ulbra.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ulbra.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulbra.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ULBRA - Universidade Luterana do Brasil</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ULBRA - Universidade Luterana do Brasil</mdui:Description>
-          <mdui:Description xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ulbra.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ulbra.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEOMAwGA1UECxMFVUxCUkExCzAJ
 BgNVBAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVsYnJhLmJyMB4XDTE1MDMx
 NzIyNTk1OVoXDTE4MDMxNjIyNTk1OVowOzEOMAwGA1UECxMFVUxCUkExCzAJBgNV
@@ -40,26 +40,26 @@ JjhDlBmnKL+sdr+7Iy7kbAzxe4SMefqUkFc5C66hqmt6rF/yPQbEJyUeE/7LaKYf
 ujFNOSl0ZlMOPaRSj82ZhRvbEOubchgMczz2GNqMfAY4IYo6MlzLvsew8ZJRILgG
 16FzfOW0GeZMJ2tNnrd4cfqeC3lwWz4Bpb6RZdLC
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ulbra.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulbra.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ulbra.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulbra.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEOMAwGA1UECxMFVUxCUkExCzAJ
 BgNVBAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVsYnJhLmJyMB4XDTE1MDMx
@@ -79,24 +79,24 @@ ujFNOSl0ZlMOPaRSj82ZhRvbEOubchgMczz2GNqMfAY4IYo6MlzLvsew8ZJRILgG
 16FzfOW0GeZMJ2tNnrd4cfqeC3lwWz4Bpb6RZdLC
                 
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ULBRA - Universidade Luterana do Brasil</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ULBRA - Universidade Luterana do Brasil</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ulbra.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ulbra.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Suporte</md:SurName>
-      <md:EmailAddress>suporteti@ulbra.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ULBRA - Universidade Luterana do Brasil</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ULBRA - Universidade Luterana do Brasil</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ulbra.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ulbra.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Suporte</md:SurName>
+    <md:EmailAddress>suporteti@ulbra.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml
index 36ac15f3..c3b6c7f9 100644
--- a/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.umich.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.its.umich.edu/help/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flint.umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">annarbor.umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dearborn.umich.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Michigan</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Michigan</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.umich.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.umich.edu/itcsdocs/r1465/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="300" xml:lang="en">https://shibboleth.umich.edu/images/StackedBlockM-InC.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.its.umich.edu/help/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flint.umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">annarbor.umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dearborn.umich.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Michigan</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Michigan</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.umich.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.umich.edu/itcsdocs/r1465/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="300" xml:lang="en">https://shibboleth.umich.edu/images/StackedBlockM-InC.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKTsnSoDNC7AuF7I0MFTRrakT8UzMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudW1pY2guZWR1MB4XDTA5MDMyNTE0
 MzcwMVoXDTI5MDMyNTE0MzcwMVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51bWlj
@@ -49,28 +49,28 @@ JZUi4F4cCLgSEdoliyfSn2Whqwbm2AGfH+77tyFMI2ZhKa9nmskThwmK12Y6ElnS
 9LmVd8q6AjVB3HnwguPOQjs9UBcxb9eeYwhhgUl11nyEmpvIUmYlGKLT/+ghVmTM
 6e4eBYMhFygzksi2hS6UIw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.umich.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.umich.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.umich.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.umich.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flint.umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">annarbor.umich.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dearborn.umich.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.umich.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.umich.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.umich.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.umich.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flint.umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">annarbor.umich.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dearborn.umich.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAKTsnSoDNC7AuF7I0MFTRrakT8UzMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudW1pY2guZWR1MB4XDTA5MDMyNTE0
 MzcwMVoXDTI5MDMyNTE0MzcwMVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51bWlj
@@ -90,35 +90,35 @@ JZUi4F4cCLgSEdoliyfSn2Whqwbm2AGfH+77tyFMI2ZhKa9nmskThwmK12Y6ElnS
 9LmVd8q6AjVB3HnwguPOQjs9UBcxb9eeYwhhgUl11nyEmpvIUmYlGKLT/+ghVmTM
 6e4eBYMhFygzksi2hS6UIw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Liam Hoekenga</md:GivenName>
-      <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS Infrastructure Services Identity and Access Management</md:GivenName>
-      <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>ITS Security</md:GivenName>
-      <md:EmailAddress>security@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bruce Timberlake</md:GivenName>
-      <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>DePriest Dockins</md:GivenName>
-      <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Liam Hoekenga</md:GivenName>
+    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS Infrastructure Services Identity and Access Management</md:GivenName>
+    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>ITS Security</md:GivenName>
+    <md:EmailAddress>security@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bruce Timberlake</md:GivenName>
+    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>DePriest Dockins</md:GivenName>
+    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
index 866ab5fb..94ad340e 100644
--- a/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unb.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNB - Universidade de Brasilia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNB - Universidade de Brasilia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unb.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unb.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNB - Universidade de Brasilia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNB - Universidade de Brasilia</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unb.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unb.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
 aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
 AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
@@ -45,26 +45,26 @@ xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
 99zu7PASZZerAxI9xXpDiD+of+jaX+uI2/zzap1sMVtlaInMICk/Sa1CL2tBGzY8
 MSmJeH91lUYBcieZYDOgno6WAgr1VoZ8Baw=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unb.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unb.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unb.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unb.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
 aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
@@ -89,24 +89,24 @@ xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
 MSmJeH91lUYBcieZYDOgno6WAgr1VoZ8Baw=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNB - Universidade de Brasilia</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNB - Universidade de Brasilia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNB - Universidade de Brasilia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unb.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unb.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Dionisio Miziara</md:SurName>
-      <md:EmailAddress>dionisiojr@unb.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNB - Universidade de Brasilia</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNB - Universidade de Brasilia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNB - Universidade de Brasilia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unb.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unb.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dionisio Miziara</md:SurName>
+    <md:EmailAddress>dionisiojr@unb.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml
index 300abcca..b6bf2e20 100644
--- a/swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.unesp.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unesp.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Unesp - Universidade Estadual Paulista</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Unesp - Universidade Estadual Paulista</mdui:Description>
+        <mdui:Description xml:lang="pt-br">Unesp - Universidade Estadual Paulista</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unesp.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Unesp - Universidade Estadual Paulista</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Unesp - Universidade Estadual Paulista</mdui:Description>
-          <mdui:Description xml:lang="pt-br">Unesp - Universidade Estadual Paulista</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unesp.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxRzBFBgNVBAoTPlVuZXNwIC0g
 VW5pdmVyc2lkYWRlIEVzdGFkdWFsIFBhdWxpc3RhIEp1bGlvIGRlIE1lc3F1aXRh
 IEZpbGhvMQwwCgYDVQQLEwNHUkMxGzAZBgkqhkiG9w0BCQEWDGdyY0B1bmVzcC5i
@@ -46,26 +46,26 @@ AaBcb1B9puJJTo7/JwJR0s8/eeUZU7N18LcyqVsZB0vSkOw8FZ44Q/r9kSVQapOe
 IddLgwQh5RHTTe38Xxu7ar37dDZDOM5GZPIw1Z8AOx46xF+vYWFx+aI1vVR1zOFV
 q0/uXG2icV7Ke+Ss1fXhDq35eQ4xxauY
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unesp.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unesp.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unesp.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unesp.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unesp.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unesp.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unesp.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxRzBFBgNVBAoTPlVuZXNwIC0g
 VW5pdmVyc2lkYWRlIEVzdGFkdWFsIFBhdWxpc3RhIEp1bGlvIGRlIE1lc3F1aXRh
@@ -92,24 +92,24 @@ q0/uXG2icV7Ke+Ss1fXhDq35eQ4xxauY
 
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Unesp - Universidade Estadual Paulista</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Unesp - Universidade Estadual Paulista</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unesp.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unesp.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>GRC</md:SurName>
-      <md:EmailAddress>grc@unesp.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unesp.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Unesp - Universidade Estadual Paulista</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Unesp - Universidade Estadual Paulista</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">Unesp - Universidade Estadual Paulista</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unesp.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unesp.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>GRC</md:SurName>
+    <md:EmailAddress>grc@unesp.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml
index 59dad8c5..a0e3be8b 100644
--- a/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-trier.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-01-08T16:16:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-01-08T16:16:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Trier</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Trier</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universitaet Trier Test IdP (shibboleth.uni-trier.de)</mdui:Description>
+        <mdui:Description xml:lang="en">University of Trier Test IdP (shibboleth.uni-trier.de)</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shibboleth.uni-trier.de/idp/images/logo_uni-trier_klein.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Trier</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Trier</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Universitaet Trier Test IdP (shibboleth.uni-trier.de)</mdui:Description>
-          <mdui:Description xml:lang="en">University of Trier Test IdP (shibboleth.uni-trier.de)</mdui:Description>
-          <mdui:Logo height="16" width="16">https://shibboleth.uni-trier.de/idp/images/logo_uni-trier_klein.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3fO22jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3fO22jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
 bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
 SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjE0WhcNMTkw
@@ -60,15 +60,15 @@ OwTG5ALARhtv23ux8/81j6cEr/yoO/Ji6u66fbTv+Eow6D29vsKXWIpm4U2/Nf7h
 7f5O3UBWFhh2H6J+VZaL5giMtnp1Jf4Hc6CJUIbin6OJHV5H86RWXtM6CMBPvQwD
 66So0BL4l93LdaiKPEcl9bwH+XuUN8LyZg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p2/FggDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p2/FggDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
 bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
 SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjExWhcNMTkw
@@ -106,15 +106,15 @@ Kbx1K3SR00x4fOoOHvk95sh9hpkhaATYJ0xAOl6u2tm06P+RHo3cLWb6CMVX3Cb/
 D4cIRB9DETEzueGA7eLRZiy1MijWJ/DPZmXWPk7nUf/m+fEQLjcU39wY97+cSXPt
 d+AgGBhISGMkYCuP35MDBWIA0yUjdIMhFA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3H46EzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3H46EzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
 bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
 SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjEyWhcNMTkw
@@ -152,31 +152,31 @@ ZDXXnJecWJYksS9f0Z1PTjp5cUQnsDLZI76yZ0H1Oav22qYaASJlkMvtyxvrTbMQ
 j1puu5J79T+gDmwtRNBJBQ1Jbc6sp45Na3obTmLZeBMNWERL2a7ipoQweeh0XhFx
 tQkWiW73DjMOwOmQhPpnYfRM6f+pLmh5iQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni-trier.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3fO22jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni-trier.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3fO22jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
 bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
 SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjE0WhcNMTkw
@@ -214,15 +214,15 @@ OwTG5ALARhtv23ux8/81j6cEr/yoO/Ji6u66fbTv+Eow6D29vsKXWIpm4U2/Nf7h
 7f5O3UBWFhh2H6J+VZaL5giMtnp1Jf4Hc6CJUIbin6OJHV5H86RWXtM6CMBPvQwD
 66So0BL4l93LdaiKPEcl9bwH+XuUN8LyZg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p2/FggDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p2/FggDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
 bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
 SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjExWhcNMTkw
@@ -260,15 +260,15 @@ Kbx1K3SR00x4fOoOHvk95sh9hpkhaATYJ0xAOl6u2tm06P+RHo3cLWb6CMVX3Cb/
 D4cIRB9DETEzueGA7eLRZiy1MijWJ/DPZmXWPk7nUf/m+fEQLjcU39wY97+cSXPt
 d+AgGBhISGMkYCuP35MDBWIA0yUjdIMhFA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3H46EzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3H46EzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
 BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
 bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
 SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjEyWhcNMTkw
@@ -306,33 +306,33 @@ ZDXXnJecWJYksS9f0Z1PTjp5cUQnsDLZI76yZ0H1Oav22qYaASJlkMvtyxvrTbMQ
 j1puu5J79T+gDmwtRNBJBQ1Jbc6sp45Na3obTmLZeBMNWERL2a7ipoQweeh0XhFx
 tQkWiW73DjMOwOmQhPpnYfRM6f+pLmh5iQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e297</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e297</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Trier</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Universität Trier</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">https://www.uni-trier.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.uni-trier.de/?L=2</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Reusch</md:SurName>
-      <md:EmailAddress>mailto:reusch@uni-trier.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Reusch</md:SurName>
-      <md:EmailAddress>mailto:reusch@uni-trier.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ZIMK</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@uni-trier.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e297</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e297</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Trier</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universität Trier</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">https://www.uni-trier.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uni-trier.de/?L=2</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Reusch</md:SurName>
+    <md:EmailAddress>mailto:reusch@uni-trier.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Reusch</md:SurName>
+    <md:EmailAddress>mailto:reusch@uni-trier.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ZIMK</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@uni-trier.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
index 803fccd1..9e7cad42 100644
--- a/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni.opole.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-12-02T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-12-02T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">
          Opole University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">
+        <mdui:DisplayName xml:lang="pl">
          Uniwersytet Opolski</mdui:DisplayName>
-          <mdui:Description xml:lang="en">
+        <mdui:Description xml:lang="en">
          Opole University Identity Provider
     </mdui:Description>
-          <mdui:Description xml:lang="pl">
+        <mdui:Description xml:lang="pl">
        Dostawca Tożsamości Uniwersytetu Opolskiego
     </mdui:Description>
-          <mdui:Logo height="55" width="165" xml:lang="en">https://shibboleth.uni.opole.pl/idp/logouo_header.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="55" width="165" xml:lang="en">https://shibboleth.uni.opole.pl/idp/logouo_header.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUJYgjpRkfWuuLnYgjmOtFu6kZyuQwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MloX
 DTM1MDQzMDA2NTU1MlowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
@@ -50,13 +50,13 @@ VBWHN6W0pQqExq6qXfgcLGnluzqJ0LbNGJrndfKV4WN/MAE52zVo24f9huQandRt
 PTimpBVSen6/qlR87r67YGV6/jgfL3Q8N5g42sT2iT/05Q22aYaIk1+e9X44jIos
 gn4E7aCKeaHFN/LG+NCNR1Fq+g0vDJIPe6FDeaC+kqK84MtvxqxG/wJxBQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVANM9C5l48yMhTAHJ9LbCXXOK1yQHMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzAeFw0xNTA0MzAwNjU1NTBa
 Fw0zNTA0MzAwNjU1NTBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzCCASIw
@@ -75,13 +75,13 @@ OeBnwcw8j36pQHdRlZKQVspAS5h0ePRHbS7luIQDeL8ZUkXIXuLEmnjHXnJzWUCP
 N5DC9rjlhu2+0Z1KeiuZgmVAiB66BFvjXCnkWIK5kh+/C/BYQpgHDx7B9nBYr5Xb
 2iYaqN73c9+XwBSf0+vYLC9Ivn6fAXMUN/wkK1FH9hjX09wBPR8LS2oq5fg=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUEVPEG+BAdndjuiWqotqWKaPL2jowDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MVoX
 DTM1MDQzMDA2NTU1MVowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
@@ -100,26 +100,26 @@ dd55ODSvyXtIcJcCSj4Iuh6iQM+Wlq2PAH4GxhPmevz/Yl/5kEGIKrAjcfDOTwaD
 vp0OaVjVxH3HPESQTqPd2JrOVd4Ghtf59oadIMAwGxQ93/Ci33s9iaoHYEQtnHdQ
 KbGw/zFpxtXvzKZu3tXYOU79RQceiSTlOhm2JNPPL43AwNw6rsX69prLZg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni.opole.pl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni.opole.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUJYgjpRkfWuuLnYgjmOtFu6kZyuQwDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MloX
 DTM1MDQzMDA2NTU1MlowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
@@ -138,13 +138,13 @@ VBWHN6W0pQqExq6qXfgcLGnluzqJ0LbNGJrndfKV4WN/MAE52zVo24f9huQandRt
 PTimpBVSen6/qlR87r67YGV6/jgfL3Q8N5g42sT2iT/05Q22aYaIk1+e9X44jIos
 gn4E7aCKeaHFN/LG+NCNR1Fq+g0vDJIPe6FDeaC+kqK84MtvxqxG/wJxBQ==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVANM9C5l48yMhTAHJ9LbCXXOK1yQHMA0GCSqGSIb3DQEB
 CwUAMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzAeFw0xNTA0MzAwNjU1NTBa
 Fw0zNTA0MzAwNjU1NTBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzCCASIw
@@ -163,13 +163,13 @@ OeBnwcw8j36pQHdRlZKQVspAS5h0ePRHbS7luIQDeL8ZUkXIXuLEmnjHXnJzWUCP
 N5DC9rjlhu2+0Z1KeiuZgmVAiB66BFvjXCnkWIK5kh+/C/BYQpgHDx7B9nBYr5Xb
 2iYaqN73c9+XwBSf0+vYLC9Ivn6fAXMUN/wkK1FH9hjX09wBPR8LS2oq5fg=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUEVPEG+BAdndjuiWqotqWKaPL2jowDQYJKoZIhvcNAQEL
 BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MVoX
 DTM1MDQzMDA2NTU1MVowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
@@ -188,24 +188,24 @@ dd55ODSvyXtIcJcCSj4Iuh6iQM+Wlq2PAH4GxhPmevz/Yl/5kEGIKrAjcfDOTwaD
 vp0OaVjVxH3HPESQTqPd2JrOVd4Ghtf59oadIMAwGxQ93/Ci33s9iaoHYEQtnHdQ
 KbGw/zFpxtXvzKZu3tXYOU79RQceiSTlOhm2JNPPL43AwNw6rsX69prLZg==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pl">Uniwersytet Opolski</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Opole University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Opole University  
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pl">Uniwersytet Opolski</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Opole University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Opole University  
     </md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Opolski</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="pl">http://www.uni.opole.pl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni.opole.pl/en
+    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Opolski</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pl">http://www.uni.opole.pl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni.opole.pl/en
     </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sławomir</md:GivenName>
-      <md:SurName>Paszkiewicz</md:SurName>
-      <md:EmailAddress>mailto:idp@uni.opole.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sławomir</md:GivenName>
+    <md:SurName>Paszkiewicz</md:SurName>
+    <md:EmailAddress>mailto:idp@uni.opole.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
index b9f5d0be..d1912fb3 100644
--- a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
 MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
@@ -41,26 +41,26 @@ saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
 r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
 OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
 MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
@@ -79,23 +79,23 @@ saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
 r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
 OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Studies of Florence</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Firenze</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Florence</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Firenze</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unifi.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unifi.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@unifi.it.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Studies of Florence</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Firenze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Florence</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Firenze</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unifi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@unifi.it.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unisi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unisi.it-idp-shibboleth.xml
index 14c77605..a71d2019 100644
--- a/swamid-interfederations-2.0/shibboleth.unisi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.unisi.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unisi.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-03-17T08:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-03-17T08:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Siena</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Siena</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users of University of Siena</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Siena</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://shibboleth.unisi.it/idem-info-eng.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://shibboleth.unisi.it/idem-info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://shibboleth.unisi.it/idem-privacy-eng.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://shibboleth.unisi.it/idem-privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="59" width="60">https://shibboleth.unisi.it/idp/images/logo_unisi_60px.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unisi.it</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisi.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Siena</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Siena</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for users of University of Siena</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Siena</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://shibboleth.unisi.it/idem-info-eng.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://shibboleth.unisi.it/idem-info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://shibboleth.unisi.it/idem-privacy-eng.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://shibboleth.unisi.it/idem-privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="59" width="60">https://shibboleth.unisi.it/idp/images/logo_unisi_60px.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>unisi.it</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDbDCCAlQCCQDCQNjXPb+J3zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJJ
 VDEOMAwGA1UECAwFU2llbmExDjAMBgNVBAcMBVNpZW5hMRwwGgYDVQQKDBNVbml2
 ZXJzaXRhIGRpIFNpZW5hMQ0wCwYDVQQLDARTUlNTMRwwGgYDVQQDDBNzaGliYm9s
@@ -47,26 +47,26 @@ FcOVtK1g+0cycim0THv3bf8BQXzhhFBNEXDAqkch+Kxp56dV51j+KUZtDKCQpCkL
 BQq/XNsdesbvmPiOtFXYzb7QwydoOR+pPqfHP+MyAbv0aZnyGOv8jtCwpb7KNeX2
 zI5NIIy574GrFouiXR+GCQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unisi.it/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unisi.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unisi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unisi.it/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisi.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unisi.it/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unisi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unisi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unisi.it/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDbDCCAlQCCQDCQNjXPb+J3zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJJ
 VDEOMAwGA1UECAwFU2llbmExDjAMBgNVBAcMBVNpZW5hMRwwGgYDVQQKDBNVbml2
 ZXJzaXRhIGRpIFNpZW5hMQ0wCwYDVQQLDARTUlNTMRwwGgYDVQQDDBNzaGliYm9s
@@ -87,23 +87,23 @@ FcOVtK1g+0cycim0THv3bf8BQXzhhFBNEXDAqkch+Kxp56dV51j+KUZtDKCQpCkL
 BQq/XNsdesbvmPiOtFXYzb7QwydoOR+pPqfHP+MyAbv0aZnyGOv8jtCwpb7KNeX2
 zI5NIIy574GrFouiXR+GCQ==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Siena</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Siena</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Siena</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Siena</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unisi.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://en.unisi.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@unisi.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unisi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Siena</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Siena</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Siena</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Siena</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unisi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://en.unisi.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@unisi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
index ce56681e..8128b39c 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-corse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-06-24T18:11:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-06-24T18:11:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-corse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Corse</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB1klEQVQ4y6WTT0iTcRjHv8+7PzqiLIqSIpQYUUhENt0OssDlal27REI3O1dqq2uI7FZ4yXXpkLEt89Ylagg2sLK2pqHudTrXdDFduZa2et/f9nQIQWxvTvpePzwfnt/veR5gi0RnGcNh7tbi0lYCIeB7OSJ3anG9FngyzDAfxEAwNH1p+Ws+vW1Bo/mH92FgvD2/xpBKhZ3besLzt+wJjcau9nRasKcqjYJSLFUsGImyJ/Jhyr2SW4GiCOjUGC6eQY0i+DYz/1sQmmDP+3DMnUxloddLyGSWoIoSTNVVSH1K9ooiPv9UubWsYHS84H0XnnEnF7IgAnSSDrIs40H/faTTi3g08BjyTLx2PpEIJhcyH/8SqKXqvqXst6JEBAKgChUOx1m4XBdQX1ePtrZziEQiCPj9qdoD+++s19HGdsLTbB16NvY69/0XzIcUXOtoxeDTIcRnEzhtaYbdbr9rMtINzT9oPEZvWlqa7EaDAST9Qd7+PhhMh3NOh402F5edgstGr05ZrJd37TBhbm4eNuctZIQ1OzZprHyRrpwnXzTOHHgx4VN5L/Krq2huoLICzVs4aSZ/3ZET1xkEqfhlX8WLtDHtTrp39HjTTWKxG/+TwSB3abHflUu/94Q3u0cAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-corse.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Corse</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-corse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Corse</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB1klEQVQ4y6WTT0iTcRjHv8+7PzqiLIqSIpQYUUhENt0OssDlal27REI3O1dqq2uI7FZ4yXXpkLEt89Ylagg2sLK2pqHudTrXdDFduZa2et/f9nQIQWxvTvpePzwfnt/veR5gi0RnGcNh7tbi0lYCIeB7OSJ3anG9FngyzDAfxEAwNH1p+Ws+vW1Bo/mH92FgvD2/xpBKhZ3besLzt+wJjcau9nRasKcqjYJSLFUsGImyJ/Jhyr2SW4GiCOjUGC6eQY0i+DYz/1sQmmDP+3DMnUxloddLyGSWoIoSTNVVSH1K9ooiPv9UubWsYHS84H0XnnEnF7IgAnSSDrIs40H/faTTi3g08BjyTLx2PpEIJhcyH/8SqKXqvqXst6JEBAKgChUOx1m4XBdQX1ePtrZziEQiCPj9qdoD+++s19HGdsLTbB16NvY69/0XzIcUXOtoxeDTIcRnEzhtaYbdbr9rMtINzT9oPEZvWlqa7EaDAST9Qd7+PhhMh3NOh402F5edgstGr05ZrJd37TBhbm4eNuctZIQ1OzZprHyRrpwnXzTOHHgx4VN5L/Krq2huoLICzVs4aSZ/3ZET1xkEqfhlX8WLtDHtTrp39HjTTWKxG/+TwSB3abHflUu/94Q3u0cAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-corse.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Corse</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
 MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
@@ -38,23 +38,23 @@ nrsOwXXTta43x7OixVk4T30ALeIRWw9GjwssjHOBI6BvXI36tEM4mjdV6TBP13Qv
 ajnfP3xyXWF0/SRe0vvOEqDioR1lKpoeqvINaa5O4u60VsqOFPoZPmNxASoOnnz8
 T9heLa0GVnNgDEgGzmeVmC1UCkmkhz0s325gEEfxAg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-corse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-corse.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-corse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-corse.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
 MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
@@ -74,20 +74,20 @@ nrsOwXXTta43x7OixVk4T30ALeIRWw9GjwssjHOBI6BvXI36tEM4mjdV6TBP13Qv
 ajnfP3xyXWF0/SRe0vvOEqDioR1lKpoeqvINaa5O4u60VsqOFPoZPmNxASoOnnz8
 T9heLa0GVnNgDEgGzmeVmC1UCkmkhz0s325gEEfxAg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Corse</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Corse</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-corse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>VAREILLE</md:SurName>
-      <md:EmailAddress>vareille@univ-corse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Corse</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Corse</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-corse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>VAREILLE</md:SurName>
+    <md:EmailAddress>vareille@univ-corse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
index 6dd39adf..f90c60c8 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-evry.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-21T11:14:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-21T11:14:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-evry.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université d'Evry Val d'Essonne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXUlEQVQ4y51S4UsTARx9552nU3ckis3MpZmmYYUsBfsQCY3y20jYYBYSQUH/RH2rbxERVGRJoXALLRGiBI0KzEyRSGboMnbblG267dzdrl27+/UpkUit3qcfP3iP93vvB/wjMtGoi4hIIaLxmYVe7m+JSlx2F5cLogpgfFWHZvIoAMsxAKBoJhUXMjAMM8RxrH0zkbR1Nwqt4rIOTIZlzMfWsRRahddxACf25J/jAGAqLKPGykAoyK8mMiWGybMDQEInt8xCfP4hiEAijW8BCYm4jB5nG+oo7eEtVT4OAOalKNTdAuTIMjpbm6qJzH6Gyeue/hwWRyY+IRqNIxVaRjqWRE/XKZysKfHY7DYfAHAAoK7EMCcFIS0GkY2s4Hz3Ge+9vlfem7f6oCeTUGJrYL4bcHs6UVdp2SBvCByvs+H6jQegbAalRgajY+8x0Csim9SgJ3VYhRK4L7rQcLTK43S2+zZnxAFAxS5+IJdKezVFRSyYwNiTCfABoHFfPeqP1cLRcRhCQ5HH0X7I93s7zK9hWHxDI0/HUCGUQp1Ko7yo2I8ydtpzzVVY01b9kmfYR3+qd0OAiGjQ9xraugqhyIraxsr7RxwHL+/0H3mkKy4ioqHRj5BiCexv2gvn2TaU2couzc8tSTsJMIpBdPfZJNYCEXQ02+FobwLLmuB5Dixrgd+/MNTS0ti1pYPbQzP44g/DRtrDjtMtj3O5H185tgB8vgUgA6ZJqW0tXLnaL468eHdh8y6Vyoizs/5ARs0SEVEkEh/e8oTtxAOLoUEykEul5betrc13dsrjv/ATgF8QqGCBY4sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-evry.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université d'Evry Val d'Essonne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-evry.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université d'Evry Val d'Essonne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXUlEQVQ4y51S4UsTARx9552nU3ckis3MpZmmYYUsBfsQCY3y20jYYBYSQUH/RH2rbxERVGRJoXALLRGiBI0KzEyRSGboMnbblG267dzdrl27+/UpkUit3qcfP3iP93vvB/wjMtGoi4hIIaLxmYVe7m+JSlx2F5cLogpgfFWHZvIoAMsxAKBoJhUXMjAMM8RxrH0zkbR1Nwqt4rIOTIZlzMfWsRRahddxACf25J/jAGAqLKPGykAoyK8mMiWGybMDQEInt8xCfP4hiEAijW8BCYm4jB5nG+oo7eEtVT4OAOalKNTdAuTIMjpbm6qJzH6Gyeue/hwWRyY+IRqNIxVaRjqWRE/XKZysKfHY7DYfAHAAoK7EMCcFIS0GkY2s4Hz3Ge+9vlfem7f6oCeTUGJrYL4bcHs6UVdp2SBvCByvs+H6jQegbAalRgajY+8x0Csim9SgJ3VYhRK4L7rQcLTK43S2+zZnxAFAxS5+IJdKezVFRSyYwNiTCfABoHFfPeqP1cLRcRhCQ5HH0X7I93s7zK9hWHxDI0/HUCGUQp1Ko7yo2I8ydtpzzVVY01b9kmfYR3+qd0OAiGjQ9xraugqhyIraxsr7RxwHL+/0H3mkKy4ioqHRj5BiCexv2gvn2TaU2couzc8tSTsJMIpBdPfZJNYCEXQ02+FobwLLmuB5Dixrgd+/MNTS0ti1pYPbQzP44g/DRtrDjtMtj3O5H185tgB8vgUgA6ZJqW0tXLnaL468eHdh8y6Vyoizs/5ARs0SEVEkEh/e8oTtxAOLoUEykEul5betrc13dsrjv/ATgF8QqGCBY4sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-evry.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université d'Evry Val d'Essonne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRzCCAi+gAwIBAgIUAq2mpKTxqh6qstX6eHwrmooVbmMwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC51bml2LWV2cnkuZnIwHhcNMTAwOTI0
 MTA0OTA0WhcNMzAwOTI0MTA0OTA0WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnVu
@@ -38,21 +38,21 @@ cRyZSJ4Xp6SYPhadkK49sLSe9lf5tdcn8Kr6EpAL3uvQx45HdtzV9CI1KS8nI/ZE
 2Y95aiTAmI2kjFbS4s2bZHjk/0TsYmOB8H6X+Ily18J3+xTfqvBw3c/inBzx1NT+
 21YW2cnfO+jzg5ZJqmB5D1PP001cJMAoHwV3
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-evry.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université d'Evry Val d'Essonne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université d'Evry Val d'Essonne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-evry.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>assistance-reseau@univ-evry.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-evry.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université d'Evry Val d'Essonne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université d'Evry Val d'Essonne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-evry.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>assistance-reseau@univ-evry.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-grenoble-alpes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-grenoble-alpes.fr-idp-shibboleth.xml
index ea516376..846dda7a 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-grenoble-alpes.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-grenoble-alpes.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-grenoble-alpes.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-01T16:04:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-04-01T16:04:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-grenoble-alpes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Grenoble Alpes - UGA</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAJsFAABkawGesHRBAAAAB3RJTUUH4AIZECkqDpoPGgAAAYpJREFUOMvN0jtrk3EUBvDf27xUA6ZBkdZLREWHVqsYWnEpeMGluxBRBD+J4uooInR0zHcQQaQoGgmKoUMIKq20QaFNsBha09fBU9TqUlw80//6nPNckkqlkvlZU9VqddY2asA/1v8HkGwXIN2y71cqlWGsYxDf4vwgVvAFR9HGYexN+8lvTddzWXYJXUzjHq4EYAdzOBHADexIp5Y7a5vTDCRZbrZY/JzxPGFffHqCQ9H1Q6znsYgDydKZiSzIz2VcH+n1Wov5/Nj+eu2lsVM5zVZfoZBLltvrGTqny+XiSrexVtiVDjZe95KF8mSG93iAhzFyB0fwMYQt4imO4xxe4Q2m0xDmLkZRwNfgeDke7sEjXEMOS7gaBlxMsYqhUDnBY4zjdoi5Fk2e4Rg2MIsm3qYYiYt5ZDHBKk5iplSvbSyUJ4dK9VoX77bYvrSpwX3sxh0M42bQaAaFnB+u3CrVa/N/S+INTER4ziOPnUFpNNYvgtofSRz/BawVTrQjfRdCsLMh3qetAN8BEBd4bcIUlrMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-grenoble-alpes.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Grenoble Alpes University staff and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université Grenoble Alpes - UGA</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">L'ensemble du personnel et des étudiants de l'Université Grenoble Alpes.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-grenoble-alpes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Grenoble Alpes - UGA</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAJsFAABkawGesHRBAAAAB3RJTUUH4AIZECkqDpoPGgAAAYpJREFUOMvN0jtrk3EUBvDf27xUA6ZBkdZLREWHVqsYWnEpeMGluxBRBD+J4uooInR0zHcQQaQoGgmKoUMIKq20QaFNsBha09fBU9TqUlw80//6nPNckkqlkvlZU9VqddY2asA/1v8HkGwXIN2y71cqlWGsYxDf4vwgVvAFR9HGYexN+8lvTddzWXYJXUzjHq4EYAdzOBHADexIp5Y7a5vTDCRZbrZY/JzxPGFffHqCQ9H1Q6znsYgDydKZiSzIz2VcH+n1Wov5/Nj+eu2lsVM5zVZfoZBLltvrGTqny+XiSrexVtiVDjZe95KF8mSG93iAhzFyB0fwMYQt4imO4xxe4Q2m0xDmLkZRwNfgeDke7sEjXEMOS7gaBlxMsYqhUDnBY4zjdoi5Fk2e4Rg2MIsm3qYYiYt5ZDHBKk5iplSvbSyUJ4dK9VoX77bYvrSpwX3sxh0M42bQaAaFnB+u3CrVa/N/S+INTER4ziOPnUFpNNYvgtofSRz/BawVTrQjfRdCsLMh3qetAN8BEBd4bcIUlrMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-grenoble-alpes.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Grenoble Alpes University staff and students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université Grenoble Alpes - UGA</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">L'ensemble du personnel et des étudiants de l'Université Grenoble Alpes.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDcTCCAlmgAwIBAgIUd4t2H5z9TaQY5iyAlE7kRfh/8FQwDQYJKoZIhvcNAQEL
 BQAwLDEqMCgGA1UEAwwhc2hpYmJvbGV0aC51bml2LWdyZW5vYmxlLWFscGVzLmZy
 MB4XDTE2MDMzMTE0MDExOFoXDTM2MDMzMTE0MDExOFowLDEqMCgGA1UEAwwhc2hp
@@ -41,21 +41,21 @@ wLdAWYFV9qsWC8MlU02u8mSLj8kRQdd6QgOsWGxweHy6W4XuFku5AXdLhARpovY8
 CiaFfEll1J7dyf/C7Hmj3LDiK8CXX6alM4ZcbVZZXQEjiAxCgwbFTCb0+3ghEJr8
 oO0zahDkkPQau5IyAPcgKkedumhq
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-grenoble-alpes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-grenoble-alpes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-grenoble-alpes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Grenoble Alpes - UGA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Grenoble Alpes - UGA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-grenoble-alpes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dgdsi-shibboleth@univ-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-grenoble-alpes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-grenoble-alpes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-grenoble-alpes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Grenoble Alpes - UGA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Grenoble Alpes - UGA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-grenoble-alpes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dgdsi-shibboleth@univ-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
index c9a25b4d..20d16c37 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-paris-est.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-10T14:34:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-10T14:34:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-est.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Paris - Est</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUUlEQVQ4y82TvUoDURCFz9ybzSbZtTAIWhoICFaSBAt9A/ENxMZCC5GkE/II4g8SSKWdpa2dNvbaWIgp7CxUTHDNkmR/7lisYtZN1qRzymHOx7ln5gJxdcDAJseOiMFtBuq8bqYeLGPpvYEaL6I6GESRzhHn0tN8nm7fFAQFIt8T6BjFi24Tq6jQEMAhQ8vizLBv1xJJH6w4NEVCwLEJVqa4h1fsokp9gBrDVHdOyuhprBQw7NkEQAh03ammrWZz2CYryMAFtKQbL/6KBr6CLltZOMiHQuT4sMOcYFbFbGH0+kcAGkNEfRsMABLwPAGSfxgigKSA09MdJPD0AygTPtQCtfXSpWIJElE/JAW8nkSTSift1ryOHXqJOi8zkMdyxrRO025jjr5P2RfoGIWr7hutoELOL1ODioE6tibU/b4yZp5ta3IDj7jG8ThJASN9509zO3fNGpcRbAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0OCswMjowMGOdgqsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDASwDoXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-paris-est.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Paris - Est</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-est.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Paris - Est</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUUlEQVQ4y82TvUoDURCFz9ybzSbZtTAIWhoICFaSBAt9A/ENxMZCC5GkE/II4g8SSKWdpa2dNvbaWIgp7CxUTHDNkmR/7lisYtZN1qRzymHOx7ln5gJxdcDAJseOiMFtBuq8bqYeLGPpvYEaL6I6GESRzhHn0tN8nm7fFAQFIt8T6BjFi24Tq6jQEMAhQ8vizLBv1xJJH6w4NEVCwLEJVqa4h1fsokp9gBrDVHdOyuhprBQw7NkEQAh03ammrWZz2CYryMAFtKQbL/6KBr6CLltZOMiHQuT4sMOcYFbFbGH0+kcAGkNEfRsMABLwPAGSfxgigKSA09MdJPD0AygTPtQCtfXSpWIJElE/JAW8nkSTSift1ryOHXqJOi8zkMdyxrRO025jjr5P2RfoGIWr7hutoELOL1ODioE6tibU/b4yZp5ta3IDj7jG8ThJASN9509zO3fNGpcRbAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0OCswMjowMGOdgqsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDASwDoXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-paris-est.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Paris - Est</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
 BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
 MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
@@ -38,23 +38,23 @@ mGObSSmyOTQAKqFYYNbPW0Y9X2jSWjS5D7JLhA6jECosQiFU212cSyCShHilp75V
 7qS8dXivDDTgSLzSTzOlPKj3qgR+6mmDYClqCaJe2iFfSMBCbk2aspn8+6hQceM4
 W1qZBfNF1cOpL5ceUG8MFu0NLSbSyFh+3TSWBJKFl6Ml3PqAQcMvfXRZ3QVZ+sWR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-paris-est.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-est.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-paris-est.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-est.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
 BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
 MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
@@ -74,19 +74,19 @@ mGObSSmyOTQAKqFYYNbPW0Y9X2jSWjS5D7JLhA6jECosQiFU212cSyCShHilp75V
 7qS8dXivDDTgSLzSTzOlPKj3qgR+6mmDYClqCaJe2iFfSMBCbk2aspn8+6hQceM4
 W1qZBfNF1cOpL5ceUG8MFu0NLSbSyFh+3TSWBJKFl6Ml3PqAQcMvfXRZ3QVZ+sWR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Paris - Est</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Paris - Est</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-paris-est.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>systeme-information@univ-paris-est.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Paris - Est</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Paris - Est</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-paris-est.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>systeme-information@univ-paris-est.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
index 53a4546c..e958b9dd 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-savoie.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-18T11:18:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-18T11:18:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-savoie.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Savoie Mont Blanc</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACgElEQVQoz1VTW0hUYRCe//zn7MXcs0tkEUUWmF0wsiJIg5B62Yj1kpWSLwViNy0Ss6QyyYweEiKwhyIMKUgyy7IbottDJLhrskEbK+7aQykbBtq6655z/v+fHs5q9b3MwDfDfDN8A3weiKjrRsu1F4bB6useR8LRp10+70AQERljjKXKCOccABAhHtdU1V5edjvxW1+1OgO5+DAYau84lrs5U9eY1aYgIgAQzjkh5EzNw1gsmZ+fZbMp/b6J7EznrziHRMK9Z11vb2ByYrq2zr0jL8swGCDi7OxcdfUDTdMZYwIxUnPu57uBsdP1Mf8nAxER29r6OjsHTc0SAAIQi6xQKkkSEQiyS7U60qyLXUgpAACARZaplMolMwiBiIgIhACPz/GkzmbjIESKNbl/GwAIAEEhBIDsdCxS7TaXAxSLmOcWsNAAiEgkKiOuaLxQeefL6O5Djk0bQWfwP2QAIASEEIoi+/3jikL73nxeszz90b3+Jao7FIqW7N8mBJL5MbK5gMUix2LJqsr7I4FvDeeLrt84OPhxrNBzKzz+/b23yelKY5z/lSRJhEhQfapjJBDcmbe+8Uqxrht5+Vlna90A7MTxdr8voqr2lCZdNxCx4nAbQMnSjJOjoUlETCZ1TTMQ8eiRuwClTrUqHI4iomEwMImuJ0MAZa9fBRAxHk/u29v68sUIIibiWs6GhoJdLWY151yiVBJClB7YXlFeoCgUAC5f7PZ4cp91D4fHovY0S07OyqvNpeYhU15CRErp1FSsualnejqxNnvZpcYi31Ck9ebb9HRrUfFWT+EWw2CUSgAApmkZY0IITTN6ng/PzCQYY4jo9Qa/Bn+YFlr4gj9nNohWG/NjZQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNiswMjowMIpzAwYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDYrMDI6MDD7Lru6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-savoie.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Savoie Mont Blanc</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-savoie.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Savoie Mont Blanc</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACgElEQVQoz1VTW0hUYRCe//zn7MXcs0tkEUUWmF0wsiJIg5B62Yj1kpWSLwViNy0Ss6QyyYweEiKwhyIMKUgyy7IbottDJLhrskEbK+7aQykbBtq6655z/v+fHs5q9b3MwDfDfDN8A3weiKjrRsu1F4bB6useR8LRp10+70AQERljjKXKCOccABAhHtdU1V5edjvxW1+1OgO5+DAYau84lrs5U9eY1aYgIgAQzjkh5EzNw1gsmZ+fZbMp/b6J7EznrziHRMK9Z11vb2ByYrq2zr0jL8swGCDi7OxcdfUDTdMZYwIxUnPu57uBsdP1Mf8nAxER29r6OjsHTc0SAAIQi6xQKkkSEQiyS7U60qyLXUgpAACARZaplMolMwiBiIgIhACPz/GkzmbjIESKNbl/GwAIAEEhBIDsdCxS7TaXAxSLmOcWsNAAiEgkKiOuaLxQeefL6O5Djk0bQWfwP2QAIASEEIoi+/3jikL73nxeszz90b3+Jao7FIqW7N8mBJL5MbK5gMUix2LJqsr7I4FvDeeLrt84OPhxrNBzKzz+/b23yelKY5z/lSRJhEhQfapjJBDcmbe+8Uqxrht5+Vlna90A7MTxdr8voqr2lCZdNxCx4nAbQMnSjJOjoUlETCZ1TTMQ8eiRuwClTrUqHI4iomEwMImuJ0MAZa9fBRAxHk/u29v68sUIIibiWs6GhoJdLWY151yiVBJClB7YXlFeoCgUAC5f7PZ4cp91D4fHovY0S07OyqvNpeYhU15CRErp1FSsualnejqxNnvZpcYi31Ck9ebb9HRrUfFWT+EWw2CUSgAApmkZY0IITTN6ng/PzCQYY4jo9Qa/Bn+YFlr4gj9nNohWG/NjZQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNiswMjowMIpzAwYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDYrMDI6MDD7Lru6AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-savoie.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Savoie Mont Blanc</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIExDCCA6ygAwIBAgIJAJbxent7hKLoMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
 VQQGEwJGUjEPMA0GA1UECBMGU2F2b2llMSUwIwYDVQQKExxVbml2ZXJzaXRlIFNh
 dm9pZSBNb250IEJsYW5jMQwwCgYDVQQLEwNkc2kxIjAgBgNVBAMTGXNoaWJib2xl
@@ -46,13 +46,13 @@ sa0Kdh5BaG+SZGojEU7rdaPHLivYBl01AqHUH8GGh8lEpW927qT5DbHB8PQ0ADLb
 Ejy9Isdv3XKc4EQXb0tXfL4ot92kqqykLaoMAePFpC84lOl7ImeTh/ZCKXIbIcHX
 TZ4u3TcwVEXeqvbuZPUec7hFrEtrVbcA
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIErTCCA5WgAwIBAgIRALPbdkEOx6FPwPjzvFKn2PswDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
@@ -80,21 +80,21 @@ spTSQxjPfGyDRqxfdI72tc0ES0O0S1NyCI9BovBjTz0sNXqHajpaOKfOmdSjasI4
 vKSy/VQ/I5RdC1gSqP+zBpdnBCrc2PHmKeDo1ofCxa0kR8omQn+Y994RoV1PdKkv
 7w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-savoie.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Savoie Mont Blanc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Savoie Mont Blanc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-savoie.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin@univ-savoie.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-savoie.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Savoie Mont Blanc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Savoie Mont Blanc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-savoie.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin@univ-savoie.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
index 7d599dcf..aecc5db1 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-toulouse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-14T11:10:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-14T11:10:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-toulouse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Toulouse</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACKUlEQVQ4y3WSu2sUURTGf3dmdvaRZNZkDUR3MYkBES0MKlsIJlsIVkGCTQor/wJbCyEi2NuLhSCmkbVKFwj4IqCyWmijcY27EpldEyfuI7Mzcyx2TDLZ5Dbnnsf3ncP5jpK5zDRQ4KCn1Hv1tPaumZt6klR6GSjvq1g2gMJ6W+b3Rpu+8PEP1NxgEVh40P5RmCCFpYwI+mpiaF7b39TpCC/r0PJhPKVtA3GATzSwxe0ZsofggwOeQEegIxIHmNT6ywBfadEQ/3CC9baw5YGhwDKg0hKA6rQ5WB7BBKBC+3CCapjLJcGK7YSzRdce8BEANvDwRCIEOwo0w+ksA37tNoqv+i3LYxfUxGcqnl4GSgZwayShjgCUNtxZgJtjiRdL6+3Lb+peHdi+Uy/fA6rhQk8CReAngJLhXBqYBErKrtwImxSB2fC//fbKSP5C2qw++t44/aXhWffPWJ9Bbalna3eVDOemK4G/DLCiezgIWdHwEAJYnLHthYcXM4+HTY2S08EN4OyAQZ+uuPbaVpElJgU8BVUVAJDqGqvmBthugBuArqBPVwerkJWu6ylwlDCqxxxgNa7Bt3DDR83o6US8jGgMSZc9hmJCaUVg6X/e1CCbiBJEjxs47+u80j1+K+G261yaOZY8XnO7Eo4mdQy1O75cP5HuOeUYirxvMBDKPmTqY7qC8ZTOYKynfNIANnOa/hwo7c2cEoO5VHyFvKGt/e2c6zd6wACb/wA7XMnoqvjdIAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-toulouse.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Toulouse</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-toulouse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Toulouse</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACKUlEQVQ4y3WSu2sUURTGf3dmdvaRZNZkDUR3MYkBES0MKlsIJlsIVkGCTQor/wJbCyEi2NuLhSCmkbVKFwj4IqCyWmijcY27EpldEyfuI7Mzcyx2TDLZ5Dbnnsf3ncP5jpK5zDRQ4KCn1Hv1tPaumZt6klR6GSjvq1g2gMJ6W+b3Rpu+8PEP1NxgEVh40P5RmCCFpYwI+mpiaF7b39TpCC/r0PJhPKVtA3GATzSwxe0ZsofggwOeQEegIxIHmNT6ywBfadEQ/3CC9baw5YGhwDKg0hKA6rQ5WB7BBKBC+3CCapjLJcGK7YSzRdce8BEANvDwRCIEOwo0w+ksA37tNoqv+i3LYxfUxGcqnl4GSgZwayShjgCUNtxZgJtjiRdL6+3Lb+peHdi+Uy/fA6rhQk8CReAngJLhXBqYBErKrtwImxSB2fC//fbKSP5C2qw++t44/aXhWffPWJ9Bbalna3eVDOemK4G/DLCiezgIWdHwEAJYnLHthYcXM4+HTY2S08EN4OyAQZ+uuPbaVpElJgU8BVUVAJDqGqvmBthugBuArqBPVwerkJWu6ylwlDCqxxxgNa7Bt3DDR83o6US8jGgMSZc9hmJCaUVg6X/e1CCbiBJEjxs47+u80j1+K+G261yaOZY8XnO7Eo4mdQy1O75cP5HuOeUYirxvMBDKPmTqY7qC8ZTOYKynfNIANnOa/hwo7c2cEoO5VHyFvKGt/e2c6zd6wACb/wA7XMnoqvjdIAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-toulouse.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Toulouse</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVzCCAj+gAwIBAgIUbiBTqjVuFrpcZlYOFXAV5Gkjxo8wDQYJKoZIhvcNAQEF
 BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51bml2LXRvdWxvdXNlLmZyMB4XDTEy
 MDgwNjE2NTI0N1oXDTMyMDgwNjE2NTI0N1owJjEkMCIGA1UEAxMbc2hpYmJvbGV0
@@ -38,26 +38,26 @@ ykLtdZM1agwtBCF0oC1/pxxPnc64MVixLBqcv0jrEi/MYJ2PcJdkKIj8QqNMj16y
 lY+k+YG78HJpawe6Y8VBsKAiFC/7p9UQhk6FjOQnD2TEEsjnevVyUeSeYq8Ynufz
 neQ3fY40PFNPR6xq43ajr4n5p9AGffHU08Hrm9fRk2HrJ4vmcYIEPXAICw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Toulouse</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Toulouse</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-toulouse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Francis DELBOS</md:SurName>
-      <md:EmailAddress>francis.delbos@univ-toulouse.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Boris VALERA</md:SurName>
-      <md:EmailAddress>boris.valera@univ-toulouse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-toulouse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Toulouse</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Toulouse</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-toulouse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Francis DELBOS</md:SurName>
+    <md:EmailAddress>francis.delbos@univ-toulouse.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Boris VALERA</md:SurName>
+    <md:EmailAddress>boris.valera@univ-toulouse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml
index b74e1c8a..f4b17fd4 100644
--- a/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uoregon.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoregon.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Oregon</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Oregon's Shibboleth Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uoregon.edu</mdui:InformationURL>
+        <mdui:Logo height="239" width="200" xml:lang="en">https://shibboleth.uoregon.edu/images/Large_UO_Logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoregon.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Oregon</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Oregon's Shibboleth Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uoregon.edu</mdui:InformationURL>
-          <mdui:Logo height="239" width="200" xml:lang="en">https://shibboleth.uoregon.edu/images/Large_UO_Logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQjCCAiqgAwIBAgITFP1Rwp3clPykVwEUThiy/rAHejANBgkqhkiG9w0BAQUF
 ADAhMR8wHQYDVQQDExZzaGliYm9sZXRoLnVvcmVnb24uZWR1MB4XDTA4MDgyMTE3
 MDc1OFoXDTI4MDgyMTE3MDc1OFowITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51b3Jl
@@ -44,24 +44,24 @@ LdvlamuJd1eoV0ltCeR52meq+ej1BdFj/hyZcM66hglH5UY4LaeejG31zJplw5o7
 N5GXH191Krz58J6/VJJBsz6T3anUiK6NxxX+/T3fb1FDmR+isSsAJfbFwSpXA1sM
 gVS2dGCBxZlwSzi9cmvk13sneid0+Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uoregon.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoregon.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uoregon.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoregon.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQjCCAiqgAwIBAgITFP1Rwp3clPykVwEUThiy/rAHejANBgkqhkiG9w0BAQUF
 ADAhMR8wHQYDVQQDExZzaGliYm9sZXRoLnVvcmVnb24uZWR1MB4XDTA4MDgyMTE3
 MDc1OFoXDTI4MDgyMTE3MDc1OFowITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51b3Jl
@@ -81,27 +81,27 @@ LdvlamuJd1eoV0ltCeR52meq+ej1BdFj/hyZcM66hglH5UY4LaeejG31zJplw5o7
 N5GXH191Krz58J6/VJJBsz6T3anUiK6NxxX+/T3fb1FDmR+isSsAJfbFwSpXA1sM
 gVS2dGCBxZlwSzi9cmvk13sneid0+Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oregon</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oregon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uoregon.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IDM Administrative Support</md:GivenName>
-      <md:EmailAddress>idmsupport@uoregon.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDM Technical Support</md:GivenName>
-      <md:EmailAddress>idmsupport@uoregon.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IDM Support</md:GivenName>
-      <md:EmailAddress>idmhelp@ithelp.uoregon.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oregon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oregon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uoregon.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IDM Administrative Support</md:GivenName>
+    <md:EmailAddress>idmsupport@uoregon.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDM Technical Support</md:GivenName>
+    <md:EmailAddress>idmsupport@uoregon.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IDM Support</md:GivenName>
+    <md:EmailAddress>idmhelp@ithelp.uoregon.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
index f8489120..8e8eec87 100644
--- a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.upmf-grenoble.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-07T16:44:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-07T16:44:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmf-grenoble.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Grenoble 2 University - UPMF</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACKklEQVQoz43ST0hUURgF8HPvfeM4oqT9s8YiRcWiVpOg1SqQgpQwCAqqXYuKIlC3LkKC2geSLmoTCBKWEVYo5aJICzRGLQipdKYZbSZNR9978969p8VkBJH023yrczbnEySxhoAgKACSAhICfxF/Bv6HRUII5pIEkfVXO7t1Kh2o3JdXH1E1u4QUAAgi16yNNqTz6vV8pDbT0+NGo3FgbjMWTiNVVzwfqV9sa89+/mJIrY3WGtoYP7Myv3tvDHDHxu2hoRngx1XFjNTvYXchuQOJcLk7NUnSI+GTK/f7YsBiSxvJ5Tt3ZwG7WzKh+EkwBX9UJjci3XzKkNpxpATsztsiVFTQ2gLAn/ygBNQe0CMMsQhVZfKb4I9ECbjPBqX78JE9+KSgsdEKbzeAN/LOqoAKC/ogQAl40szAWEoCTm+vXLp0RQCBhsMCMKmU/3Y8eACikMKQVChSzkux+gL5zQ3a87yh54gDX1XAfTNK0u57EIewu6RJKsaESUm3H4kSfIvU64UFe2AgBliqbCdWHVVeAcDufypDzKsDbZMdg/OY7uDW4JmzGzraRXGxfa/H2laG7xcvJzeVaqON48xV1sSBVB3SR0vTJxqXb97ypmcNaUhvJZMoKlm61mGFjh2RoBAyG53wpz/mNR0vOHnOOnTQqgoL5MYlAelmC9taQxfOg2uWr99IbCn1HIfrkvhVA3d4OLC/VgWD67+jzB2TzeqJqUB19e/8v/wE7wdXROlEJI0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.upmf-grenoble.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Staff and students of Grenoble 2 University</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Grenoble 2 UPMF</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et étudiants de l’université Grenoble 2</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmf-grenoble.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Grenoble 2 University - UPMF</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACKklEQVQoz43ST0hUURgF8HPvfeM4oqT9s8YiRcWiVpOg1SqQgpQwCAqqXYuKIlC3LkKC2geSLmoTCBKWEVYo5aJICzRGLQipdKYZbSZNR9978969p8VkBJH023yrczbnEySxhoAgKACSAhICfxF/Bv6HRUII5pIEkfVXO7t1Kh2o3JdXH1E1u4QUAAgi16yNNqTz6vV8pDbT0+NGo3FgbjMWTiNVVzwfqV9sa89+/mJIrY3WGtoYP7Myv3tvDHDHxu2hoRngx1XFjNTvYXchuQOJcLk7NUnSI+GTK/f7YsBiSxvJ5Tt3ZwG7WzKh+EkwBX9UJjci3XzKkNpxpATsztsiVFTQ2gLAn/ygBNQe0CMMsQhVZfKb4I9ECbjPBqX78JE9+KSgsdEKbzeAN/LOqoAKC/ogQAl40szAWEoCTm+vXLp0RQCBhsMCMKmU/3Y8eACikMKQVChSzkux+gL5zQ3a87yh54gDX1XAfTNK0u57EIewu6RJKsaESUm3H4kSfIvU64UFe2AgBliqbCdWHVVeAcDufypDzKsDbZMdg/OY7uDW4JmzGzraRXGxfa/H2laG7xcvJzeVaqON48xV1sSBVB3SR0vTJxqXb97ypmcNaUhvJZMoKlm61mGFjh2RoBAyG53wpz/mNR0vOHnOOnTQqgoL5MYlAelmC9taQxfOg2uWr99IbCn1HIfrkvhVA3d4OLC/VgWD67+jzB2TzeqJqUB19e/8v/wE7wdXROlEJI0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.upmf-grenoble.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Staff and students of Grenoble 2 University</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Grenoble 2 UPMF</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels et étudiants de l’université Grenoble 2</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVzCCAj+gAwIBAgIUO1f61l32R6TuA6rB5vgAXHLdHFMwDQYJKoZIhvcNAQEF
 BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51cG1mLWdyZW5vYmxlLmZyMB4XDTEy
 MDYwNjEzNTYxMVoXDTMyMDYwNjEzNTYxMVowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
@@ -40,21 +40,21 @@ Xz86gMzPL/738R1fdrfgDG33nm95lR98v0+MrxwANS7ah9173mxGFY+otLFCwMdb
 i4Rso8QVUsjhRyUPu+LGdANROT8v+NgRL9ef7xDu4VdjMUHJKqxjQ+ahQdEu7+Lb
 zZ6QCFpB0/4tW9KCEPrLa+D/keEg+5vWKfMF+e5TMX4H4d2MW4in6HfySw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Grenoble 2 UPMF</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Grenoble 2 UPMF</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upmf-grenoble.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sysadm-dsiu2@upmf-grenoble.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Grenoble 2 UPMF</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Grenoble 2 UPMF</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upmf-grenoble.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sysadm-dsiu2@upmf-grenoble.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
index e88703fd..641d5d9b 100644
--- a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ups-tlse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T08:21:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T08:21:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAA1VBMVEW9AADegnvOQTnvw73WYWPGIBj/4+fnopzecWvGEAjnkpTWUUr3087OMDH/8/feaWPGCAjniozOKCnvtrXeeXPGGBDnmpTWWVr3297WSUL3y8b/6+/OODn/+//GBADehoTeZWPOICHecXPWUVL309beaWvvvr3GGBjnmpzGAADWRUL3x8beYWP/5+fvpqXGEBDnlpTONDH/9/fGDAjnjozOLCnvur3efXvWXVr3397WTUr3z87/7+/OPDn////nhoTOJCHedXPWVVL319bebWvGHBjnnpzxf+KOAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAx0lEQVQY0y2ObW+CQBCEpxWDxKIXQGsVvFgFjYRQjFbRc2Ik8f//JG/R+bDZl9ndBwqYA2q0ficQLT4uxkz+fOlI62T40r4do58wdw61yUgtnrKge967pkZE/ljDkV/LnfXPPDyY2Rv/TDfs3SofCJJkAdUw1sw2Oi0l70v4LFfyY6rQ8BsqZwpVxVXIq2dYAZo5EDvOlEHKxmJ1B/b9w664vuGvgPXIccjxMCrYUS26lpOTmrysW3SFbSZk9dF7laLg7lzbEk90xx7pCF5XGwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-tlse3.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students and staff from Université de Toulouse 3 - Paul Sabatier</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et étudiants Université de Toulouse 3 - Paul Sabatier</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse3.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAA1VBMVEW9AADegnvOQTnvw73WYWPGIBj/4+fnopzecWvGEAjnkpTWUUr3087OMDH/8/feaWPGCAjniozOKCnvtrXeeXPGGBDnmpTWWVr3297WSUL3y8b/6+/OODn/+//GBADehoTeZWPOICHecXPWUVL309beaWvvvr3GGBjnmpzGAADWRUL3x8beYWP/5+fvpqXGEBDnlpTONDH/9/fGDAjnjozOLCnvur3efXvWXVr3397WTUr3z87/7+/OPDn////nhoTOJCHedXPWVVL319bebWvGHBjnnpzxf+KOAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAx0lEQVQY0y2ObW+CQBCEpxWDxKIXQGsVvFgFjYRQjFbRc2Ik8f//JG/R+bDZl9ndBwqYA2q0ficQLT4uxkz+fOlI62T40r4do58wdw61yUgtnrKge967pkZE/ljDkV/LnfXPPDyY2Rv/TDfs3SofCJJkAdUw1sw2Oi0l70v4LFfyY6rQ8BsqZwpVxVXIq2dYAZo5EDvOlEHKxmJ1B/b9w664vuGvgPXIccjxMCrYUS26lpOTmrysW3SFbSZk9dF7laLg7lzbEk90xx7pCF5XGwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-tlse3.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students and staff from Université de Toulouse 3 - Paul Sabatier</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels et étudiants Université de Toulouse 3 - Paul Sabatier</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUdyy5eL0UrTjscSSpJnKojdThIJcwDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51cHMtdGxzZS5mcjAeFw0wOTA1MTkw
 NzIzMTNaFw0yOTA1MTkwNzIzMTNaMCExHzAdBgNVBAMTFnNoaWJib2xldGgudXBz
@@ -40,21 +40,21 @@ m12tRjMzKjY4oPO8ILrjLxIiigbNF5fYfMsWVQFMBHW6wVlBDpuxKmeZTu/TwuqB
 8RPESGgN651QtWiUBwk7Na2WAVQvgcmEwr0BZ+vYq8mymtwQiaXGGY1y51ANm3Lf
 qveDyh76C64hnLr9Jvlv1+E5QP2YPgo=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ups-tlse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-tlse3.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>federidmaster@univ-tlse3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ups-tlse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-tlse3.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federidmaster@univ-tlse3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml
index 6c8b920e..3cf042e1 100644
--- a/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.usu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Utah State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Utah State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAN5rvbP4K7GmRoDpmtKTw2gl0lEMMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVkdTAeFw0xMTAyMTQxMjI1
 MDdaFw0zMTAyMTQxMjI1MDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVk
@@ -41,24 +41,24 @@ YI3rmm+hqgCiHnN4ROJ6aCcII03zTdyVbE97Ho77trGKzB2F4aXqTBhMab39rAOl
 oBeFIPuEqHYWp3GalpQ4DlTYl3+t24gGqfR+XcZSfSbMV7YEB09Bg72LSU7h+t1t
 4WTDmHYR+OA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.usu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.usu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAN5rvbP4K7GmRoDpmtKTw2gl0lEMMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVkdTAeFw0xMTAyMTQxMjI1
 MDdaFw0zMTAyMTQxMjI1MDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVk
@@ -78,31 +78,31 @@ YI3rmm+hqgCiHnN4ROJ6aCcII03zTdyVbE97Ho77trGKzB2F4aXqTBhMab39rAOl
 oBeFIPuEqHYWp3GalpQ4DlTYl3+t24gGqfR+XcZSfSbMV7YEB09Bg72LSU7h+t1t
 4WTDmHYR+OA=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Utah State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Utah State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.usu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>USU IT Security</md:GivenName>
-      <md:EmailAddress>security@usu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>USU IT Technical</md:GivenName>
-      <md:EmailAddress>tech.contact@usu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>USU IT Service Desk</md:GivenName>
-      <md:EmailAddress>servicedesk@usu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>USU IT Administrative</md:GivenName>
-      <md:EmailAddress>admin.contact@usu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Utah State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Utah State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.usu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>USU IT Security</md:GivenName>
+    <md:EmailAddress>security@usu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>USU IT Technical</md:GivenName>
+    <md:EmailAddress>tech.contact@usu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>USU IT Service Desk</md:GivenName>
+    <md:EmailAddress>servicedesk@usu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>USU IT Administrative</md:GivenName>
+    <md:EmailAddress>admin.contact@usu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
index 04b83072..e4b7813f 100644
--- a/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.utb.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-12-19T16:42:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-12-19T16:42:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Tomas Bata University in Zlín</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Tomas Bata University in Zlín</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Tomáše Bati ve Zlíně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</mdui:InformationURL>
+        <mdui:Logo height="20" width="150" xml:lang="cs">https://shibboleth.utb.cz/idp/images/logo_cs_150x20.png</mdui:Logo>
+        <mdui:Logo height="20" width="150" xml:lang="en">https://shibboleth.utb.cz/idp/images/logo_en_150x20.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Tomas Bata University in Zlín</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Tomas Bata University in Zlín</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Tomáše Bati ve Zlíně</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</mdui:InformationURL>
-          <mdui:Logo height="20" width="150" xml:lang="cs">https://shibboleth.utb.cz/idp/images/logo_cs_150x20.png</mdui:Logo>
-          <mdui:Logo height="20" width="150" xml:lang="en">https://shibboleth.utb.cz/idp/images/logo_en_150x20.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
 N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
@@ -52,27 +52,27 @@ IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
 e72PuA==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utb.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utb.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utb.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utb.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utb.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
 N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
@@ -93,30 +93,30 @@ IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
 e72PuA==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tomas Bata University in Zlín</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tomas Bata University in Zlín</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ivan</md:GivenName>
-      <md:SurName>Masár</md:SurName>
-      <md:EmailAddress>imasar@k.utb.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ondřej</md:GivenName>
-      <md:SurName>Fabián</md:SurName>
-      <md:EmailAddress>fabian@k.utb.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tomas Bata University in Zlín</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tomas Bata University in Zlín</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ivan</md:GivenName>
+    <md:SurName>Masár</md:SurName>
+    <md:EmailAddress>imasar@k.utb.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ondřej</md:GivenName>
+    <md:SurName>Fabián</md:SurName>
+    <md:EmailAddress>fabian@k.utb.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
index 293e2735..1fad0d50 100644
--- a/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uvsq.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-06T11:23:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-06T11:23:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvsq.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZklEQVQozzXOzY4TRxSG4e+cOlVdbbfdYxscrACjGY0SoQkhQgoLBFLEErFjmytIriEXklUugX2yBiSUXRQkfkRGCp7FBPDM+KfdXVWnshjxrp/FS5su/Pz8zW+LeMubRnG/cu+b9gvLDD1r22ulebs870Pnm+UP08kv9+7Q3x8Xh0/eYrYHZFidUj4J6bYkQTzu2j3uKHWn7crn5sXx8asfH8vIWdQFpIPia0ufNH9XoEcogBtsoWnsHJMfAPuXJ7Wz/KkN8BFde8nrqxz2JQ0lZUqG88TRtDCJ8l7frzK+qfqnXeCeEZxv4NOH0FzhWHDsmViLjgU9o6VQZc1a00HVf7puSmMkZMWA0TUoLaAAj4UdoSJYoi5CQH22i7Z5MBymnMUyodtiUAI0E55aGgnGQiVRypqMCQlNzHXhjjZrxywxZwiAAOGx8Kyg64WZOrFEbUybEFchM5vUptq5mFUYBFKwitFZQQd9e3PQv+oLYfq4DfNNc9IArao1Z8YwkYAyNIH1juNdL7d3qu9HO4UxAL7spVI4qWrOW01EBBAzGFwg25r8dT/8djS50ACcMQd1PSwGCrtNtsuWiKTk9if+s5do59zlUDxbVc5wzgBAhC6l+Wq92rYuxqsRnvYlxWVe/OpHp00w/6zT65OQAQUAMECAsFhipk7baYyPhUlO1rpKua68d9YLs0lEYMLnVHMI6bRVGBKKKfzx15MX736fL9+sw79GzkrPvbIwnKOuk2ZB3be7V6obt2YP7x48onzxCyyb8/ni3dF/L48+vDxeviZK13a+2p0c7l46nNX7g7K+YP8DWk4gReOlj2AAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.uvsq.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvsq.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZklEQVQozzXOzY4TRxSG4e+cOlVdbbfdYxscrACjGY0SoQkhQgoLBFLEErFjmytIriEXklUugX2yBiSUXRQkfkRGCp7FBPDM+KfdXVWnshjxrp/FS5su/Pz8zW+LeMubRnG/cu+b9gvLDD1r22ulebs870Pnm+UP08kv9+7Q3x8Xh0/eYrYHZFidUj4J6bYkQTzu2j3uKHWn7crn5sXx8asfH8vIWdQFpIPia0ufNH9XoEcogBtsoWnsHJMfAPuXJ7Wz/KkN8BFde8nrqxz2JQ0lZUqG88TRtDCJ8l7frzK+qfqnXeCeEZxv4NOH0FzhWHDsmViLjgU9o6VQZc1a00HVf7puSmMkZMWA0TUoLaAAj4UdoSJYoi5CQH22i7Z5MBymnMUyodtiUAI0E55aGgnGQiVRypqMCQlNzHXhjjZrxywxZwiAAOGx8Kyg64WZOrFEbUybEFchM5vUptq5mFUYBFKwitFZQQd9e3PQv+oLYfq4DfNNc9IArao1Z8YwkYAyNIH1juNdL7d3qu9HO4UxAL7spVI4qWrOW01EBBAzGFwg25r8dT/8djS50ACcMQd1PSwGCrtNtsuWiKTk9if+s5do59zlUDxbVc5wzgBAhC6l+Wq92rYuxqsRnvYlxWVe/OpHp00w/6zT65OQAQUAMECAsFhipk7baYyPhUlO1rpKua68d9YLs0lEYMLnVHMI6bRVGBKKKfzx15MX736fL9+sw79GzkrPvbIwnKOuk2ZB3be7V6obt2YP7x48onzxCyyb8/ni3dF/L48+vDxeviZK13a+2p0c7l46nNX7g7K+YP8DWk4gReOlj2AAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.uvsq.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUMO6BFdwk5alVPNeSspXonkZTWeswDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZyMB4XDTEwMTAwNTExMTQw
 MFoXDTMwMTAwNTExMTQwMFowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZy
@@ -38,21 +38,21 @@ C1FLA1wgCxeTsi+KmGq0JNFvQAHIBwG6SwwHuCVWY97C3gaBpILCbZoeJw31Niw5
 Xyjj+EyUPnVwCMYCUqwr0lvRau6V0YBulvWeViv9Q8PvP3NHklMpriikJOkRxueN
 cJdVGhbkcQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uvsq.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uvsq.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sysadm@cri.uvsq.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uvsq.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uvsq.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sysadm@cri.uvsq.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml
index dafa6291..5c57f4a2 100644
--- a/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uwyo.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwyo.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wyoming</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Production IdP for UWYO domain</mdui:Description>
+        <mdui:Logo height="253" width="88" xml:lang="en">https://www.uwyo.edu/_files/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwyo.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wyoming</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Production IdP for UWYO domain</mdui:Description>
-          <mdui:Logo height="253" width="88" xml:lang="en">https://www.uwyo.edu/_files/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVANo3Z4/Uxn2PVJs0WudES8wCVuyuMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudXd5by5lZHUwHhcNMTIwMjE1MjE1
 MTMwWhcNMzIwMjE1MjE1MTMwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnV3eW8u
@@ -43,24 +43,24 @@ ZpdD0gf3Agw5wNueGv7cubwYGYEdG4yQGcq59Z1WwW9mD92tI7KfnxX4Ew0vO1pg
 vvzAEN1ksmkE84dyB8aObIrU3F7zmXG3LhS93xrPKNiXtB48BM6ovBkUQr+DGlRZ
 sAnxXYy7lSDqYZTx
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uwyo.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uwyo.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uwyo.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uwyo.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwyo.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uwyo.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uwyo.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uwyo.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uwyo.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwyo.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVANo3Z4/Uxn2PVJs0WudES8wCVuyuMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudXd5by5lZHUwHhcNMTIwMjE1MjE1
 MTMwWhcNMzIwMjE1MjE1MTMwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnV3eW8u
@@ -80,30 +80,30 @@ ZpdD0gf3Agw5wNueGv7cubwYGYEdG4yQGcq59Z1WwW9mD92tI7KfnxX4Ew0vO1pg
 vvzAEN1ksmkE84dyB8aObIrU3F7zmXG3LhS93xrPKNiXtB48BM6ovBkUQr+DGlRZ
 sAnxXYy7lSDqYZTx
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wyoming</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wyoming</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwyo.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom Wilson</md:GivenName>
-      <md:EmailAddress>thomas.wilson@uwyo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Robert Morrison</md:GivenName>
-      <md:EmailAddress>Robert.Morrison@uwyo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Matt Kelly</md:GivenName>
-      <md:EmailAddress>mkelly@uwyo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tom Wilson</md:GivenName>
-      <md:EmailAddress>thomas.wilson@uwyo.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wyoming</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wyoming</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwyo.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom Wilson</md:GivenName>
+    <md:EmailAddress>thomas.wilson@uwyo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Robert Morrison</md:GivenName>
+    <md:EmailAddress>Robert.Morrison@uwyo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Matt Kelly</md:GivenName>
+    <md:EmailAddress>mkelly@uwyo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom Wilson</md:GivenName>
+    <md:EmailAddress>thomas.wilson@uwyo.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml
index 80b85f68..58982b51 100644
--- a/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.vcu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vcu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Virginia Commonwealth University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vcu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Virginia Commonwealth University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAMyTsDp4A5caMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0xMjEwMDIxNTI2MzhaFw0yMjA5MzAx
 NTI2MzhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
@@ -38,13 +38,13 @@ tlcoYKNW6ADof1DI8Q1z6ZgtYEnc/zVfA7dtudPYeYQZ6TL/R00gSdfN9GM+j7PA
 PBMWlPnwimjDzbm/2/sjWQ4+XXo1LpySq58tAyeqlmwQchr7rWzfQdJw8h5pBTLI
 tBa/rT5xLEJ4lKciSEO4
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAMkP0cy6Mj6OMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0wOTEwMzAxMzM0MjFaFw0xMjEwMjkx
 MzM0MjFaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
@@ -64,21 +64,21 @@ Uw8mKyvL8HT3iZ42D8wENFNhA3nck2RDX3K1nv0qCbNF+FlnUDTy7i6EnH4U2aoe
 mYJ3G1FBVt0b8LdS0XisQ9pY3kpuQqspN4SFrJUDi6luNLdH8/YguSB0uf2Pdyyj
 KUd8anrB7gIglUS1bz6F
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.vcu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.vcu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.vcu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vcu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.vcu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.vcu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.vcu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vcu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAMyTsDp4A5caMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0xMjEwMDIxNTI2MzhaFw0yMjA5MzAx
 NTI2MzhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
@@ -98,13 +98,13 @@ tlcoYKNW6ADof1DI8Q1z6ZgtYEnc/zVfA7dtudPYeYQZ6TL/R00gSdfN9GM+j7PA
 PBMWlPnwimjDzbm/2/sjWQ4+XXo1LpySq58tAyeqlmwQchr7rWzfQdJw8h5pBTLI
 tBa/rT5xLEJ4lKciSEO4
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIJAMkP0cy6Mj6OMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0wOTEwMzAxMzM0MjFaFw0xMjEwMjkx
 MzM0MjFaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
@@ -124,19 +124,19 @@ Uw8mKyvL8HT3iZ42D8wENFNhA3nck2RDX3K1nv0qCbNF+FlnUDTy7i6EnH4U2aoe
 mYJ3G1FBVt0b8LdS0XisQ9pY3kpuQqspN4SFrJUDi6luNLdH8/YguSB0uf2Pdyyj
 KUd8anrB7gIglUS1bz6F
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vcu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vcu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Virginia Commonwealth University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Virginia Commonwealth University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vcu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>L T Harris</md:GivenName>
-      <md:EmailAddress>tsmiddleware@vcu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vcu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vcu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Virginia Commonwealth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Virginia Commonwealth University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vcu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>L T Harris</md:GivenName>
+    <md:EmailAddress>tsmiddleware@vcu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml
index 628a5d63..e556d263 100644
--- a/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.webassign.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.webassign.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WebAssign - PlaceU</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.webassign.net/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WebAssign - PlaceU</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGtDCCBZygAwIBAgIHBx3OYpjt3TANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBE
 aWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENs
@@ -56,25 +56,25 @@ NZSZ8I6BpxYXuklpQiqYhix7j33BMx9WmXVbxBDyFFCWMEYhVJfhFyOhpUNyLljE
 L1w65SA7X1AgB2x3zTlL3EfrjTnJaAMzz2qCvlTMdmYT+XmgaBNq08un9JnNa8EQ
 3QhMBkpxpdG7DQxhEkDyZUArmdH011y94LJk3W5or4AQna2hVQSs8g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">WebAssign</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">WebAssign</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.webassign.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Dodd Jones</md:GivenName>
-      <md:EmailAddress>djones@webassign.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brent Wells</md:GivenName>
-      <md:EmailAddress>bwells@webassign.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">WebAssign</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">WebAssign</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.webassign.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dodd Jones</md:GivenName>
+    <md:EmailAddress>djones@webassign.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brent Wells</md:GivenName>
+    <md:EmailAddress>bwells@webassign.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml
index 6f0cf10b..22a53b1d 100644
--- a/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.webbased.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-09T16:45:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-09T16:45:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFpDCCA4wCCQCP8vR8IUmCBDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
 						R0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEVMBMGA1UEChMM
 						V2ViYmFzZWQgTHRkMSIwIAYDVQQDExlzaGliYm9sZXRoLndlYmJhc2VkLmNvLnVr
@@ -60,13 +60,13 @@
 						MlkmuDE86SLn6Pl2VHZsCJtNwZ6kVVRrQymRQjAQg24OEroEgBwpCF9SRFm61TfW
 						HJPUxmoTmWo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFpDCCA4wCCQCP8vR8IUmCBDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
 						R0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEVMBMGA1UEChMM
 						V2ViYmFzZWQgTHRkMSIwIAYDVQQDExlzaGliYm9sZXRoLndlYmJhc2VkLmNvLnVr
@@ -99,42 +99,42 @@
 						MlkmuDE86SLn6Pl2VHZsCJtNwZ6kVVRrQymRQjAQg24OEroEgBwpCF9SRFm61TfW
 						HJPUxmoTmWo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">WebBased Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">WebBased Limited: Shibboleth service provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.webbased.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martine</md:GivenName>
-      <md:SurName>Davies</md:SurName>
-      <md:EmailAddress>mailto:martine.davies@webbased.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg</md:GivenName>
-      <md:SurName>Hawkins</md:SurName>
-      <md:EmailAddress>mailto:greg.hawkins@webbased.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">WebBased Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">WebBased Limited: Shibboleth service provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.webbased.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martine</md:GivenName>
+    <md:SurName>Davies</md:SurName>
+    <md:EmailAddress>mailto:martine.davies@webbased.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg</md:GivenName>
+    <md:SurName>Hawkins</md:SurName>
+    <md:EmailAddress>mailto:greg.hawkins@webbased.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml
index a9c7d076..0404197e 100644
--- a/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.westking.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-03T14:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-03T14:58:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westking.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westking.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDijCCAnICCQDsX92sZyIapDANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEbMBkGA1UEBxMSMjExIEdyYXlzIElubiBSb2Fk
 						MSUwIwYDVQQKExxXZXN0bWluc3RlciBLaW5nc3dheSBDb2xsZWdlMSIwIAYDVQQD
@@ -33,26 +33,26 @@
 						VMItRsiEAyRjKrCKpI3OKMVlG7zIXsT9NHJhdgswP9F0aSZMqshJlwqzLo+JojfZ
 						i8cWVtd1PUDIV3RJapAS+tcUTOFIirh1kTv4pD5VvRfSPYabAuXCAvU9jfnlsQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.westking.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westking.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.westking.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westking.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDijCCAnICCQDsX92sZyIapDANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
 						R0IxDzANBgNVBAgTBkxvbmRvbjEbMBkGA1UEBxMSMjExIEdyYXlzIElubiBSb2Fk
 						MSUwIwYDVQQKExxXZXN0bWluc3RlciBLaW5nc3dheSBDb2xsZWdlMSIwIAYDVQQD
@@ -73,27 +73,27 @@
 						VMItRsiEAyRjKrCKpI3OKMVlG7zIXsT9NHJhdgswP9F0aSZMqshJlwqzLo+JojfZ
 						i8cWVtd1PUDIV3RJapAS+tcUTOFIirh1kTv4pD5VvRfSPYabAuXCAvU9jfnlsQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Westminster Kingsway College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Westminster Kingsway College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.westking.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Inderpal</md:GivenName>
-      <md:SurName>Chaggar</md:SurName>
-      <md:EmailAddress>mailto:Inderpal.Chaggar@westking.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Inderpal</md:GivenName>
-      <md:SurName>Chaggar</md:SurName>
-      <md:EmailAddress>mailto:Inderpal.Chaggar@westking.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Westminster Kingsway College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Westminster Kingsway College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.westking.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Inderpal</md:GivenName>
+    <md:SurName>Chaggar</md:SurName>
+    <md:EmailAddress>mailto:Inderpal.Chaggar@westking.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Inderpal</md:GivenName>
+    <md:SurName>Chaggar</md:SurName>
+    <md:EmailAddress>mailto:Inderpal.Chaggar@westking.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml
index 664c7f45..41864aeb 100644
--- a/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.wmintelligence.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-03T12:00:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-03T12:00:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">World Market Intelligence</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The world's markets quantified, qualified and expertly evaluated</mdui:Description>
+        <mdui:Logo height="67" width="201">https://s3-eu-west-1.amazonaws.com/www.worldmarketintelligence.com/world_market_intelligence_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">World Market Intelligence</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The world's markets quantified, qualified and expertly evaluated</mdui:Description>
-          <mdui:Logo height="67" width="201">https://s3-eu-west-1.amazonaws.com/www.worldmarketintelligence.com/world_market_intelligence_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIJAOR5X3M97uKJMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHXNoaWJib2xldGgud21pbnRlbGxpZ2VuY2UuY29tMB4XDTE0MDMyMjA0MDAy
 						OVoXDTE3MDMyMTA0MDAyOVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC53bWludGVs
@@ -54,47 +54,47 @@
 						iuc28kLhBX8fCLSx4fnkb7l9g6ogFqNJEGf3PG1EDahl9oX6r51bBVYHYBJM6+Zr
 						hTLk6uX2iiqI9onok/cihw18QDh106Ws9cafIukWyVpHbt4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">World Market Intelligence Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">World Market Intelligence</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.worldmarketintelligence.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bharadwaj</md:GivenName>
-      <md:SurName>Revuri</md:SurName>
-      <md:EmailAddress>mailto:bharadwaj.revuri@digitalinsightresearch.in</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bharadwaj</md:GivenName>
-      <md:SurName>Revuri</md:SurName>
-      <md:EmailAddress>mailto:bharadwaj.revuri@digitalinsightresearch.in</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">World Market Intelligence Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">World Market Intelligence</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worldmarketintelligence.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bharadwaj</md:GivenName>
+    <md:SurName>Revuri</md:SurName>
+    <md:EmailAddress>mailto:bharadwaj.revuri@digitalinsightresearch.in</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bharadwaj</md:GivenName>
+    <md:SurName>Revuri</md:SurName>
+    <md:EmailAddress>mailto:bharadwaj.revuri@digitalinsightresearch.in</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml
index dacc73d2..acf76c79 100644
--- a/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.wolvcoll.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-08T11:12:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-08T11:12:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wolvcoll.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">City of Wolverhampton College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wolvcoll.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">City of Wolverhampton College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUQ4d3Glz5yjW7FW9jd2mP9LsAUe8wDQYJKoZIhvcNAQEF
 						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51azAeFw0xNDA2
 						MjQwOTA1MTdaFw0zNDA2MjQwOTA1MTdaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
@@ -35,26 +35,26 @@
 						SEtWwENvyTZ9VwAGYNoZaEmAjl1eVGaQANlcpXGuTRTLNHFYE+aCa7vYJuxdeU/N
 						Z+YEKF+K/tNlHmpEZ2x/tIv8PvDWgGsK+1FaCPoBrzZmKLo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wolvcoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wolvcoll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIUQ4d3Glz5yjW7FW9jd2mP9LsAUe8wDQYJKoZIhvcNAQEF
 						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51azAeFw0xNDA2
 						MjQwOTA1MTdaFw0zNDA2MjQwOTA1MTdaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
@@ -74,32 +74,32 @@
 						SEtWwENvyTZ9VwAGYNoZaEmAjl1eVGaQANlcpXGuTRTLNHFYE+aCa7vYJuxdeU/N
 						Z+YEKF+K/tNlHmpEZ2x/tIv8PvDWgGsK+1FaCPoBrzZmKLo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">City of Wolverhampton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">City of Wolverhampton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wolvcoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ashley</md:GivenName>
-      <md:SurName>Mills</md:SurName>
-      <md:EmailAddress>mailto:millsash@wolvcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ashley</md:GivenName>
-      <md:SurName>Mills</md:SurName>
-      <md:EmailAddress>mailto:millsash@wolvcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Dean</md:SurName>
-      <md:EmailAddress>mailto:deani@wolvcoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City of Wolverhampton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City of Wolverhampton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wolvcoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ashley</md:GivenName>
+    <md:SurName>Mills</md:SurName>
+    <md:EmailAddress>mailto:millsash@wolvcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ashley</md:GivenName>
+    <md:SurName>Mills</md:SurName>
+    <md:EmailAddress>mailto:millsash@wolvcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Dean</md:SurName>
+    <md:EmailAddress>mailto:deani@wolvcoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
index 3d9bfc0f..2a09e8db 100644
--- a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.crous-poitiers.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T16:02:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T16:02:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">crous Poitiers - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">crous Poitiers - Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">crous Poitiers - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">crous Poitiers - Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDYTCCAkmgAwIBAgIVAK1JJY+Vni1K2/Gj8TSecZ2nfA5OMA0GCSqGSIb3DQEB
 BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgyLmNyb3VzLXBvaXRpZXJzLmZyMB4X
 DTEwMDYxODE2MTUxOVoXDTMwMDYxODE2MTUxOVowKDEmMCQGA1UEAxMdc2hpYmJv
@@ -39,13 +39,13 @@ AJHK4x9hJmHdOd7vCFkzLOmJEyQFYBClzWDbakXM90jaPI8NeC6pWc+qgpYjFGTg
 txfnocW3JJnVt8ty6uqIWt0k+qkO/ogJBnOOe+Lty2s6kWKlpgPNLbT+ongZFDMt
 3IP53Xs=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhDCCA2ygAwIBAgIRAOyWnKD1f6FGsnPww4j9GTkwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMjA1MDcwMDAwMDBaFw0xNTA1MDcyMzU5NTlaMFExCzAJBgNV
@@ -72,21 +72,21 @@ bWRonNMfOHD7lQ8sKowKbLEQ5MBXk+CxZlAXtB6J3WXkoWSr6da7oZNz0YoLx/mJ
 9AS7r/BCoOea+IcvD+fob1d4AG9iMhGJVve2XR1qL22bGdoozeBgr4uLqhOUyC+a
 /H5tNLU/LA8=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">crous Poitiers - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">crous Poitiers - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">crous Poitiers - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">crous Poitiers - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
index 4e00b26a..17235859 100644
--- a/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.id.ubc.ca/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T15:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T15:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubc.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of British Columbia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of British Columbia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ubc.ca</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubc.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The University of British Columbia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of British Columbia</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ubc.ca</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUS6eV0UJWr8nFaqbSe1zg4O1lb7kwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQudWJjLmNhMB4XDTEwMTIwODAx
 NDMyN1oXDTMwMTIwODAxNDMyN1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQu
@@ -37,26 +37,26 @@ LBiArzwbulDn6e1JchJsQjmYeySC3ukrNubxZbprJvgkF3JB/SVGmdd59lR26kSN
 Razfk7UV1M4HAv71TpcdpKM/zApv5/9Glp9lQT+uq2U5TS8njGgEC6Z+ZKDRcOw6
 rmMMp8QfnRo+ehVUPP49SGgN/g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.id.ubc.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubc.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.id.ubc.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubc.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUS6eV0UJWr8nFaqbSe1zg4O1lb7kwDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQudWJjLmNhMB4XDTEwMTIwODAx
 NDMyN1oXDTMwMTIwODAxNDMyN1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQu
@@ -76,22 +76,22 @@ LBiArzwbulDn6e1JchJsQjmYeySC3ukrNubxZbprJvgkF3JB/SVGmdd59lR26kSN
 Razfk7UV1M4HAv71TpcdpKM/zApv5/9Glp9lQT+uq2U5TS8njGgEC6Z+ZKDRcOw6
 rmMMp8QfnRo+ehVUPP49SGgN/g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of British Columbia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of British Columbia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ubc.ca/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hari</md:GivenName>
-      <md:SurName>Mailvaganam</md:SurName>
-      <md:EmailAddress>mailto:hari.mailvaganam@ubc.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of British Columbia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of British Columbia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ubc.ca/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hari</md:GivenName>
+    <md:SurName>Mailvaganam</md:SurName>
+    <md:EmailAddress>mailto:hari.mailvaganam@ubc.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml
index e4b71f47..902d01d5 100644
--- a/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.liv.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-29T09:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-29T09:49:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQDWC0umrtoXlDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEQMA4GA1UECAwHRW5nbGFuZDETMBEGA1UEBwwKTWVyc2V5c2lkZTEgMB4GA1UE
 						CgwXVW5pdmVyc2l0eSBvZiBMaXZlcnBvb2wxHjAcBgNVBAMMFXNoaWJib2xldGgy
@@ -38,26 +38,26 @@
 						SIk8ozzg9KvEhce6LWuJTSYgUNXkGjl84VhJAMK9ioFkQmdFaCXCs+Vp2bZJovkN
 						t8ukc2Dgz1WJXVlP
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQDWC0umrtoXlDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEQMA4GA1UECAwHRW5nbGFuZDETMBEGA1UEBwwKTWVyc2V5c2lkZTEgMB4GA1UE
 						CgwXVW5pdmVyc2l0eSBvZiBMaXZlcnBvb2wxHjAcBgNVBAMMFXNoaWJib2xldGgy
@@ -78,27 +78,27 @@
 						SIk8ozzg9KvEhce6LWuJTSYgUNXkGjl84VhJAMK9ioFkQmdFaCXCs+Vp2bZJovkN
 						t8ukc2Dgz1WJXVlP
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Liverpool (TEST do not use)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Gilbertson</md:SurName>
-      <md:EmailAddress>mailto:webmaster@liv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Pretlove</md:SurName>
-      <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Liverpool (TEST do not use)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Gilbertson</md:SurName>
+    <md:EmailAddress>mailto:webmaster@liv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Pretlove</md:SurName>
+    <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml
index 880c112c..26ead730 100644
--- a/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.rwcmd.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-03T18:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-03T18:05:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rwcmd.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rwcmd.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9DCCAtwCCQCCojb3OfH/lTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0NhcmRpZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoT
 						JlJveWFsIFdlbHNoIENvbGxlZ2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQL
@@ -37,27 +37,27 @@
 						jJlh7/XeUvowweMSEk7iKrbGp4pHhMbPQsFo90i3BWBE9yot/DN+T/G9Z6W05Tsr
 						Pk3B5nn2ecE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rwcmd.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rwcmd.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9DCCAtwCCQCCojb3OfH/lTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
 						R0IxEDAOBgNVBAgTB0NhcmRpZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoT
 						JlJveWFsIFdlbHNoIENvbGxlZ2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQL
@@ -81,27 +81,27 @@
 						jJlh7/XeUvowweMSEk7iKrbGp4pHhMbPQsFo90i3BWBE9yot/DN+T/G9Z6W05Tsr
 						Pk3B5nn2ecE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Welsh College of Music and Drama</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Welsh College of Music and Drama</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rwcmd.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Tottle</md:SurName>
-      <md:EmailAddress>mailto:gareth.tottle@rwcmd.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Tottle</md:SurName>
-      <md:EmailAddress>mailto:gareth.tottle@rwcmd.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Welsh College of Music and Drama</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Welsh College of Music and Drama</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rwcmd.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Tottle</md:SurName>
+    <md:EmailAddress>mailto:gareth.tottle@rwcmd.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Tottle</md:SurName>
+    <md:EmailAddress>mailto:gareth.tottle@rwcmd.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
index 70a8b13e..66cdbeb3 100644
--- a/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.ufms.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufms.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufms.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufms.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufms.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufms.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufms.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
 EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
@@ -46,26 +46,26 @@ aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
 HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
 d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ufms.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufms.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ufms.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufms.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
@@ -91,24 +91,24 @@ HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
 d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufms.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufms.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Ronaldo Alves Ferreira</md:SurName>
-      <md:EmailAddress>raf@dct.ufms.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufms.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufms.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Ronaldo Alves Ferreira</md:SurName>
+    <md:EmailAddress>raf@dct.ufms.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml
index 7abd5e3e..f325079f 100644
--- a/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp-test.sams2.oup.com-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp-test.sams2.oup.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-18T15:49:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-18T15:49:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID6DCCAtCgAwIBAgIJANEE6ny6uMMRMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xKTAnBgNVBAMTIHNoaWJib2xldGgyc3AtdGVzdC5zYW1z
@@ -52,45 +52,45 @@
 						/fcE+OPO0R3z4fEP9zYI58KoazgI7QwYCyObT117ACShSVXbwtHzVa+wabUBU7r7
 						cxQkl4oHEJe5OMQLLIlOkRgAFVe8e3UsWhSICCOSwB8SgQVHxrrJJ1UnOxw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OUP SAMS2 test Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethSupport@oup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethSupport@oup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp-test.sams2.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OUP SAMS2 test Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethSupport@oup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethSupport@oup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml
index e15d9d67..37448789 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.bpp.semcs.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-29T12:04:50Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-29T12:04:50Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzjCCAzegAwIBAgIDEAAXMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
 						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
 						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
@@ -30,13 +30,13 @@
 						x37npAKQWvdmRWPFQPmXq1vzl+K21P25cPpuKyfmTakrVBCgLc6FfF/+mMlSl1QG
 						WDHMW7heQivp3022de81dMFg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzjCCAzegAwIBAgIDEAAXMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
 						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
 						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
@@ -59,36 +59,36 @@
 						x37npAKQWvdmRWPFQPmXq1vzl+K21P25cPpuKyfmTakrVBCgLc6FfF/+mMlSl1QG
 						WDHMW7heQivp3022de81dMFg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bloomsbury Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bloomsbury.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:bpp-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:bpp-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bloomsbury Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bloomsbury.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:bpp-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:bpp-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
index 8a83ce59..13eca8cc 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.brill.test.semantico.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEADCCAuigAwIBAgIJAJHnQHTfSIkVMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xLzAtBgNVBAMTJnNoaWJib2xldGgyc3AuYnJpbGwudGVz
@@ -31,36 +31,36 @@
 						YewH2BVJfIHcvb0og5JuID8n6pK5dk3Oto7JfrfFBMud5HXQyiJQBFG3XImvCKyA
 						apRzo7PMQM8MkzJRll+WaeTncU4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Brill Test Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brill.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Brill Test Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brill.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
index 8da29d43..cfa7889b 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.brillonline.nl/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID1jCCAr6gAwIBAgIJANySKK7sPqq+MA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJTAjBgNVBAMTHHNoaWJib2xldGgyc3AuYnJpbGxvbmxp
@@ -30,36 +30,36 @@
 						GUyHWM3Hk/NPMuV49u+GU/beegr/XVyLUTMj1EyxCPpXr5bShe1sZ73TVQ51b6am
 						uVOG89dvf99DIrLXGx9zxyM6HTWXTmaT/9A=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Brill Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brill.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Brill Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brill.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:brill-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml
index df55d9f0..bd395cca 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.bw.semcs.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-06T13:59:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-06T13:59:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzjCCAragAwIBAgIJAOrzhMg7IMvZMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3AuYncuc2VtY3Mu
@@ -36,37 +36,37 @@
 						4voeK7R1wmoYtSVdDb506kbMzSM+jsSaX8tjlI5AULxOFcarmZnJQzSV6RkSUSqP
 						dZIy/reh17W2tzo/KX0nvOa+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Wiley Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://eu.wiley.com/WileyCDA/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Williamson</md:SurName>
-      <md:EmailAddress>mailto:mawilliams@wiley.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Wiley Support</md:GivenName>
-      <md:EmailAddress>mailto:wiley-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Wiley Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://eu.wiley.com/WileyCDA/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Williamson</md:SurName>
+    <md:EmailAddress>mailto:mawilliams@wiley.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wiley Support</md:GivenName>
+    <md:EmailAddress>mailto:wiley-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml
index 1ca6b606..1e23ca1c 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.cab.semcs.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCArqgAwIBAgIJAKhAI5hrPtycMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY2FiLnNlbWNz
@@ -30,36 +30,36 @@
 						0m0iUUdeVcYD/QO1RmKCVKRiE/ggedRWm9kWuZndS9NKueRPBSUS+cRTrt1gjHT6
 						6rueyK7gPe52OqpcIeT+P9Ubo17Llg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: CABI Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:cab-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:cab-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: CABI Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:cab-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:cab-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml
index ef2f4828..bc430117 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.col.semcs.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-22T13:05:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-22T13:05:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCArqgAwIBAgIJAIR565zZHkQcMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY29sLnNlbWNz
@@ -52,47 +52,47 @@
 						sLggjdvG35vJWHdpUgrzL1hqg4409PL/XNr9JSLUCHp7hjMW5GhHG8fGiwgEC/gl
 						fgKAz+RKd1veDuEVh3+fQuDubthfwg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Columbia Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.columbia.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Sterns</md:SurName>
-      <md:EmailAddress>mailto:ss724@columbia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Sterns</md:SurName>
-      <md:EmailAddress>mailto:ss724@columbia.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Columbia Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.columbia.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Sterns</md:SurName>
+    <md:EmailAddress>mailto:ss724@columbia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Sterns</md:SurName>
+    <md:EmailAddress>mailto:ss724@columbia.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
index 9d83c018..474ef2b4 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.gar.semcs.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-28T10:24:56Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-28T10:24:56Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzjCCAzegAwIBAgIDEAAjMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
 						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
 						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
@@ -34,38 +34,38 @@
 						O37Rw5jvRqdt0E37hhYtiWVCQPPKYtuHpQ9Jiz/8nEiH2Ozpq3CHC8VDb3D5qbZm
 						x5OFM73HnkJd1Zy08T41rQ9l
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Little Group Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">VLebooks.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vlebooks.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Pallant</md:SurName>
-      <md:EmailAddress>mailto:gsupport@gardners.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Pallant</md:SurName>
-      <md:EmailAddress>mailto:gsupport@gardners.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Little Group Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">VLebooks.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vlebooks.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Pallant</md:SurName>
+    <md:EmailAddress>mailto:gsupport@gardners.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Pallant</md:SurName>
+    <md:EmailAddress>mailto:gsupport@gardners.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml
index b80af946..6e964e41 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.ios.semcs.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.ios.semcs.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-01T17:31:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-01T17:31:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCArqgAwIBAgIJAMXnSzQszPKAMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuaW9zLnNlbWNz
@@ -52,45 +52,45 @@
 						ReOQ+FcpuO5hS7L0bhpYICYJYidKZFWCsEBrHYub2bDLlM57tbowVy/SPg65ftcv
 						3PPCuNuaSO0bOCP/EsX2q+VJZ4T0rg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ios Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iospress.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IOS Press Customer Service</md:GivenName>
-      <md:EmailAddress>mailto:customerservice@iospress.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Semantico Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.ios.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ios Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iospress.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IOS Press Customer Service</md:GivenName>
+    <md:EmailAddress>mailto:customerservice@iospress.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Semantico Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
index 625831ca..19bfa02e 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.jstor.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-16T08:54:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-16T08:54:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JSTOR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">JSTOR is a digital library of academic journals, books, and primary sources.</mdui:Description>
+        <mdui:Logo height="80" width="80">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_80x80px.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_16x16px.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">JSTOR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">JSTOR is a digital library of academic journals, books, and primary sources.</mdui:Description>
-          <mdui:Logo height="80" width="80">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_80x80px.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_16x16px.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwjCCAqqgAwIBAgIJAJgkGmQBfO0tMA0GCSqGSIb3DQEBBQUAMGcxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xIDAeBgNVBAMTF3NoaWJib2xldGgyc3AuanN0b3Iub3Jn
@@ -58,52 +58,52 @@
 						DhqQFdFGUhFvH+wuY366L7UhWBLqhLhERqJ4qBe06Qeg7JrAvK7fqPBWNTbDtEkI
 						NNLmpeHL
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">JSTOR</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ithaka Harbors, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">JSTOR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://about.jstor.org/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Larsen</md:SurName>
-      <md:EmailAddress>mailto:brian.larsen@ithaka.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Larsen</md:SurName>
-      <md:EmailAddress>mailto:brian.larsen@ithaka.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">JSTOR</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ithaka Harbors, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JSTOR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://about.jstor.org/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Larsen</md:SurName>
+    <md:EmailAddress>mailto:brian.larsen@ithaka.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Larsen</md:SurName>
+    <md:EmailAddress>mailto:brian.larsen@ithaka.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml
index d2edb93f..3d6f9fae 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.mhp.semcs.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-23T13:54:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-23T13:54:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCArqgAwIBAgIJAPx54Ehep++5MA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNz
@@ -36,13 +36,13 @@
 						bDPaJ11iT7DRjo2la7koLO/ZuPVilaWNPD2DTKQzkbErUbKmWY7RSp2QgwIKuDT/
 						zLCWlyfdI+tWif3o7y28c1cRve942w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCArqgAwIBAgIJAPx54Ehep++5MA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNz
@@ -65,36 +65,36 @@
 						bDPaJ11iT7DRjo2la7koLO/ZuPVilaWNPD2DTKQzkbErUbKmWY7RSp2QgwIKuDT/
 						zLCWlyfdI+tWif3o7y28c1cRve942w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">McGraw-Hill Education LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">McGraw-Hill Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mheducation.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>McGraw-Hill Tech Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@mhprofessional.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>McGraw-Hill Tech Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@mhprofessional.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">McGraw-Hill Education LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">McGraw-Hill Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mheducation.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>McGraw-Hill Tech Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@mhprofessional.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>McGraw-Hill Tech Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@mhprofessional.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml
index 723026e7..1dbe8d90 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.pm.semcs.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzjCCAragAwIBAgIJALftanjyX859MA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3AucG0uc2VtY3Mu
@@ -30,36 +30,36 @@
 						wpqstIhDfYaH16h7HTMThBsVP6AlR+ANOzavUQsZTw73l/KeFAJtIFICkqK1jFlq
 						CySVk3++EEgHcu1AN8Mb779L
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Palgrave Macmillan Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:pm-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:pm-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Palgrave Macmillan Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:pm-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:pm-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml
index 213579f5..3c243934 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.rps.semcs.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T14:32:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T14:32:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID0jCCArqgAwIBAgIJAOqGEKcJ4C/CMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AucnBzLnNlbWNz
@@ -36,36 +36,36 @@
 						fy7FRF3c0SYeXHzVnLhlGC9GNmE7UgKcrllxkfnuQSujIElzo1QXYhYS1/xLl34A
 						mDKmI+Hu/XcCdWeZu0zW90bBAEGR4w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: RPS Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rpharms.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@rps.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>RPS Support</md:GivenName>
-      <md:EmailAddress>mailto:rps-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: RPS Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rpharms.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@rps.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>RPS Support</md:GivenName>
+    <md:EmailAddress>mailto:rps-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml
index 1c614a78..6b11b680 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.sams.oup.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzjCCAragAwIBAgIJAOCOWWVEFpLlMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3Auc2Ftcy5vdXAu
@@ -30,36 +30,36 @@
 						vBhfOmEMUYk81ZVClGg8E3sxZlKowDo50xkUPnBIqEtBwvQssEcNipQ4bTOtK0qn
 						zZ5OrA5cf9v+vwbMpv+nt4L+
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OUP Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OUP Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml
index 024a217b..96f8894f 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.samstest.oup.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID3jCCAsagAwIBAgIJALmUDAYFh5xSMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xJzAlBgNVBAMTHnNoaWJib2xldGgyc3Auc2Ftc3Rlc3Qu
@@ -30,36 +30,36 @@
 						LBpvmKRfF8+YKlXaQs3Bbc9asY7l/D+JHfa392OXEwEZg5MsRfhOBrmRw0lJHO+V
 						wp4If5+CQ3qDrxN7e9dH2boYn/dxLkDTeg4bSVeU0YvUQw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: OUP Test Shibboleth 2 SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: OUP Test Shibboleth 2 SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.semantico.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:oup-shibboleth-support@semantico.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml
index 1329a811..70b9f0f3 100644
--- a/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.tf.semcs.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-23T15:07:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-23T15:07:00Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzTCCAzagAwIBAgIDEAAKMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
 						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
 						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
@@ -33,13 +33,13 @@
 						jpfkkHBvE7wePMvargxjK/IzU8Q627GESWcLk4Z2oGcYo4DDQLJMim3iklcl2PJt
 						v8IZHuUqZxTbUnnNWkrb8Kc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzTCCAzagAwIBAgIDEAAKMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
 						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
 						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
@@ -62,37 +62,37 @@
 						jpfkkHBvE7wePMvargxjK/IzU8Q627GESWcLk4Z2oGcYo4DDQLJMim3iklcl2PJt
 						v8IZHuUqZxTbUnnNWkrb8Kc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Taylor and Francis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.taylorandfrancisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TandF Online Support</md:GivenName>
-      <md:EmailAddress>mailto:support@tandfonline.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joanne</md:GivenName>
-      <md:SurName>Golding</md:SurName>
-      <md:EmailAddress>mailto:eproductsopssupport@informa.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Semantico Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Semantico Limited: Taylor and Francis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.taylorandfrancisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TandF Online Support</md:GivenName>
+    <md:EmailAddress>mailto:support@tandfonline.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joanne</md:GivenName>
+    <md:SurName>Golding</md:SurName>
+    <md:EmailAddress>mailto:eproductsopssupport@informa.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
index 891d4b45..c693d8ae 100644
--- a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth3.liv.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:14:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:14:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
 						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
@@ -37,29 +37,29 @@
 						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
 						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3-test.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3-test.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
 						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
@@ -79,27 +79,27 @@
 						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
 						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Liverpool - Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Pretlove</md:SurName>
-      <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Pretlove</md:SurName>
-      <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Liverpool - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Pretlove</md:SurName>
+    <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Pretlove</md:SurName>
+    <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth3t.lsbu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth3t.lsbu.ac.uk-idp-shibboleth.xml
index 51d3a870..7e95b951 100644
--- a/swamid-interfederations-2.0/shibboleth3t.lsbu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth3t.lsbu.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth3t.lsbu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-23T11:48:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-23T11:48:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London South Bank University Shibboleth3 Test Server</mdui:DisplayName>
+        <mdui:Description xml:lang="en">shibboleth3t.lsbu.ac.uk a test server for shibboleth 3</mdui:Description>
+        <mdui:Logo height="80" width="60">https://www1.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London South Bank University Shibboleth3 Test Server</mdui:DisplayName>
-          <mdui:Description xml:lang="en">shibboleth3t.lsbu.ac.uk a test server for shibboleth 3</mdui:Description>
-          <mdui:Logo height="80" width="60">https://www1.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUE/fT/9pMSO/v5nE3rz+9rwFT5wgwDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXc2hpYmJvbGV0aDN0LmxzYnUuYWMudWswHhcNMTYwMjE3
 						MTEwOTI5WhcNMzYwMjE3MTEwOTI5WjAiMSAwHgYDVQQDDBdzaGliYm9sZXRoM3Qu
@@ -42,13 +42,13 @@
 						aYrSsA4SIpO2p2XH139JUCYRdqe1bwdkRR0vZC+Ptlamgy9+b41Khs++0leMZyCp
 						sVe7a6G/u+7AFOngbpVv9w0jzNUnUFfcBHwE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUS+bn4hDHkAGNq6o7sEADhOt+uiswDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXc2hpYmJvbGV0aDN0LmxzYnUuYWMudWswHhcNMTYwMjE3
 						MTEwOTI4WhcNMzYwMjE3MTEwOTI4WjAiMSAwHgYDVQQDDBdzaGliYm9sZXRoM3Qu
@@ -68,13 +68,13 @@
 						Bbf3A4EFzN/y5UzHcSYtDcK8cYDj3Uysx0Kggc9RLkWKh+OyEssxCNlgb+bE3coW
 						tGrLYFmeRvM/llGe2Z+2PTPmBu7g8e0bsJOn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUBKlrJrjzS1nUF+AXlA8lmcYlmG4wDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXc2hpYmJvbGV0aDN0LmxzYnUuYWMudWswHhcNMTYwMjE3
 						MTEwOTI5WhcNMzYwMjE3MTEwOTI5WjAiMSAwHgYDVQQDDBdzaGliYm9sZXRoM3Qu
@@ -94,26 +94,26 @@
 						FvDijCjqTEo3JeTvKJxdiF7wGCiuIWw0iOscp1vSmBgJnpr9jECB3v24PflxzpzJ
 						ZrKdJ6BC/BQX0WPYD5TrOObIbg3wh61P7mSA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3t.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3t.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3t.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3t.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3t.lsbu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUE/fT/9pMSO/v5nE3rz+9rwFT5wgwDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXc2hpYmJvbGV0aDN0LmxzYnUuYWMudWswHhcNMTYwMjE3
 						MTEwOTI5WhcNMzYwMjE3MTEwOTI5WjAiMSAwHgYDVQQDDBdzaGliYm9sZXRoM3Qu
@@ -133,13 +133,13 @@
 						aYrSsA4SIpO2p2XH139JUCYRdqe1bwdkRR0vZC+Ptlamgy9+b41Khs++0leMZyCp
 						sVe7a6G/u+7AFOngbpVv9w0jzNUnUFfcBHwE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUS+bn4hDHkAGNq6o7sEADhOt+uiswDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXc2hpYmJvbGV0aDN0LmxzYnUuYWMudWswHhcNMTYwMjE3
 						MTEwOTI4WhcNMzYwMjE3MTEwOTI4WjAiMSAwHgYDVQQDDBdzaGliYm9sZXRoM3Qu
@@ -159,13 +159,13 @@
 						Bbf3A4EFzN/y5UzHcSYtDcK8cYDj3Uysx0Kggc9RLkWKh+OyEssxCNlgb+bE3coW
 						tGrLYFmeRvM/llGe2Z+2PTPmBu7g8e0bsJOn
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUBKlrJrjzS1nUF+AXlA8lmcYlmG4wDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXc2hpYmJvbGV0aDN0LmxzYnUuYWMudWswHhcNMTYwMjE3
 						MTEwOTI5WhcNMzYwMjE3MTEwOTI5WjAiMSAwHgYDVQQDDBdzaGliYm9sZXRoM3Qu
@@ -185,24 +185,24 @@
 						FvDijCjqTEo3JeTvKJxdiF7wGCiuIWw0iOscp1vSmBgJnpr9jECB3v24PflxzpzJ
 						ZrKdJ6BC/BQX0WPYD5TrOObIbg3wh61P7mSA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3t.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London South Bank University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London South Bank University Shibboleth3 Test Server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bethan</md:GivenName>
-      <md:SurName>James</md:SurName>
-      <md:EmailAddress>mailto:jamesbe@lsbu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Swigg</md:SurName>
-      <md:EmailAddress>mailto:swiggtc@lsbu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3t.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London South Bank University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London South Bank University Shibboleth3 Test Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bethan</md:GivenName>
+    <md:SurName>James</md:SurName>
+    <md:EmailAddress>mailto:jamesbe@lsbu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Swigg</md:SurName>
+    <md:EmailAddress>mailto:swiggtc@lsbu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml
index 5d5c357f..7fa67475 100644
--- a/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboletht.lsbu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-12T17:50:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-12T17:50:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London South Bank University (Test)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London South Bank University (Test)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVANaRWeyV4EZWBxiDDbeqrCEOlAx/MA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFnNoaWJib2xldGh0LmxzYnUuYWMudWswHhcNMTMwMzEy
 						MDkyMDQwWhcNMzMwMzEyMDkyMDQwWjAhMR8wHQYDVQQDExZzaGliYm9sZXRodC5s
@@ -42,26 +42,26 @@
 						Rk/wXB36TDkXc/SzFG0A8TfwgU0UbGmCmEdywRiSR/YrgOJQjTtet52TtbO6winR
 						HMkLjW4kYt87oasn5kJ1P/G3WWy4BZvd
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboletht.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboletht.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsbu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVANaRWeyV4EZWBxiDDbeqrCEOlAx/MA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFnNoaWJib2xldGh0LmxzYnUuYWMudWswHhcNMTMwMzEy
 						MDkyMDQwWhcNMzMwMzEyMDkyMDQwWjAhMR8wHQYDVQQDExZzaGliYm9sZXRodC5s
@@ -81,26 +81,26 @@
 						Rk/wXB36TDkXc/SzFG0A8TfwgU0UbGmCmEdywRiSR/YrgOJQjTtet52TtbO6winR
 						HMkLjW4kYt87oasn5kJ1P/G3WWy4BZvd
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">London South Bank University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London South Bank University (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Subscriptions and Licensing Team</md:GivenName>
-      <md:EmailAddress>mailto:llrejnls@lsbu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Swigg</md:SurName>
-      <md:EmailAddress>mailto:swiggtc@lsbu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">London South Bank University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London South Bank University (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Subscriptions and Licensing Team</md:GivenName>
+    <md:EmailAddress>mailto:llrejnls@lsbu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Swigg</md:SurName>
+    <md:EmailAddress>mailto:swiggtc@lsbu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml
index f2070a9a..d3ffaa32 100644
--- a/swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbolethv3.ac-limoges.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbolethv3.ac-limoges.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-10T15:29:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-10T15:29:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-limoges.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rectorat Limoges Test shib3</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz32ST2iScRjHn9/vfdXXOfW113RJ09Y2xWXvDJLYkiIGRR1ih6AReIh1aF2COu1Q9Ic61W0xqE616LCglRdjh1ogdZhsWZTTzWzWmDLf+W5z6uvr++swoWbSc3y+z4fvA98vIoRAo5mKLGEEFMa93pa/97jhdTQh3Hsw/ex1nHeZ6yTU0GE+La6slg7xVvSPVA98SuQ+ziz/XN7AGO22Nvu6rV4n1xgQC5Xbo9OLqTxnaXK3myoVJZbM53ObjjbTtaGDRp1qG1AoyZduvqcxXDi7z9vJIYwojAiByNzK6FiUovDI9SM6hv4D3HkYiSWER3f7Xga/TUx+RwhVFbKxKY/cOqpntZdvTPH7LcODBwCABoCsUJqJZi4GeEaFCYCWofw+m92ml6Sq0aAxs0z/yfYXwXh21W0xMRgAFtIixrjbtbP2JaBiURbXpfxaWa2iAMDnsWKEFtJizaEsyQRA30RvARSFIp+zZUlZK1SO+fcY9BqdVkUAypJcA4wGDQKSyRUdu5oBoCxVBwc8fJe1IiscqwGArFBEhLB6ppa0p4NDGIfCiwBQrRIAePz8y9Dw5Pmrb+JJAQCCb5NYTXs6d9QcVBQaOO0cG//a1cEd9tksZmbrN0WBvXb21bvU7Gzm3Bk3jdG24O4/iYY/pI/3tZ3yO+wtOgUg9Wt9PDQ/HVnq6Wm9EuAbVCMUTj+diEklGTACAogQtVYV6Hed6G39X/nmfohCvggAHKt1Oox16m8MQ+kQHdNaCQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ac-limoges.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personnel éducation national</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Rectorat Academie de  Limoges</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel éducation national</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-limoges.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rectorat Limoges Test shib3</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz32ST2iScRjHn9/vfdXXOfW113RJ09Y2xWXvDJLYkiIGRR1ih6AReIh1aF2COu1Q9Ic61W0xqE616LCglRdjh1ogdZhsWZTTzWzWmDLf+W5z6uvr++swoWbSc3y+z4fvA98vIoRAo5mKLGEEFMa93pa/97jhdTQh3Hsw/ex1nHeZ6yTU0GE+La6slg7xVvSPVA98SuQ+ziz/XN7AGO22Nvu6rV4n1xgQC5Xbo9OLqTxnaXK3myoVJZbM53ObjjbTtaGDRp1qG1AoyZduvqcxXDi7z9vJIYwojAiByNzK6FiUovDI9SM6hv4D3HkYiSWER3f7Xga/TUx+RwhVFbKxKY/cOqpntZdvTPH7LcODBwCABoCsUJqJZi4GeEaFCYCWofw+m92ml6Sq0aAxs0z/yfYXwXh21W0xMRgAFtIixrjbtbP2JaBiURbXpfxaWa2iAMDnsWKEFtJizaEsyQRA30RvARSFIp+zZUlZK1SO+fcY9BqdVkUAypJcA4wGDQKSyRUdu5oBoCxVBwc8fJe1IiscqwGArFBEhLB6ppa0p4NDGIfCiwBQrRIAePz8y9Dw5Pmrb+JJAQCCb5NYTXs6d9QcVBQaOO0cG//a1cEd9tksZmbrN0WBvXb21bvU7Gzm3Bk3jdG24O4/iYY/pI/3tZ3yO+wtOgUg9Wt9PDQ/HVnq6Wm9EuAbVCMUTj+diEklGTACAogQtVYV6Hed6G39X/nmfohCvggAHKt1Oox16m8MQ+kQHdNaCQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ac-limoges.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Personnel éducation national</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Rectorat Academie de  Limoges</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel éducation national</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDVDCCAjygAwIBAgIVAIJ5CqGf8i3eeJ4z6EwaacBFom5OMA0GCSqGSIb3DQEB
 CwUAMCUxIzAhBgNVBAMMGnNoaWJib2xldGh2My5hYy1saW1vZ2VzLmZyMB4XDTE2
 MDMyMzEwNTI1MFoXDTM2MDMyMzEwNTI1MFowJTEjMCEGA1UEAwwac2hpYmJvbGV0
@@ -40,21 +40,21 @@ EmIQZeG+ZQqerErfzzH6QYl6KZpNpvQKYY5u/PskHO9IxKixVf6vbyTIqHZOzhc0
 b4wzF3bsYpMFytKm/s30eB0y4TFS8yJenO3Hs0h/RVXJc5hyzeoFduTIM8/Caroc
 nny0Gc5o3vE90Pel8WhL9uZht7coxWkn7V349ALZl4yKygo5tKbhSQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rectorat Academie de  Limoges</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rectorat Academie de  Limoges</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ac-limoges.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>l.das-ie@ac-limoges.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbolethv3.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rectorat Academie de  Limoges</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rectorat Academie de  Limoges</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ac-limoges.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>l.das-ie@ac-limoges.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml b/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml
index a8990487..3d5b91d9 100644
--- a/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbox.lpplus.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T11:11:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T11:11:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibbox.lpplus.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibbox.lpplus.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibbox.lpplus.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibbox.lpplus.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJAKnfC0bVM4B8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGWxwZTFiMTEtZHBtLTAxLmxwcGx1cy5uZXQwHhcNMTUwNjExMTE0NjI3WhcN
 						MjUwNjA4MTE0NjI3WjAkMSIwIAYDVQQDExlscGUxYjExLWRwbS0wMS5scHBsdXMu
@@ -48,43 +48,43 @@
 						uLJGy1P1ZbNhvLrcFsfa9DWPvDNmg2BxLs0GTv84b2Tqfc09muz7IEQbeRv5IVzJ
 						+mCa8NQYKoO0Gn2O/HMlYdnqjqw/Hw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.lpplus.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LP+ Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LP+ Limited: Shibboleth single signon</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lpplus.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sandip</md:GivenName>
-      <md:SurName>Mehta</md:SurName>
-      <md:EmailAddress>mailto:Sandip.mehta@lpplus.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sandip</md:GivenName>
-      <md:SurName>Mehta</md:SurName>
-      <md:EmailAddress>mailto:Sandip.mehta@lpplus.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.lpplus.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LP+ Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LP+ Limited: Shibboleth single signon</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lpplus.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sandip</md:GivenName>
+    <md:SurName>Mehta</md:SurName>
+    <md:EmailAddress>mailto:Sandip.mehta@lpplus.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sandip</md:GivenName>
+    <md:SurName>Mehta</md:SurName>
+    <md:EmailAddress>mailto:Sandip.mehta@lpplus.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml
index d1cd7552..0217fdf2 100644
--- a/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbserver.preston.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">preston.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">preston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDkmtqgfo843jANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTGFuY2FzaGlyZTEQMA4GA1UEBxMHUHJlc3RvbjEYMBYGA1UE
 						ChMPUHJlc3RvbiBDb2xsZWdlMSIwIAYDVQQDExlzaGliYnNlcnZlci5wcmVzdG9u
@@ -31,26 +31,26 @@
 						LwVxuog72RAqDyvj84SV+ihyvitlwBEs3Q9/qecTCl9zvdYuhUrdqQ/CiWut7Vhu
 						jPVaDg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbserver.preston.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">preston.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbserver.preston.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">preston.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYDCCAkgCCQDkmtqgfo843jANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
 						QjETMBEGA1UECBMKTGFuY2FzaGlyZTEQMA4GA1UEBxMHUHJlc3RvbjEYMBYGA1UE
 						ChMPUHJlc3RvbiBDb2xsZWdlMSIwIAYDVQQDExlzaGliYnNlcnZlci5wcmVzdG9u
@@ -71,27 +71,27 @@
 						LwVxuog72RAqDyvj84SV+ihyvitlwBEs3Q9/qecTCl9zvdYuhUrdqQ/CiWut7Vhu
 						jPVaDg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Preston College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Preston College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.preston.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Greenwood</md:SurName>
-      <md:EmailAddress>mailto:JGreenwood@preston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Greenwood</md:SurName>
-      <md:EmailAddress>mailto:JGreenwood@preston.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Preston College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Preston College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.preston.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Greenwood</md:SurName>
+    <md:EmailAddress>mailto:JGreenwood@preston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Greenwood</md:SurName>
+    <md:EmailAddress>mailto:JGreenwood@preston.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml
index 8c13305d..d10547ff 100644
--- a/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbsrv1.gsa.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsa.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsa.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWjCCAkICCQCivWPQEvRbljANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHR2xhc2dvdzEXMBUGA1UEBxMOUmVuZnJldyBTdHJlZXQxFzAV
 						BgNVBAoTDlJlbmZyZXcgU3RyZWV0MRwwGgYDVQQDExNzaGliYnNydjEuZ3NhLmFj
@@ -30,26 +30,26 @@
 						yhnJqONwsMlgVqghAmHILD54ZgEsBUX+drhMVu7+Vk0tocvfr5SDmp5yfB2zl2RV
 						ZAsbj5IQmyAuMRF3AnM7837HCnvjO/89bCjODt286HBAvPgyRFbHiUpruf3F+A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsa.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsa.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWjCCAkICCQCivWPQEvRbljANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHR2xhc2dvdzEXMBUGA1UEBxMOUmVuZnJldyBTdHJlZXQxFzAV
 						BgNVBAoTDlJlbmZyZXcgU3RyZWV0MRwwGgYDVQQDExNzaGliYnNydjEuZ3NhLmFj
@@ -69,27 +69,27 @@
 						yhnJqONwsMlgVqghAmHILD54ZgEsBUX+drhMVu7+Vk0tocvfr5SDmp5yfB2zl2RV
 						ZAsbj5IQmyAuMRF3AnM7837HCnvjO/89bCjODt286HBAvPgyRFbHiUpruf3F+A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Glasgow School of Art</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glasgow School of Art (MyGSA)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gsa.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sid</md:GivenName>
-      <md:SurName>Meldrum</md:SurName>
-      <md:EmailAddress>mailto:s.meldrum@gsa.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sid</md:GivenName>
-      <md:SurName>Meldrum</md:SurName>
-      <md:EmailAddress>mailto:s.meldrum@gsa.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Glasgow School of Art</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow School of Art (MyGSA)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gsa.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sid</md:GivenName>
+    <md:SurName>Meldrum</md:SurName>
+    <md:EmailAddress>mailto:s.meldrum@gsa.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sid</md:GivenName>
+    <md:SurName>Meldrum</md:SurName>
+    <md:EmailAddress>mailto:s.meldrum@gsa.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml
index 9fbd01c5..f6de3d28 100644
--- a/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml
+++ b/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibby.wmc.ac.uk/shibboleth-idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T13:29:41Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T13:29:41Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAJm8LRnbbTtCyAebesXC3JGiCv8lMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEHNoaWJieS53bWMuYWMudWswHhcNMTIxMTAyMTYxNDQx
 						WhcNMzIxMTAyMTYxNDQxWjAbMRkwFwYDVQQDExBzaGliYnkud21jLmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						frMvrz8BJyqOnVn3ZPPCnURELyep6IyLChkzQv34g7hdewKWzF/fvrz1XAD2e3RO
 						Lf2uU4A+RncCtsGT3wOKNjecHAfQ5rZy+MGd3LT9iRDeWeHwF0+dYV2vSb43n90e
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAJm8LRnbbTtCyAebesXC3JGiCv8lMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEHNoaWJieS53bWMuYWMudWswHhcNMTIxMTAyMTYxNDQx
 						WhcNMzIxMTAyMTYxNDQxWjAbMRkwFwYDVQQDExBzaGliYnkud21jLmFjLnVrMIIB
@@ -67,27 +67,27 @@
 						frMvrz8BJyqOnVn3ZPPCnURELyep6IyLChkzQv34g7hdewKWzF/fvrz1XAD2e3RO
 						Lf2uU4A+RncCtsGT3wOKNjecHAfQ5rZy+MGd3LT9iRDeWeHwF0+dYV2vSb43n90e
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wirral Metropolitan College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wirral Metropolitan College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://wmc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Fogarty</md:SurName>
-      <md:EmailAddress>mailto:ian.fogarty@wmc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Fogarty</md:SurName>
-      <md:EmailAddress>mailto:ian.fogarty@wmc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wirral Metropolitan College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wirral Metropolitan College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://wmc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Fogarty</md:SurName>
+    <md:EmailAddress>mailto:ian.fogarty@wmc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Fogarty</md:SurName>
+    <md:EmailAddress>mailto:ian.fogarty@wmc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml b/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml
index 370976ab..8e244897 100644
--- a/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev.ltscotland.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-25T08:40:02Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-25T08:40:02Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/GlowApproval"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/GlowDS"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/GlowApproval"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/GlowDS"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJALr0olzkd9TzMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGWx0c2UtZGV2MDEubHRzY290bGFuZC5jb20wHhcNMTAwMzAzMTIyMjEyWhcN
 						MjAwMjI5MTIyMjEyWjAkMSIwIAYDVQQDExlsdHNlLWRldjAxLmx0c2NvdGxhbmQu
@@ -48,47 +48,47 @@
 						EWiBnZJb0MdjMCENixhuHes8WRqs5CZ3GRqswZ1WdQJI7YirJLzaSydiasXH/QqL
 						eoQwxslZb8rsMUyN8K/+4EGSsAa35g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Education Scotland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Education Scotland: Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.educationscotland.gov.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Education Scotland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Education Scotland: Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.educationscotland.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml
index d80cd143..b7482ebf 100644
--- a/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev.shef.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-14T17:56:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-14T17:56:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEcjCCA1qgAwIBAgIRAPsd0lQ3zA9qshZ/AtQzPukwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA5MzAwMDAwMDBaFw0xNjA5MjkyMzU5NTlaMEAxITAfBgNV
@@ -43,26 +43,26 @@
 						EB/lCePMbGo0SM+B5SDGNNGksrW1LczHBsCSUBLDxaYEYbldDVeRybFNMc6N7y+x
 						0OgEvEcrtOAwP6Jl4BujPGJZBytgiK6zu/8jG9xGys6DVheK5OA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibdev.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibdev.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sheffield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEcjCCA1qgAwIBAgIRAPsd0lQ3zA9qshZ/AtQzPukwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA5MzAwMDAwMDBaFw0xNjA5MjkyMzU5NTlaMEAxITAfBgNV
@@ -88,27 +88,27 @@
 						EB/lCePMbGo0SM+B5SDGNNGksrW1LczHBsCSUBLDxaYEYbldDVeRybFNMc6N7y+x
 						0OgEvEcrtOAwP6Jl4BujPGJZBytgiK6zu/8jG9xGys6DVheK5OA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Sheffield</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sheffield TEST IDP (DO NOT USE!)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Harnomit</md:GivenName>
-      <md:SurName>Babraa</md:SurName>
-      <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Gilbert</md:SurName>
-      <md:EmailAddress>mailto:R.Gilbert@sheffield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Sheffield</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sheffield TEST IDP (DO NOT USE!)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Harnomit</md:GivenName>
+    <md:SurName>Babraa</md:SurName>
+    <md:EmailAddress>mailto:h.babraa@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Gilbert</md:SurName>
+    <md:EmailAddress>mailto:R.Gilbert@sheffield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
index 7e2139a8..ddfcfcc8 100644
--- a/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev2.stir.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-23T10:56:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-23T10:56:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUVk73b1csIS7JJF+7A9VPKzf1PS8wDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTc2hpYmRldjIuc3Rpci5hYy51azAeFw0xNjAzMTEwOTMx
 						NDdaFw0zNjAzMTEwOTMxNDdaMB4xHDAaBgNVBAMME3NoaWJkZXYyLnN0aXIuYWMu
@@ -37,26 +37,26 @@
 						32K+lbBcxuokL0inWGyoh8R24mjFDsbVtLr0kMG192gXxWcF9RNJKx5uXe9CNN2j
 						adwAW4bubm1Whaw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibdev2.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibdev2.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUVk73b1csIS7JJF+7A9VPKzf1PS8wDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAwwTc2hpYmRldjIuc3Rpci5hYy51azAeFw0xNjAzMTEwOTMx
 						NDdaFw0zNjAzMTEwOTMxNDdaMB4xHDAaBgNVBAMME3NoaWJkZXYyLnN0aXIuYWMu
@@ -76,26 +76,26 @@
 						32K+lbBcxuokL0inWGyoh8R24mjFDsbVtLr0kMG192gXxWcF9RNJKx5uXe9CNN2j
 						adwAW4bubm1Whaw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Stirling</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Stirling - Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stir.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Centre</md:GivenName>
-      <md:EmailAddress>mailto:infocentre@stir.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>White</md:SurName>
-      <md:EmailAddress>mailto:michael.white@stir.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Stirling</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Stirling - Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stir.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Centre</md:GivenName>
+    <md:EmailAddress>mailto:infocentre@stir.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>White</md:SurName>
+    <md:EmailAddress>mailto:michael.white@stir.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev3.stir.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibdev3.stir.ac.uk-idp-shibboleth.xml
index 278b791f..39119946 100644
--- a/swamid-interfederations-2.0/shibdev3.stir.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibdev3.stir.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev3.stir.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-05T11:24:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-05T11:24:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Stirling - v3 Development IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The v3 Development Shibboleth IdP at the University of Stirling</mdui:Description>
+        <mdui:Logo height="99" width="324">https://shibdev3.stir.ac.uk/idp/images/stirunilogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Stirling - v3 Development IdP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The v3 Development Shibboleth IdP at the University of Stirling</mdui:Description>
-          <mdui:Logo height="99" width="324">https://shibdev3.stir.ac.uk/idp/images/stirunilogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAIer8h0qu0L1ls9V4FpV7xkTPfN+MA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME3NoaWJkZXYzLnN0aXIuYWMudWswHhcNMTUxMjA5MTQz
 						OTUxWhcNMzUxMjA5MTQzOTUxWjAeMRwwGgYDVQQDDBNzaGliZGV2My5zdGlyLmFj
@@ -42,26 +42,26 @@
 						epCkmO4elYDv5AHRg1XMpxBssZx3k21d+9+BmjURlJTROwl62GzjS6N8iXGysw8O
 						Uofdcf9XA7H+vk8h
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev3.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev3.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibdev3.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev3.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev3.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev3.stir.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev3.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev3.stir.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibdev3.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev3.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev3.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev3.stir.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stir.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAIer8h0qu0L1ls9V4FpV7xkTPfN+MA0GCSqGSIb3DQEB
 						CwUAMB4xHDAaBgNVBAMME3NoaWJkZXYzLnN0aXIuYWMudWswHhcNMTUxMjA5MTQz
 						OTUxWhcNMzUxMjA5MTQzOTUxWjAeMRwwGgYDVQQDDBNzaGliZGV2My5zdGlyLmFj
@@ -81,23 +81,23 @@
 						epCkmO4elYDv5AHRg1XMpxBssZx3k21d+9+BmjURlJTROwl62GzjS6N8iXGysw8O
 						Uofdcf9XA7H+vk8h
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev3.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Stirling</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Stirling - v3 Development IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stir.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Centre</md:GivenName>
-      <md:EmailAddress>mailto:infocentre@stir.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>White</md:SurName>
-      <md:EmailAddress>mailto:michael.white@stir.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev3.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Stirling</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Stirling - v3 Development IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stir.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Centre</md:GivenName>
+    <md:EmailAddress>mailto:infocentre@stir.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>White</md:SurName>
+    <md:EmailAddress>mailto:michael.white@stir.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml
index 2276d7fe..5c5e0f2e 100644
--- a/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.amherst.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amherst.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Amherst College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amherst.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Amherst College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAKMvGP/vH0uzAwPfsNR+8twMxr8nMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJpZHAuYW1oZXJzdC5lZHUwHhcNMTAwMzI5MTc0
 MDIzWhcNMzAwMzI5MTc0MDIzWjAeMRwwGgYDVQQDExNzaGliaWRwLmFtaGVyc3Qu
@@ -38,24 +38,24 @@ gl7fU1fEoCtBURaLf/tkzMKykipuzzSpZVS3uq8slt2jVsQlddIXR60pkGyQgr6/
 Is8EDBRpRFjVojjmYbLxcdbgEVA3CteakwkNe5Gb4gJuhFiq6nGhxFOron13TF69
 fuOjmWpbYZwDGqld
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.amherst.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.amherst.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.amherst.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.amherst.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amherst.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.amherst.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.amherst.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.amherst.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.amherst.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amherst.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAKMvGP/vH0uzAwPfsNR+8twMxr8nMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJpZHAuYW1oZXJzdC5lZHUwHhcNMTAwMzI5MTc0
 MDIzWhcNMzAwMzI5MTc0MDIzWjAeMRwwGgYDVQQDExNzaGliaWRwLmFtaGVyc3Qu
@@ -75,23 +75,23 @@ gl7fU1fEoCtBURaLf/tkzMKykipuzzSpZVS3uq8slt2jVsQlddIXR60pkGyQgr6/
 Is8EDBRpRFjVojjmYbLxcdbgEVA3CteakwkNe5Gb4gJuhFiq6nGhxFOron13TF69
 fuOjmWpbYZwDGqld
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Amherst College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Amherst College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.amherst.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob Ansaldo</md:GivenName>
-      <md:EmailAddress>rlansaldo@amherst.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John Manly</md:GivenName>
-      <md:EmailAddress>jwmanly@amherst.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Amherst College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Amherst College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amherst.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob Ansaldo</md:GivenName>
+    <md:EmailAddress>rlansaldo@amherst.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John Manly</md:GivenName>
+    <md:EmailAddress>jwmanly@amherst.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml
index 8caa0018..c297b47a 100644
--- a/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.bates.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.bates.edu/ils/login-service" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bates.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bates College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Bates College Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bates.edu/ils/login-service</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.bates.edu/ils/policies</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="515" xml:lang="en">https://abacus.bates.edu/1855/wordmarks/bates-wordmark-201-515x150.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.bates.edu/ils/login-service" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bates.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bates College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Bates College Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.bates.edu/ils/login-service</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.bates.edu/ils/policies</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="515" xml:lang="en">https://abacus.bates.edu/1855/wordmarks/bates-wordmark-201-515x150.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUL/x4yeKXw8Qo1fj6nOo++CaAWnEwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRc2hpYmlkcC5iYXRlcy5lZHUwHhcNMTMwODMwMTQwOTMx
 WhcNMzMwODMwMTQwOTMxWjAcMRowGAYDVQQDExFzaGliaWRwLmJhdGVzLmVkdTCC
@@ -45,24 +45,24 @@ NMGcNLnWPXMs/8cJh+BhVcMR+ATeUYIT6ZZR5XVsjxtSVj/dYlugatENLwu4Zxye
 P9qcR8MfjVr4G5DgNUhpRXkHN5Oj8WhYwa2rgzTR+QqGnIKHZNVyna7BTHVIDsgV
 Iq67
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bates.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bates.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bates.edu/idp/profile/Logout"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bates.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.bates.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.bates.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bates.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bates.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bates.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bates.edu/idp/profile/Logout"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bates.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.bates.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.bates.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bates.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUL/x4yeKXw8Qo1fj6nOo++CaAWnEwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRc2hpYmlkcC5iYXRlcy5lZHUwHhcNMTMwODMwMTQwOTMx
 WhcNMzMwODMwMTQwOTMxWjAcMRowGAYDVQQDExFzaGliaWRwLmJhdGVzLmVkdTCC
@@ -82,30 +82,30 @@ NMGcNLnWPXMs/8cJh+BhVcMR+ATeUYIT6ZZR5XVsjxtSVj/dYlugatENLwu4Zxye
 P9qcR8MfjVr4G5DgNUhpRXkHN5Oj8WhYwa2rgzTR+QqGnIKHZNVyna7BTHVIDsgV
 Iq67
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bates.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bates College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bates College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bates.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bates NetAdmin</md:GivenName>
-      <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Bates NetAdmin</md:GivenName>
-      <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Bates NetAdmin</md:GivenName>
-      <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk Services</md:GivenName>
-      <md:EmailAddress>helpdesk@bates.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bates.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bates College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bates College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bates.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bates NetAdmin</md:GivenName>
+    <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Bates NetAdmin</md:GivenName>
+    <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Bates NetAdmin</md:GivenName>
+    <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk Services</md:GivenName>
+    <md:EmailAddress>helpdesk@bates.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml
index 12d7875d..f2052106 100644
--- a/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.bloomu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sso.bloomu.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bloomu.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huskies.bloomu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Bloomsburg University of Pennsylvania</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for all faculty, staff, and students of Bloomsburg University, one of the fourteen universities in the Pennsylvania State System of Higher Education (PASSHE).</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bloomu.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.bloomu.edu/policies_procedures</mdui:PrivacyStatementURL>
+        <mdui:Logo height="137" width="259" xml:lang="en">https://sso.bloomu.edu/idp/images/bu.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sso.bloomu.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bloomu.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huskies.bloomu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Bloomsburg University of Pennsylvania</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for all faculty, staff, and students of Bloomsburg University, one of the fourteen universities in the Pennsylvania State System of Higher Education (PASSHE).</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.bloomu.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.bloomu.edu/policies_procedures</mdui:PrivacyStatementURL>
-          <mdui:Logo height="137" width="259" xml:lang="en">https://sso.bloomu.edu/idp/images/bu.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUa2z6CycWE6LUrGRPn7Cemf5wDEswDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc3NvLmJsb29tdS5lZHUwHhcNMTMwMjA3MjEzMzE1WhcN
 MzMwMjA3MjEzMzE1WjAZMRcwFQYDVQQDEw5zc28uYmxvb211LmVkdTCCASIwDQYJ
@@ -42,29 +42,29 @@ gfISZot3Vn5ux3rA8/JiXhEOi1zJlbeSRLWQRUm9+lTftEWWg19TE9NR5YJK9D1p
 R26ZBnGAXB3pxgg6q08oHO7BQ7esjKXaf4Y3rpghvA5SFf1A3vFBXrTK1WgoUTXd
 QZ8qhl/Wc9j5mSANbebH6m5IJcNikMvib+f34/Jy9j82Aw8yP1n7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bloomu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bloomu.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bloomu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.bloomu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:444/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bloomu.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huskies.bloomu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bloomu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bloomu.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bloomu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.bloomu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:444/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bloomu.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huskies.bloomu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUa2z6CycWE6LUrGRPn7Cemf5wDEswDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc3NvLmJsb29tdS5lZHUwHhcNMTMwMjA3MjEzMzE1WhcN
 MzMwMjA3MjEzMzE1WjAZMRcwFQYDVQQDEw5zc28uYmxvb211LmVkdTCCASIwDQYJ
@@ -83,27 +83,27 @@ gfISZot3Vn5ux3rA8/JiXhEOi1zJlbeSRLWQRUm9+lTftEWWg19TE9NR5YJK9D1p
 R26ZBnGAXB3pxgg6q08oHO7BQ7esjKXaf4Y3rpghvA5SFf1A3vFBXrTK1WgoUTXd
 QZ8qhl/Wc9j5mSANbebH6m5IJcNikMvib+f34/Jy9j82Aw8yP1n7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bloomu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bloomsburg University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bloomsburg University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bloomu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vincent Kozlek</md:GivenName>
-      <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Vincent Kozlek</md:GivenName>
-      <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Vincent Kozlek</md:GivenName>
-      <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bloomu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bloomsburg University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bloomsburg University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bloomu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vincent Kozlek</md:GivenName>
+    <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vincent Kozlek</md:GivenName>
+    <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Vincent Kozlek</md:GivenName>
+    <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
index f1c52dcc..cd9e1cfb 100644
--- a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
-          <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
-          <mdui:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-          <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
 NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
@@ -46,26 +46,26 @@ d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
 48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
 G+DXFhqRaj5xn2FulnFc
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
 NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
@@ -85,23 +85,23 @@ d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
 48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
 G+DXFhqRaj5xn2FulnFc
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Padova</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Padova</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Padova</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Padova</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unipd.it/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.unipd.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:supporto.sso@unipd.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Padova</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Padova</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Padova</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Padova</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unipd.it/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unipd.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:supporto.sso@unipd.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml
index 9997e6ae..d2fb0bed 100644
--- a/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cit.cornell.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cornell University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cornell University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAOZ8NfBem6sHcI7F39sYmD/JG4YDMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAuY2l0LmNvcm5lbGwuZWR1MB4XDTA5MTEy
 MzE4NTI0NFoXDTI5MTEyMzE4NTI0NFowIjEgMB4GA1UEAxMXc2hpYmlkcC5jaXQu
@@ -41,23 +41,23 @@ prGI2oAv/ShPBOyrkadectHzvu5K6CL7AxNTWCSXswtfdsuxcKo65tO5TRO1hWlr
 p36uB6TmSYl1nBmS5LgWF4EpEuODPSmy4sIV6jl1otuyI/An2dOcNqcgu7tYEXLX
 C8N6DXggDWPtPRdpk96UW45huvXudpZenrcd7A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cit.cornell.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cit.cornell.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cit.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cit.cornell.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cit.cornell.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cit.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAOZ8NfBem6sHcI7F39sYmD/JG4YDMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAuY2l0LmNvcm5lbGwuZWR1MB4XDTA5MTEy
 MzE4NTI0NFoXDTI5MTEyMzE4NTI0NFowIjEgMB4GA1UEAxMXc2hpYmlkcC5jaXQu
@@ -77,31 +77,31 @@ prGI2oAv/ShPBOyrkadectHzvu5K6CL7AxNTWCSXswtfdsuxcKo65tO5TRO1hWlr
 p36uB6TmSYl1nBmS5LgWF4EpEuODPSmy4sIV6jl1otuyI/An2dOcNqcgu7tYEXLX
 C8N6DXggDWPtPRdpk96UW45huvXudpZenrcd7A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cornell University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cornell University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cornell.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hong Ye</md:GivenName>
-      <md:EmailAddress>hy93@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>University Security Office</md:GivenName>
-      <md:EmailAddress>security@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Steve Edgar</md:GivenName>
-      <md:EmailAddress>se10@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>idmgmt@cornell.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cornell University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cornell University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cornell.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hong Ye</md:GivenName>
+    <md:EmailAddress>hy93@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>University Security Office</md:GivenName>
+    <md:EmailAddress>security@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Steve Edgar</md:GivenName>
+    <md:EmailAddress>se10@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>idmgmt@cornell.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml
index 9f76f89d..fa1066fc 100644
--- a/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.colostate.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colostate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Colorado State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Enterprise identity provider at Colorado State University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.acns.colostate.edu/Help/Single-Sign-On-Shibboleth</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.colostate.edu/info-privacy.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://wsnet.colostate.edu/cwis262/ShibIdpLogout/images/csu-fc-logo-80-60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colostate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Colorado State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Enterprise identity provider at Colorado State University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.acns.colostate.edu/Help/Single-Sign-On-Shibboleth</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.colostate.edu/info-privacy.aspx</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://wsnet.colostate.edu/cwis262/ShibIdpLogout/images/csu-fc-logo-80-60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIENTCCAx2gAwIBAgIJAPoTdBgmWKz8MA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIQ29sb3JhZG8xFTATBgNVBAcMDEZvcnQgQ29sbGlu
 czEiMCAGA1UECgwZQ29sb3JhZG8gU3RhdGUgVW5pdmVyc2l0eTEzMDEGA1UECwwq
@@ -50,24 +50,24 @@ jSFFRXYSlRJIsrg+Uh7ysGgO7VarAyqk9MJaws1jOKKuty67mmsisYdq7kXdD1bg
 ZITT93c2OAMIaG88OOem1zR+9uaKJY3HZZxP4LniL796pGtoKLcv4ZJxQHx3Y9oG
 ZLnubpkwFuURC5Ffz084UPzpg/oiHm/r7Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.colostate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.colostate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.colostate.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.colostate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colostate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.colostate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.colostate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.colostate.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.colostate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colostate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIENTCCAx2gAwIBAgIJAPoTdBgmWKz8MA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIQ29sb3JhZG8xFTATBgNVBAcMDEZvcnQgQ29sbGlu
 czEiMCAGA1UECgwZQ29sb3JhZG8gU3RhdGUgVW5pdmVyc2l0eTEzMDEGA1UECwwq
@@ -92,27 +92,27 @@ jSFFRXYSlRJIsrg+Uh7ysGgO7VarAyqk9MJaws1jOKKuty67mmsisYdq7kXdD1bg
 ZITT93c2OAMIaG88OOem1zR+9uaKJY3HZZxP4LniL796pGtoKLcv4ZJxQHx3Y9oG
 ZLnubpkwFuURC5Ffz084UPzpg/oiHm/r7Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Colorado State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Colorado State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.colostate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Randy Miotke</md:GivenName>
-      <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Scott Baily</md:GivenName>
-      <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel Hamp</md:GivenName>
-      <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Colorado State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Colorado State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.colostate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Randy Miotke</md:GivenName>
+    <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Scott Baily</md:GivenName>
+    <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel Hamp</md:GivenName>
+    <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml
index 22fe0cc7..2fc686b6 100644
--- a/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.kgv.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T10:26:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T10:26:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVANzd8W7p4MbyVI3/OVktKiz5Ch7uMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEXNoaWJpZHAua2d2LmFjLnVrMB4XDTE0MDUwODE1MDE1
 						NloXDTM0MDUwODE1MDE1NlowHDEaMBgGA1UEAxMRc2hpYmlkcC5rZ3YuYWMudWsw
@@ -37,26 +37,26 @@
 						ZhQMaxwU9/UVwOWO1REhWcd7KE+W2ELIgeySGijZmKquKTrOSqyFx3DKSxGdhFsk
 						nSUetQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.kgv.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.kgv.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVANzd8W7p4MbyVI3/OVktKiz5Ch7uMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEXNoaWJpZHAua2d2LmFjLnVrMB4XDTE0MDUwODE1MDE1
 						NloXDTM0MDUwODE1MDE1NlowHDEaMBgGA1UEAxMRc2hpYmlkcC5rZ3YuYWMudWsw
@@ -76,27 +76,27 @@
 						ZhQMaxwU9/UVwOWO1REhWcd7KE+W2ELIgeySGijZmKquKTrOSqyFx3DKSxGdhFsk
 						nSUetQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">King George V College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KGV College - Latest</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kgv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martyn</md:GivenName>
-      <md:SurName>Coleman</md:SurName>
-      <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martyn</md:GivenName>
-      <md:SurName>Coleman</md:SurName>
-      <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">King George V College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KGV College - Latest</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kgv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martyn</md:GivenName>
+    <md:SurName>Coleman</md:SurName>
+    <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martyn</md:GivenName>
+    <md:SurName>Coleman</md:SurName>
+    <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml
index a4d07ac0..e736312a 100644
--- a/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.ku.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://technology.ku.edu/personal-accounts" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Kansas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Kansas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ku.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://policy.ku.edu/IT/info-access-control-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="139" width="180" xml:lang="en">https://webmedia.ku.edu/css/template2012/login/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://technology.ku.edu/personal-accounts" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Kansas</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Kansas</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ku.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://policy.ku.edu/IT/info-access-control-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="139" width="180" xml:lang="en">https://webmedia.ku.edu/css/template2012/login/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUDA++q9rOZ3sgUuUAKIcSiarF79UwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC5rdS5lZHUwHhcNMTIwOTI0MjEyOTIyWhcN
 MzIwOTI0MjEyOTIyWjAZMRcwFQYDVQQDEw5zaGliaWRwLmt1LmVkdTCCASIwDQYJ
@@ -44,23 +44,23 @@ QNVyGISL1Jqo0Cf2Hbx/oBpZG0ZfQWp1yjRQEGIY0rPmoUAXiMwS84QejZaAhYEo
 8VSJChX0odckTkyR9tIRsamzggitwOZFBcfe5tActER8pWSwoV3TI51wWUkgHCPC
 Whg3BytKZnscULFupWbLbJq8TAVX/WfUAomsXvqpxn+N1PEybPMC
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ku.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.ku.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.ku.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.ku.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.ku.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ku.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.ku.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.ku.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.ku.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.ku.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUDA++q9rOZ3sgUuUAKIcSiarF79UwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC5rdS5lZHUwHhcNMTIwOTI0MjEyOTIyWhcN
 MzIwOTI0MjEyOTIyWjAZMRcwFQYDVQQDEw5zaGliaWRwLmt1LmVkdTCCASIwDQYJ
@@ -79,27 +79,27 @@ QNVyGISL1Jqo0Cf2Hbx/oBpZG0ZfQWp1yjRQEGIY0rPmoUAXiMwS84QejZaAhYEo
 8VSJChX0odckTkyR9tIRsamzggitwOZFBcfe5tActER8pWSwoV3TI51wWUkgHCPC
 Whg3BytKZnscULFupWbLbJq8TAVX/WfUAomsXvqpxn+N1PEybPMC
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ku.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.ku.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kansas</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Kansas</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ku.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Technology Customer Service Center</md:GivenName>
-      <md:EmailAddress>itcsc@ku.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Information Technology System Integration</md:GivenName>
-      <md:EmailAddress>itsi@ku.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommon-admin@ku.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ku.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.ku.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kansas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Kansas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ku.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Technology Customer Service Center</md:GivenName>
+    <md:EmailAddress>itcsc@ku.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Information Technology System Integration</md:GivenName>
+    <md:EmailAddress>itsi@ku.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommon-admin@ku.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml
index edde278d..733d691a 100644
--- a/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.luc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Loyola University of Chicago</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Loyola University of Chicago</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFGDCCBACgAwIBAgIJAMgsqvOPf0BMMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYD
 VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xHjAc
 BgNVBAoTFVVuaXZlcnNpdHkgb2YgQ2hpY2FnbzEoMCYGA1UECxMfSW5mb3JtYXRp
@@ -51,23 +51,23 @@ Sv1JUZ8WViWg/2H1ELeCnhc5MDvHCKZd2+tdm7vyi+9gQTuBUhTcAM68yqtMf9kA
 F4MhlfISGNByyfe+7TgWasEJjTyrX1UyNm4S219PsfZ1xvfk+5mv3ZgRnk/ioqB7
 l2CikVfLPoeavqtv
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.luc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.luc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.luc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.luc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFGDCCBACgAwIBAgIJAMgsqvOPf0BMMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYD
 VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xHjAc
 BgNVBAoTFVVuaXZlcnNpdHkgb2YgQ2hpY2FnbzEoMCYGA1UECxMfSW5mb3JtYXRp
@@ -97,19 +97,19 @@ Sv1JUZ8WViWg/2H1ELeCnhc5MDvHCKZd2+tdm7vyi+9gQTuBUhTcAM68yqtMf9kA
 F4MhlfISGNByyfe+7TgWasEJjTyrX1UyNm4S219PsfZ1xvfk+5mv3ZgRnk/ioqB7
 l2CikVfLPoeavqtv
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.luc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.luc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loyola University of Chicago</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Loyola University of Chicago</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.luc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ITS</md:GivenName>
-      <md:EmailAddress>dns-admin@luc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.luc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.luc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loyola University of Chicago</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Loyola University of Chicago</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.luc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ITS</md:GivenName>
+    <md:EmailAddress>dns-admin@luc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
index 5f3cf267..399ae35b 100644
--- a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.oca.eu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-12T19:40:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-12T19:40:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oca.eu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Observatoire de la Côte d'Azur</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH6y5QEjNUMIJD1YBxkpOgkaJjEBAAAAAAYJDAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQGAAMEBg4BAwYYAAAFGQEFCWcAAwwoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAYOAgQGJgIEBjkAAgQ7AAIETTAiE7RONBv2Ujgcx1g8IQg6KRsFEA0KBgAAAAAAAAAAAAAAAAAAAAAAAAAAAgQGIQIEBikDBQcbAwICL0w1JdVZPin/XT8ifFw+H00AAAAAAAAABVc8KD5WPy1yAAAAAAAAAAAAAAAAAAAAAAIEBhYCBAYKAAAAAkw5LcBhRzb1RC8hak87L41BMik8TTkugTcpIzdPOi03WUAuSGVLO4YAAAAAAAAAAAAAAAACBAYEAAAAATksJ2BmTkH/blJBW0I1MI5mTkLdUT41TVlEOtpCMSkaOS0nRnFXSmhdRjqZcldLfzkbCwEAAAAAAAAAAAAAAAJVRD3AeV9U4SgiISxsVUzybFNJdlZEOzZsVUzKAAAACjksJiRnUki7QjMtN3JbUPN4YFYXAAAAAAAAAAAAAAAAa1dQ1oJqYMBKPjl6gmhfywAAAAgmIB8ic11VdVRGQEkAAAAAa1hQ4wAAAAt3Yln/gWlfMAAAAAAAAAAAAAAAAHBdVqCPeG3LYlJLe4p0aqIAAAACAAAADzEmJA9pV1BHXlBJZoRuZdsYFBQriHJo/4x1azMAAAAAAAAAAAAAAABqWVI1lYB10HZlXEiTfnKanId6HAAAAACNe28/jnxwZoNwZt6ZgXVtZlhRiJ2GePuVfnMfAAAAAAAAAAAAAAAAAAAAAJeDdmuslohloIt9U5qGeE55amAIlIF1q5+KfeCii36EYFZOLpyIe/SmkoK1qpGCAwAAAAAAAAAAAAAAAAAAAAAAAAAAsp2MiLijkjmwnIwZeWpgGp2Nfz+olodTnpCBN5WFd+O4opHgtqGRJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4pZIYqJaGIgAAAACQg3V+s6KQ2cKvnP7NuKXhx7SeJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAy7ijO+HOtNfcyrCUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD16ccFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAD//wAA+P8AAPP/AADldwAA6XcAAMtrAADL6wAAy+sAAOvTAAD/EwAA9+cAAP+PAAD/nwAA//8AAA==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.oca.eu</mdui:InformationURL>
+        <mdui:Description xml:lang="en">People with an OCA account.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Observatoire de la Côte d'Azur</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnes ayant un compte OCA.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oca.eu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Observatoire de la Côte d'Azur</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH6y5QEjNUMIJD1YBxkpOgkaJjEBAAAAAAYJDAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQGAAMEBg4BAwYYAAAFGQEFCWcAAwwoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAYOAgQGJgIEBjkAAgQ7AAIETTAiE7RONBv2Ujgcx1g8IQg6KRsFEA0KBgAAAAAAAAAAAAAAAAAAAAAAAAAAAgQGIQIEBikDBQcbAwICL0w1JdVZPin/XT8ifFw+H00AAAAAAAAABVc8KD5WPy1yAAAAAAAAAAAAAAAAAAAAAAIEBhYCBAYKAAAAAkw5LcBhRzb1RC8hak87L41BMik8TTkugTcpIzdPOi03WUAuSGVLO4YAAAAAAAAAAAAAAAACBAYEAAAAATksJ2BmTkH/blJBW0I1MI5mTkLdUT41TVlEOtpCMSkaOS0nRnFXSmhdRjqZcldLfzkbCwEAAAAAAAAAAAAAAAJVRD3AeV9U4SgiISxsVUzybFNJdlZEOzZsVUzKAAAACjksJiRnUki7QjMtN3JbUPN4YFYXAAAAAAAAAAAAAAAAa1dQ1oJqYMBKPjl6gmhfywAAAAgmIB8ic11VdVRGQEkAAAAAa1hQ4wAAAAt3Yln/gWlfMAAAAAAAAAAAAAAAAHBdVqCPeG3LYlJLe4p0aqIAAAACAAAADzEmJA9pV1BHXlBJZoRuZdsYFBQriHJo/4x1azMAAAAAAAAAAAAAAABqWVI1lYB10HZlXEiTfnKanId6HAAAAACNe28/jnxwZoNwZt6ZgXVtZlhRiJ2GePuVfnMfAAAAAAAAAAAAAAAAAAAAAJeDdmuslohloIt9U5qGeE55amAIlIF1q5+KfeCii36EYFZOLpyIe/SmkoK1qpGCAwAAAAAAAAAAAAAAAAAAAAAAAAAAsp2MiLijkjmwnIwZeWpgGp2Nfz+olodTnpCBN5WFd+O4opHgtqGRJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4pZIYqJaGIgAAAACQg3V+s6KQ2cKvnP7NuKXhx7SeJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAy7ijO+HOtNfcyrCUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD16ccFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAD//wAA+P8AAPP/AADldwAA6XcAAMtrAADL6wAAy+sAAOvTAAD/EwAA9+cAAP+PAAD/nwAA//8AAA==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.oca.eu</mdui:InformationURL>
-          <mdui:Description xml:lang="en">People with an OCA account.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Observatoire de la Côte d'Azur</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnes ayant un compte OCA.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQTCCAimgAwIBAgIJAOV7bDK2kJs0MA0GCSqGSIb3DQEBDQUAMDcxCzAJBgNV
 BAYTAkZSMQ8wDQYDVQQKDAZvY2EuZXUxFzAVBgNVBAMMDnNoaWJpZHAub2NhLmV1
 MB4XDTE1MDcyMDE3NDQzNVoXDTE4MDcxOTE3NDQzNVowNzELMAkGA1UEBhMCRlIx
@@ -40,13 +40,13 @@ KhTmiD1DrndtsdMrD9T69ra2BSW/MgUhuUOUisMqqJZNWDnrVG1bb1OBoC8zx1kV
 22klzEX/n1uKYUj1tmLdD8PgS+xD4qsYc4dUwdSc1Ee+jzy6Fw+IDlZWXETbwsd3
 4cPhU/7ZhxoTQe+Vryc61Cs97o5u
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIJAKyLcn7sL8vlMA0GCSqGSIb3DQEBDQUAMDAxCzAJBgNV
 BAYTAkZSMQ8wDQYDVQQKDAZvY2EuZXUxEDAOBgNVBAMMB3NoaWJpZHAwHhcNMTUw
 NzIwMTY0ODQyWhcNMTgwNzE5MTY0ODQyWjAwMQswCQYDVQQGEwJGUjEPMA0GA1UE
@@ -66,21 +66,21 @@ NaSpjU0SpU2lWAsJWS7mfWjO9ZyNnhjhmlUatHEq9qjDMKdtlCfd4Mg6v3Sf5YiM
 Hi8WsKvOPJRSWmD7niI3qfMF07UU0OgCQ6eFhvh19E2MOi9lD6D10gd76QYZjAbg
 UfiJZdPA+g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.oca.eu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.oca.eu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.oca.eu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oca.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi@oca.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.oca.eu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.oca.eu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.oca.eu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oca.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi@oca.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
index 3096c663..5d714c6e 100644
--- a/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.polimi.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polimi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Politecnico di Milano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Politecnico di Milano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Politecnico di Milano users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Milano</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://aunicalogin.polimi.it/aunicalogin/idem.jsp</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.polimi.it/en/english-version/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polimi.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Politecnico di Milano</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Politecnico di Milano</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for Politecnico di Milano users</mdui:Description>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Milano</mdui:Description>
-          <mdui:InformationURL xml:lang="it">https://aunicalogin.polimi.it/aunicalogin/idem.jsp</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.polimi.it/en/english-version/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDjTCCAnWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCSVQx
 CzAJBgNVBAgTAk1JMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
 DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
@@ -42,26 +42,26 @@ WRQMqSSzXV/Ti6l+6Mu2wvg0LSH2F9XZjN49ZX1E4LPcB8ChCzmrMf87+9+tru9C
 Y00stxLKVpXdX8pXFj3zFusdHk7fSeE4cCUYQvN7+Jyy7uSEM10eED6xOqvPw31n
 oA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.polimi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.polimi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.polimi.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.polimi.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.polimi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.polimi.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polimi.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.polimi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.polimi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.polimi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.polimi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.polimi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.polimi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polimi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDjTCCAnWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCSVQx
 CzAJBgNVBAgTAk1JMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
 DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
@@ -83,27 +83,27 @@ WRQMqSSzXV/Ti6l+6Mu2wvg0LSH2F9XZjN49ZX1E4LPcB8ChCzmrMf87+9+tru9C
 Y00stxLKVpXdX8pXFj3zFusdHk7fSeE4cCUYQvN7+Jyy7uSEM10eED6xOqvPw31n
 oA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.polimi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.polimi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Politecnico di Milano Identity Provider</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Politecnico di Milano Identity Provider</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Politecnico di Milano</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Politecnico di Milano</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://shibidp.polimi.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://shibidp.polimi.it/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Gaffuri</md:SurName>
-      <md:EmailAddress>mailto:roberto.gaffuri@polimi.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:idem@polimi.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.polimi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.polimi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Politecnico di Milano Identity Provider</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Politecnico di Milano Identity Provider</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Politecnico di Milano</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Politecnico di Milano</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://shibidp.polimi.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://shibidp.polimi.it/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Gaffuri</md:SurName>
+    <md:EmailAddress>mailto:roberto.gaffuri@polimi.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idem@polimi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml
index f7fe9a77..1b010020 100644
--- a/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.syr.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">syr.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Syracuse University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">syr.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Syracuse University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUVVcomBH8KzJQ9YGnfZRbSd7sVU4wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MB4XDTEzMDMyNjEyMDMwM1oX
 DTMzMDMyNjEyMDMwM1owGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MIIBIjAN
@@ -40,24 +40,24 @@ TRgUSKBwLA0z3ual+MQ5FDr+flqoThn4OFHxXxjyp4MBd2o5eyMGyCiZ0JH+s0Hc
 5WVUMo7am2UIynA+j+rhpm5rQhTXjkEA1lTHtqDOnALwKzGsXh5trle0tBcs1B1M
 2fzviLyo4jkmqs5KbWl2c5jut2uUl8jmJ6588cy0BHKiiJOwd/+bFTJF8Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.syr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.syr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.syr.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.syr.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.syr.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.syr.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">syr.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.syr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.syr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.syr.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.syr.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.syr.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.syr.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">syr.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUVVcomBH8KzJQ9YGnfZRbSd7sVU4wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MB4XDTEzMDMyNjEyMDMwM1oX
 DTMzMDMyNjEyMDMwM1owGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MIIBIjAN
@@ -76,27 +76,27 @@ TRgUSKBwLA0z3ual+MQ5FDr+flqoThn4OFHxXxjyp4MBd2o5eyMGyCiZ0JH+s0Hc
 5WVUMo7am2UIynA+j+rhpm5rQhTXjkEA1lTHtqDOnALwKzGsXh5trle0tBcs1B1M
 2fzviLyo4jkmqs5KbWl2c5jut2uUl8jmJ6588cy0BHKiiJOwd/+bFTJF8Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.syr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.syr.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Syracuse University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Syracuse University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.syr.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Cynthia Hoalcraft</md:GivenName>
-      <md:EmailAddress>clhoalcr@syr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve Leonard</md:GivenName>
-      <md:EmailAddress>sleonard@syr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kelly Fallon</md:GivenName>
-      <md:EmailAddress>kjfallon@syr.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.syr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.syr.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Syracuse University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Syracuse University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.syr.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Cynthia Hoalcraft</md:GivenName>
+    <md:EmailAddress>clhoalcr@syr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve Leonard</md:GivenName>
+    <md:EmailAddress>sleonard@syr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kelly Fallon</md:GivenName>
+    <md:EmailAddress>kjfallon@syr.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml
index 63ca2183..ac701e76 100644
--- a/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.tameside.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-17T16:46:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-17T16:46:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tameside.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tameside.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUFPl+UkOqD1xU344a+Z5gAA9KFhIwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC50YW1lc2lkZS5hYy51azAeFw0xMzEwMDMw
 						ODA2MDBaFw0zMzEwMDMwODA2MDBaMCExHzAdBgNVBAMTFnNoaWJpZHAudGFtZXNp
@@ -32,26 +32,26 @@
 						e0DJl3bx82dv2VE65r/Ugzfu95M9GnIVTX6GZ/S6ey2/mYNi8/7XNkdk5Y5OLnP7
 						2e4BhZ7ipNcvA3dRv8lUFszj/juA6xM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.tameside.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tameside.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.tameside.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tameside.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUFPl+UkOqD1xU344a+Z5gAA9KFhIwDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC50YW1lc2lkZS5hYy51azAeFw0xMzEwMDMw
 						ODA2MDBaFw0zMzEwMDMwODA2MDBaMCExHzAdBgNVBAMTFnNoaWJpZHAudGFtZXNp
@@ -71,27 +71,27 @@
 						e0DJl3bx82dv2VE65r/Ugzfu95M9GnIVTX6GZ/S6ey2/mYNi8/7XNkdk5Y5OLnP7
 						2e4BhZ7ipNcvA3dRv8lUFszj/juA6xM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tameside College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tameside College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tameside.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Albert</md:GivenName>
-      <md:SurName>Peach</md:SurName>
-      <md:EmailAddress>mailto:apeach@tameside.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Albert</md:GivenName>
-      <md:SurName>Peach</md:SurName>
-      <md:EmailAddress>mailto:apeach@tameside.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tameside College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tameside College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tameside.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Albert</md:GivenName>
+    <md:SurName>Peach</md:SurName>
+    <md:EmailAddress>mailto:apeach@tameside.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Albert</md:GivenName>
+    <md:SurName>Peach</md:SurName>
+    <md:EmailAddress>mailto:apeach@tameside.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml
index 95e0dcd2..0bfda6bf 100644
--- a/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.uclan.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclan.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Central Lancashire</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shibidp.uclan.ac.uk/shib_icons/shib_logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shibidp.uclan.ac.uk/shib_icons/shib_16_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclan.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Central Lancashire</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shibidp.uclan.ac.uk/shib_icons/shib_logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shibidp.uclan.ac.uk/shib_icons/shib_16_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUSKz+Pzg6MzaPsUgoAoOA39vnnNowDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51Y2xhbi5hYy51azAeFw0xMDAxMTUxMDQ2
 						NTNaFw0zMDAxMTUxMDQ2NTNaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWNsYW4uYWMu
@@ -35,26 +35,26 @@
 						weHFK1mmzgO5pFZlnMlfNXETio2pjmd2xImp3MsVxjQwXaIA/BDUOWKgJOS+usLP
 						w0iuQVGHNW3BFZA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.uclan.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclan.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.uclan.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclan.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUSKz+Pzg6MzaPsUgoAoOA39vnnNowDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51Y2xhbi5hYy51azAeFw0xMDAxMTUxMDQ2
 						NTNaFw0zMDAxMTUxMDQ2NTNaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWNsYW4uYWMu
@@ -74,27 +74,27 @@
 						weHFK1mmzgO5pFZlnMlfNXETio2pjmd2xImp3MsVxjQwXaIA/BDUOWKgJOS+usLP
 						w0iuQVGHNW3BFZA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Central Lancashire</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Central Lancashire</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uclan.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Guy</md:GivenName>
-      <md:SurName>Heatley</md:SurName>
-      <md:EmailAddress>mailto:grheatley@uclan.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Malcolm</md:GivenName>
-      <md:SurName>Lowe</md:SurName>
-      <md:EmailAddress>mailto:MJLowe@uclan.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Central Lancashire</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Central Lancashire</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uclan.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Guy</md:GivenName>
+    <md:SurName>Heatley</md:SurName>
+    <md:EmailAddress>mailto:grheatley@uclan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Malcolm</md:GivenName>
+    <md:SurName>Lowe</md:SurName>
+    <md:EmailAddress>mailto:MJLowe@uclan.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
index 9f83c3d8..70bf0ccd 100644
--- a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.unipr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Parma</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Parma</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Parma</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for users of University of di Parma</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipr.it/ateneo/albo-online/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://en.unipr.it/privacy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipr.it/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://en.unipr.it/idem</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:44.76630697035048,10.314061939716339</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="it">Università degli Studi di Parma</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Parma</mdui:DisplayName>
-          <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Parma</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for users of University of di Parma</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.unipr.it/ateneo/albo-online/privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://en.unipr.it/privacy</mdui:PrivacyStatementURL>
-          <mdui:InformationURL xml:lang="it">http://www.unipr.it/idem</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://en.unipr.it/idem</mdui:InformationURL>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:44.76630697035048,10.314061939716339</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
 WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
@@ -44,26 +44,26 @@ aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
 ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
 Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.unipr.it/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.unipr.it/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.unipr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.unipr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
 WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
@@ -82,25 +82,25 @@ aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
 ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
 Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Università degli Studi di Parma</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Parma</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Parma</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Parma</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unipr.it/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://en.unipr.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Panella</md:SurName>
-      <md:EmailAddress>mailto:idem@unipr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Parma</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Parma</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Parma</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Parma</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unipr.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://en.unipr.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Panella</md:SurName>
+    <md:EmailAddress>mailto:idem@unipr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml
index 89631037..2d9515f1 100644
--- a/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.uwo.ca/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-04-08T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-04-08T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
 http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwo.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Western Ontario</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Western Ontario</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uwo.ca</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwo.ca</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Western Ontario</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Western Ontario</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uwo.ca</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHu68aG+ypoAo35nJ065wP9seHlAwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC51d28uY2EwHhcNMTAxMjA5MTgzNzA2WhcN
 MzAxMjA5MTgzNzA2WjAZMRcwFQYDVQQDEw5zaGliaWRwLnV3by5jYTCCASIwDQYJ
@@ -38,27 +38,27 @@ vp/ydJZ440q0UrF+OYk2/5e189gaN29GYDYA7EyDpytm9fZ8VYqI971jSOpL3kdn
 0fE7zOUe938KjLSx9YTJKthJHO+8pYGKHtS6d72LVaVSGtcQe6nLSPcP/k5Kvsmi
 M7uVja22Aj1EEVKZzF23JRNlkuqp1T6fi59hN+Y16Za36mfF1yTC
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:emailaddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailaddress</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.uwo.ca/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.uwo.ca/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.uwo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.uwo.ca/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwo.ca</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:emailaddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailaddress</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.uwo.ca/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.uwo.ca/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.uwo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.uwo.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwo.ca</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUHu68aG+ypoAo35nJ065wP9seHlAwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC51d28uY2EwHhcNMTAxMjA5MTgzNzA2WhcN
 MzAxMjA5MTgzNzA2WjAZMRcwFQYDVQQDEw5zaGliaWRwLnV3by5jYTCCASIwDQYJ
@@ -77,21 +77,21 @@ vp/ydJZ440q0UrF+OYk2/5e189gaN29GYDYA7EyDpytm9fZ8VYqI971jSOpL3kdn
 0fE7zOUe938KjLSx9YTJKthJHO+8pYGKHtS6d72LVaVSGtcQe6nLSPcP/k5Kvsmi
 M7uVja22Aj1EEVKZzF23JRNlkuqp1T6fi59hN+Y16Za36mfF1yTC
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Western Ontario</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Western Ontario</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwo.ca</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NOC</md:SurName>
-      <md:EmailAddress>noc@uwo.ca</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Western Ontario</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Western Ontario</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwo.ca</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@uwo.ca</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml
index 278e8bdb..c643cfd1 100644
--- a/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.varndean.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-16T11:52:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-16T11:52:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">varndean.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Varndean College</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://shibidp.varndean.ac.uk/idp/images/dummylogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">varndean.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Varndean College</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://shibidp.varndean.ac.uk/idp/images/dummylogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUYnAHVOZFTgSHvflAx2tiuguv7kowDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC52YXJuZGVhbi5hYy51azAeFw0xNDA1MDEx
 						MDEwNTlaFw0zNDA1MDExMDEwNTlaMCExHzAdBgNVBAMTFnNoaWJpZHAudmFybmRl
@@ -41,26 +41,26 @@
 						OjXjAm0VoplJriXkOkpXBRpP/XraSC+wha4JhjrZZTLOs2qwHf0WkT19H5i5Fe2x
 						hG2q5MTeya5x8Bg9CY3QvgzviQlwuho=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.varndean.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">varndean.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.varndean.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">varndean.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQzCCAiugAwIBAgIUYnAHVOZFTgSHvflAx2tiuguv7kowDQYJKoZIhvcNAQEF
 						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC52YXJuZGVhbi5hYy51azAeFw0xNDA1MDEx
 						MDEwNTlaFw0zNDA1MDExMDEwNTlaMCExHzAdBgNVBAMTFnNoaWJpZHAudmFybmRl
@@ -80,27 +80,27 @@
 						OjXjAm0VoplJriXkOkpXBRpP/XraSC+wha4JhjrZZTLOs2qwHf0WkT19H5i5Fe2x
 						hG2q5MTeya5x8Bg9CY3QvgzviQlwuho=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Varndean College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Varndean College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.varndean.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Skelhorn</md:SurName>
-      <md:EmailAddress>mailto:sas@varndean.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Skelhorn</md:SurName>
-      <md:EmailAddress>mailto:sas@varndean.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Varndean College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Varndean College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.varndean.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Skelhorn</md:SurName>
+    <md:EmailAddress>mailto:sas@varndean.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Skelhorn</md:SurName>
+    <md:EmailAddress>mailto:sas@varndean.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml
index 68a778b4..9ab972d2 100644
--- a/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.wcupa.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcupa.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">West Chester University of Pennsylvania</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://wcupa.edu/infoservices/security/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wcupa.edu/infoservices/security/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="201" xml:lang="en">https://wcupa.edu/images/WCULogo100x201.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcupa.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">West Chester University of Pennsylvania</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://wcupa.edu/infoservices/security/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://wcupa.edu/infoservices/security/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="100" width="201" xml:lang="en">https://wcupa.edu/images/WCULogo100x201.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUdeH51iARpA9IRaqlBc5rN1Yb6gUwDQYJKoZIhvcNAQEL
 BQAwHDEaMBgGA1UEAwwRc2hpYmlkcC53Y3VwYS5lZHUwHhcNMTUxMDMwMjAzNTM0
 WhcNMzUxMDMwMjAzNTM0WjAcMRowGAYDVQQDDBFzaGliaWRwLndjdXBhLmVkdTCC
@@ -41,31 +41,31 @@ wsB2fZoZ/BEWyXyKG3k7rOfY5O1BvVQefIJZBlD2CYQr8Oc8PLZK1eHGB7pjD8qg
 8p22ptxVX4rEhY8uEkXGjxUNzvCy+R7HIJMnssjYyyu394532pvLwrFEJbi3IIpk
 lG2H
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wcupa.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wcupa.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Chester University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Chester University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://wcupa.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rashed Kabir</md:GivenName>
-      <md:EmailAddress>rkabir@wcupa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Frank Piscitello</md:GivenName>
-      <md:EmailAddress>fpiscitello@wcupa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Information Security</md:GivenName>
-      <md:EmailAddress>abuse@wcupa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT HelpDesk</md:GivenName>
-      <md:EmailAddress>helpdesk@wcupa.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wcupa.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wcupa.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Chester University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Chester University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://wcupa.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rashed Kabir</md:GivenName>
+    <md:EmailAddress>rkabir@wcupa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Frank Piscitello</md:GivenName>
+    <md:EmailAddress>fpiscitello@wcupa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Information Security</md:GivenName>
+    <md:EmailAddress>abuse@wcupa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT HelpDesk</md:GivenName>
+    <md:EmailAddress>helpdesk@wcupa.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml
index b728ee91..44b4e92a 100644
--- a/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.whoi.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">whoi.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Woods Hole Oceanographic Institution</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">whoi.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Woods Hole Oceanographic Institution</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAK9ViuP7Id0FFmCVaVuFWSnKVkLaMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAud2hvaS5lZHUwHhcNMTMwNTAyMTQxNzM2
 WhcNMzMwNTAyMTQxNzM2WjAbMRkwFwYDVQQDExBzaGliaWRwLndob2kuZWR1MIIB
@@ -37,23 +37,23 @@ c6lcEum0KbdThIYWQtyg0k7SEtjY5cEn7ICnNSzhfbpPWLsgoq6jwWStEa8NAV1M
 FDR1FwRmayfteRPZA0EnE08UbFA11Uwwh/od4x8HlIo5ETVho2acGzJAM71wmgOP
 xw3C9UWXaVWxIYXm/JvbQCPf++KaXM3P4cZ7GhitZVCnXWNwEty6P84nQRAKoyat
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.whoi.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.whoi.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.whoi.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">whoi.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.whoi.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.whoi.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.whoi.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">whoi.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAK9ViuP7Id0FFmCVaVuFWSnKVkLaMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAud2hvaS5lZHUwHhcNMTMwNTAyMTQxNzM2
 WhcNMzMwNTAyMTQxNzM2WjAbMRkwFwYDVQQDExBzaGliaWRwLndob2kuZWR1MIIB
@@ -72,22 +72,22 @@ c6lcEum0KbdThIYWQtyg0k7SEtjY5cEn7ICnNSzhfbpPWLsgoq6jwWStEa8NAV1M
 FDR1FwRmayfteRPZA0EnE08UbFA11Uwwh/od4x8HlIo5ETVho2acGzJAM71wmgOP
 xw3C9UWXaVWxIYXm/JvbQCPf++KaXM3P4cZ7GhitZVCnXWNwEty6P84nQRAKoyat
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Woods Hole Oceanographic Institution</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Woods Hole Oceanographic Institution</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.whoi.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg Pike</md:GivenName>
-      <md:EmailAddress>gpike@whoi.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Mark Jones</md:GivenName>
-      <md:EmailAddress>mark@whoi.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Woods Hole Oceanographic Institution</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Woods Hole Oceanographic Institution</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.whoi.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg Pike</md:GivenName>
+    <md:EmailAddress>gpike@whoi.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Mark Jones</md:GivenName>
+    <md:EmailAddress>mark@whoi.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml
index 3f06ea06..b6b37909 100644
--- a/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.wnc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-04T16:04:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-04T16:04:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDeDCCAmACCQDV2f231qNoMzANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
 						QjEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRIwEAYDVQQHDAlNYW5zZmllbGQx
 						JTAjBgNVBAoMHFdlc3QgTm90dGluZ2hhbXNoaXJlIENvbGxlZ2UxGjAYBgNVBAMM
@@ -33,26 +33,26 @@
 						t7IWhuOL2qj1e65huFQRUrHdvKsvm9+iydT7JkIMw0tUDO/uTPRl51QNYCP6aiC2
 						d88+xmq6gSOp+ZyGanKnNUHyRuukGiawzUDS5w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wnc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wnc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDeDCCAmACCQDV2f231qNoMzANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
 						QjEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRIwEAYDVQQHDAlNYW5zZmllbGQx
 						JTAjBgNVBAoMHFdlc3QgTm90dGluZ2hhbXNoaXJlIENvbGxlZ2UxGjAYBgNVBAMM
@@ -73,27 +73,27 @@
 						t7IWhuOL2qj1e65huFQRUrHdvKsvm9+iydT7JkIMw0tUDO/uTPRl51QNYCP6aiC2
 						d88+xmq6gSOp+ZyGanKnNUHyRuukGiawzUDS5w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Nottinghamshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Nottinghamshire College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wnc.ac.uk/About-Us/The-College/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Heather</md:GivenName>
-      <md:SurName>Peake</md:SurName>
-      <md:EmailAddress>mailto:heather.peake@wnc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Owen</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:owen.williams@wnc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Nottinghamshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Nottinghamshire College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wnc.ac.uk/About-Us/The-College/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Heather</md:GivenName>
+    <md:SurName>Peake</md:SurName>
+    <md:EmailAddress>mailto:heather.peake@wnc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Owen</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:owen.williams@wnc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml
index 40fd4ecc..0f1fc54b 100644
--- a/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.wqeic.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-28T12:51:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-28T12:51:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wqeic.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wqeic.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEijCCA3KgAwIBAgIJANv4hjZSaLpQMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcMCUxlaWNl
 						c3RlcjEuMCwGA1UECgwlV3lnZ2VzdG9uICYgUXVlZW4gRWxpemFiZXRoIEkgQ29s
@@ -39,26 +39,26 @@
 						IR2ATC49n4iiDdgsestoH8IsHHoClXDv1wMFL5TfGS2BJq3PWWYN/bB9R7xL2F6N
 						SlZXFQLen4vcwe+CNlM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wqeic.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wqeic.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wqeic.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wqeic.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEijCCA3KgAwIBAgIJANv4hjZSaLpQMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
 						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcMCUxlaWNl
 						c3RlcjEuMCwGA1UECgwlV3lnZ2VzdG9uICYgUXVlZW4gRWxpemFiZXRoIEkgQ29s
@@ -85,27 +85,27 @@
 						IR2ATC49n4iiDdgsestoH8IsHHoClXDv1wMFL5TfGS2BJq3PWWYN/bB9R7xL2F6N
 						SlZXFQLen4vcwe+CNlM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wyggeston and Queen Elizabeth I College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wyggeston &amp; QEI College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wqeic.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Roger</md:GivenName>
-      <md:SurName>Laurenti</md:SurName>
-      <md:EmailAddress>mailto:roger.laurenti@wqeic.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roger</md:GivenName>
-      <md:SurName>Laurenti</md:SurName>
-      <md:EmailAddress>mailto:roger.laurenti@wqeic.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wyggeston and Queen Elizabeth I College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wyggeston &amp; QEI College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wqeic.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Laurenti</md:SurName>
+    <md:EmailAddress>mailto:roger.laurenti@wqeic.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Laurenti</md:SurName>
+    <md:EmailAddress>mailto:roger.laurenti@wqeic.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml
index 711385c4..c1248d7f 100644
--- a/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.wsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Washington State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Shibboleth Identity Provider for Washington State University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.wsu.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://policies.wsu.edu/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Washington State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Shibboleth Identity Provider for Washington State University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.wsu.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://policies.wsu.edu/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUfDyEVJT9ZZfmUITKqh/iiWittqowDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MB4XDTEyMDgwOTE5MzQzNFoX
 DTMyMDgwOTE5MzQzNFowGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MIIBIjAN
@@ -40,23 +40,23 @@ EsSHjRpXbDNZcGr33nqSJ3nO1jM9pZziJfQK6pd20kRJL0SciAJlKcq3C/OHPDpW
 PN24xa2MgysJHH0EW8DeMX2qkmmXQcwOR+WITmYWm3gFNLSYGVuOQHVlMHr36Sgj
 yhBzX1IxZYmZwTPf9bX6fxdb1KoMOKPR09NUokT6l41eBJmpxiZQXLr3fw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUfDyEVJT9ZZfmUITKqh/iiWittqowDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MB4XDTEyMDgwOTE5MzQzNFoX
 DTMyMDgwOTE5MzQzNFowGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MIIBIjAN
@@ -75,30 +75,30 @@ EsSHjRpXbDNZcGr33nqSJ3nO1jM9pZziJfQK6pd20kRJL0SciAJlKcq3C/OHPDpW
 PN24xa2MgysJHH0EW8DeMX2qkmmXQcwOR+WITmYWm3gFNLSYGVuOQHVlMHr36Sgj
 yhBzX1IxZYmZwTPf9bX6fxdb1KoMOKPR09NUokT6l41eBJmpxiZQXLr3fw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Washington State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Washington State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IAM Team</md:GivenName>
-      <md:EmailAddress>its.iam@wsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IAM Team</md:GivenName>
-      <md:EmailAddress>its.iam@wsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IAM Team</md:GivenName>
-      <md:EmailAddress>its.iam@wsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security Team</md:GivenName>
-      <md:EmailAddress>security@wsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Washington State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Washington State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IAM Team</md:GivenName>
+    <md:EmailAddress>its.iam@wsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IAM Team</md:GivenName>
+    <md:EmailAddress>its.iam@wsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IAM Team</md:GivenName>
+    <md:EmailAddress>its.iam@wsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security Team</md:GivenName>
+    <md:EmailAddress>security@wsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
index ae44b3d0..06b77e6f 100644
--- a/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidptest.york.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-07T16:13:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-07T16:13:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID/DCCAuSgAwIBAgIJAOgs+vZkeVN+MA0GCSqGSIb3DQEBBQUAMH8xCzAJBgNV
 						BAYTAkdCMQ0wCwYDVQQIEwRZb3JrMQ0wCwYDVQQHEwRZb3JrMRswGQYDVQQKExJV
 						bml2ZXJzaXR5IG9mIFlvcmsxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQD
@@ -41,26 +41,26 @@
 						mjybiHzAx77eG8wAb0J52d2t64ppwtOjauky+ppRFmP9Nu+J4WVwlnJsqQZTcQYt
 						RKXBwZEOA6Bf4YjcgUtkWQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidptest.york.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidptest.york.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">york.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID/DCCAuSgAwIBAgIJAOgs+vZkeVN+MA0GCSqGSIb3DQEBBQUAMH8xCzAJBgNV
 						BAYTAkdCMQ0wCwYDVQQIEwRZb3JrMQ0wCwYDVQQHEwRZb3JrMRswGQYDVQQKExJV
 						bml2ZXJzaXR5IG9mIFlvcmsxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQD
@@ -84,25 +84,25 @@
 						mjybiHzAx77eG8wAb0J52d2t64ppwtOjauky+ppRFmP9Nu+J4WVwlnJsqQZTcQYt
 						RKXBwZEOA6Bf4YjcgUtkWQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of York test service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of York</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of York test service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.york.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@york.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml
index b5e3e7a7..1a0087fc 100644
--- a/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shiblogin.hull.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T11:48:17Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T11:48:17Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Hull (Shibboleth)</mdui:DisplayName>
+        <mdui:Logo height="80" width="60">https://library.hull.ac.uk/screens/newlogo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Hull (Shibboleth)</mdui:DisplayName>
-          <mdui:Logo height="80" width="60">https://library.hull.ac.uk/screens/newlogo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIULUB2P8Qd8xEzfYUd14VtQqBiwXswDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUc2hpYmxvZ2luLmh1bGwuYWMudWswHhcNMTMwNjI2MTQy
 						ODQwWhcNMzMwNjI2MTQyODQwWjAfMR0wGwYDVQQDExRzaGlibG9naW4uaHVsbC5h
@@ -34,29 +34,29 @@
 						+e+c96h5fZroNkwofpqn6rpmvQfSmV2eRkpShhOjXXOarehRMQ+TIJJhdYR/w/8R/
 						I7/29liqhV3JptWNE4C
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.hull.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiblogin.hull.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hull.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIULUB2P8Qd8xEzfYUd14VtQqBiwXswDQYJKoZIhvcNAQEF
 						BQAwHzEdMBsGA1UEAxMUc2hpYmxvZ2luLmh1bGwuYWMudWswHhcNMTMwNjI2MTQy
 						ODQwWhcNMzMwNjI2MTQyODQwWjAfMR0wGwYDVQQDExRzaGlibG9naW4uaHVsbC5h
@@ -76,26 +76,26 @@
 						+e+c96h5fZroNkwofpqn6rpmvQfSmV2eRkpShhOjXXOarehRMQ+TIJJhdYR/w/8R
 						/I7/29liqhV3JptWNE4C
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Hull</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Hull (Shibboleth)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hull.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Library help</md:GivenName>
-      <md:EmailAddress>mailto:libhelp@hull.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>McLoughlin</md:SurName>
-      <md:EmailAddress>mailto:Michael.McLoughlin@hull.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Hull</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Hull (Shibboleth)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hull.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library help</md:GivenName>
+    <md:EmailAddress>mailto:libhelp@hull.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>McLoughlin</md:SurName>
+    <md:EmailAddress>mailto:Michael.McLoughlin@hull.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
index 21b66e9b..57c5ed3f 100644
--- a/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibo.vkol.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-08T15:12:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-08T15:12:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Research Library in Olomouc</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vědecká knihovna v Olomouci</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Research Library in Olomouc</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Vědecké knihovny v Olomouci</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vkol.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vkol.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://shibo.vkol.cz/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="91">https://shibo.vkol.cz/logo_90.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Research Library in Olomouc</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Vědecká knihovna v Olomouci</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Research Library in Olomouc</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Vědecké knihovny v Olomouci</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vkol.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.vkol.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://shibo.vkol.cz/logo_40.png</mdui:Logo>
-          <mdui:Logo height="90" width="91">https://shibo.vkol.cz/logo_90.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVANklP/WPGioD4uJOxCiHuW1lyYvLMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM5WhcN
 MzUxMDI3MTIzNDM5WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
@@ -50,13 +50,13 @@ ch/yHVANoJSXRI1Lg5sQ6YJD48CJyk3HKxLegiBdArok3rupcUMzpU9Ibbi2lUe+
 +jRxhQBU9X1CRgb5y6UdeWrFmE5N3tMsRP1D5hEOFDXzpMO+9N+mqNT74HXVHmBh
 IunquFiwHqaq+d/VHve7lJaNERMGP8dnUjTisHQYoBXzzE2Y
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUFpKDcZj8pgvy6pKI1EiT0+Z7PpAwDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNc2hpYm8udmtvbC5jejAeFw0xNTEwMjcxMzM0MzdaFw0z
 NTEwMjcxMjM0MzdaMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owggEiMA0GCSqG
@@ -75,13 +75,13 @@ Y+n53tBF9hIjkOYsO/z0GUlu96PncZeZ96vc5Vm9lkW0gs7druFFc/GgUZ+1RB/R
 MrZqvpCJ8ufxMWB+d+Y0ogq5CXmYrvbVYiQf+KieHmY7jw7/oBTnYnM8JANC2pwe
 FhbZRUsHucC16PyRIVtne6BJfM1mwy6+BQTNUAl9y4KXO9U=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKS9iTg+VmzdK2E7t2F4uc9lX0QAMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM4WhcN
 MzUxMDI3MTIzNDM4WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
@@ -100,31 +100,31 @@ MA0GCSqGSIb3DQEBCwUAA4IBAQBvf8Q6BumhEbT4H1K9clkLLepE8LrafTWFniv8
 v+8IGZJ5jUs5oKN/zYrSkLwtgg05gLGRRohYmrOenaIdvtJN7zezoZOEaq1G6scC
 EFATVycEnZXPpoVMS/L8mnJxbKmTSRcsOn8gsOBYLVIV03Zw
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibo.vkol.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibo.vkol.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVANklP/WPGioD4uJOxCiHuW1lyYvLMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM5WhcN
 MzUxMDI3MTIzNDM5WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
@@ -143,13 +143,13 @@ ch/yHVANoJSXRI1Lg5sQ6YJD48CJyk3HKxLegiBdArok3rupcUMzpU9Ibbi2lUe+
 +jRxhQBU9X1CRgb5y6UdeWrFmE5N3tMsRP1D5hEOFDXzpMO+9N+mqNT74HXVHmBh
 IunquFiwHqaq+d/VHve7lJaNERMGP8dnUjTisHQYoBXzzE2Y
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUFpKDcZj8pgvy6pKI1EiT0+Z7PpAwDQYJKoZIhvcNAQEL
 BQAwGDEWMBQGA1UEAwwNc2hpYm8udmtvbC5jejAeFw0xNTEwMjcxMzM0MzdaFw0z
 NTEwMjcxMjM0MzdaMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owggEiMA0GCSqG
@@ -168,13 +168,13 @@ Y+n53tBF9hIjkOYsO/z0GUlu96PncZeZ96vc5Vm9lkW0gs7druFFc/GgUZ+1RB/R
 MrZqvpCJ8ufxMWB+d+Y0ogq5CXmYrvbVYiQf+KieHmY7jw7/oBTnYnM8JANC2pwe
 FhbZRUsHucC16PyRIVtne6BJfM1mwy6+BQTNUAl9y4KXO9U=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAKS9iTg+VmzdK2E7t2F4uc9lX0QAMA0GCSqGSIb3DQEB
 CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM4WhcN
 MzUxMDI3MTIzNDM4WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
@@ -193,23 +193,23 @@ MA0GCSqGSIb3DQEBCwUAA4IBAQBvf8Q6BumhEbT4H1K9clkLLepE8LrafTWFniv8
 v+8IGZJ5jUs5oKN/zYrSkLwtgg05gLGRRohYmrOenaIdvtJN7zezoZOEaq1G6scC
 EFATVycEnZXPpoVMS/L8mnJxbKmTSRcsOn8gsOBYLVIV03Zw
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Research Library in Olomouc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Research Library in Olomouc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vkol.cz/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.vkol.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Novák</md:SurName>
-      <md:EmailAddress>petr.novak@ruk.cuni.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Research Library in Olomouc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Research Library in Olomouc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vkol.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.vkol.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Novák</md:SurName>
+    <md:EmailAddress>petr.novak@ruk.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml
index f2862238..e207a7b0 100644
--- a/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibprodapp.loyola.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loyola.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Loyola University Maryland</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loyola.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Loyola University Maryland</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUWLSGsZvWl23rl/5DUpC+PY0gdCowDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWc2hpYnByb2RhcHAubG95b2xhLmVkdTAeFw0xMTAyMTcx
 NjUyMDVaFw0zMTAyMTcxNjUyMDVaMCExHzAdBgNVBAMTFnNoaWJwcm9kYXBwLmxv
@@ -38,24 +38,24 @@ ht/rW5SFnbRAX0v4KyQ3YUpnnL0335rWfuCVnyni2pzAfSzYb5/wJMvP74wI+FuJ
 FvQGSFkWMaNqaxat36IGB684E28xf/OPEJ+0L/x83anw+zz7oPZHhUVnK72ps3al
 tni4iLs+Rp8r9iFpwZc5M51492MyihM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibprodapp.loyola.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loyola.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibprodapp.loyola.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loyola.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQzCCAiugAwIBAgIUWLSGsZvWl23rl/5DUpC+PY0gdCowDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWc2hpYnByb2RhcHAubG95b2xhLmVkdTAeFw0xMTAyMTcx
 NjUyMDVaFw0zMTAyMTcxNjUyMDVaMCExHzAdBgNVBAMTFnNoaWJwcm9kYXBwLmxv
@@ -75,19 +75,19 @@ ht/rW5SFnbRAX0v4KyQ3YUpnnL0335rWfuCVnyni2pzAfSzYb5/wJMvP74wI+FuJ
 FvQGSFkWMaNqaxat36IGB684E28xf/OPEJ+0L/x83anw+zz7oPZHhUVnK72ps3al
 tni4iLs+Rp8r9iFpwZc5M51492MyihM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loyola University Maryland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Loyola University Maryland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.loyola.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James McCartin</md:GivenName>
-      <md:EmailAddress>jmccartin@loyola.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loyola University Maryland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Loyola University Maryland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.loyola.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James McCartin</md:GivenName>
+    <md:EmailAddress>jmccartin@loyola.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml
index 923c9e44..f0c936e3 100644
--- a/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibserv.abdn.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-24T15:39:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-24T15:39:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abdn.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Aberdeen</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.abdn.ac.uk/local/shibboleth/universitylogo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.abdn.ac.uk/local/shibboleth/favicon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abdn.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Aberdeen</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.abdn.ac.uk/local/shibboleth/universitylogo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.abdn.ac.uk/local/shibboleth/favicon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYDCCA0igAwIBAgIJAKyEfiLtLS+qMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxETAPBgNVBAcTCEFiZXJkZWVuMR8w
 						HQYDVQQKExZVbml2ZXJzaXR5IG9mIEFiZXJkZWVuMRQwEgYDVQQLEwtJVCBTZXJ2
@@ -43,26 +43,26 @@
 						gnrpddtYjDrcly5nGW+xcCzHmxJE11pNuvBs3smlTrl2KWSo376k4hCTMXJkCSna
 						/Of8WnJZ6TQKBGIFWx6paDusZPY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibserv2.abdn.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abdn.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibserv2.abdn.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abdn.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEYDCCA0igAwIBAgIJAKyEfiLtLS+qMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxETAPBgNVBAcTCEFiZXJkZWVuMR8w
 						HQYDVQQKExZVbml2ZXJzaXR5IG9mIEFiZXJkZWVuMRQwEgYDVQQLEwtJVCBTZXJ2
@@ -88,27 +88,27 @@
 						gnrpddtYjDrcly5nGW+xcCzHmxJE11pNuvBs3smlTrl2KWSo376k4hCTMXJkCSna
 						/Of8WnJZ6TQKBGIFWx6paDusZPY=                       
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Aberdeen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abdn.ac.uk/dit/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Morrow</md:SurName>
-      <md:EmailAddress>mailto:webmaster@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Morrow</md:SurName>
-      <md:EmailAddress>mailto:webmaster@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Aberdeen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abdn.ac.uk/dit/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Morrow</md:SurName>
+    <md:EmailAddress>mailto:webmaster@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Morrow</md:SurName>
+    <md:EmailAddress>mailto:webmaster@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
index 91f760a0..12a9b274 100644
--- a/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsles.brunel.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIJAPWdUCwLL6STMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azAeFw0xMjA2MDExMTMwMDFaFw0yMjA2
 						MDExMTMwMDFaMCAxHjAcBgNVBAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azCCASIw
@@ -35,26 +35,26 @@
 						84p18Y4QJKlwEQhkkqg8PykdSAHzaIDTN9N6qJjfdFSKLp0DRHWpeDqnbhlc2+8H
 						NySru11ACLA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibsles.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibsles.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIJAPWdUCwLL6STMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azAeFw0xMjA2MDExMTMwMDFaFw0yMjA2
 						MDExMTMwMDFaMCAxHjAcBgNVBAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azCCASIw
@@ -74,27 +74,27 @@
 						84p18Y4QJKlwEQhkkqg8PykdSAHzaIDTN9N6qJjfdFSKLp0DRHWpeDqnbhlc2+8H
 						NySru11ACLA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brunel University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brunel University (Old)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Fraser</md:SurName>
-      <md:EmailAddress>mailto:alex.fraser@brunel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Fraser</md:SurName>
-      <md:EmailAddress>mailto:alex.fraser@brunel.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brunel University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brunel University (Old)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Fraser</md:SurName>
+    <md:EmailAddress>mailto:alex.fraser@brunel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Fraser</md:SurName>
+    <md:EmailAddress>mailto:alex.fraser@brunel.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml
index cdd40fc2..acf79935 100644
--- a/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.proofidcloud.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T16:03:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T16:03:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ProofID test Shibboleth service provider</mdui:DisplayName>
+        <mdui:Logo height="65" width="160">https://shibsp.proofidcloud.co.uk/images/pid_logo.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Used to test Shibboleth SP and customers IdP's</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ProofID test Shibboleth service provider</mdui:DisplayName>
-          <mdui:Logo height="65" width="160">https://shibsp.proofidcloud.co.uk/images/pid_logo.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Used to test Shibboleth SP and customers IdP's</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJALfRd5E/JliNMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXNoaWJzcC5wcm9vZmlkY2xvdWQuY28udWswHhcNMTQwNzEzMTkyOTQ5WhcN
 						MjQwNzEwMTkyOTQ5WjAkMSIwIAYDVQQDExlzaGlic3AucHJvb2ZpZGNsb3VkLmNv
@@ -53,43 +53,43 @@
 						9CrnIlE7O4sZBY2VJAtaunwddT1dKQy+x8QDFQT0NwbvmQi4wQg5y0BSAyFvt/xV
 						brtz87FyltGkVZR1IVYfqb05znwnfQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProofID test Shibboleth service provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Heaney</md:SurName>
-      <md:EmailAddress>mailto:ukfed@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Heaney</md:SurName>
-      <md:EmailAddress>mailto:ukfed@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProofID test Shibboleth service provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Heaney</md:SurName>
+    <md:EmailAddress>mailto:ukfed@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Heaney</md:SurName>
+    <md:EmailAddress>mailto:ukfed@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml
index a09b7d95..5d595fbd 100644
--- a/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.ex.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-17T17:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-17T17:49:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAIy6kv9GigBZ9U3z8fU8Mx1ZZgITMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEXNoaWJ0ZXN0LmV4LmFjLnVrMB4XDTE0MDQwMzEyMTU0
 						NFoXDTM0MDQwMzEyMTU0NFowHDEaMBgGA1UEAxMRc2hpYnRlc3QuZXguYWMudWsw
@@ -37,26 +37,26 @@
 						vX0KDQfY9ZUswe33O2BqbGmS6XWET6Dx039Kh0RSn4aq3bQq0sZqU3z2QrN9qwxW
 						GU4XtQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibtest.ex.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibtest.ex.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIVAIy6kv9GigBZ9U3z8fU8Mx1ZZgITMA0GCSqGSIb3DQEB
 						BQUAMBwxGjAYBgNVBAMTEXNoaWJ0ZXN0LmV4LmFjLnVrMB4XDTE0MDQwMzEyMTU0
 						NFoXDTM0MDQwMzEyMTU0NFowHDEaMBgGA1UEAxMRc2hpYnRlc3QuZXguYWMudWsw
@@ -76,31 +76,31 @@
 						vX0KDQfY9ZUswe33O2BqbGmS6XWET6Dx039Kh0RSn4aq3bQq0sZqU3z2QrN9qwxW
 						GU4XtQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Exeter</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Exeter Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.as.exeter.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Exeter IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:Helpdesk@exeter.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Taylor</md:SurName>
-      <md:EmailAddress>mailto:L.W.Taylor@exeter.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pete</md:GivenName>
-      <md:SurName>Leggett</md:SurName>
-      <md:EmailAddress>mailto:P.F.Leggett@exeter.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Exeter</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Exeter Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.as.exeter.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Exeter IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:Helpdesk@exeter.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Taylor</md:SurName>
+    <md:EmailAddress>mailto:L.W.Taylor@exeter.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pete</md:GivenName>
+    <md:SurName>Leggett</md:SurName>
+    <md:EmailAddress>mailto:P.F.Leggett@exeter.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml
index b7136e71..4f375613 100644
--- a/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.idp.mimas.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAN7ga1+uXpDOX1/droiJ39Pl1TLUMA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmlkcC5taW1hcy5hYy51azAeFw0xMDA3
 						MTAxNDE4NTdaFw0zMDA3MTAxNDE4NTdaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0Lmlk
@@ -35,26 +35,26 @@
 						hnd57QZ3WTyqB0/30TrDkpPkL3GAjrdoUAMfG7wBYagR+soc+1URAr8oP+shK8M/
 						uSohqKcoLLVvY0qjE+AzYlX6YdrpGbad1nCO6WOIm/0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mimas.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTDCCAjSgAwIBAgIVAN7ga1+uXpDOX1/droiJ39Pl1TLUMA0GCSqGSIb3DQEB
 						BQUAMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmlkcC5taW1hcy5hYy51azAeFw0xMDA3
 						MTAxNDE4NTdaFw0zMDA3MTAxNDE4NTdaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0Lmlk
@@ -74,25 +74,25 @@
 						hnd57QZ3WTyqB0/30TrDkpPkL3GAjrdoUAMfG7wBYagR+soc+1URAr8oP+shK8M/
 						uSohqKcoLLVvY0qjE+AzYlX6YdrpGbad1nCO6WOIm/0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Manchester: Mimas Development IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mimas helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:info@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Manchester: Mimas Development IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mimas helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:info@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml
index 881b7193..28982b2d 100644
--- a/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.informit.com.au/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-18T09:01:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-18T09:01:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.informit.com.au/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.informit.com.au/Shibboleth.sso/DS" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/TESTtestDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.informit.com.au/Shibboleth.sso/TESTtestDS" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</mdui:Description>
+        <mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.informit.com.au/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.informit.com.au/Shibboleth.sso/DS" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/Shibboleth.sso/TESTtestDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibtest.informit.com.au/Shibboleth.sso/TESTtestDS" index="3"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</mdui:Description>
-          <mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIJANAW6lqADfvcMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWJ0ZXN0LmluZm9ybWl0LmNvbS5hdTAeFw0xMjEwMDgwMzIxMjBaFw0y
 						MjEwMDYwMzIxMjBaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmluZm9ybWl0LmNvbS5h
@@ -60,52 +60,52 @@
 						h6LqQQCPoFMVqQPIacUcCcKA5scEpnxtalUccX8h6zOdpDjijSPRABuFJVRD4kWl
 						2jG8gQO/jLpnk4IGfgwN1w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.informit.com.au/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RMIT Training Pty Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Informit</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.informit.com.au/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Informit Support</md:GivenName>
-      <md:EmailAddress>mailto:support@rmitpublishing.com.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dominic</md:GivenName>
-      <md:SurName>Crowther</md:SurName>
-      <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Loan</md:GivenName>
-      <md:SurName>Pham</md:SurName>
-      <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paras</md:GivenName>
-      <md:SurName>Daftary</md:SurName>
-      <md:EmailAddress>mailto:paras.daftary@rmit.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.informit.com.au/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RMIT Training Pty Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Informit</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.informit.com.au/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Informit Support</md:GivenName>
+    <md:EmailAddress>mailto:support@rmitpublishing.com.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dominic</md:GivenName>
+    <md:SurName>Crowther</md:SurName>
+    <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Loan</md:GivenName>
+    <md:SurName>Pham</md:SurName>
+    <md:EmailAddress>mailto:dominic.crowther@rmit.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paras</md:GivenName>
+    <md:SurName>Daftary</md:SurName>
+    <md:EmailAddress>mailto:paras.daftary@rmit.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml
index 8f4da591..b72ad08f 100644
--- a/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.zetoc.mimas.ac.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+jCCAuKgAwIBAgIJALJQK6WnWBR9MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5pdmVy
 						c2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMac2hp
@@ -31,35 +31,35 @@
 						bA1OE1Qdd7atomQvFpRilpWvYVFDjd9v7oEovrcc0oZJ9ObIcFug951Kfpvhk4d7
 						XR9LvyjviSLUKhaEZa0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MIMAS Zetoc Service Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Zetoc Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:zetoc@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS Zetoc Service Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zetoc Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:zetoc@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml
index 137c49d0..1ed864b1 100644
--- a/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shidp.glam.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOq/2C/MoDMaYd36KL3bSPyQItVzMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEHNoaWRwLmdsYW0uYWMudWswHhcNMTIxMTIxMTA1NTE0
 						WhcNMzIxMTIxMTA1NTE0WjAbMRkwFwYDVQQDExBzaGlkcC5nbGFtLmFjLnVrMIIB
@@ -29,26 +29,26 @@
 						AWjHb1nOc8EIMekqmGuiQMmvBnp86qHn2Dpm4bioErd4401iF+mHfpTdaLEu0YUr
 						whThODhFpFOM7D3ct8xJhHG1lK+wwqGzn32PVvxKlXGAVr42J1ejVDKdRXA2rCtY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shidp.glam.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shidp.glam.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIVAOq/2C/MoDMaYd36KL3bSPyQItVzMA0GCSqGSIb3DQEB
 						BQUAMBsxGTAXBgNVBAMTEHNoaWRwLmdsYW0uYWMudWswHhcNMTIxMTIxMTA1NTE0
 						WhcNMzIxMTIxMTA1NTE0WjAbMRkwFwYDVQQDExBzaGlkcC5nbGFtLmFjLnVrMIIB
@@ -67,26 +67,26 @@
 						AWjHb1nOc8EIMekqmGuiQMmvBnp86qHn2Dpm4bioErd4401iF+mHfpTdaLEu0YUr
 						whThODhFpFOM7D3ct8xJhHG1lK+wwqGzn32PVvxKlXGAVr42J1ejVDKdRXA2rCtY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of South Wales</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of South Wales</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services Support</md:GivenName>
-      <md:EmailAddress>mailto:itsupport@southwales.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Sewell</md:SurName>
-      <md:EmailAddress>mailto:kevin.sewell@southwales.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of South Wales</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of South Wales</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@southwales.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Sewell</md:SurName>
+    <md:EmailAddress>mailto:kevin.sewell@southwales.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml
index a61e9577..39969657 100644
--- a/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shu-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-08T13:43:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-08T13:43:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sheffield Hallam University - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Sheffield Hallam University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sheffield Hallam University - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Sheffield Hallam University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAMbLNjH7IdN7MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjgwHhcNMTUwNDAyMTkyMjE5WhcNMjUwMzMwMTkyMjE5WjASMRAw
 						DgYDVQQDEwdhaW8wMDI4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -50,43 +50,43 @@
 						fd+fRWW+0dWqB9jA2+UE1R4V+6NiJVESYmnc+pfeVOtt8kinJ3fXa3kjFgwN7gZt
 						616nxaRmxDQmzhRhAYD2LA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Sheffield Hallam University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Sheffield Hallam University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml b/swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml
index 49f0d7b9..72f536b0 100644
--- a/swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/si-saai.ualg.pt-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://si-saai.ualg.pt/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt" registrationInstant="2010-01-22T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt" registrationInstant="2010-01-22T00:00:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ualg.pt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Algarve</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">Universidade do Algarve</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ualg.pt/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt">http://www.ualg.pt/pt</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ualg.pt</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Algarve</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt">Universidade do Algarve</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ualg.pt/en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt">http://www.ualg.pt/pt</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUKuW5MuiehKHHdGjp+5rQDbXzx4IwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPc2ktc2FhaS51YWxnLnB0MB4XDTE2MDIwMTA5MTQwNFoX
 DTM2MDIwMTA5MTQwNFowGjEYMBYGA1UEAxMPc2ktc2FhaS51YWxnLnB0MIIBIjAN
@@ -35,32 +35,32 @@ nZDbmjY7IsP1f9iLm5aP6tCSszjkEbWzsnweQMBlteNa/2m9Ncfb4TpRwvcViCW7
 7uv/13bbYB4F4pTr6fVxqORhM7HSJYn6WkgZczGbCFUMaIfTxKSF9v7/bpHnbXIP
 8YekuHRId7rJxQiwaGni69uLUvfjTo4cRrDa6daZo2Ff1LlKlfjTN4ANRA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si-saai.ualg.pt/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://si-saai.ualg.pt/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://si-saai.ualg.pt/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si-saai.ualg.pt/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pt">Universidade do Algarve</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Algarve</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="pt">Universidade do Algarve</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Algarve</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="pt">http://www.ualg.pt/pt</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.ualg.pt/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adriano</md:GivenName>
-      <md:SurName>Pires</md:SurName>
-      <md:EmailAddress>mailto:helpmail@ualg.pt</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Suporte</md:GivenName>
-      <md:SurName>Serviços de Informática da Ualg</md:SurName>
-      <md:EmailAddress>mailto:helpmail@ualg.pt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si-saai.ualg.pt/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://si-saai.ualg.pt/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://si-saai.ualg.pt/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si-saai.ualg.pt/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pt">Universidade do Algarve</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Algarve</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="pt">Universidade do Algarve</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Algarve</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="pt">http://www.ualg.pt/pt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ualg.pt/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adriano</md:GivenName>
+    <md:SurName>Pires</md:SurName>
+    <md:EmailAddress>mailto:helpmail@ualg.pt</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Suporte</md:GivenName>
+    <md:SurName>Serviços de Informática da Ualg</md:SurName>
+    <md:EmailAddress>mailto:helpmail@ualg.pt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
index 66d69dda..50fbedda 100644
--- a/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://si.crous-rouen.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-03-07T17:54:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-03-07T17:54:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rouen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Rouen - Personnels</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crous-rouen.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CROUS Rouen - Personnels</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rouen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CROUS Rouen - Personnels</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crous-rouen.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CROUS Rouen - Personnels</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
@@ -45,23 +45,23 @@ pE+J4hzosDSAGW1pQrD0ZpUhr4dvnIkTk71if9YppptIBkjaQRs+A3VLlGjx/h+4
 KNJE8Xihgi+rF2omHHm1CzPNO0SDP7slHJNSbXGPcW8sGTtBq3j3qd7/hZrLxFr2
 3afUu/R74xDmkXU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://si.crous-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si.crous-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si.crous-rouen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rouen.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://si.crous-rouen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si.crous-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si.crous-rouen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rouen.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
@@ -88,19 +88,19 @@ pE+J4hzosDSAGW1pQrD0ZpUhr4dvnIkTk71if9YppptIBkjaQRs+A3VLlGjx/h+4
 KNJE8Xihgi+rF2omHHm1CzPNO0SDP7slHJNSbXGPcW8sGTtBq3j3qd7/hZrLxFr2
 3afUu/R74xDmkXU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://si.crous-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS Rouen - Personnels</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS Rouen - Personnels</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-rouen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>service-informatique@crous-rouen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://si.crous-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS Rouen - Personnels</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS Rouen - Personnels</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-rouen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>service-informatique@crous-rouen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml b/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
index 2776e8db..2c1fdf66 100644
--- a/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://siaiap08.univali.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univali.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.univali.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.univali.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univali.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.univali.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.univali.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
 ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
 AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
@@ -45,26 +45,26 @@ qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
 xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
 bDtUbUIh3bPnDHUI9So2aC1i27Q=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://siaiap08.univali.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siaiap08.univali.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univali.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://siaiap08.univali.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siaiap08.univali.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univali.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
 ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
@@ -89,24 +89,24 @@ xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
 bDtUbUIh3bPnDHUI9So2aC1i27Q=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univali.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.univali.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Marcio Luiz Ota</md:SurName>
-      <md:EmailAddress>admin@univali.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univali.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.univali.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Marcio Luiz Ota</md:SurName>
+    <md:EmailAddress>admin@univali.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml
index 6fb2da5b..c46fe4be 100644
--- a/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sid.kent.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kent.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Kent</mdui:DisplayName>
+        <mdui:Logo height="177" width="236">https://jordan.kent.ac.uk/images/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://jordan.kent.ac.uk/images/icon-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>129.12.0.0/16</mdui:IPHint>
+        <mdui:IPHint>195.195.86.0/23</mdui:IPHint>
+        <mdui:IPHint>195.195.88.0/24</mdui:IPHint>
+        <mdui:IPHint>195.195.89.0/26</mdui:IPHint>
+        <mdui:IPHint>195.195.89.128/25</mdui:IPHint>
+        <mdui:DomainHint>kent.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.29861,1.07059</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.39781,0.54197</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.19263,0.27140</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:48.841877,2.331676</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.82142,4.39169</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kent.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Kent</mdui:DisplayName>
-          <mdui:Logo height="177" width="236">https://jordan.kent.ac.uk/images/logo.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://jordan.kent.ac.uk/images/icon-16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>129.12.0.0/16</mdui:IPHint>
-          <mdui:IPHint>195.195.86.0/23</mdui:IPHint>
-          <mdui:IPHint>195.195.88.0/24</mdui:IPHint>
-          <mdui:IPHint>195.195.89.0/26</mdui:IPHint>
-          <mdui:IPHint>195.195.89.128/25</mdui:IPHint>
-          <mdui:DomainHint>kent.ac.uk</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.29861,1.07059</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.39781,0.54197</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.19263,0.27140</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:48.841877,2.331676</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.82142,4.39169</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUFTvaqDYnEQRtqGKyg61iRHS6DSMwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAwwRam9yZGFuLmtlbnQuYWMudWswHhcNMTYwMTA0MTAxMTEw
 						WhcNMzYwMTA0MTAxMTEwWjAcMRowGAYDVQQDDBFqb3JkYW4ua2VudC5hYy51azCC
@@ -48,26 +48,26 @@
 						j6vg6TghDxdXZTqf631sCMtZHCiuSE1ErlrleXwIi6GCCSoDjCEWG36E8Yi/291n
 						LkgY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://jordan.kent.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kent.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://jordan.kent.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kent.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUFTvaqDYnEQRtqGKyg61iRHS6DSMwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAwwRam9yZGFuLmtlbnQuYWMudWswHhcNMTYwMTA0MTAxMTEw
 						WhcNMzYwMTA0MTAxMTEwWjAcMRowGAYDVQQDDBFqb3JkYW4ua2VudC5hYy51azCC
@@ -87,26 +87,26 @@
 						j6vg6TghDxdXZTqf631sCMtZHCiuSE1ErlrleXwIi6GCCSoDjCEWG36E8Yi/291n
 						LkgY
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Kent</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kent.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Slowe</md:SurName>
-      <md:EmailAddress>mailto:M.Slowe@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Kent</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kent.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Slowe</md:SurName>
+    <md:EmailAddress>mailto:M.Slowe@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml
index 037b8605..da1cf862 100644
--- a/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sid.swarthmore.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swarthmore.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Swarthmore College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Swarthmore College</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">swarthmore.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Swarthmore College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Swarthmore College</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAO7xcYpBnwYIVTLfF6pF14NXi0KmMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEnNpZC5zd2FydGhtb3JlLmVkdTAeFw0xNDAyMTAyMDEw
 MThaFw0zNDAyMTAyMDEwMThaMB0xGzAZBgNVBAMTEnNpZC5zd2FydGhtb3JlLmVk
@@ -39,36 +39,36 @@ G+CNVVb2DBJTvVkhO3f17lY/dklyI2gdwVllRNFBAnmy1Df9aWkDyKjUOJ/8q/fF
 CE6FGmpQsHtUKkKdVS5iUqYG7e6khmfvWCCsU25yjK9G05ktEvFcD/3FCsyGG3hs
 BaXUFreM06I=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sid.swarthmore.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sid.swarthmore.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sid.swarthmore.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Swarthmore College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Swarthmore College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swarthmore.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>shib-admin@swarthmore.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Glenn Stauffer</md:GivenName>
-      <md:EmailAddress>stauffer@swarthmore.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Clemente</md:GivenName>
-      <md:EmailAddress>mclemen2@swarthmore.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Jason Rotunno</md:GivenName>
-      <md:EmailAddress>jrotunno@swarthmore.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Swarthmore Support</md:GivenName>
-      <md:EmailAddress>help@swarthmore.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sid.swarthmore.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sid.swarthmore.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sid.swarthmore.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swarthmore College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swarthmore College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swarthmore.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shib-admin@swarthmore.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Glenn Stauffer</md:GivenName>
+    <md:EmailAddress>stauffer@swarthmore.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Clemente</md:GivenName>
+    <md:EmailAddress>mclemen2@swarthmore.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Jason Rotunno</md:GivenName>
+    <md:EmailAddress>jrotunno@swarthmore.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Swarthmore Support</md:GivenName>
+    <md:EmailAddress>help@swarthmore.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml
index 78a768b6..dc96b6be 100644
--- a/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sidp.wwu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wwu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Western Washington University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wwu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Western Washington University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAIyxNK+nL1tj4FcJPnDbbol76zmjMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNpZHAud3d1LmVkdTAeFw0xMzAzMDQyMTI0MDBaFw0z
 MzAzMDQyMTI0MDBaMBcxFTATBgNVBAMTDHNpZHAud3d1LmVkdTCCASIwDQYJKoZI
@@ -37,28 +37,28 @@ BJdhULANxUopZOpy8U2fDG9mepmv95tWPBIz2XOqkya9hGNGAnvL0PmRUMt55O8L
 dOrRtblBNkeAYH1baKgdjO6nPQoZkENYrIpPD6yvosumYyUyo3fHvM+YOi+TdK2/
 6lphblIDurvkP+seqzCJBN3tjEYWQh+eVmvzbwH1nDg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sidp.wwu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sidp.wwu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sidp.wwu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Western Washington University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Western Washington University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wwu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim McLaughlin</md:GivenName>
-      <md:EmailAddress>tim.mclaughlin@wwu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Ken Pearce</md:GivenName>
-      <md:EmailAddress>ken.pearce@wwu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Linc Nesheim</md:GivenName>
-      <md:EmailAddress>linc.nesheim@wwu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sidp.wwu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sidp.wwu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sidp.wwu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Western Washington University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Western Washington University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wwu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim McLaughlin</md:GivenName>
+    <md:EmailAddress>tim.mclaughlin@wwu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Ken Pearce</md:GivenName>
+    <md:EmailAddress>ken.pearce@wwu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Linc Nesheim</md:GivenName>
+    <md:EmailAddress>linc.nesheim@wwu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml b/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml
index 74783248..e10c5c79 100644
--- a/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml
+++ b/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sids.somerset.ac.uk/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somerset.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somerset.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAJhc0Z//qBJuMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU29tZXJzZXQxEDAOBgNVBAcTB1RhdW50b24xGTAX
 						BgNVBAoTEFNvbWVyc2V0IENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRww
@@ -35,26 +35,26 @@
 						sZoM785kMGdeBeTv1HBl3REOMog53DByCkCLaD/YfsfekU/V3AUNsLA6fPIpTefI
 						MMqkediE0Hq1mipwj+g10F2TrMFHxGMHv3hLtgjVXSbBbzcSocw1Mgi4P2U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sids.somerset.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somerset.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sids.somerset.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somerset.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAJhc0Z//qBJuMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU29tZXJzZXQxEDAOBgNVBAcTB1RhdW50b24xGTAX
 						BgNVBAoTEFNvbWVyc2V0IENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRww
@@ -79,27 +79,27 @@
 						sZoM785kMGdeBeTv1HBl3REOMog53DByCkCLaD/YfsfekU/V3AUNsLA6fPIpTefI
 						MMqkediE0Hq1mipwj+g10F2TrMFHxGMHv3hLtgjVXSbBbzcSocw1Mgi4P2U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Somerset College of Arts and Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Somerset College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.somerset.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Snook</md:SurName>
-      <md:EmailAddress>mailto:chris.snook@somerset.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Snook</md:SurName>
-      <md:EmailAddress>mailto:chris.snook@somerset.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Somerset College of Arts and Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Somerset College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.somerset.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Snook</md:SurName>
+    <md:EmailAddress>mailto:chris.snook@somerset.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Snook</md:SurName>
+    <md:EmailAddress>mailto:chris.snook@somerset.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml
index c3d53031..75562d72 100644
--- a/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signin.k-state.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://signin.k-state.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ksu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kansas State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Kansas State University Shibboleth Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.k-state.edu/its/security/procedures/incommon.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.k-state.edu/its/policies/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="65" width="200" xml:lang="en">https://www.k-state.edu/images/kstate-logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://signin.k-state.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ksu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kansas State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Kansas State University Shibboleth Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.k-state.edu/its/security/procedures/incommon.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.k-state.edu/its/policies/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="65" width="200" xml:lang="en">https://www.k-state.edu/images/kstate-logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUddkT+9u91blTGSOr4CVwQBZ/FFYwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1MB4XDTEyMDYwNTE1NDAw
 OVoXDTMyMDYwNTE1NDAwOVowHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1
@@ -45,24 +45,24 @@ UKw8tiWpALVruSodJQw9Guq0Mpmic3daaI/TjD5rl3k6rXDlr5aXHpCRdpZynQGx
 ABEpAgjaGHvTyEOi849GB2Tewhzj8HGIyx1TfT175MtFN2kfVCDznA+zPXZUg73f
 ymGADBlpjg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signin.k-state.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signin.k-state.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signin.k-state.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.k-state.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signin.k-state.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.k-state.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ksu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signin.k-state.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signin.k-state.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signin.k-state.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.k-state.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signin.k-state.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.k-state.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ksu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMzCCAhugAwIBAgIUddkT+9u91blTGSOr4CVwQBZ/FFYwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1MB4XDTEyMDYwNTE1NDAw
 OVoXDTMyMDYwNTE1NDAwOVowHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1
@@ -82,27 +82,27 @@ UKw8tiWpALVruSodJQw9Guq0Mpmic3daaI/TjD5rl3k6rXDlr5aXHpCRdpZynQGx
 ABEpAgjaGHvTyEOi849GB2Tewhzj8HGIyx1TfT175MtFN2kfVCDznA+zPXZUg73f
 ymGADBlpjg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signin.k-state.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signin.k-state.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kansas State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kansas State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ksu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support Team</md:GivenName>
-      <md:EmailAddress>idm-dev-l@ksu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Office of Administrative Support</md:GivenName>
-      <md:EmailAddress>caffey@ksu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@ksu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signin.k-state.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signin.k-state.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kansas State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kansas State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ksu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support Team</md:GivenName>
+    <md:EmailAddress>idm-dev-l@ksu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Office of Administrative Support</md:GivenName>
+    <md:EmailAddress>caffey@ksu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@ksu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml b/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml
index 6d8c03d0..1e05b57e 100644
--- a/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml
+++ b/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signin.staging.studentmoneysaver.co.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-20T11:21:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-20T11:21:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Money Saver (Test SP)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is a test­-only SP for Student Money Saver. Do not use in production.</mdui:Description>
+        <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Student Money Saver (Test SP)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is a test­-only SP for Student Money Saver. Do not use in production.</mdui:Description>
-          <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
 						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
@@ -41,13 +41,13 @@
 						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
 						y3MXd8zZdHL4dhUTYdiF
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
 						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
@@ -72,25 +72,25 @@
 						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
 						y3MXd8zZdHL4dhUTYdiF
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.staging.studentmoneysaver.co.uk/saml/signout/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.staging.studentmoneysaver.co.uk/saml/consume/" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Student Money Saver Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Money Saver (Test SP)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.studentmoneysaver.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Team</md:GivenName>
-      <md:EmailAddress>mailto:support@studentmoneysaver.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Silimon</md:SurName>
-      <md:EmailAddress>mailto:adrian@studentmoneysaver.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.staging.studentmoneysaver.co.uk/saml/signout/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.staging.studentmoneysaver.co.uk/saml/consume/" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Student Money Saver Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Money Saver (Test SP)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.studentmoneysaver.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Team</md:GivenName>
+    <md:EmailAddress>mailto:support@studentmoneysaver.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Silimon</md:SurName>
+    <md:EmailAddress>mailto:adrian@studentmoneysaver.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml b/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
index 22f4b71b..081f5e17 100644
--- a/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
+++ b/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signin.studentmoneysaver.co.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-03T08:33:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-03T08:33:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Money Saver</mdui:DisplayName>
+        <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-logo.png</mdui:Logo>
+        <mdui:Description xml:lang="en">We specialise in student discounts, deals and free stuff, as well as ways to make money quickly. Plus, everything you need to know about student finance, made simple.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Student Money Saver</mdui:DisplayName>
-          <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-logo.png</mdui:Logo>
-          <mdui:Description xml:lang="en">We specialise in student discounts, deals and free stuff, as well as ways to make money quickly. Plus, everything you need to know about student finance, made simple.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
 						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
@@ -41,13 +41,13 @@
 						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
 						y3MXd8zZdHL4dhUTYdiF
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
 						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
@@ -72,25 +72,25 @@
 						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
 						y3MXd8zZdHL4dhUTYdiF
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.studentmoneysaver.co.uk/saml/signout/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.studentmoneysaver.co.uk/saml/consume/" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Student Money Saver Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Money Saver</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.studentmoneysaver.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Team</md:GivenName>
-      <md:EmailAddress>mailto:info@studentmoneysaver.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adrian</md:GivenName>
-      <md:SurName>Silimon</md:SurName>
-      <md:EmailAddress>mailto:adrian@studentmoneysaver.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.studentmoneysaver.co.uk/saml/signout/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.studentmoneysaver.co.uk/saml/consume/" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Student Money Saver Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Money Saver</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.studentmoneysaver.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Team</md:GivenName>
+    <md:EmailAddress>mailto:info@studentmoneysaver.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adrian</md:GivenName>
+    <md:SurName>Silimon</md:SurName>
+    <md:EmailAddress>mailto:adrian@studentmoneysaver.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
index 7642b36a..1c9f028c 100644
--- a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signon.hh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hh.se</mdui:InformationURL>
+        <mdui:Logo height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="116" width="350">https://signon.hh.se/hh-logo-sv-350x116.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://signon.hh.se/idp_privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://signon.hh.se/idp_privacy_statement_en.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hh.se</mdui:DomainHint>
+        <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.hh.se</mdui:InformationURL>
-          <mdui:Logo height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="116" width="350">https://signon.hh.se/hh-logo-sv-350x116.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://signon.hh.se/idp_privacy_statement.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://signon.hh.se/idp_privacy_statement_en.html</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>hh.se</mdui:DomainHint>
-          <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
-          <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
 OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
@@ -52,26 +52,26 @@ vAXrKY9loLQYkufnJ3GlXmbn3eFOyxmA11Q9xTukB8qno9QI2KMxUH8N2cG0vYXB
 CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signon.hh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.hh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signon.hh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signon.hh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signon.hh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.hh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signon.hh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signon.hh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
 OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
@@ -91,36 +91,36 @@ vAXrKY9loLQYkufnJ3GlXmbn3eFOyxmA11Q9xTukB8qno9QI2KMxUH8N2cG0vYXB
 CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Halmstad University</md:Company>
-      <md:SurName>Magnus Morén</md:SurName>
-      <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Halmstad University</md:Company>
-      <md:SurName>Magnus Morén</md:SurName>
-      <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Halmstad University</md:Company>
-      <md:SurName>Helpdesk Högskloan i Halmstad</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-      <md:TelephoneNumber>+35 167800</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Halmstad University</md:Company>
+    <md:SurName>Magnus Morén</md:SurName>
+    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Halmstad University</md:Company>
+    <md:SurName>Magnus Morén</md:SurName>
+    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Halmstad University</md:Company>
+    <md:SurName>Helpdesk Högskloan i Halmstad</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
+    <md:TelephoneNumber>+35 167800</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
index 13e17455..e04749f4 100644
--- a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signon.rug.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-10-09T11:57:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-10-09T11:57:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rug.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Rijksuniversiteit Groningen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Groningen</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Rijksuniversiteit Groningen</mdui:Description>
+        <mdui:Description xml:lang="en">Rijksuniversiteit Groningen</mdui:Description>
+        <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/rug.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rug.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Rijksuniversiteit Groningen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Groningen</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Rijksuniversiteit Groningen</mdui:Description>
-          <mdui:Description xml:lang="en">Rijksuniversiteit Groningen</mdui:Description>
-          <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/rug.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/56d78f05c751aeb3d57b29caff8510e3"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rijksuniversiteit Groningen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RUG</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rug.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/56d78f05c751aeb3d57b29caff8510e3"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rijksuniversiteit Groningen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RUG</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rug.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml
index 61c9b679..48e82e95 100644
--- a/swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://singlesignon.gwu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The George Washington University</mdui:DisplayName>
+        <mdui:Logo height="90" width="199" xml:lang="en">https://singlesignon.gwu.edu/idp/images/gwlogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The George Washington University</mdui:DisplayName>
-          <mdui:Logo height="90" width="199" xml:lang="en">https://singlesignon.gwu.edu/idp/images/gwlogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUCCBIyMPxHCBVy4X6syXgB3qY64gwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUc2luZ2xlc2lnbm9uLmd3dS5lZHUwHhcNMTMwNTE1MTMx
 NDU3WhcNMzMwNTE1MTMxNDU3WjAfMR0wGwYDVQQDExRzaW5nbGVzaWdub24uZ3d1
@@ -42,25 +42,25 @@ bvAGbxdEwTssKwpaD1d2KWHdaX+SImsJ58jOna4mJ6eCAYPfjgrtLPht9aiRHtvx
 Wz3Q2BXEs5f75bfIUKL/LKI8/LMmP650thtM6YlRjLIDNoa+ymaV48i1+Lb7dPRZ
 2/bMRZ3Y0d/jjfFfYyhu
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://singlesignon.gwu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://singlesignon.gwu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIUCCBIyMPxHCBVy4X6syXgB3qY64gwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAxMUc2luZ2xlc2lnbm9uLmd3dS5lZHUwHhcNMTMwNTE1MTMx
 NDU3WhcNMzMwNTE1MTMxNDU3WjAfMR0wGwYDVQQDExRzaW5nbGVzaWdub24uZ3d1
@@ -80,22 +80,22 @@ bvAGbxdEwTssKwpaD1d2KWHdaX+SImsJ58jOna4mJ6eCAYPfjgrtLPht9aiRHtvx
 Wz3Q2BXEs5f75bfIUKL/LKI8/LMmP650thtM6YlRjLIDNoa+ymaV48i1+Lb7dPRZ
 2/bMRZ3Y0d/jjfFfYyhu
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The George Washington University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The George Washington University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gwu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dhinakaran Thamanan Ramaian (Dhina)</md:GivenName>
-      <md:EmailAddress>dhina@gwu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Dhinakaran Thamanan Ramaian (Dhina)</md:GivenName>
-      <md:EmailAddress>dhina@gwu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The George Washington University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The George Washington University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gwu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dhinakaran Thamanan Ramaian (Dhina)</md:GivenName>
+    <md:EmailAddress>dhina@gwu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Dhinakaran Thamanan Ramaian (Dhina)</md:GivenName>
+    <md:EmailAddress>dhina@gwu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sir2.rediris.es-hub-metadata-federation-validation.xml b/swamid-interfederations-2.0/sir2.rediris.es-hub-metadata-federation-validation.xml
index d80c2b91..52be29d5 100644
--- a/swamid-interfederations-2.0/sir2.rediris.es-hub-metadata-federation-validation.xml
+++ b/swamid-interfederations-2.0/sir2.rediris.es-hub-metadata-federation-validation.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sir2.rediris.es/hub/metadata/federation/validation">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2016-05-26T22:59:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rediris.es</shibmd:Scope>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2016-05-26T22:59:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RedIRIS (SIR2 - SAML2int) - Spanish Research and Academic Network</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">RedIRIS (SIR2 - SAML2int) - Red académica y de investigación española</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider run by RedIRIS</mdui:Description>
+        <mdui:Description xml:lang="es">Proveedor de identidad operado por RedIRIS</mdui:Description>
+      </mdui:UIInfo>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rediris.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RedIRIS (SIR2 - SAML2int) - Spanish Research and Academic Network</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">RedIRIS (SIR2 - SAML2int) - Red académica y de investigación española</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider run by RedIRIS</mdui:Description>
-          <mdui:Description xml:lang="es">Proveedor de identidad operado por RedIRIS</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rediris.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIJANcJwbBM6rtYMA0GCSqGSIb3DQEBCwUAMIGmMQswCQYD
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIJANcJwbBM6rtYMA0GCSqGSIb3DQEBCwUAMIGmMQswCQYD
 VQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNV
 BAoTB1JlZElSSVMxKTAnBgNVBAsTIFNlcnZpY2lvIGRlIElkZW50aWRhZCBkZSBS
 ZWRJUklTMRgwFgYDVQQDEw9zaXIyLnJlZGlyaXMuZXMxHjAcBgkqhkiG9w0BCQEW
@@ -46,22 +46,22 @@ wj0oP74sALmjUzhmL5DxVQ5zJ2FZzMi5V04Ru5z0wAcG1EfOhbWIfZdagUVWKqk7
 M0PyBZynIex/DpgvM+HEbYlLkAh+w83vd6D6gcdpBwXW1EvmUXj5tvAMq39OPwRC
 e8uEfZmR9oe1z6zzsnQAgPHhy/JEEj8bGyyWuXTkV2asPQIt+2Q+DTQNNohVABiE
 P6lcnIWq</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SLOService.php" ResponseLocation="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SLOService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedIRIS - Spanish Research and Academic Network</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedIRIS (SIR2 - SAML2int) - Red académica y de investigación española</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>José Manuel Macías</md:SurName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SLOService.php" ResponseLocation="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SLOService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sir2.rediris.es/hub/fed/federation/validation/RedIRIS_SAML2/SAML2/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedIRIS - Spanish Research and Academic Network</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedIRIS (SIR2 - SAML2int) - Red académica y de investigación española</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>José Manuel Macías</md:SurName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
index 2dd1d533..67a1d016 100644
--- a/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sistemas.uepg.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uepg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uepg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uepg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uepg.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uepg.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.uepg.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
 aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
@@ -50,26 +50,26 @@ gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
 sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
 n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.uepg.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.uepg.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uepg.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.uepg.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.uepg.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uepg.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
@@ -99,24 +99,24 @@ sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
 n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uepg.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.uepg.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Luiz Gustavo Barros</md:SurName>
-      <md:EmailAddress>gustavo@uepg.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uepg.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uepg.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Luiz Gustavo Barros</md:SurName>
+    <md:EmailAddress>gustavo@uepg.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
index bc4c80bf..09d6e4d1 100644
--- a/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sivic.redclara.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
 http://cofre.reuna.cl/index.php/es/reglas-federacion
 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SIVIC - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">SIVIC - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's SIVIC Service</mdui:Description>
+        <mdui:Description xml:lang="es">SIVIC de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DSRENATA" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SIVIC - RedCLARA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">SIVIC - RedCLARA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RedCLARA's SIVIC Service</mdui:Description>
-          <mdui:Description xml:lang="es">SIVIC de RedCLARA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
-        </mdui:UIInfo>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="2"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DSRENATA" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>*.redclara.net</ds:KeyName>
-          <ds:KeyName>redclara.net</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.redclara.net</ds:KeyName>
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
 MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
@@ -56,16 +56,16 @@ I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
 yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
 s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>*.redclara.net</ds:KeyName>
-          <ds:KeyName>redclara.net</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.redclara.net</ds:KeyName>
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
 MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
@@ -94,50 +94,50 @@ I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
 yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
 s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">SIVIC - RedCLARA</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SIVIC - RedCLARA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 SIVIC - RedCLARA
 </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Authentication Support</md:GivenName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Urban</md:SurName>
-      <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
index 760372dd..110b9219 100644
--- a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://skmms-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Riga Red Cross Medical College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Riga Red Cross Medical College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - RCMC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Riga Red Cross Medical College - RCMC IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.rcmc.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - RCMC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Riga Red Cross Medical College - RCMC IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.rcmc.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml
index cfc0b95e..e2e644de 100644
--- a/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slademedia.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-23T09:14:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-23T09:14:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</mdui:Description>
+        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</mdui:Description>
-          <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -51,34 +51,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sisoshibboleth.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sisoshibboleth.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml
index c5f282de..8900df40 100644
--- a/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slateford.edina.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-30T09:42:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-30T09:42:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUaFQBDsbQD1myaqUBq2Sfj+zNqTMwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB4XDTE1MDkxNzE1
 						MTIzNloXDTM1MDkxNzE1MTIzNlowIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5h
@@ -37,13 +37,13 @@
 						495tpKxyzKlo4C5QKUDpViGUP58XSD5kJCJeS4Ymi+WV+aFs/O8lmZ5hDfewOc1g
 						5uS5lUQuoXJ9EWaUU4yHKgG38Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAJXbfu0qWAZqhGmvDTbCJH2YO2I8MA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
 						NTEyMzRaFw0zNTA5MTcxNTEyMzRaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
@@ -63,13 +63,13 @@
 						3/6MjSrnTGa+QNCQYYKgPYEcUi5O3Pzt5kqELoU4AEHS9UePQ5no+8VLaNrOanrk
 						UgdUiNZ8Ouem7SX/w7R0VgYEvno=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAKOoQhLtWEUvuc1BChPnl4v49qTyMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
 						NTEyMzVaFw0zNTA5MTcxNTEyMzVaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
@@ -89,27 +89,27 @@
 						1quXSXm1737rQJwd9EsXzGhUxxdRC2H/ly3H8E0NuDgeWfmBYVkXUn4JY1J2W1Dq
 						xnuCMY0qHTFh2QuZSh0kGrs2wcY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://slateford.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://slateford.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIUaFQBDsbQD1myaqUBq2Sfj+zNqTMwDQYJKoZIhvcNAQEL
 						BQAwIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB4XDTE1MDkxNzE1
 						MTIzNloXDTM1MDkxNzE1MTIzNlowIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5h
@@ -129,13 +129,13 @@
 						495tpKxyzKlo4C5QKUDpViGUP58XSD5kJCJeS4Ymi+WV+aFs/O8lmZ5hDfewOc1g
 						5uS5lUQuoXJ9EWaUU4yHKgG38Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAJXbfu0qWAZqhGmvDTbCJH2YO2I8MA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
 						NTEyMzRaFw0zNTA5MTcxNTEyMzRaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
@@ -155,13 +155,13 @@
 						3/6MjSrnTGa+QNCQYYKgPYEcUi5O3Pzt5kqELoU4AEHS9UePQ5no+8VLaNrOanrk
 						UgdUiNZ8Ouem7SX/w7R0VgYEvno=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVAKOoQhLtWEUvuc1BChPnl4v49qTyMA0GCSqGSIb3DQEB
 						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
 						NTEyMzVaFw0zNTA5MTcxNTEyMzVaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
@@ -181,24 +181,24 @@
 						1quXSXm1737rQJwd9EsXzGhUxxdRC2H/ly3H8E0NuDgeWfmBYVkXUn4JY1J2W1Dq
 						xnuCMY0qHTFh2QuZSh0kGrs2wcY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Slateford Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Stuart</md:SurName>
-      <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Stuart</md:SurName>
-      <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Slateford Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Stuart</md:SurName>
+    <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Stuart</md:SurName>
+    <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml
index ed2dbd13..fb71334f 100644
--- a/swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slateford.edina.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-16T13:56:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-16T13:56:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://slateford.edina.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://slateford.edina.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://slateford.edina.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://slateford.edina.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJAOyJ8qoa9P1EMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA2MTUxNjEzMTRaFw0yNTA2
 						MTIxNjEzMTRaMCAxHjAcBgNVBAMTFXNsYXRlZm9yZC5lZGluYS5hYy51azCCASIw
@@ -48,43 +48,43 @@
 						8WdrnAJTiIHQ+dCDEJ7aP4UUyW27pNpqPHNQVRcj9x2fT2egIy/7qG6Xpy/ZaC6R
 						GZxkOPiMUxA+/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Slateford</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Stuart</md:SurName>
-      <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Stuart</md:SurName>
-      <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Slateford</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Stuart</md:SurName>
+    <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Stuart</md:SurName>
+    <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml
index 3389f07b..8ee5edce 100644
--- a/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smidp.uwstout.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwstout.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin - Stout</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwstout.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin - Stout</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGQzCCBSugAwIBAgIQdYe679tqRUWxqWGBWyB7jjANBgkqhkiG9w0BAQUFADBE
 MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
 R2VvVHJ1c3QgU1NMIENBIC0gRzIwHhcNMTQwMTI3MDAwMDAwWhcNMTgwMTIzMjM1
@@ -54,19 +54,19 @@ RSB8b/KAUzjxxGmAnzA5mDPrrkPiMV4COR+Jb+ez1A8JF/HFb1nidSI3/Rt70X7U
 0DIq8r5JX+47/W6ikqvq2OOxikFJG57d9eldAjC3jXhjHG/HnafzZ6stL1FYKHuF
 6zchnxeWCYfmFi6iASRnTMQBMipNMsc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://smidp.uwstout.edu/SAML/ArtifactResolutionService.aspx" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://smidp.uwstout.edu/SAML/SSOService.aspx?binding=redirect"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin - Stout</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Stout</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwstout.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Darren Hoyland</md:GivenName>
-      <md:EmailAddress>tnst@uwstout.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://smidp.uwstout.edu/SAML/ArtifactResolutionService.aspx" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://smidp.uwstout.edu/SAML/SSOService.aspx?binding=redirect"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin - Stout</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Stout</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwstout.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Darren Hoyland</md:GivenName>
+    <md:EmailAddress>tnst@uwstout.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml b/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml
index 41efb690..6b8b41f9 100644
--- a/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smile.informatik.uni-freiburg.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-09-18T12:59:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-09-18T12:59:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">SMILE - Smartphones in der Lehre</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SMILE - Smartphones in der Lehre</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Die SMILE-App für Smartphones, Tablets und Internetbrowser ermöglicht Live-Feedback, Quiz-Fragen und Lernfragen während sehr großen Lehrveranstaltungen. Mit der Q&amp;A-Funktion können Studierende Fragen genau dann stellen, wenn Sie auftreten - ohne den Vortragenden zu stören.</mdui:Description>
+        <mdui:Description xml:lang="en">SMILE serves as a lecture-supporting system which students and lecturers can use with their usual login data given by their home institution. The system offers - among other functions - live feedback for the lecturer and quizzes for checking the learning process of the students.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://www.smile.informatik.uni-freiburg.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.smile.informatik.uni-freiburg.de/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://smile.informatik.uni-freiburg.de/CoC/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">SMILE - Smartphones in der Lehre</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SMILE - Smartphones in der Lehre</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Die SMILE-App für Smartphones, Tablets und Internetbrowser ermöglicht Live-Feedback, Quiz-Fragen und Lernfragen während sehr großen Lehrveranstaltungen. Mit der Q&amp;A-Funktion können Studierende Fragen genau dann stellen, wenn Sie auftreten - ohne den Vortragenden zu stören.</mdui:Description>
-          <mdui:Description xml:lang="en">SMILE serves as a lecture-supporting system which students and lecturers can use with their usual login data given by their home institution. The system offers - among other functions - live feedback for the lecturer and quizzes for checking the learning process of the students.</mdui:Description>
-          <mdui:InformationURL xml:lang="de">https://www.smile.informatik.uni-freiburg.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.smile.informatik.uni-freiburg.de/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://smile.informatik.uni-freiburg.de/CoC/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>smile.informatik.uni-freiburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=ira-web@informatik.uni-freiburg.de,CN=smile.informatik.uni-freiburg.de,OU=Institut fuer Informatik,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHxzCCBq+gAwIBAgIHGIKSSfQ6RTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>smile.informatik.uni-freiburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=ira-web@informatik.uni-freiburg.de,CN=smile.informatik.uni-freiburg.de,OU=Institut fuer Informatik,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHxzCCBq+gAwIBAgIHGIKSSfQ6RTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
 UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
 hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTExMjA4MDUxNFoX
@@ -71,15 +71,15 @@ EMjPtDVQCM0J2ubHFyrlaUPExBLlR+4Nw+w2zCII/ToDW3dpEW19Qh9aqrNvaCtp
 A3WX+PsJTXiVTe3aMB8naNylEm4JfyvMSzWP09kuPVF0WQP7+t5pZwXcqNPDuFJF
 SA1QPBvLr4BMM0YEyE5oqagy03A8rmgvpFDJ
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>smile.informatik.uni-freiburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=ira-web@informatik.uni-freiburg.de,CN=smile.informatik.uni-freiburg.de,OU=Institut fuer Informatik,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIHxzCCBq+gAwIBAgIHGIKSSfQ6RTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>smile.informatik.uni-freiburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=ira-web@informatik.uni-freiburg.de,CN=smile.informatik.uni-freiburg.de,OU=Institut fuer Informatik,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHxzCCBq+gAwIBAgIHGIKSSfQ6RTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
 UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
 hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTExMjA4MDUxNFoX
@@ -122,49 +122,49 @@ EMjPtDVQCM0J2ubHFyrlaUPExBLlR+4Nw+w2zCII/ToDW3dpEW19Qh9aqrNvaCtp
 A3WX+PsJTXiVTe3aMB8naNylEm4JfyvMSzWP09kuPVF0WQP7+t5pZwXcqNPDuFJF
 SA1QPBvLr4BMM0YEyE5oqagy03A8rmgvpFDJ
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">SMILE - Smartphones in der Lehre</md:ServiceName>
-        <md:ServiceName xml:lang="en">SMILE - Smartphones in der Lehre</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Die SMILE-App für Smartphones, Tablets und Internetbrowser ermöglicht Live-Feedback, Quiz-Fragen und Lernfragen während sehr großen Lehrveranstaltungen. Mit der Q&amp;A-Funktion können Studierende Fragen genau dann stellen, wenn Sie auftreten - ohne den Vortragenden zu stören.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">SMILE serves as a lecture-supporting system which students and lecturers can use with their usual login data given by their home institution. The system offers - among other functions - live feedback for the lecturer and quizzes for checking the learning process of the students.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e14</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e14</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-freiburg.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sebastian</md:GivenName>
-      <md:SurName>Sester</md:SurName>
-      <md:EmailAddress>mailto:smile@informatik.uni-freiburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sebastian</md:GivenName>
-      <md:SurName>Sester</md:SurName>
-      <md:EmailAddress>mailto:smile@informatik.uni-freiburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Linus</md:GivenName>
-      <md:SurName>Feiten</md:SurName>
-      <md:EmailAddress>mailto:feiten@informatik.uni-freiburg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">SMILE - Smartphones in der Lehre</md:ServiceName>
+      <md:ServiceName xml:lang="en">SMILE - Smartphones in der Lehre</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Die SMILE-App für Smartphones, Tablets und Internetbrowser ermöglicht Live-Feedback, Quiz-Fragen und Lernfragen während sehr großen Lehrveranstaltungen. Mit der Q&amp;A-Funktion können Studierende Fragen genau dann stellen, wenn Sie auftreten - ohne den Vortragenden zu stören.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">SMILE serves as a lecture-supporting system which students and lecturers can use with their usual login data given by their home institution. The system offers - among other functions - live feedback for the lecturer and quizzes for checking the learning process of the students.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e14</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e14</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-freiburg.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sebastian</md:GivenName>
+    <md:SurName>Sester</md:SurName>
+    <md:EmailAddress>mailto:smile@informatik.uni-freiburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sebastian</md:GivenName>
+    <md:SurName>Sester</md:SurName>
+    <md:EmailAddress>mailto:smile@informatik.uni-freiburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Linus</md:GivenName>
+    <md:SurName>Feiten</md:SurName>
+    <md:EmailAddress>mailto:feiten@informatik.uni-freiburg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml
index 06183db7..aac48dc5 100644
--- a/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://snf.esc.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-01T14:08:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-01T14:08:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: UK Spent Fuel Research Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://snf.esc.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: UK Spent Fuel Research Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://snf.esc.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/soasunion.org-shibboleth.xml b/swamid-interfederations-2.0/soasunion.org-shibboleth.xml
index 7f9c3709..8781c792 100644
--- a/swamid-interfederations-2.0/soasunion.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/soasunion.org-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://soasunion.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-09T15:21:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-09T15:21:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://soasunion.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://soasunion.org/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://soasunion.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://soasunion.org/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soasunion.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soasunion.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soasunion.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soasunion.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soasunion.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soasunion.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soasunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soasunion.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soasunion.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soasunion.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soasunion.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SOAS Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://soasunion.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soasunion.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soasunion.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soasunion.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soasunion.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soasunion.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soasunion.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soasunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soasunion.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soasunion.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soasunion.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soasunion.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SOAS Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://soasunion.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solutions.sciquest.com.xml b/swamid-interfederations-2.0/solutions.sciquest.com.xml
index 4d3ddf02..63cedb79 100644
--- a/swamid-interfederations-2.0/solutions.sciquest.com.xml
+++ b/swamid-interfederations-2.0/solutions.sciquest.com.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://solutions.sciquest.com">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-13T16:38:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-13T16:38:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8zCCAlygAwIBAgIIXNlF3j4QphEwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCVVMxETAP
 						BgNVBAoTCFNjaVF1ZXN0MRMwEQYDVQQLEwpQcm9kdWN0aW9uMScwJQYDVQQDEx5TY2lRdWVzdCBD
 						ZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTMwOTA5MjAzMjE1WhcNMzMwMzMxMjAzMjE1WjBgMRUw
@@ -25,26 +25,26 @@
 						kDCehLIDIkMAjvohSIQutcNv6MY/snhHfrB+0cbabtIItYC8aAVhS5FLXmFMTxjZFUUPMVqMWo8L
 						tth7vyK/SYLX2V4sn3LELAUA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solutions.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Edinburgh" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solutions.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Warwick" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SciQuest Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SciQuest, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sciquest.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Monroe</md:SurName>
-      <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Monroe</md:SurName>
-      <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solutions.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Edinburgh" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solutions.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Warwick" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SciQuest Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SciQuest, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sciquest.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Monroe</md:SurName>
+    <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Monroe</md:SurName>
+    <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/somgateway.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/somgateway.uk-idp-shibboleth.xml
index 4efca660..0b2e5628 100644
--- a/swamid-interfederations-2.0/somgateway.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/somgateway.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://somgateway.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-23T10:30:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-23T10:30:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somgateway.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">St John's School of Mission, Nottingham</mdui:DisplayName>
+        <mdui:Description xml:lang="en">St John's School of Mission, Nottingham Identity Provider</mdui:Description>
+        <mdui:Logo height="145" width="300">https://stjohns-nottm.ac.uk/themes/stjohns2015/images/St-Johns-Logo-RP_forweb.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somgateway.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">St John's School of Mission, Nottingham</mdui:DisplayName>
-          <mdui:Description xml:lang="en">St John's School of Mission, Nottingham Identity Provider</mdui:Description>
-          <mdui:Logo height="145" width="300">https://stjohns-nottm.ac.uk/themes/stjohns2015/images/St-Johns-Logo-RP_forweb.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUWH4ErGctcSNcWbmWobJ4wcf3bAUwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNc29tZ2F0ZXdheS51azAeFw0xNjA1MTAxMzI2MTFaFw0z
 						NjA1MTAxMzI2MTFaMBgxFjAUBgNVBAMMDXNvbWdhdGV3YXkudWswggEiMA0GCSqG
@@ -41,13 +41,13 @@
 						ExDB9C7/6mM4iypYbfYAxWTL5hs3BKRPhPlkOSUvtd87v2BE+oCDNhlN8VRmo92+
 						kdE7iXsgQUY3kVYmyqMrT44lGD4Ab9kE/a0V7MeOjHvgCM8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUYB76PAT6ZET5oUXV4wfb1zPl21MwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNc29tZ2F0ZXdheS51azAeFw0xNjA1MTAxMzI2MTBaFw0z
 						NjA1MTAxMzI2MTBaMBgxFjAUBgNVBAMMDXNvbWdhdGV3YXkudWswggEiMA0GCSqG
@@ -66,13 +66,13 @@
 						e0RFDy8RS+mOW1jlxCWw4he10NIafd8sd2vh3veSMiKb0MfeFmgMVdRZivibYLSi
 						Lar6J7EfY193ZA7eCIaOthocOuaKxxXJbZiomvsb5eCrpXE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUJ1eeApHQfQXJVadIFm0VrSQhQWcwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNc29tZ2F0ZXdheS51azAeFw0xNjA1MTAxMzI2MTFaFw0z
 						NjA1MTAxMzI2MTFaMBgxFjAUBgNVBAMMDXNvbWdhdGV3YXkudWswggEiMA0GCSqG
@@ -91,26 +91,26 @@
 						1eBn1Z+r8hnA+sbNZHm7FkCEfpInnASeSVFlr5GQy4SEYt+HByPsFj0f0biubUXc
 						wqE/17aM5DZIYNA2mLwfNvXOHmv/JSFI/ljXZ/+D+FiQ5Og=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://somgateway.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://somgateway.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://somgateway.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://somgateway.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://somgateway.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://somgateway.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somgateway.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://somgateway.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://somgateway.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://somgateway.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://somgateway.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://somgateway.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://somgateway.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">somgateway.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUWH4ErGctcSNcWbmWobJ4wcf3bAUwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNc29tZ2F0ZXdheS51azAeFw0xNjA1MTAxMzI2MTFaFw0z
 						NjA1MTAxMzI2MTFaMBgxFjAUBgNVBAMMDXNvbWdhdGV3YXkudWswggEiMA0GCSqG
@@ -129,13 +129,13 @@
 						ExDB9C7/6mM4iypYbfYAxWTL5hs3BKRPhPlkOSUvtd87v2BE+oCDNhlN8VRmo92+
 						kdE7iXsgQUY3kVYmyqMrT44lGD4Ab9kE/a0V7MeOjHvgCM8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUYB76PAT6ZET5oUXV4wfb1zPl21MwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNc29tZ2F0ZXdheS51azAeFw0xNjA1MTAxMzI2MTBaFw0z
 						NjA1MTAxMzI2MTBaMBgxFjAUBgNVBAMMDXNvbWdhdGV3YXkudWswggEiMA0GCSqG
@@ -154,13 +154,13 @@
 						e0RFDy8RS+mOW1jlxCWw4he10NIafd8sd2vh3veSMiKb0MfeFmgMVdRZivibYLSi
 						Lar6J7EfY193ZA7eCIaOthocOuaKxxXJbZiomvsb5eCrpXE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHzCCAgegAwIBAgIUJ1eeApHQfQXJVadIFm0VrSQhQWcwDQYJKoZIhvcNAQEL
 						BQAwGDEWMBQGA1UEAwwNc29tZ2F0ZXdheS51azAeFw0xNjA1MTAxMzI2MTFaFw0z
 						NjA1MTAxMzI2MTFaMBgxFjAUBgNVBAMMDXNvbWdhdGV3YXkudWswggEiMA0GCSqG
@@ -179,24 +179,24 @@
 						1eBn1Z+r8hnA+sbNZHm7FkCEfpInnASeSVFlr5GQy4SEYt+HByPsFj0f0biubUXc
 						wqE/17aM5DZIYNA2mLwfNvXOHmv/JSFI/ljXZ/+D+FiQ5Og=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://somgateway.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St. John's College Nottingham Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St John's School of Mission, Nottingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stjohns-nottm.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Barrett</md:SurName>
-      <md:EmailAddress>mailto:martin.barrett@stjohns-nottm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Barrett</md:SurName>
-      <md:EmailAddress>mailto:martin.barrett@stjohns-nottm.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://somgateway.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St. John's College Nottingham Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St John's School of Mission, Nottingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stjohns-nottm.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Barrett</md:SurName>
+    <md:EmailAddress>mailto:martin.barrett@stjohns-nottm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Barrett</md:SurName>
+    <md:EmailAddress>mailto:martin.barrett@stjohns-nottm.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sonny.furman.edu-idp.xml b/swamid-interfederations-2.0/sonny.furman.edu-idp.xml
index 23079fe5..248dca1e 100644
--- a/swamid-interfederations-2.0/sonny.furman.edu-idp.xml
+++ b/swamid-interfederations-2.0/sonny.furman.edu-idp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sonny.furman.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sonny.furman.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furman.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Furman University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://furman.edu/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sonny.furman.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furman.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Furman University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://furman.edu/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIVAI1H0QkWz5jLIhTXfA7tHGhkNvo5MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNvbm55LmZ1cm1hbi5lZHUwHhcNMTIwMzIxMTYyNDQ1
 WhcNMzIwMzIxMTYyNDQ1WjAbMRkwFwYDVQQDExBzb25ueS5mdXJtYW4uZWR1MIIB
@@ -38,24 +38,24 @@ yABPQE3LJxQ1tyOFRVYjxNbh9P7fR8bqEtLSPOZyiElyc+eV1Y6sQF6edXY1hyuK
 6t98O1ZdhVRiz7VlYeAspGvww4oDGKQUZiKTL7VWvPhIlDNv5kcakfZSRcN/QCf9
 cmzZA1pJew==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sonny.furman.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonny.furman.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sonny.furman.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonny.furman.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sonny.furman.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sonny.furman.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furman.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sonny.furman.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonny.furman.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sonny.furman.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonny.furman.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sonny.furman.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sonny.furman.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">furman.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDAzCCAeugAwIBAgIVAI1H0QkWz5jLIhTXfA7tHGhkNvo5MA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHNvbm55LmZ1cm1hbi5lZHUwHhcNMTIwMzIxMTYyNDQ1
 WhcNMzIwMzIxMTYyNDQ1WjAbMRkwFwYDVQQDExBzb25ueS5mdXJtYW4uZWR1MIIB
@@ -74,27 +74,27 @@ yABPQE3LJxQ1tyOFRVYjxNbh9P7fR8bqEtLSPOZyiElyc+eV1Y6sQF6edXY1hyuK
 6t98O1ZdhVRiz7VlYeAspGvww4oDGKQUZiKTL7VWvPhIlDNv5kcakfZSRcN/QCf9
 cmzZA1pJew==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sonny.furman.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonny.furman.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Furman University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Furman University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www2.furman.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Randy Dill</md:GivenName>
-      <md:EmailAddress>randy.dill@furman.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Clayton Burton</md:GivenName>
-      <md:EmailAddress>clayton.burton@furman.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Center</md:GivenName>
-      <md:EmailAddress>service.center@furman.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sonny.furman.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonny.furman.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Furman University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Furman University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www2.furman.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Randy Dill</md:GivenName>
+    <md:EmailAddress>randy.dill@furman.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clayton Burton</md:GivenName>
+    <md:EmailAddress>clayton.burton@furman.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Center</md:GivenName>
+    <md:EmailAddress>service.center@furman.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml
index 8f80422b..fee4d39b 100644
--- a/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sonotc.cirqahosting.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T14:27:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T14:27:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHjCCAgagAwIBAgIJAIkX1kpNjmt4MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHXNvbm90Yy5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDExNTE4NDcw
 						M1oXDTI1MDExMjE4NDcwM1owKDEmMCQGA1UEAxMdc29ub3RjLmlzb3hmb3JkLWhv
@@ -47,43 +47,43 @@
 						q6+D40u+RkuFZVpUQkZbbzqssNWPKNcmc+uyL5mmtftY3jrpfSr5drEavAvP56YA
 						6JOF2uvl6zbgdTrMH8GNTMVyqtpeBOZPwDR1RJTd4PH+4w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IS Oxford Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Central College Nottingham Heritage Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.isoxford.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Orchard</md:SurName>
-      <md:EmailAddress>mailto:lee@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Salvesen</md:SurName>
-      <md:EmailAddress>mailto:david@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IS Oxford Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Central College Nottingham Heritage Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.isoxford.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Orchard</md:SurName>
+    <md:EmailAddress>mailto:lee@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Salvesen</md:SurName>
+    <md:EmailAddress>mailto:david@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml
index 04f41722..0d4787d3 100644
--- a/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sos.scran.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:38:53Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:38:53Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scotland on Screen</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An educational resource of historical film texts, providing students with a rear-view mirror on our society over the past century.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-sos.png</mdui:Logo>
+        <mdui:Logo height="100" width="138">https://shib.scran.ac.uk/images/logo-sos.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/glow"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Scotland on Screen</mdui:DisplayName>
-          <mdui:Description xml:lang="en">An educational resource of historical film texts, providing students with a rear-view mirror on our society over the past century.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-sos.png</mdui:Logo>
-          <mdui:Logo height="100" width="138">https://shib.scran.ac.uk/images/logo-sos.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/DS/UKFederation" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/glow"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
 						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
@@ -61,57 +61,57 @@
 						LTUxK70J8DSNHEuzC8s+rTfXhsn01ZUKGDQqeFDO3TccF/x8iespeHPJO7uD/klz
 						bjQPf6gJKSkRW/uiwoDLkt/CChMGLGbYpQcx/7RpyzUpN4u4PHLduf03kQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scotland On Screen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scotlandonscreen.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scotland On Screen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scotlandonscreen.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml b/swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml
index 3d4afd7d..286a19cd 100644
--- a/swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://soton.co-tutor.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-05T10:16:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-05T10:16:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAJlCEOj+nIZfMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlwLTE3Mi0zMS0xMS0yMTcwHhcNMTUwNjAzMTEyMTUxWhcNMjUwNTMxMTEy
 						MTUxWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMTEtMjE3MIIBIjANBgkqhkiG9w0B
@@ -47,43 +47,43 @@
 						LPLV8uxLejPBzqHqJAhWFluXzd5zQ+/EOiC7V7mTAnoAVDrAUNkBL0dbeAHUTnyC
 						KDAVvSt52LmVV8PEOmxkTjVwJnTlE5Acb3D+aIHu/YwRkSeyeVdUvdYlJw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Co-Tutor at Southampton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Chung</md:SurName>
-      <md:EmailAddress>mailto:ray.chung@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Newman</md:SurName>
-      <md:EmailAddress>mailto:p.m.newman@lboro.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loughborough University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Co-Tutor at Southampton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Chung</md:SurName>
+    <md:EmailAddress>mailto:ray.chung@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Newman</md:SurName>
+    <md:EmailAddress>mailto:p.m.newman@lboro.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml b/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml
index 588cc18e..a5c1dfe2 100644
--- a/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sounds.bl.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-10T13:34:53Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-10T13:34:53Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sounds.bl.uk/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sounds.bl.uk/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJAMDqFzqjF6jWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC3Y4Yi13ZWJwcm9kMB4XDTEzMDIxOTExMzIzMloXDTIzMDIxNzExMzIzMlow
 						FjEUMBIGA1UEAxMLdjhiLXdlYnByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -44,47 +44,47 @@
 						CU1pROsZ/785vkAVYrvxKnzuCoGAnlWf2X6UExDgeWZLEJ9mrYL6pTU6eHc2ukl5
 						Xou/5adlzlgyMCWRMLIRs7fMaiZ3/guduGhqnw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sounds.bl.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sounds.bl.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The British Library</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British Library: Archival Sound Recordings</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bl.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Penty</md:SurName>
-      <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Penty</md:SurName>
-      <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sounds.bl.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sounds.bl.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The British Library</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Library: Archival Sound Recordings</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bl.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Penty</md:SurName>
+    <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Penty</md:SurName>
+    <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml b/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml
index d7d1dd76..a2ceac17 100644
--- a/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://soundstage.bl.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-22T17:29:28Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-22T17:29:28Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://soundstage.bl.uk/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://soundstage.bl.uk/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJAMDqFzqjF6jWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC3Y4Yi13ZWJwcm9kMB4XDTEzMDIxOTExMzIzMloXDTIzMDIxNzExMzIzMlow
 						FjEUMBIGA1UEAxMLdjhiLXdlYnByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -44,47 +44,47 @@
 						CU1pROsZ/785vkAVYrvxKnzuCoGAnlWf2X6UExDgeWZLEJ9mrYL6pTU6eHc2ukl5
 						Xou/5adlzlgyMCWRMLIRs7fMaiZ3/guduGhqnw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The British Library</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British Library: Archival Sound Recordings</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bl.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Penty</md:SurName>
-      <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Penty</md:SurName>
-      <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The British Library</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Library: Archival Sound Recordings</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bl.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Penty</md:SurName>
+    <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Penty</md:SurName>
+    <md:EmailAddress>mailto:david.penty@bl.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
index b35864dd..d618002a 100644
--- a/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sourcesup.cru.fr/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T15:50:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T15:50:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - software forge for RENATER community</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://sourcesup.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">RENATER - la plateforme SourceSup</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RENATER - software forge for RENATER community</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://sourcesup.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">RENATER - la plateforme SourceSup</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEjCCAfqgAwIBAgIJAOiUbftDbrjWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 BAMTGXByb2Qtc291cmNlc3VwLnJlbmF0ZXIuZnIwHhcNMTQxMjE4MTQwNjMyWhcN
 MjQxMjE1MTQwNjMyWjAkMSIwIAYDVQQDExlwcm9kLXNvdXJjZXN1cC5yZW5hdGVy
@@ -43,13 +43,13 @@ fGATL7uXdhzPwDjo1kpd9TeuZ1JvWHQqgXgtIG4xnNCLERS0FYT+Hw3sXxyoNmcO
 fHoVLzXiO+cyO8ju79HLsrI28go6UlY+I2nAXmDolYqOwUgjqkXnC9GnX40zZCMw
 CpyHcHTaVxqS+lxgQHejUBXGYLXNSg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEjCCAfqgAwIBAgIJAOiUbftDbrjWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 BAMTGXByb2Qtc291cmNlc3VwLnJlbmF0ZXIuZnIwHhcNMTQxMjE4MTQwNjMyWhcN
 MjQxMjE1MTQwNjMyWjAkMSIwIAYDVQQDExlwcm9kLXNvdXJjZXN1cC5yZW5hdGVy
@@ -68,13 +68,13 @@ fGATL7uXdhzPwDjo1kpd9TeuZ1JvWHQqgXgtIG4xnNCLERS0FYT+Hw3sXxyoNmcO
 fHoVLzXiO+cyO8ju79HLsrI28go6UlY+I2nAXmDolYqOwUgjqkXnC9GnX40zZCMw
 CpyHcHTaVxqS+lxgQHejUBXGYLXNSg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
 MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
@@ -93,26 +93,25 @@ iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
 Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
 6e4sAmYv7w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</md:ServiceName>
-        <md:ServiceName xml:lang="en">RENATER - software forge for RENATER community</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</md:ServiceName>
+      <md:ServiceName xml:lang="en">RENATER - software forge for RENATER community</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml b/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml
index 5ea586cc..86a69e88 100644
--- a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml
+++ b/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-demo.proofidcloud.co.uk/fedhub">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T10:36:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T10:36:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIGAUwSegszMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
 						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSMwIQYDVQQDExpzcC1kZW1vLnByb29maWRj
 						bG91ZC5jby51azAeFw0xNTAzMTMwOTMyMTBaFw0yNTAzMTAwOTMyMTBaMEQxCzAJ
@@ -28,22 +28,22 @@
 						52cBGjDQSv4b9b63zX/MGxHASJ2m1jV+CQ+ZAUb1+Ek0lXtfULBHrE9q6XDt5UWQ
 						LJfFHRUh/AHvJA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/sp/ACS.saml2" index="0" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProofID Federation Hub SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/sp/ACS.saml2" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProofID Federation Hub SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml b/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml
index 37f349ee..0d5b6976 100644
--- a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml
+++ b/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-demo.proofidcloud.co.uk/portal">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T15:12:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T15:12:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIGAUwSegszMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
 						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSMwIQYDVQQDExpzcC1kZW1vLnByb29maWRj
 						bG91ZC5jby51azAeFw0xNTAzMTMwOTMyMTBaFw0yNTAzMTAwOTMyMTBaMEQxCzAJ
@@ -28,22 +28,22 @@
 						52cBGjDQSv4b9b63zX/MGxHASJ2m1jV+CQ+ZAUb1+Ek0lXtfULBHrE9q6XDt5UWQ
 						LJfFHRUh/AHvJA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/sp/ACS.saml2" index="0" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProofID test portal SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/sp/ACS.saml2" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProofID test portal SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
index 37e9cc21..299949d1 100644
--- a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.swamid.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
+        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-          <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sp-test.swamid.se</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJANmYETA8gTbGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp-test.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJANmYETA8gTbGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTE1MDEyODE0NDkzNVoXDTI1MDEyNTE0
 NDkzNVowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQDB9LT9HoTmLjPiMQvo9zujGS3cLF6TbukK8A0B
@@ -50,40 +50,40 @@ Z7BVMhzPKNxFNlHEJOEVenCxPNn/B4pVV3W7pq2EKYgi6e2MtpQGKb0IKWaZzVLz
 bqvHv30vxBnEMgIgSmDtVTlSKFzulp153JSZJpb/88H0RPZY6odIakCuDzOkVhIj
 CUgd8Vxw9b2Xr/McJ4HsCt/ebBUvDnW98Sk+e03ZX2PQNLhKOtyKaF0l+o0K8g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-vaas-stage.asknet.de-shibboleth.xml b/swamid-interfederations-2.0/sp-vaas-stage.asknet.de-shibboleth.xml
index f95e71f7..d41c044c 100644
--- a/swamid-interfederations-2.0/sp-vaas-stage.asknet.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp-vaas-stage.asknet.de-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-vaas-stage.asknet.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-09T14:39:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-09T14:39:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</mdui:Description>
+        <mdui:Logo height="70" width="134">https://verify-service.com/fileadmin/templates/images/logo_70.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/DFN-DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/DFN-DS" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SWITCH-DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SWITCH-DS" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/UKfederation-DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/UKfederation-DS" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</mdui:Description>
-          <mdui:Logo height="70" width="134">https://verify-service.com/fileadmin/templates/images/logo_70.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/DFN-DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/DFN-DS" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SWITCH-DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SWITCH-DS" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/UKfederation-DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/UKfederation-DS" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIJAOLeXLHoXOOiMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
 						BAMMF3NwLXZhYXMtc3RhZ2UuYXNrbmV0LmRlMB4XDTE1MDcyMjEzMDczOVoXDTE2
 						MDcyMTEzMDczOVowIjEgMB4GA1UEAwwXc3AtdmFhcy1zdGFnZS5hc2tuZXQuZGUw
@@ -42,50 +42,50 @@
 						0QioQKnSaAN78iwuNCB+geZyn+pUAVmtEIwSW6iDZ5PfA1b3Gs+qa6OR77czMUYu
 						dfRSQz6T7P1oJNSr
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">asknet AG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asknet.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Service</md:GivenName>
-      <md:EmailAddress>mailto:customerservice@asknet.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth-adm</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-adm@asknet.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-vaas-stage.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">asknet AG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asknet.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Service</md:GivenName>
+    <md:EmailAddress>mailto:customerservice@asknet.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth-adm</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-adm@asknet.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-vaas.asknet.de-shibboleth.xml b/swamid-interfederations-2.0/sp-vaas.asknet.de-shibboleth.xml
index 7db59491..19661006 100644
--- a/swamid-interfederations-2.0/sp-vaas.asknet.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp-vaas.asknet.de-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-vaas.asknet.de/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-09T14:56:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-09T14:56:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Asknet Verification Services for Student Discounts</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Asknet Verification Services for Student Discounts</mdui:Description>
+        <mdui:Logo height="70" width="134">https://verify-service.com/fileadmin/templates/images/logo_70.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas.asknet.de/Shibboleth.sso/DFN-DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas.asknet.de/Shibboleth.sso/DFN-DS" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SWITCH-DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SWITCH-DS" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas.asknet.de/Shibboleth.sso/ACOnet-DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas.asknet.de/Shibboleth.sso/ACOnet-DS" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Asknet Verification Services for Student Discounts</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Asknet Verification Services for Student Discounts</mdui:Description>
-          <mdui:Logo height="70" width="134">https://verify-service.com/fileadmin/templates/images/logo_70.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas.asknet.de/Shibboleth.sso/DFN-DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas.asknet.de/Shibboleth.sso/DFN-DS" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SWITCH-DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SWITCH-DS" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-vaas.asknet.de/Shibboleth.sso/ACOnet-DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-vaas.asknet.de/Shibboleth.sso/ACOnet-DS" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIG7TCCBdWgAwIBAgIQD4nEgeRsmOwtU6PiCE1hojANBgkqhkiG9w0BAQsFADBw
 						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 						d3cuZGlnaWNlcnQuY29tMS8wLQYDVQQDEyZEaWdpQ2VydCBTSEEyIEhpZ2ggQXNz
@@ -62,50 +62,50 @@
 						3U3q/8D8VI1sOVcxjAGhLccii2RdkSC2MwUSbNqQjs84wa0hiKW1WsJVyYwCN5u4
 						bw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas.asknet.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">asknet AG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Asknet Verification Services for Student Discounts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asknet.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Service</md:GivenName>
-      <md:EmailAddress>mailto:customerservice@asknet.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth-adm</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-adm@asknet.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas.asknet.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas.asknet.de/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-vaas.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Asknet Verification Services for Student Discounts (TEST)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">asknet AG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Asknet Verification Services for Student Discounts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asknet.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Service</md:GivenName>
+    <md:EmailAddress>mailto:customerservice@asknet.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth-adm</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-adm@asknet.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml
index 11bf71bf..6c263428 100644
--- a/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.cat-portal.epigenesys.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T11:40:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T11:40:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Clinical Academic Training Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Clinical Academic Training Portal provides management and monitoring of the training undertaken by postgraduate medical professionals.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Clinical Academic Training Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Clinical Academic Training Portal provides management and monitoring of the training undertaken by postgraduate medical professionals.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIJALwqYDQ+/VO6MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMMH3NwLmNhdC1wb3J0YWwuZXBpZ2VuZXN5cy5vcmcudWswHhcNMTUwNzE1MDkz
 						MjQ1WhcNMjUwNzEyMDkzMjQ1WjAqMSgwJgYDVQQDDB9zcC5jYXQtcG9ydGFsLmVw
@@ -35,44 +35,44 @@
 						oQVG2tSDNdiE6UN+D3jXlgmZSYSs80SvPVo3WFGdmj3y0lC89i7+dsRAaJNeakZH
 						buM7D9A982RDuZMPE7hmviLtmENGtpw8zJBjOxkKTxmMPxNTXMotCBLdzA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Epi Genesys Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Clinical Academic Training Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.epigenesys.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>epiGenesys Support</md:GivenName>
-      <md:EmailAddress>mailto:support@epigenesys.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Gregory</md:SurName>
-      <md:EmailAddress>mailto:james.gregory@epigenesys.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Epi Genesys Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Clinical Academic Training Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.epigenesys.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>epiGenesys Support</md:GivenName>
+    <md:EmailAddress>mailto:support@epigenesys.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Gregory</md:SurName>
+    <md:EmailAddress>mailto:james.gregory@epigenesys.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index 87ef5715..c9bebef7 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:53:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:53:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://catalog.clarin.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN CMDI Metadaten (prod)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN CMDI metadata (prod)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</mdui:Description>
+        <mdui:Logo height="220" width="195">https://www.clarin.eu/sites/default/files/clarin-logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://www.clarin.eu/applications</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.xhtml</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://catalog.clarin.eu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">CLARIN CMDI Metadaten (prod)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CLARIN CMDI metadata (prod)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</mdui:Description>
-          <mdui:Description xml:lang="en">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</mdui:Description>
-          <mdui:Logo height="220" width="195">https://www.clarin.eu/sites/default/files/clarin-logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://www.clarin.eu/applications</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.xhtml</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>catalog.clarin.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
 TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
 SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
 aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
@@ -52,15 +52,15 @@ ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
 gDLbA/e0dbDclBvxUIm9cemA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>catalog.clarin.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
 TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
 SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
 aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
@@ -81,47 +81,47 @@ ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
 gDLbA/e0dbDclBvxUIm9cemA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">CLARIN CMDI Metadaten (prod)</md:ServiceName>
-        <md:ServiceName xml:lang="en">CLARIN CMDI metadata (prod)</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>CLARIN</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:clarin@clarin.eu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>CLARIN</md:GivenName>
-      <md:SurName>Sysops</md:SurName>
-      <md:EmailAddress>mailto:sysops@clarin.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARIN CMDI Metadaten (prod)</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN CMDI metadata (prod)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">CLARIN catalog Component+Registry Virtual+Language+Observatory VLO</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>CLARIN</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:clarin@clarin.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CLARIN</md:GivenName>
+    <md:SurName>Sysops</md:SurName>
+    <md:EmailAddress>mailto:sysops@clarin.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml
index aac758be..d296ddf2 100644
--- a/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.cds.stfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-20T11:39:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-20T11:39:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cds.dl.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cds.dl.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALfgUSfF89pnMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDWNkczYuZGwuYWMudWswHhcNMTAwMjE2MTMzNDI2WhcNMjAwMjE0MTMzNDI2
 						WjAYMRYwFAYDVQQDEw1jZHM2LmRsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,13 +30,13 @@
 						FWLAMzDMWQMdKGY6yndSdSf+RVCNka03NbDNOWkRf5pUfmsbTnr2Jn0StH2tOPBu
 						SR5rJW8JbCAeIO/ydDoOl43joSNAAzoOPF0HFf5WHJDZCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALfgUSfF89pnMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDWNkczYuZGwuYWMudWswHhcNMTAwMjE2MTMzNDI2WhcNMjAwMjE0MTMzNDI2
 						WjAYMRYwFAYDVQQDEw1jZHM2LmRsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -54,37 +54,37 @@
 						FWLAMzDMWQMdKGY6yndSdSf+RVCNka03NbDNOWkRf5pUfmsbTnr2Jn0StH2tOPBu
 						SR5rJW8JbCAeIO/ydDoOl43joSNAAzoOPF0HFf5WHJDZCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Chemical Database Service, Daresbury</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Miller</md:SurName>
-      <md:EmailAddress>mailto:cdsbb@stfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ali</md:GivenName>
-      <md:SurName>Akkas</md:SurName>
-      <md:EmailAddress>mailto:ali.akkas@stfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chemical Database Service, Daresbury</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Miller</md:SurName>
+    <md:EmailAddress>mailto:cdsbb@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ali</md:GivenName>
+    <md:SurName>Akkas</md:SurName>
+    <md:EmailAddress>mailto:ali.akkas@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.clarin.si-.xml b/swamid-interfederations-2.0/sp.clarin.si-.xml
index f56642ad..77c1b831 100644
--- a/swamid-interfederations-2.0/sp.clarin.si-.xml
+++ b/swamid-interfederations-2.0/sp.clarin.si-.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.clarin.si/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:24:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:24:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.clarin.si/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN.SI Dienste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN.SI Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.clarin.si/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.clarin.si/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">CLARIN.SI Dienste</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CLARIN.SI Repository</mdui:DisplayName>
-          <mdui:Description xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</mdui:Description>
-          <mdui:Description xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</mdui:Description>
-          <mdui:Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.clarin.si/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>fido</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=fido</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>fido</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=fido</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
 BAMTBGZpZG8wHhcNMTQwNDI0MTAyODAyWhcNMjQwNDIxMTAyODAyWjAPMQ0wCwYD
 VQQDEwRmaWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAru0HRu+t
 qyjRI6Y07bMruUz39rZbESeIekqt7LFe3RuowbYwYuwZEC0wHwFSheDgV70Q/sDs
@@ -48,56 +48,56 @@ nEAEQtr4mtLzJO8yC8mQrT89tUNW7Uj6D84YO9q57BbdugNew7Zb90z359GqjMDZ
 p4E2ZJZF5NWCFiPdJTBoNtMPngEHxcgYsDQefnJAk3YTKzkWXT/sqx8cRPLJXpYk
 +Xb2ywjVWg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.clarin.si/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.clarin.si/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clarin.si/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clarin.si/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">CLARIN.SI Dienste</md:ServiceName>
-        <md:ServiceName xml:lang="en">CLARIN.SI Repository</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan Jona</md:GivenName>
-      <md:SurName>Javoršek</md:SurName>
-      <md:EmailAddress>mailto:repo-technical@clarin.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jan Jona</md:GivenName>
-      <md:SurName>Javoršek</md:SurName>
-      <md:EmailAddress>mailto:repo-help@clarin.si</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tomaž Jona</md:GivenName>
-      <md:SurName>Erjavec</md:SurName>
-      <md:EmailAddress>mailto:repo-admin@clarin.si</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.clarin.si/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.clarin.si/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clarin.si/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clarin.si/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARIN.SI Dienste</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN.SI Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan Jona</md:GivenName>
+    <md:SurName>Javoršek</md:SurName>
+    <md:EmailAddress>mailto:repo-technical@clarin.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jan Jona</md:GivenName>
+    <md:SurName>Javoršek</md:SurName>
+    <md:EmailAddress>mailto:repo-help@clarin.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tomaž Jona</md:GivenName>
+    <md:SurName>Erjavec</md:SurName>
+    <md:EmailAddress>mailto:repo-admin@clarin.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml b/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml
index c95bbcdf..65d4b056 100644
--- a/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml
+++ b/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.cliowebhost.co.uk/Patron/Stirling/entity">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T12:56:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T12:56:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCDCCAfSgAwIBAgIQY/Afradun5dG2rwUj4AANzAJBgUrDgMCHQUAMBsxGTAX
 						BgNVBAMTEENsaW9TdGlybGluZzIwMTMwHhcNMTMwOTAzMDgyNDMxWhcNMjMwOTAz
 						MDgyNDMwWjAbMRkwFwYDVQQDExBDbGlvU3RpcmxpbmcyMDEzMIIBIjANBgkqhkiG
@@ -28,25 +28,25 @@
 						VE+wnFJbmrR6M0zEPlKlhgEVZhDbCuu6qCHdnnby2yuNr6Kuv19Jad2cAZfMI+7U
 						vCvcjHSOY6SmLIwA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cliowebhost.co.uk/Patron/Stirling/Login2.aspx" index="0"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Clio Software UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ClioWeb for University of Stirling</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://cliosoftware.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jennifer</md:GivenName>
-      <md:SurName>Perkins</md:SurName>
-      <md:EmailAddress>mailto:jennifer@cliosoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jennifer</md:GivenName>
-      <md:SurName>Perkins</md:SurName>
-      <md:EmailAddress>mailto:jennifer@cliosoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cliowebhost.co.uk/Patron/Stirling/Login2.aspx" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Clio Software UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ClioWeb for University of Stirling</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://cliosoftware.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jennifer</md:GivenName>
+    <md:SurName>Perkins</md:SurName>
+    <md:EmailAddress>mailto:jennifer@cliosoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jennifer</md:GivenName>
+    <md:SurName>Perkins</md:SurName>
+    <md:EmailAddress>mailto:jennifer@cliosoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml
index 530962c4..56762441 100644
--- a/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.colegsirgar.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-13T11:27:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-13T11:27:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Coleg Sir Gar</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Shibboleth Service Provider for Coleg Sir Gar providing online access to Coleg Sir Gar applications</mdui:Description>
+        <mdui:Logo height="142" width="350">https://sp.colegsirgar.ac.uk/img/csg_logo_350.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://sp.colegsirgar.ac.uk/img/csg_shield.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Coleg Sir Gar</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Shibboleth Service Provider for Coleg Sir Gar providing online access to Coleg Sir Gar applications</mdui:Description>
-          <mdui:Logo height="142" width="350">https://sp.colegsirgar.ac.uk/img/csg_logo_350.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://sp.colegsirgar.ac.uk/img/csg_shield.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICzTCCAbWgAwIBAgIJAIl+WHxfd4mhMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
 						BAMTAnNwMB4XDTE1MDEwNzEzNDc0N1oXDTI1MDEwNDEzNDc0N1owDTELMAkGA1UE
 						AxMCc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6TAAssygAHhtn
@@ -53,43 +53,43 @@
 						iiXTgSzWSDPcAp/x5Vqrvd2qkKx5efJYioATLHvnBeW8L2Tnwf4ehtlaI524a/y4
 						OA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coleg Sir Gar</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg Sir Gar</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://colegsirgar.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Palmer</md:SurName>
-      <md:EmailAddress>mailto:Simon.Palmer@colegsirgar.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coleg Sir Gar</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg Sir Gar</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://colegsirgar.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Palmer</md:SurName>
+    <md:EmailAddress>mailto:Simon.Palmer@colegsirgar.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 3d4a699a..26cec722 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:30:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:30:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Über Sprachen (prod)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">On languages (prod)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
+        <mdui:Description xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
+        <mdui:Logo height="90" width="90">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Über Sprachen (prod)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">On languages (prod)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-          <mdui:Description xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-          <mdui:Logo height="90" width="90">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
 TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
 LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
 YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
@@ -51,15 +51,15 @@ uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
 FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
 vKRir2Cb6A/NaScKNHBBhg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
 TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
 LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
 YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
@@ -79,51 +79,51 @@ uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
 FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
 vKRir2Cb6A/NaScKNHBBhg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Über Sprachen (prod)</md:ServiceName>
-        <md:ServiceName xml:lang="en">On languages (prod)</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>LAT</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LAT</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Über Sprachen (prod)</md:ServiceName>
+      <md:ServiceName xml:lang="en">On languages (prod)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>LAT</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LAT</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml
index 046ea5f7..7d7e1511 100644
--- a/swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.data.alpha.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T13:28:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T13:28:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Learning Analytics App</mdui:DisplayName>
+        <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Access to the Jisc Learning Analytics App</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Learning Analytics App</mdui:DisplayName>
-          <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Access to the Jisc Learning Analytics App</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAJbOo5wDkdRWMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD2lwLTE3Mi0zMS0zMy02NDAeFw0xNjAxMTIxMzE5NDBaFw0yNjAxMDkxMzE5
 						NDBaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS0zMy02NDCCASIwDQYJKoZIhvcNAQEB
@@ -51,50 +51,50 @@
 						cMGZ28Oyh7V1E+6+ul78gIdfy1yQj5WqBKL0Uz/qCuCO8s1X3C/awptnKK8DpILu
 						Uwh1H7KfHMaG/3PxyNByst2/w0gFWfgG+omDTMb1d0EO81nDbFJBYQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Jisc Learning Analytics App</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc Learning Analytics App</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.jisc.ac.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Baylis</md:SurName>
-      <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Baylis</md:SurName>
-      <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Jisc Learning Analytics App</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc Learning Analytics App</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.jisc.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Baylis</md:SurName>
+    <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Baylis</md:SurName>
+    <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml b/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
index cdf53f87..cfd1b132 100644
--- a/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.demo.researchspace.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-27T09:25:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-27T09:25:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.researchspace.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.researchspace.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RSpace ELN Demo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RSpace is an enterprise grade Electronic Lab Notebook designed for use in research universities</mdui:Description>
+        <mdui:Logo height="158" width="246">https://demo.researchspace.com/images/biggerLogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.researchspace.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.researchspace.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RSpace ELN Demo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RSpace is an enterprise grade Electronic Lab Notebook designed for use in research universities</mdui:Description>
-          <mdui:Logo height="158" width="246">https://demo.researchspace.com/images/biggerLogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDITCCAgmgAwIBAgIJANwZ+u5yyYcuMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHmlwLTEwLTE4My0yMDQtMTEyLmVjMi5pbnRlcm5hbDAeFw0xNjAxMjgxMzI5
 						MTFaFw0yNjAxMjUxMzI5MTFaMCkxJzAlBgNVBAMTHmlwLTEwLTE4My0yMDQtMTEy
@@ -53,42 +53,42 @@
 						cmZfEyO7pK5jDrtmAk9LcGMBQ/rDcI0oMgTdDPfmdI2vlIx+ubcdE26jzllYOWUF
 						gxcqTxdxZ1uOBFCZBpakANq368HS3vm1rFISGY2Vup0tTCkolw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Research Innovations Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RSpace ELN Demo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.researchspace.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Research Support</md:GivenName>
-      <md:EmailAddress>mailto:support@researchspace.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthias</md:GivenName>
-      <md:SurName>Kowalski</md:SurName>
-      <md:EmailAddress>mailto:matthias@researchspace.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Research Innovations Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSpace ELN Demo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.researchspace.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Research Support</md:GivenName>
+    <md:EmailAddress>mailto:support@researchspace.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthias</md:GivenName>
+    <md:SurName>Kowalski</md:SurName>
+    <md:EmailAddress>mailto:matthias@researchspace.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml b/swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml
index 460c5052..379a86ca 100644
--- a/swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.eblib.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCzCCAfOgAwIBAgIJALoCnTVhq1IhMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDHNwLmVibGliLmNvbTAeFw0xMjAxMDUwMDIyMzZaFw0yMjAxMDIwMDIyMzZa
 						MBcxFTATBgNVBAMTDHNwLmVibGliLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -42,52 +42,52 @@
 						4elyV6s5HxPWucc0hyO4eUkbyMnP9QKLAemBKJUgU4SzTVSPLfiFdbe1x4zUMsSO
 						3yQ7F/pT44mChEK7mdRw
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.eblib.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.eblib.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ebooks Corporation Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EBL - Ebook Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eblib.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Drew</md:GivenName>
-      <md:SurName>Watson</md:SurName>
-      <md:EmailAddress>mailto:drew.watson@eblib.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vinay</md:GivenName>
-      <md:SurName>Bharadwaj</md:SurName>
-      <md:EmailAddress>mailto:vinay.bharadwaj@ebooks.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ashmir</md:GivenName>
-      <md:SurName>Dhrolia</md:SurName>
-      <md:EmailAddress>mailto:ashmir.dhrolia@eblib.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.eblib.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.eblib.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ebooks Corporation Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EBL - Ebook Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eblib.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Drew</md:GivenName>
+    <md:SurName>Watson</md:SurName>
+    <md:EmailAddress>mailto:drew.watson@eblib.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vinay</md:GivenName>
+    <md:SurName>Bharadwaj</md:SurName>
+    <md:EmailAddress>mailto:vinay.bharadwaj@ebooks.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ashmir</md:GivenName>
+    <md:SurName>Dhrolia</md:SurName>
+    <md:EmailAddress>mailto:ashmir.dhrolia@eblib.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
index 50d2039f..d6dc770b 100644
--- a/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.ebrary.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:15:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:15:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/DS/Edugate" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/WAYF/UKFederation" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/WAYF/DFN-AAI" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">ebrary ebooks</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ebrary ebooks</mdui:DisplayName>
+        <mdui:Description xml:lang="de">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
+        <mdui:Description xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/DS/Edugate" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/WAYF/UKFederation" index="2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/WAYF/DFN-AAI" index="3"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">ebrary ebooks</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">ebrary ebooks</mdui:DisplayName>
-          <mdui:Description xml:lang="de">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
-          <mdui:Description xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibb01.ebrary.com</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=shibb01.ebrary.com</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJ7CVX1opkHyMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibb01.ebrary.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibb01.ebrary.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJ7CVX1opkHyMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTAeFw0xMjAzMDYxNTEzNDFaFw0yMjAzMDQx
 NTEzNDFaMB0xGzAZBgNVBAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALuIVAFYCaz6nqWxxN9tMxXk+aXzCN0eAyG0
@@ -41,56 +41,56 @@ C5fDoiy5vcwBBRPdhH7xJpgBSzx71lAiYjpUZqkt3URWaPYA3RWEnP5dlRZ1SuY6
 qXS98sBULfKabCh9PFamzMzeaerLQAKf3ZGcK0f47tLo2fp4GlFUTE9EyIn9sixR
 Dw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/ECP" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">ebrary ebooks</md:ServiceName>
-        <md:ServiceName xml:lang="en">ebrary ebooks</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e65</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e65</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">ProQuest</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ProQuest</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.proquest.com</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.proquest.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>jingwen</md:GivenName>
-      <md:SurName>wang</md:SurName>
-      <md:EmailAddress>mailto:jingwen@ebrary.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>rob</md:GivenName>
-      <md:SurName>wright</md:SurName>
-      <md:EmailAddress>mailto:rob@ebrary.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>jingwen</md:GivenName>
-      <md:SurName>wang</md:SurName>
-      <md:EmailAddress>mailto:jingwen@ebrary.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/ECP" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">ebrary ebooks</md:ServiceName>
+      <md:ServiceName xml:lang="en">ebrary ebooks</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e65</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e65</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">ProQuest</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ProQuest</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.proquest.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.proquest.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>jingwen</md:GivenName>
+    <md:SurName>wang</md:SurName>
+    <md:EmailAddress>mailto:jingwen@ebrary.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>rob</md:GivenName>
+    <md:SurName>wright</md:SurName>
+    <md:EmailAddress>mailto:rob@ebrary.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>jingwen</md:GivenName>
+    <md:SurName>wang</md:SurName>
+    <md:EmailAddress>mailto:jingwen@ebrary.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
index aecad2fa..49f35c03 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/agcensus">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Agcensus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Grid square agricultural census data for England, Scotland and Wales</mdui:Description>
+        <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Agcensus</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Grid square agricultural census data for England, Scotland and Wales</mdui:Description>
-          <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -41,37 +41,37 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/Artifact" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/ECP" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA: agcensus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/agcensus/description.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/Artifact" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/ECP" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/agcensus/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA: agcensus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/agcensus/description.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml
index 0528a9c9..a47fc4e0 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/cris">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -36,13 +36,13 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -67,47 +67,47 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML/Artifact" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/Artifact" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/ECP" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/POST" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/POST-SimpleSign" index="35"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA CRIS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML/Artifact" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/Artifact" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/ECP" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/POST" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/gv/Shibboleth.sso/SAML2/POST-SimpleSign" index="35"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA CRIS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
index c089b884..69efe040 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/digicolleges">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T11:09:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T11:09:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/UKDA"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/EDINASchools"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Digimap for Colleges</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDINA Digimap for Colleges</mdui:Description>
+        <mdui:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/UKDA"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/EDINASchools"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/WAYF/UKall"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Digimap for Colleges</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDINA Digimap for Colleges</mdui:Description>
-          <mdui:Logo height="90" width="350">https://auth.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -46,52 +46,52 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA Digimap for Colleges</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA Digimap for Colleges</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml
index 76b2e99a..cd1af31e 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/digischools">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/EDINASchools"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/DS" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/EDINASchools"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -37,35 +37,35 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/ECP" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA: Digimap for Schools</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/digischools/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA: Digimap for Schools</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
index f7267d1d..601f2b73 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/m2m">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T13:09:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T13:09:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDINA M2M Authentication</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDINA M2M Authentication</mdui:Description>
+        <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EDINA M2M Authentication</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDINA M2M Authentication</mdui:Description>
-          <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -43,44 +43,44 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA M2M Authentication</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA M2M Authentication</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
index 541b97b7..40873a12 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/mediahub">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JISC MediaHub</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The definitive academic video, image &amp; audio resource</mdui:Description>
+        <mdui:Logo height="84" width="350">https://auth.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">JISC MediaHub</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The definitive academic video, image &amp; audio resource</mdui:Description>
-          <mdui:Logo height="84" width="350">https://auth.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -41,13 +41,13 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -72,47 +72,47 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="35"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA Mediahub</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="35"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA Mediahub</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
index e34e4e9a..563e5a3e 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/safenet">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T10:26:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T10:26:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SafeNet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SafeNet</mdui:Description>
+        <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SafeNet</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SafeNet</mdui:Description>
-          <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -43,44 +43,44 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/Artifact/SOAP" index="12"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML/Artifact" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML/POST" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/Artifact" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/ECP" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML/Artifact" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML/POST" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/Artifact" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/ECP" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SafeNet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/Artifact/SOAP" index="12"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML/Artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML/POST" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/Artifact" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/ECP" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML/Artifact" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML/POST" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/Artifact" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/ECP" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SafeNet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-suncat.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-suncat.xml
index 07697ade..59f473ed 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-suncat.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-suncat.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/suncat">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-06-03T15:08:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-06-03T15:08:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SUNCAT</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNCAT</mdui:Description>
+        <mdui:Logo height="118" width="219">https://auth.edina.ac.uk/public/images/splogos/suncat.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SUNCAT</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SUNCAT</mdui:Description>
-          <mdui:Logo height="118" width="219">https://auth.edina.ac.uk/public/images/splogos/suncat.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -42,34 +42,34 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML/Artifact" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/ECP" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SUNCAT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/suncat/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNCAT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
index e6b7cf34..ee3b409d 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/ukborders">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UK Data Service Census Support</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
+        <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UK Data Service Census Support</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
-          <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEnDCCA4SgAwIBAgIQWut7bBSSWefrikHOubml4zANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -41,52 +41,52 @@
 						vnPPZxVDGAaP4I1gJPTdzPqtTsiKRiMb3x1hMMK/dF/n6nlK94YZ3tixX6OJRAwD
 						a2U2jkfsIUdtV6+2zYAlc6uXUWKRrE8+ManCTprC5/k=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="38"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="39"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="40"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UK Data Service Census Support</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/ukborders/description/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="40"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UK Data Service Census Support</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/ukborders/description/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
index 8feedb24..d63995d7 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/vsm">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -32,31 +32,31 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="10"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA VSM Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/projects/vsmportal/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="10"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA VSM Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/projects/vsmportal/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
index cd075951..012c365d 100644
--- a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.gogeo.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GeoDoc</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A metadata creation and management tool</mdui:Description>
+        <mdui:Logo height="100" width="350">https://auth.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GeoDoc</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A metadata creation and management tool</mdui:Description>
-          <mdui:Logo height="100" width="350">https://auth.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -39,31 +39,31 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="10"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA: Go-Geo!</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gogeo.ac.uk/cgi-bin/info.cgi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="10"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA: Go-Geo!</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gogeo.ac.uk/cgi-bin/info.cgi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml b/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml
index df526cd1..5efe0b4c 100644
--- a/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.igpublish.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IG Publishing Pte Ltd</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Established in Singapore since 2006, we work with many reputable publishers to represent their brands.</mdui:Description>
+        <mdui:Logo height="99" width="256">https://sp.igpublish.com/logos/256.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IG Publishing Pte Ltd</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Established in Singapore since 2006, we work with many reputable publishers to represent their brands.</mdui:Description>
-          <mdui:Logo height="99" width="256">https://sp.igpublish.com/logos/256.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC5TCCAc2gAwIBAgIJAP+bL8Y9JiKWMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTClNFQVJDSFNSVkEwHhcNMTAxMTEyMDcyMzA4WhcNMjAxMTA5MDcyMzA4WjAV
 						MRMwEQYDVQQDEwpTRUFSQ0hTUlZBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -32,13 +32,13 @@
 						MOkHFT1pJm1IeztRNZZ+4ARMt54WciOkwbYb1rxGCi2Mi3ex5avJPyQioHoezkKo
 						ZHd6NA1VwSUDsZ3pgZB//nGB5fZPi9SIJw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC5TCCAc2gAwIBAgIJAP+bL8Y9JiKWMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTClNFQVJDSFNSVkEwHhcNMTAxMTEyMDcyMzA4WhcNMjAxMTA5MDcyMzA4WjAV
 						MRMwEQYDVQQDEwpTRUFSQ0hTUlZBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -56,38 +56,38 @@
 						MOkHFT1pJm1IeztRNZZ+4ARMt54WciOkwbYb1rxGCi2Mi3ex5avJPyQioHoezkKo
 						ZHd6NA1VwSUDsZ3pgZB//nGB5fZPi9SIJw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.igpublish.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.igpublish.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Academic Rights Press Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IG Publishing Pte Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.igpublish.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Art</md:GivenName>
-      <md:SurName>Hung</md:SurName>
-      <md:EmailAddress>mailto:art@igroupnet.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Art</md:GivenName>
-      <md:SurName>Hung</md:SurName>
-      <md:EmailAddress>mailto:art@igroupnet.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.igpublish.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.igpublish.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Academic Rights Press Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IG Publishing Pte Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.igpublish.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Art</md:GivenName>
+    <md:SurName>Hung</md:SurName>
+    <md:EmailAddress>mailto:art@igroupnet.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Art</md:GivenName>
+    <md:SurName>Hung</md:SurName>
+    <md:EmailAddress>mailto:art@igroupnet.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml
index 1b8affa8..9eab6a63 100644
--- a/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.issuesonline.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-02T08:54:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-02T08:54:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Issues Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Resources for schools, colleges and libraries</mdui:Description>
+        <mdui:Logo height="79" width="329">https://www.issuesonline.co.uk/resources/images/header/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.issuesonline.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.issuesonline.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Issues Online</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Resources for schools, colleges and libraries</mdui:Description>
-          <mdui:Logo height="79" width="329">https://www.issuesonline.co.uk/resources/images/header/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.issuesonline.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.issuesonline.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDITCCAgmgAwIBAgIJALqyRi7RcRm9MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHnNlcmVuaXR5LTAwMS5yZWFsbmV0MjAwMC5jby51azAeFw0xNTAyMjYxMjEy
 						NTNaFw0yNTAyMjMxMjEyNTNaMCkxJzAlBgNVBAMTHnNlcmVuaXR5LTAwMS5yZWFs
@@ -48,40 +48,40 @@
 						B/bTTlZ72l4idlNBvCEanRUR3vteHosW+NdoHZqfeb/2hoZDgVX6mxrNmVsngt+a
 						HxkUVc9Uc6QfHSqM+dXfPFIex+3Xwa+jJ6RvjcoUIWJoMN8r0g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.issuesonline.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Independence Educational Publishers Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Issues Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://issuesonline.co.uk/what-we-do/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kari</md:GivenName>
-      <md:SurName>Sewell</md:SurName>
-      <md:EmailAddress>mailto:kari@realnet.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kari</md:GivenName>
-      <md:SurName>Sewell</md:SurName>
-      <md:EmailAddress>mailto:kari@realnet.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.issuesonline.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Independence Educational Publishers Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Issues Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://issuesonline.co.uk/what-we-do/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Sewell</md:SurName>
+    <md:EmailAddress>mailto:kari@realnet.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Sewell</md:SurName>
+    <md:EmailAddress>mailto:kari@realnet.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml
index 0a72e39d..344af392 100644
--- a/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.kbplus.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-22T11:56:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-22T11:56:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.kbplus.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kbplus.ac.uk/Shibboleth.sso/Login" index="4"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KnowledgeBase+</mdui:DisplayName>
+        <mdui:Description xml:lang="en">KnowledgeBase+</mdui:Description>
+        <mdui:Logo height="170" width="242">https://sp.kbplus.ac.uk/kbplus.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.kbplus.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kbplus.ac.uk/Shibboleth.sso/Login" index="4"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">KnowledgeBase+</mdui:DisplayName>
-          <mdui:Description xml:lang="en">KnowledgeBase+</mdui:Description>
-          <mdui:Logo height="170" width="242">https://sp.kbplus.ac.uk/kbplus.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJAIBmyUyWFATyMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDWlwLTEwLTAtNjAtMjgwHhcNMTQxMjE5MTQzMzE5WhcNMjQxMjE2MTQzMzE5
 						WjAYMRYwFAYDVQQDEw1pcC0xMC0wLTYwLTI4MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -54,51 +54,51 @@
 						t/b+LmlaKpl3emlCNXTRMA3reOd/DprijQ1LfLwvcDpU+T3TQ8SlNwy77eoOxP6O
 						KnqjBKrvm9/rhPNvZwtmlWq7PcmrftbKcYLsJNpIC5j2nw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KnowledgeBase+</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support (Ian Ibbotson)</md:GivenName>
-      <md:EmailAddress>mailto:support@k-int.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mike</md:GivenName>
-      <md:SurName>Jones</md:SurName>
-      <md:EmailAddress>mailto:mike.jones@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KnowledgeBase+</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support (Ian Ibbotson)</md:GivenName>
+    <md:EmailAddress>mailto:support@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mike</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:mike.jones@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi-.xml b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
index b6939aca..684015a8 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.korp.csc.fi/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+        <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
-          <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
-          <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE2MTIxMjIzNTk1OVowOTEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtrb3JwLmNzYy5m
@@ -52,13 +52,13 @@ v8qqjG84Y4OUAd46zhiFpXr+6InhbkahABizqoXs2/aLm3nutf8rWzwFQqm+8YLE
 eLvEROIn209q+8M0V95avRxK1/wTTqwTnEGlGfRU5aTct+hLpJIRQS1DsAJpVDLU
 eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
 5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIQCxa0kBsonBX338rpeuui2DANBgkqhkiG9w0BAQsFADBk
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIQCxa0kBsonBX338rpeuui2DANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTEyMjgwMDAwMDBaFw0xOTAxMDQxMjAwMDBaMHYxCzAJBgNVBAYT
@@ -91,50 +91,50 @@ AqgYgG7RO2v/SI18E4pB43C92Vb9uwgYvwgEw7yxRx2+cHIgr+Pitx8DOsD8HK4W
 R8KiGe76H96fEd3gXuv1GQhzXQDNUIuQEFssxdoTVKlYyTm81s6O2BuOe340Iuh7
 aISD7Gp+2qdKlWmO8UW60wk7w21HondpWXJBOoKNtAfG5iDAbGdnYsN+N6rCqWy5
 3k4erFdcobsBurkw/gjBwFa8fG95wh/32SdqRWJeMLH8sWBZXp8Xrckuv5sOig==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">Korp - hakuohjelma tekstiaineistoille</md:ServiceName>
-        <md:ServiceName xml:lang="en">Korp - search service for text material</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Krister</md:GivenName>
-      <md:SurName>Lindén</md:SurName>
-      <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Matthiesen</md:SurName>
-      <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tero</md:GivenName>
-      <md:SurName>Aalto</md:SurName>
-      <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jyrki</md:GivenName>
-      <md:SurName>Niemi</md:SurName>
-      <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Korp - hakuohjelma tekstiaineistoille</md:ServiceName>
+      <md:ServiceName xml:lang="en">Korp - search service for text material</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Krister</md:GivenName>
+    <md:SurName>Lindén</md:SurName>
+    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tero</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jyrki</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
index abdbbb91..efed8895 100644
--- a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
+++ b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.kpi.ua/simplesaml/module.php/saml/sp/metadata.php/ntuu-kpi-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:04:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:04:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NTUU KPI SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Service Provider for NTUU KPI</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://sp.kpi.ua</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://sp.kpi.ua/privacy-policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NTUU KPI SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Service Provider for NTUU KPI</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://sp.kpi.ua</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://sp.kpi.ua/privacy-policy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFjDCCBHSgAwIBAgIQEUOHKK6sc4pWmFK5HgFIITANBgkqhkiG9w0BAQsFADCB
 kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
@@ -49,37 +49,37 @@ scGwj5R7R1F8+6m+zW6wLnJqIIYUZ8UpxtF7n/Mtza8bdJQJ+39JeHX+ZErdYh3e
 2a7XcvfmOg9UBEhd/UhzCegDplloCmxzt2dmmlFEPj/IA5wJCtc0nUmeirxhYoZx
 5GHTzCwt0Z2osUZDlKP/lZr+nSBukUtRYtyoNNJoUJ0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-logout.php/ntuu-kpi-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">NTUU KPI SP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Service Provider for NTUU KPI</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
-      <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>TechSupport</md:GivenName>
-      <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-logout.php/ntuu-kpi-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NTUU KPI SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Service Provider for NTUU KPI</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
+    <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TechSupport</md:GivenName>
+    <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml
index 97a972c2..86a6a2a3 100644
--- a/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lamlash.edina.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:18:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:18:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/UKFedDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/UKFedDS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lamlash UK fed support test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lamlash UK fed support test SP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/UKFedDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/UKFedDS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lamlash UK fed support test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Lamlash UK fed support test SP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAIz7KDvHw5ORMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTMwOTEzMTc1NDI1WhcNMjMwOTEx
 						MTc1NDI1WjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFjLnVrMIIBIjANBgkq
@@ -47,44 +47,44 @@
 						xaFW7FiB0FShlypmGvWvjIC6h4+oxI3D7fVMoX7MElb5+Xmy4qdTKZIXFBRSTLnt
 						fbyOPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lamlash UK fed support test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sara</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sara</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lamlash UK fed support test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index 845983ed..d0396dec 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.lat.csc.fi">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
+        <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
+        <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
+        <mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
-          <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
-          <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
-          <mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="fi">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDQxOTAwMDAwMFoXDTE2MDUxNjIzNTk1OVowODEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwpsYXQuY3NjLmZp
@@ -54,13 +54,13 @@ jC+pHnekS6zfoVTN66KDHzU/JtJK3v8Bp3tudeAUlwXs7sSuiFSiD/Ua3qfZ21/v
 rkz1YmSz4bPS+bO477WiuDDTRHo5FSifBlWe46QQfM1beNCAiiBJZh0uyB6PPrD8
 CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
 TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIGKDCCBRCgAwIBAgIQCDaLAFllh/G6tbAenGqfPjANBgkqhkiG9w0BAQsFADBk
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGKDCCBRCgAwIBAgIQCDaLAFllh/G6tbAenGqfPjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTEyMjgwMDAwMDBaFw0xOTAxMDQxMjAwMDBaMHUxCzAJBgNVBAYT
@@ -93,44 +93,44 @@ L+lvXyyP4MvRztlhWLpFoO74XBIKJjDRug+baE6rkpvDDzTDk2tUbVOCDRW71Xuy
 ALR+iipzKaxCynoPejzIwLPvckad7JUGszueVpgtH31bL2HLh7NrKnHIUpOcbgKN
 jOEqVCzeo06iawzNDcZ8T6LbMAVXFMe1GmCL8UVC69J2cEvh2IBL7RXnSrOOSu2/
 u6rNJlWkYCvlInc3MkWPxtgF8OqCZwcqjcAlmUD9/I3ReN2J2nkBis1zTVA=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
-        <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Krister</md:GivenName>
-      <md:SurName>Lindén</md:SurName>
-      <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Matthiesen</md:SurName>
-      <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tero</md:GivenName>
-      <md:SurName>Aalto</md:SurName>
-      <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
+      <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Krister</md:GivenName>
+    <md:SurName>Lindén</md:SurName>
+    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tero</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 51662f7e..6cea9296 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Über Sprachen (dev)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">On languages (dev)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
+        <mdui:Description xml:lang="en">MPI-PL lux17 linguistics Annex IMDI+Browser Lamus Metadata+Browser</mdui:Description>
+        <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Über Sprachen (dev)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">On languages (dev)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-          <mdui:Description xml:lang="en">MPI-PL lux17 linguistics Annex IMDI+Browser Lamus Metadata+Browser</mdui:Description>
-          <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lux17.mpi.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
 TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
 LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
 bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
@@ -51,15 +51,15 @@ GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
 MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
 HFhkY9jzkGrcHMME
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lux17.mpi.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
 TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
 LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
 bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
@@ -79,51 +79,51 @@ GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
 MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
 HFhkY9jzkGrcHMME
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Über Sprachen (dev)</md:ServiceName>
-        <md:ServiceName xml:lang="en">On languages (dev)</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">MPI-PL lux17 linguistics Annex IMDI+Browser Lamus Metadata+Browser</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>LAT</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LAT</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Über Sprachen (dev)</md:ServiceName>
+      <md:ServiceName xml:lang="en">On languages (dev)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">MPI-PL lux17 linguistics Annex IMDI+Browser Lamus Metadata+Browser</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>LAT</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LAT</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml
index 404a546d..d7a4d0c2 100644
--- a/swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.moodledo.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-17T12:26:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-17T12:26:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodledo.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodledo.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMDCCAxigAwIBAgIJAKFo34oT/WkGMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEb
 						MBkGA1UEChMSQ2FwaXRhIElUIFNlcnZpY2VzMRowGAYDVQQDExFzcC5tb29kbGVk
@@ -37,13 +37,13 @@
 						jBqQ0Lu5E59wVNCcZjorPO2NXBgjJj1RCIGuT6t0XcUWqoc+8BquPHUnCPDxcGLI
 						Lc5jKY1m2DuiXohoI6f8rmRKggs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMDCCAxigAwIBAgIJAKFo34oT/WkGMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEb
 						MBkGA1UEChMSQ2FwaXRhIElUIFNlcnZpY2VzMRowGAYDVQQDExFzcC5tb29kbGVk
@@ -68,37 +68,37 @@
 						jBqQ0Lu5E59wVNCcZjorPO2NXBgjJj1RCIGuT6t0XcUWqoc+8BquPHUnCPDxcGLI
 						Lc5jKY1m2DuiXohoI6f8rmRKggs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodledo.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodledo.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Capita Business Services Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Synetrix Limited: Moodledo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.synetrix.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Hillyer</md:SurName>
-      <md:EmailAddress>mailto:andrew.hillyer@capita.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Carter</md:SurName>
-      <md:EmailAddress>mailto:andy.carter2@capita.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodledo.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodledo.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Capita Business Services Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Synetrix Limited: Moodledo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.synetrix.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Hillyer</md:SurName>
+    <md:EmailAddress>mailto:andrew.hillyer@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Carter</md:SurName>
+    <md:EmailAddress>mailto:andy.carter2@capita.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
index 1386a098..8697e352 100644
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onlinelibrary.wiley.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-27T11:15:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-27T11:15:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows Wiley Online Library users to use login credentials at their home organisations</mdui:Description>
+        <mdui:Logo height="60" width="74">https://sp.onlinelibrary.wiley.com/images/WOL_Stacked_k.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://sp.onlinelibrary.wiley.com/images/WOL_favicon.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This service allows Wiley Online Library users to use login credentials at their home organisations</mdui:Description>
-          <mdui:Logo height="60" width="74">https://sp.onlinelibrary.wiley.com/images/WOL_Stacked_k.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://sp.onlinelibrary.wiley.com/images/WOL_favicon.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFTDCCBDSgAwIBAgIQGN7fuC0Uze8yew92tsrArTANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -66,50 +66,50 @@
 						avofP9ub8R9GYHjPSoX6IlOlJTFigxBnP4AonNGmQZjVgqp81MZSMhwEo7MZvhnT
 						QQTmkDY7OVzHpicSEkVGKw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				This service allows Wiley Online Library users to use login credentials at their home organisations.
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">John Wiley &amp; Sons Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://wiley.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:wps-olhelp@wiley.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:wps-olhelp@wiley.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">John Wiley &amp; Sons Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://wiley.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:wps-olhelp@wiley.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:wps-olhelp@wiley.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml b/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml
index c69fe6c4..fc5a743e 100644
--- a/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.owncloud.gla.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-23T14:19:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-23T14:19:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Glasgow Cloud</mdui:DisplayName>
+        <mdui:Description xml:lang="en">simpleSAMLPHP SP for federated access to Uni. Of Glasgow cloud infrastructure.</mdui:Description>
+        <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Glasgow Cloud</mdui:DisplayName>
-          <mdui:Description xml:lang="en">simpleSAMLPHP SP for federated access to Uni. Of Glasgow cloud infrastructure.</mdui:Description>
-          <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIECjCCAvKgAwIBAgIJAKwtx3NdckJyMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
 						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAc
 						BgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEUMBIGA1UECwwLSVQgU2Vydmlj
@@ -40,13 +40,13 @@
 						4Ucenlt3BaKnK3VatoEjN/qo99xeWuIfjj9YWRKpuPV4k95VuK9ye9bfBmpEjpqu
 						8JmOVu1HXJd97u281HNmTHuDPFEHCPMK/qYtDP4Y
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIECjCCAvKgAwIBAgIJAKwtx3NdckJyMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
 						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAc
 						BgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEUMBIGA1UECwwLSVQgU2Vydmlj
@@ -70,28 +70,28 @@
 						4Ucenlt3BaKnK3VatoEjN/qo99xeWuIfjj9YWRKpuPV4k95VuK9ye9bfBmpEjpqu
 						8JmOVu1HXJd97u281HNmTHuDPFEHCPMK/qYtDP4Y
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Glasgow Cloud</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Watt</md:SurName>
-      <md:EmailAddress>mailto:John.Watt@glasgow.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Watt</md:SurName>
-      <md:EmailAddress>mailto:John.Watt@glasgow.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Glasgow</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Glasgow Cloud</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gla.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:John.Watt@glasgow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:John.Watt@glasgow.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.refme.com-shibboleth.xml b/swamid-interfederations-2.0/sp.refme.com-shibboleth.xml
index fb418cc6..50c7ed69 100644
--- a/swamid-interfederations-2.0/sp.refme.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.refme.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.refme.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-08T09:57:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-08T09:57:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.refme.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.refme.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RefME</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Accurate, automated citations in over 7,500 styles. The leading smart reference management tool</mdui:Description>
+        <mdui:Logo height="70" width="220">https://sp.refme.com/shibboleth-sp/refme.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.refme.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.refme.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RefME</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Accurate, automated citations in over 7,500 styles. The leading smart reference management tool</mdui:Description>
-          <mdui:Logo height="70" width="220">https://sp.refme.com/shibboleth-sp/refme.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6zCCAdOgAwIBAgIJAKDqrd6tuFRoMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDHNwLnJlZm1lLmNvbTAeFw0xNjAyMDMxNDUyMDJaFw0yNjAxMzExNDUyMDJa
 						MBcxFTATBgNVBAMTDHNwLnJlZm1lLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -52,49 +52,49 @@
 						6wBdaSG/rj+CjUHXTvjop42zY53H4daC0afDALEK3B9g2OpeDVOTsZwCMTI7gZHW
 						xtvfwBO3xVnetZqHnVDunjMewZwlU0/UVpfUmhGi/g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.refme.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.refme.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.refme.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.refme.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.refme.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.refme.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.refme.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.refme.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.refme.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.refme.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.refme.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">RefME</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RefME Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RefME</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.refme.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support contact</md:GivenName>
-      <md:EmailAddress>mailto:hello@refme.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical contact</md:GivenName>
-      <md:EmailAddress>mailto:productivity@refme.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.refme.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.refme.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.refme.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.refme.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.refme.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.refme.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.refme.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.refme.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.refme.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.refme.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.refme.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">RefME</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RefME Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RefME</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.refme.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support contact</md:GivenName>
+    <md:EmailAddress>mailto:hello@refme.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical contact</md:GivenName>
+    <md:EmailAddress>mailto:productivity@refme.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml b/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml
index bfab24fe..0e4dedad 100644
--- a/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.sae.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T09:58:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T09:58:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.sae.org/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SAE Digital Library</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Subscription-based access to aerospace and automotive technical information from SAE International</mdui:Description>
+        <mdui:Logo height="67" width="106">https://www.sae.org/images/design13/sae-international.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.sae.org/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SAE Digital Library</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Subscription-based access to aerospace and automotive technical information from SAE International</mdui:Description>
-          <mdui:Logo height="67" width="106">https://www.sae.org/images/design13/sae-international.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC5TCCAc2gAwIBAgIJAMzQRYYPKgNmMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTCnNwLnNhZS5vcmcwHhcNMTQwNTA4MTg1ODAyWhcNMjQwNTA1MTg1ODAyWjAV
 						MRMwEQYDVQQDEwpzcC5zYWUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -51,40 +51,40 @@
 						zc920LYEc7WudUXMp8/0+q0f20iPBWRETgybUmCEQE6yabF3wuQ0QMpBW2f71dzP
 						qUpkwubpN3QS7q9U8Emmulh/zSie3zkeBQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.sae.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.sae.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.sae.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sae.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sae.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sae.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.sae.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sae.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.sae.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SAE International</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SAE Digital Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sae.org/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>HelpDesk</md:GivenName>
-      <md:EmailAddress>mailto:eptech@sae.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jim</md:GivenName>
-      <md:SurName>Yauger</md:SurName>
-      <md:EmailAddress>mailto:jyauger@sae.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.sae.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.sae.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.sae.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sae.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sae.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sae.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.sae.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sae.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.sae.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SAE International</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SAE Digital Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sae.org/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HelpDesk</md:GivenName>
+    <md:EmailAddress>mailto:eptech@sae.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim</md:GivenName>
+    <md:SurName>Yauger</md:SurName>
+    <md:EmailAddress>mailto:jyauger@sae.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml
index 6ebb9c55..5661ccef 100644
--- a/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.schoolspeoplenet.nsix.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-09T10:29:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-09T10:29:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAN5YKsPXDSWGMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGG5jY3ZtcnAwOC5ub3Jmb2xrLmdvdi51azAeFw0xNDAxMDkwOTI3MzhaFw0y
 						NDAxMDcwOTI3MzhaMCMxITAfBgNVBAMTGG5jY3ZtcnAwOC5ub3Jmb2xrLmdvdi51
@@ -47,41 +47,41 @@
 						V1RkCcDHXv9gSHsR4sLFl7ihWLiy8cwYh2ZrV+WfrVMPq+apGUNvw/2rr8LGZ7GI
 						WRa4qcbZKMNcIe2284SSyOXXLA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Norfolk County Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Norfolk Schools Peoplenet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.norfolk.gov.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>School Apps Team</md:GivenName>
-      <md:EmailAddress>mailto:schoolapps@norfolk.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>School Apps Team</md:GivenName>
-      <md:EmailAddress>mailto:schoolapps@norfolk.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Norfolk County Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Norfolk Schools Peoplenet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.norfolk.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>School Apps Team</md:GivenName>
+    <md:EmailAddress>mailto:schoolapps@norfolk.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>School Apps Team</md:GivenName>
+    <md:EmailAddress>mailto:schoolapps@norfolk.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml
index ff32b8ae..078b59b8 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/accp/development/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T08:24:40Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T08:24:40Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://accpdev.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://accpdev.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAOnxeyETHXm1MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA2MDUxNzU2NDNaFw0yMjA2MDMxNzU2
 						NDNaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
@@ -28,33 +28,33 @@
 						aaNBHcUL8keqOTY8ysUEOR6KX85YvoGmqrqiCQqJHRPBQgoOuMgGK5iHg97hFk9g
 						G7EPjuEL78uppkzFBJ0XRmOQ4YBUzYxYqxmwYElCO+/9bP+ETGAXBQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development: American College of Chest Physicians</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://accpdev.silverchair.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development: American College of Chest Physicians</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://accpdev.silverchair.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml
index 9f8363ba..247aa0e0 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/accp/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T09:21:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T09:21:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://publications.chestnet.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://publications.chestnet.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAM6qfAoL8z8tMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA2MjYxNzQ2NDhaFw0y
 						MjA2MjQxNzQ2NDhaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
@@ -47,42 +47,42 @@
 						Dme3Upx+SwBPhVrpKbIfsHldCI9J0bRn99npxaboQO+IQiQDt6/VckxpoA8KHPJT
 						f2uosMUQ4B+r8+Je/nia0So1Zg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.chestnet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Production: American College of Chest Physicians</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://publications.chestnet.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.chestnet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Production: American College of Chest Physicians</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://publications.chestnet.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml
index e490e7e4..1cbf3fef 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/accp/qa/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T14:30:05Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T14:30:05Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://accpqa.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://accpqa.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIJAMSQAnn0pgeRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFmFjY3BxYS5zaWx2ZXJjaGFpci5jb20wHhcNMTIwOTEwMTQ1NjUxWhcNMTcw
 						OTA5MTQ1NjUxWjAhMR8wHQYDVQQDExZhY2NwcWEuc2lsdmVyY2hhaXIuY29tMIIB
@@ -30,33 +30,33 @@
 						Gq1fJzvfn7PdQNLr7csb3PiECWhvFWwPk2KGVzq74VRuxyHASWZ+AXyvTpltB8a1
 						4KgBBHMxs84w4ffM
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpqa.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair QA: American College of Chest Physicians</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://publications.chestnet.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpqa.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair QA: American College of Chest Physicians</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://publications.chestnet.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml
index bfa9c74a..55abe694 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/accp/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T14:48:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T14:48:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://accprc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://accprc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAIgwGFzp7TWjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFmFjY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjEwMTg0NjE5WhcNMjUw
 						NjA3MTg0NjE5WjAhMR8wHQYDVQQDExZhY2NwcmMuc2lsdmVyY2hhaXIuY29tMIIB
@@ -47,41 +47,41 @@
 						JVHIKx9avGRJlYdd81XdQ9UAaGEhx1BWYRWSDmWWNnjU6O4l78SmQLikwPsLj5dP
 						KJuHiHhmS7Pxi9kfyw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Chest Publications</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://books.publications.chestnet.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Chest Publications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://books.publications.chestnet.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml
index dabb45e5..96263260 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/aclands/development/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-06T10:19:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-06T10:19:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIJAPiUPVz43aH0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGWFjbGFuZGFuYXRvbXkuZGV2LnNzYy5pbnQwHhcNMTUwNDAyMTI1ODM5WhcN
 						MjAwMzMxMTI1ODM5WjAkMSIwIAYDVQQDExlhY2xhbmRhbmF0b215LmRldi5zc2Mu
@@ -48,42 +48,42 @@
 						R/+Zzl32L5W3B0jhx9NhNi0e3GpADQwolOiU3fis+kYnNV2BoQpXJ078buJwaczY
 						1QeyT+fSedIs7gT7TBwwU/irCCxBkbTkg3ejO/rbnrlIGDw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  Wolters Kluwer Acland’s Video Atlas Of Human Anatomy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://aclandanatomy.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  Wolters Kluwer Acland’s Video Atlas Of Human Anatomy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://aclandanatomy.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml
index 946c3950..340a64cf 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/aclands/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-13T08:42:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-13T08:42:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aclandanatomy.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aclandanatomy.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIJANQPFsPXukDlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEWFjbGFuZGFuYXRvbXkuY29tMB4XDTE1MDgwNjE2MjcwNloXDTIwMDgwNDE2
 						MjcwNlowHDEaMBgGA1UEAxMRYWNsYW5kYW5hdG9teS5jb20wggEiMA0GCSqGSIb3
@@ -48,43 +48,43 @@
 						ns4Sfo76aXjkCwGTIIzI1wNIrvdRT3XQZPGCPSCA9DNyU2JuZdL9vq79F/PVPlDk
 						JDcaYjS2aIc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomy.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomy.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Acland's Video Atlas Of Human Anatomy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://aclandanatomy.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth</md:GivenName>
-      <md:SurName>Admin</md:SurName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Collier</md:SurName>
-      <md:EmailAddress>mailto:dcollier@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomy.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomy.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Acland's Video Atlas Of Human Anatomy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://aclandanatomy.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Collier</md:SurName>
+    <md:EmailAddress>mailto:dcollier@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
index b0710f52..4d8c3b6d 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/aclands/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-06T13:15:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-06T13:15:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXTCCAkWgAwIBAgIJAP0kjtCO5LCSMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH2FjbGFuZGFuYXRvbXlyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNTA1MTI1
 						OTQyWhcNMjAwNTAzMTI1OTQyWjAqMSgwJgYDVQQDEx9hY2xhbmRhbmF0b215cmMu
@@ -49,41 +49,41 @@
 						4kzhd/HkufOmKXEgGTXk4n+7KETjJzDaIQVWRiOBZgWGVtBRqglkhiNRg/gTkARJ
 						Ww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Wolters Kluwer Acland’s Video Atlas Of Human Anatomy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://aclandanatomy.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Wolters Kluwer Acland’s Video Atlas Of Human Anatomy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://aclandanatomy.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml
index e510b25d..7daf36ed 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/acp/development/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T08:30:27Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T08:30:27Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJANkdfBndUGSUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjAzMTQyMDU5NTlaFw0yMjAzMTIyMDU5
 						NTlaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
@@ -28,33 +28,33 @@
 						woa/kecYOrfOwsG37V5+oZYDCKSQqRN9YNHWYWe9EFTudAhXQ5OddG6dfUCRHSjR
 						82RnLXadMaIx/FmmRgg6I5P2NcEmdxVgDi6yQQ/FY1h0DaoFbBSC9A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: Annals of Internal Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://annals.acpdev.silverchair.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: Annals of Internal Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://annals.acpdev.silverchair.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml
index 557e5c47..3fe4e8c4 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/acp/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T09:33:34Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T09:33:34Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://annals.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://annals.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJANicnaiWujsWMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjAzMjMxNjEzNDlaFw0y
 						MjAzMjExNjEzNDlaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
@@ -45,42 +45,42 @@
 						mEdO6bcXXu7zFrr7ckCioS4N12ZSQuIDPFyfb9/fbpxmcbMmqY3KvZlPvR9OkV6L
 						Td7a8cntDuAvJ/skPcyYKaXcbA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Annals of Internal Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Annals of Internal Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
index eb4bca39..49bf772c 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/acp/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T09:28:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T09:28:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTjCCAjagAwIBAgIJAJZHv95563KvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHGFubmFscy5hY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNzE0MjEwNDA0
 						WhcNMjAwNzEyMjEwNDA0WjAnMSUwIwYDVQQDExxhbm5hbHMuYWNwcmMuc2lsdmVy
@@ -48,42 +48,42 @@
 						yd73sCRREx9PLTR9xwaFTXd3sUKa9twF2Mcelv+YMQ54jDLMYMXYE7sQQAmCJntA
 						XHPzjiDW9qkSn90k3YhY8pW1gd59mGKAZUiC+cQFhlnRFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Annals of Internal Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://annals.acprc.silverchair.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Annals of Internal Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://annals.acprc.silverchair.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acpv2-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acpv2-development-shibboleth.xml
index 7cdcb031..b446ff9b 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-acpv2-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acpv2-development-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/acpv2/development/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-28T09:41:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-28T09:41:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJANkdfBndUGSUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjAzMTQyMDU5NTlaFw0yMjAzMTIyMDU5
 						NTlaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
@@ -46,42 +46,42 @@
 						woa/kecYOrfOwsG37V5+oZYDCKSQqRN9YNHWYWe9EFTudAhXQ5OddG6dfUCRHSjR
 						82RnLXadMaIx/FmmRgg6I5P2NcEmdxVgDi6yQQ/FY1h0DaoFbBSC9A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development: American College Of Physicians</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Amir</md:GivenName>
-      <md:SurName>Jalali</md:SurName>
-      <md:EmailAddress>mailto:ajalali@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.acpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development: American College Of Physicians</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Amir</md:GivenName>
+    <md:SurName>Jalali</md:SurName>
+    <md:EmailAddress>mailto:ajalali@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acpv2-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acpv2-staging-shibboleth.xml
index c911ce7b..dccf12df 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-acpv2-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-acpv2-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/acpv2/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-11T11:02:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-11T11:02:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.acprc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.acprc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTjCCAjagAwIBAgIJAJZHv95563KvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHGFubmFscy5hY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNzE0MjEwNDA0
 						WhcNMjAwNzEyMjEwNDA0WjAnMSUwIwYDVQQDExxhbm5hbHMuYWNwcmMuc2lsdmVy
@@ -48,42 +48,42 @@
 						yd73sCRREx9PLTR9xwaFTXd3sUKa9twF2Mcelv+YMQ54jDLMYMXYE7sQQAmCJntA
 						XHPzjiDW9qkSn90k3YhY8pW1gd59mGKAZUiC+cQFhlnRFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development: American College Of Physicians</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Amir</md:GivenName>
-      <md:SurName>Jalali</md:SurName>
-      <md:EmailAddress>mailto:ajalali@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.acprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development: American College Of Physicians</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Amir</md:GivenName>
+    <md:SurName>Jalali</md:SurName>
+    <md:EmailAddress>mailto:ajalali@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml
index ea190feb..48cfe0bf 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/ama/development/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T09:25:47Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T09:25:47Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://amadev.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://amadev.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAPXRSgDr+PDuMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA0MTAyMTEyNDRaFw0yMjA0MDgyMTEy
 						NDRaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
@@ -28,33 +28,33 @@
 						s8B1+61eO70ycIKXRJHIOtIKk4Yw2/I2i3oqMaLmNhUoIv2ffsWmvzrD+L3ekdHn
 						WUsU5iaReLX2zaEHSuiSsV+twmfrjxC81N77dMrndS+fAQD6BVQ2OA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amadev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: The American Medical Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://amadev.silverchair.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amadev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: The American Medical Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://amadev.silverchair.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml
index 3480e854..caf8efef 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/ama/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-01T09:41:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-01T09:41:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jamanetwork.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jamanetwork.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAORzNvJp0EaDMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA0MTYxOTA1NTVaFw0y
 						MjA0MTQxOTA1NTVaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
@@ -47,42 +47,42 @@
 						3rS8ZogxfmobnOH0s+5b057fVvyufQDC0HKekcn27HKzyGlml/uZVN0dN2ZxsPk9
 						dF0f57p7T8LXtcYychN122+l5A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jamanetwork.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jamanetwork.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jamanetwork.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jamanetwork.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jamanetwork.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jamanetwork.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: The American Medical Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://jamanetwork.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jamanetwork.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jamanetwork.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jamanetwork.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jamanetwork.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jamanetwork.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jamanetwork.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: The American Medical Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://jamanetwork.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml
index b908d2e5..5113464b 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/ama/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-30T10:37:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-30T10:37:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://amarc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://amarc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOTCCAiGgAwIBAgIJAJFFNj7kjgfPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFWFtYXJjLnNpbHZlcmNoYWlyLmNvbTAeFw0xNTA2MTAxNTA0MDFaFw0yNTA2
 						MDcxNTA0MDFaMCAxHjAcBgNVBAMTFWFtYXJjLnNpbHZlcmNoYWlyLmNvbTCCASIw
@@ -48,41 +48,41 @@
 						re+F8ASbv5E/diQLVBP8asRNLNZc1UerSrCS79MaKqjfNv0mYwuCji7+f/+uR3HE
 						SwMMGe5NEtYVH3YFKA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amarc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: The JAMA Network</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://jamanetwork.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amarc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: The JAMA Network</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://jamanetwork.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-amav2-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-amav2-development-shibboleth.xml
index 3b2855b2..c0938756 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-amav2-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-amav2-development-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/amav2/development/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-14T08:28:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-14T08:28:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.amadev.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.amadev.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIJANiTZEkGOfWhMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGm5ldy5hbWFkZXYuc2lsdmVyY2hhaXIuY29tMB4XDTE2MDQwNTE3MzEwOVoX
 						DTE5MDQwNTE3MzEwOVowJTEjMCEGA1UEAxMabmV3LmFtYWRldi5zaWx2ZXJjaGFp
@@ -48,42 +48,42 @@
 						Zm/lXvGC3bdn8vu/UolHHhtOjFMBJwEaV2am7lEsovQyRZvq/Wnx2AcFAiXCJjhX
 						gXdX0Csq+GNp7MHduR2cVhqhaXhJx4pIUM1gXBVJAZWAPw8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amadev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  JAMA Network v2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://jamanetwork.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zhao</md:GivenName>
-      <md:SurName>Wang</md:SurName>
-      <md:EmailAddress>mailto:zhaow@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amadev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.amadev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  JAMA Network v2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://jamanetwork.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zhao</md:GivenName>
+    <md:SurName>Wang</md:SurName>
+    <md:EmailAddress>mailto:zhaow@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-amav2-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-amav2-staging-shibboleth.xml
index e374f671..d00d932b 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-amav2-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-amav2-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/amav2/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-28T10:44:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-28T10:44:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.amarc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://new.amarc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIJAMdHNKYnZbj9MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGW5ldy5hbWFyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTYwNDE5MTMyNTAyWhcN
 						MTkwNDE5MTMyNTAyWjAkMSIwIAYDVQQDExluZXcuYW1hcmMuc2lsdmVyY2hhaXIu
@@ -48,42 +48,42 @@
 						K3r7VKuQSv6dB7HJXLlHjqJJiQS/4p8jzp3lzf0YdTlt8826EoNCRpj20nUEKOOk
 						A4VLoeeSX3MiqbIh4O04GS5YgzJm+q3WyDqE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amarc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: JAMA Network v2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zhao</md:GivenName>
-      <md:SurName>Wang</md:SurName>
-      <md:EmailAddress>mailto:zhaow@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amarc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new.amarc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: JAMA Network v2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://annals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zhao</md:GivenName>
+    <md:SurName>Wang</md:SurName>
+    <md:EmailAddress>mailto:zhaow@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml
index d751696c..96cece7b 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/asme/development/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-14T10:40:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-14T10:40:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDOzCCAiOgAwIBAgIJAMfTOFohtsoAMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFGFzbWVkZXZzY202LmFzbWUub3JnMB4XDTE1MDgzMTE0NTMzMVoXDTI1MDgy
 						ODE0NTMzMVowHzEdMBsGA1UEAxMUYXNtZWRldnNjbTYuYXNtZS5vcmcwggEiMA0G
@@ -32,33 +32,33 @@
 						rMp9E87N8wIkNyEvWdd5YgDwtMqHgcFSuzv0r1aEr8AbTxKU4cNTiHMYd/8DJDSI
 						bSaO7kJ1d0p5tmwRU8PK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  ASME Digital Collection</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asme.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Call</md:SurName>
-      <md:EmailAddress>mailto:benc@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  ASME Digital Collection</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asme.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Call</md:SurName>
+    <md:EmailAddress>mailto:benc@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml
index 1d819eaa..26b87478 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/asme/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-11T10:50:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-11T10:50:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWjCCAkKgAwIBAgIJAOZ/+oV5563RMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHmFzbWVkaWdpdGFsY29sbGVjdGlvbi5hc21lLm9yZzAeFw0xNTA4MzExNTAy
 						MzVaFw0yNTA4MjgxNTAyMzVaMCkxJzAlBgNVBAMTHmFzbWVkaWdpdGFsY29sbGVj
@@ -48,42 +48,42 @@
 						MiR2KKNHBmqkQy1MBMyTQlNZ6WFCJwMZ4Av6gFvvx8aFshAP567LJ4EL9qJsaloa
 						KDpHjZY1f4q5ikk+6A667DYhM+hUjrjUg/54DXVTvkBsIyZ8fdKZEt07OEMUhg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: ASME Digital Collection</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asme.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Call</md:SurName>
-      <md:EmailAddress>mailto:benc@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: ASME Digital Collection</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asme.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Call</md:SurName>
+    <md:EmailAddress>mailto:benc@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml
index a8103d30..72036c3e 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/bates/development/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-22T11:14:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-22T11:14:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bates.dev.ssc.int/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bates.dev.ssc.int/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+jCCAeKgAwIBAgIJAOjfBbdUrprIMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEWJhdGVzLmRldi5zc2MuaW50MB4XDTE1MDEyMTE2MTk0NVoXDTI1MDExODE2
 						MTk0NVowHDEaMBgGA1UEAxMRYmF0ZXMuZGV2LnNzYy5pbnQwggEiMA0GCSqGSIb3
@@ -46,42 +46,42 @@
 						+hHOQ9XVo5GjhvSGpWsPFfuTo5L/sAf+s1rmzfNJ5sZE5ka8Vh7bd8WxP3kRMUcO
 						yMUwgp6WFPxp5b/JWSuXvaQM75RO1edmy4SJJQNKZ8HVZ1aava+i3i9D5up/8w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bates.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  Wolters Kluwer Bates Visual Guide</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://batesvisualguide.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bates.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Development:  Wolters Kluwer Bates Visual Guide</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://batesvisualguide.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml
index f364e71f..c12ad61c 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/bates/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-27T11:52:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-27T11:52:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesvisualguide.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesvisualguide.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJAOFo9MBRXeFRMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAyMjYxNjIyMzZaFw0yNTAy
 						MjMxNjIyMzZaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
@@ -47,42 +47,42 @@
 						taO2s6UldkU0aSnJaTrk/q+F6LGyyA2cpVEhjSNQrUdd0o7JHDzo1/62wILbORpj
 						+0cK6G714oAgXg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesvisualguide.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesvisualguide.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesvisualguide.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://batesvisualguide.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesvisualguide.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesvisualguide.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesvisualguide.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://batesvisualguide.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml
index 685c3b39..4db3e3a9 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/bates/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-13T10:07:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-13T10:07:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesrc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesrc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAJ2KkG77HkGAMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF2JhdGVzcmMuc2lsdmVyY2hhaXIuY29tMB4XDTE1MDYwOTE4Mjk0M1oXDTI1
 						MDYwNjE4Mjk0M1owIjEgMB4GA1UEAxMXYmF0ZXNyYy5zaWx2ZXJjaGFpci5jb20w
@@ -47,41 +47,41 @@
 						TmtN8MS1QK7dip9Z28UfFVXYZOAXzKGWbH6hVO1dqYfydZB43D1KBEOgvZSlmCQi
 						m1PTokszlb2QuY/86Yar3g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Bates Visual Guide to Physical Examination</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://batesvisualguide.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Bates Visual Guide to Physical Examination</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://batesvisualguide.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
index 2c9f2fc9..a7c5332f 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/esbates/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-05T09:19:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-05T09:19:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesguiavisual.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesguiavisual.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJALin0XFwb82yMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAzMDMxNTQyNDJaFw0yNTAy
 						MjgxNTQyNDJaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
@@ -47,42 +47,42 @@
 						bCcqOJmtKjzk1/DIfnKQ4av6pqbdsJCtZI2gFo2qTPtZK3mJJjew8qOmIqUnbEIj
 						j3IeauG38pyehw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide Spanish</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://batesguiavisual.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide Spanish</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://batesguiavisual.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml
index 7c221822..79aec2b0 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/spie/development/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T14:57:55Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T14:57:55Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spiedev.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spiedev.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJALlaiHmGwxxMMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA2MDUyMTQ2MzZaFw0yMjA2MDMyMTQ2
 						MzZaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
@@ -28,33 +28,33 @@
 						l9tktU5kKQam047p/nqlfbTrgh/YIOiOrTaHGs7xS0lGpm2Nv/HE7Plwrm1QFnwq
 						5SFytGmkTdNq/TwMwm8GWlPEObESkTCavAvPo3CqO7xALX2XJRO3WA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://spiedev.silverchair.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://spiedev.silverchair.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml
index 504c6a15..166ba67e 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/spie/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-20T07:40:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-20T07:40:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spiedigitallibrary.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spiedigitallibrary.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJALDmz160GZUgMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA3MTkxNzIyMjRaFw0y
 						MjA3MTcxNzIyMjRaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
@@ -47,42 +47,42 @@
 						MMW8uxvLMg0NdQGLtSclrrUCUf5qcoRvdAxkdoCxbJgrqNSI9xOnOmdQgwfDwQbu
 						4lzH+AGLbg18D+2I28Y7IdPrUg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedigitallibrary.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://spiedigitallibrary.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedigitallibrary.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://spiedigitallibrary.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml
index 3bb70973..ea9576d1 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/spie/qa/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T14:12:02Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T14:12:02Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spieqa.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spieqa.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIJAPnMLU76c53nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnNwaWVxYS5zaWx2ZXJjaGFpci5jb20wHhcNMTIwOTEwMTQ1ODM1WhcNMTcw
 						OTA5MTQ1ODM1WjAhMR8wHQYDVQQDExZzcGllcWEuc2lsdmVyY2hhaXIuY29tMIIB
@@ -30,33 +30,33 @@
 						q0YAwR3jfb6c9XO9hxJECjQXdf1LUq3Upu8UOVrjLNcTKLmIfHELW7Qc/i2Xc/Xf
 						fd2W+VeaBiFExG0U
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spieqa.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair QA: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://spieqa.silverchair.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Laseter</md:SurName>
-      <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spieqa.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair QA: International Society for Optics and Photonics (SPIE)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://spieqa.silverchair.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Laseter</md:SurName>
+    <md:EmailAddress>mailto:jlaseter@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml
index 062e1205..cc3baa16 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/spie/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-19T09:42:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-19T09:42:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spierc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spierc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJANpeel3qLSr0MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnNwaWVyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjEwMTQ0NTI5WhcNMjUw
 						NjA3MTQ0NTI5WjAhMR8wHQYDVQQDExZzcGllcmMuc2lsdmVyY2hhaXIuY29tMIIB
@@ -47,41 +47,41 @@
 						lwBvLW3jYxApTijN0OtJY5T+FrCKi0GHAmxfXJHhgOvd3UbnhjSx7aPiIkMY6TIE
 						tDq3WK+nizIMVNDEcg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spierc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: SPIE Digital Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://spiedigitallibrary.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spierc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: SPIE Digital Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://spiedigitallibrary.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml
index 3612dc9e..4c423d87 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/wk/development/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-13T13:24:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-13T13:24:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIJAM4mt4HjZTAdMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGWhlYWx0aGxpYnJhcnkuZGV2LnNzYy5pbnQwHhcNMTQwNTA4MjA1NjM0WhcN
 						MTkwNTA3MjA1NjM0WjAkMSIwIAYDVQQDExloZWFsdGhsaWJyYXJ5LmRldi5zc2Mu
@@ -48,42 +48,42 @@
 						lIjfB2fGvFOB3MTZBGQPcDQmaOo5L4CPPyV/K/EogvjK5sQ34yO5Lm44G1QWWAXl
 						IGpJC/ak3Nz/isC5vMl7v2NAxF12Htfk8DQOtg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: Wolters Kluwer Health Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://healthlibrary.dev.ssc.int/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Dev: Wolters Kluwer Health Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://healthlibrary.dev.ssc.int/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml
index cdf06f00..a92b42d4 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/wk/production/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T10:13:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T10:13:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lwwhealthlibrary.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lwwhealthlibrary.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJALWFGogVxAS2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNjbS1wcm9kd2ViMDguc2lzLmxhbjAeFw0xNDA1MTkyMDUwMzdaFw0yNDA1
 						MTYyMDUwMzdaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDguc2lzLmxhbjCCASIw
@@ -47,42 +47,42 @@
 						OFyN7PBLATDkX9S1xjUSySmjbgl64V9NLDH2kLJcKSm9SvTTqItvyr24+vW7mP+U
 						SVE9x2xO/0m9Dw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lwwhealthlibrary.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Production:  Wolters Kluwer Health Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://lwwhealthlibrary.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Hirst</md:SurName>
-      <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lwwhealthlibrary.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Production:  Wolters Kluwer Health Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://lwwhealthlibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:ShibbolethAdmin@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Hirst</md:SurName>
+    <md:EmailAddress>mailto:khirst@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml
index 4368322a..48be1515 100644
--- a/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.silverchair.com/wk/staging/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-16T11:20:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-16T11:20:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIJANemRPFFotJuMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH2hlYWx0aGxpYnJhcnlyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjA5MTgz
 						NTMyWhcNMjUwNjA2MTgzNTMyWjAqMSgwJgYDVQQDEx9oZWFsdGhsaWJyYXJ5cmMu
@@ -48,41 +48,41 @@
 						Ik3lqQT6SDFjVEe4hInI7jBQbkLudMIotGPeTNxgF1C2qOHTr8q0phZz+YQnTikV
 						RQNj1gLvwUV5w6Ci5TgGjq+ceVJRpDssoSst3fGXAbE1O2ncFR6ZBsWx
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Wolters Kluwer Health Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://lwwhealthlibrary.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Operations</md:GivenName>
-      <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Silverchair Staging: Wolters Kluwer Health Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://lwwhealthlibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Operations</md:GivenName>
+    <md:EmailAddress>mailto:technicaloperations@silverchair.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml
index 10bab99c..6fb8f530 100644
--- a/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.strubi.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-28T07:59:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-28T07:59:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 							MIIDCTCCAfGgAwIBAgIJAL/JPtEDio6dMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 							BAMTFmVnZ25vZy5zdHJ1Ymkub3guYWMudWswHhcNMTUwNDIzMTEwMjU2WhcNMjUw
 							NDIwMTEwMjU2WjAhMR8wHQYDVQQDExZlZ2dub2cuc3RydWJpLm94LmFjLnVrMIIB
@@ -42,71 +42,71 @@
 							U3fQV0/6WlIjdp/hYDa9bNp/t9lOb7qj6/GOml96mhyNDpYGos+3UXPvgEJzwGPy
 							W1KLJhYtR1M9XiLeuw==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford Division of Structural Biology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.strubi.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@strubi.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Webmaster</md:GivenName>
-      <md:EmailAddress>mailto:webmaster@strubi.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford Division of Structural Biology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.strubi.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@strubi.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Webmaster</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@strubi.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml b/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml
index 4ee29666..580668f3 100644
--- a/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.studentsponge.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-02T17:00:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-02T17:00:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.studentsponge.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.studentsponge.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.studentsponge.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.studentsponge.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJALYqZP4B0mCPMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNwLnN0dWRlbnRzcG9uZ2UuY29tMB4XDTEzMDkyMDE5MTAwM1oXDTIzMDkx
 						ODE5MTAwM1owHzEdMBsGA1UEAxMUc3Auc3R1ZGVudHNwb25nZS5jb20wggEiMA0G
@@ -43,40 +43,40 @@
 						ofHQDrKLmgZz0yWkkCTo9w3seESEViIiz9pivL405wJGFltc7HhuI56FsG763W8v
 						mMCgoLVuAA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.studentsponge.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Student Sponge Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Sponge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.studentsponge.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Swapnica</md:GivenName>
-      <md:SurName>Jain</md:SurName>
-      <md:EmailAddress>mailto:swapnica@personaliveservices.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Swapnica</md:GivenName>
-      <md:SurName>Jain</md:SurName>
-      <md:EmailAddress>mailto:swapnica@personaliveservices.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.studentsponge.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Student Sponge Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Sponge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.studentsponge.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Swapnica</md:GivenName>
+    <md:SurName>Jain</md:SurName>
+    <md:EmailAddress>mailto:swapnica@personaliveservices.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Swapnica</md:GivenName>
+    <md:SurName>Jain</md:SurName>
+    <md:EmailAddress>mailto:swapnica@personaliveservices.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
index 357d38ae..a33b93ce 100644
--- a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.swamid.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
+        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-          <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
-          <ds:KeyName>sp.swamid.se</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
+        <ds:KeyName>sp.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
 MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
@@ -49,16 +49,16 @@ fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
 jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
 IznEEJKY8IltpfdkKGE20g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
-          <ds:KeyName>sp.swamid.se</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
+        <ds:KeyName>sp.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
 MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
@@ -76,40 +76,40 @@ fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
 jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
 IznEEJKY8IltpfdkKGE20g==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">SWAMID Test SP</md:ServiceDescription>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SWAMID Test SP</md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.tapingo.com-shibboleth.xml b/swamid-interfederations-2.0/sp.tapingo.com-shibboleth.xml
index c9fba6e2..b125803a 100644
--- a/swamid-interfederations-2.0/sp.tapingo.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.tapingo.com-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tapingo.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Tapingo, Inc.</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.tapingo.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.tapingo.com/legal/privacy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Tapingo, Inc.</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.tapingo.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.tapingo.com/legal/privacy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCTCCAfGgAwIBAgIJALSuahuyPgz5MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFmRvbVUtMTItMzEtMzktMDktQzQtMkEwHhcNMTMxMjA5MTY1NTA5WhcNMjMx
 MjA3MTY1NTA5WjAhMR8wHQYDVQQDExZkb21VLTEyLTMxLTM5LTA5LUM0LTJBMIIB
@@ -38,33 +38,33 @@ ueH8KwBU9zmyaUF9abjlmsqNx4x/hlySwr0BwjxuWoeR4wDsTVOhBndVp4QFh8yb
 WrmV/57nWLGAzx5kAAXFMwxmNt4IVZ7HosGPp2y3kUmg4mQg4uCQi7Kpf53vNUoZ
 fayQuDsxPIeinbhslg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tapingo, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tapingo, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tapingo.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tapingo Support</md:GivenName>
-      <md:EmailAddress>support@tapingo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jared Frey</md:GivenName>
-      <md:EmailAddress>jared.frey@tapingo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chris Bahrami</md:GivenName>
-      <md:EmailAddress>chris.bahrami@tapingo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Udi Oster</md:GivenName>
-      <md:EmailAddress>udi@tapingo.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.tapingo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tapingo, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tapingo, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tapingo.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tapingo Support</md:GivenName>
+    <md:EmailAddress>support@tapingo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jared Frey</md:GivenName>
+    <md:EmailAddress>jared.frey@tapingo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Bahrami</md:GivenName>
+    <md:EmailAddress>chris.bahrami@tapingo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Udi Oster</md:GivenName>
+    <md:EmailAddress>udi@tapingo.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
index 0c8d60c8..45e198a1 100644
--- a/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.textgridlab.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-02T09:05:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-02T09:05:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://textgridlab.org/1.0/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TextGridLab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TextGridLab</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</mdui:Description>
+        <mdui:Description xml:lang="en">TextGridLab virtual research environment</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.textgrid.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.textgrid.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://textgridlab.org/1.0/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">TextGridLab</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">TextGridLab</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</mdui:Description>
-          <mdui:Description xml:lang="en">TextGridLab virtual research environment</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.textgrid.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.textgrid.de</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>textgridlab.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>textgridlab.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -65,15 +65,15 @@ Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
 Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
 Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>textgridlab.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>textgridlab.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
 ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
 bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
@@ -107,58 +107,58 @@ Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
 Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
 Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/2.0/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">TextGridLab</md:ServiceName>
-        <md:ServiceName xml:lang="en">TextGridLab</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">TextGridLab virtual research environment</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Haase</md:SurName>
-      <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Christof</md:GivenName>
-      <md:SurName>Pohl</md:SurName>
-      <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TextGrid</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:support@textgrid.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/2.0/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">TextGridLab</md:ServiceName>
+      <md:ServiceName xml:lang="en">TextGridLab</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">TextGridLab virtual research environment</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Haase</md:SurName>
+    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Christof</md:GivenName>
+    <md:SurName>Pohl</md:SurName>
+    <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TextGrid</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@textgrid.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml b/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml
index 0603c18b..8b70cdda 100644
--- a/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml
+++ b/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.thestudentroom.com/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T09:35:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T09:35:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Student Room Group Ltd.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Student Room SP.</mdui:Description>
+        <mdui:Logo height="112" width="123">https://static1.tsrfiles.co.uk/images/base/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.thestudentroom.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.thestudentroom.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Student Room Group Ltd.</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Student Room SP.</mdui:Description>
-          <mdui:Logo height="112" width="123">https://static1.tsrfiles.co.uk/images/base/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.thestudentroom.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.thestudentroom.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJAOQNyj4JRfiuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNwLnRoZXN0dWRlbnRyb29tLmNvbTAeFw0xNTAxMjIxMTAyNTVaFw0yNTAx
 						MTkxMTAyNTVaMCAxHjAcBgNVBAMTFXNwLnRoZXN0dWRlbnRyb29tLmNvbTCCASIw
@@ -53,38 +53,38 @@
 						IAdwjUmiIgwi5TyEulA8NXC1w9DQuR3TBQP7NAMXYyu65JDIVqeD9Udk3vXkj87D
 						vJgWzXpNHSoUNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.thestudentroom.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Student Room Group Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Student Room Group Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.thestudentroom.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@thestudentroom.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Dept.</md:GivenName>
-      <md:EmailAddress>mailto:techies@thestudentroom.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.thestudentroom.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Student Room Group Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Student Room Group Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.thestudentroom.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@thestudentroom.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Dept.</md:GivenName>
+    <md:EmailAddress>mailto:techies@thestudentroom.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml b/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml
index e79f012f..5b7aa6a6 100644
--- a/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tshhosting.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T10:17:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T10:17:00Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.isiknowledge.com/" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin-router.webofknowledge.com/" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Thomson Reuters SP (Web of Knowledge &amp; EndNote Web)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Explore literature in the sciences, social sciences, arts and humanities and publish bibliographies.</mdui:Description>
+        <mdui:Logo height="84" width="292">https://www.myendnoteweb.com/Download/logos/tr-wok-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.isiknowledge.com/" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin-router.webofknowledge.com/" index="3"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Thomson Reuters SP (Web of Knowledge &amp; EndNote Web)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Explore literature in the sciences, social sciences, arts and humanities and publish bibliographies.</mdui:Description>
-          <mdui:Logo height="84" width="292">https://www.myendnoteweb.com/Download/logos/tr-wok-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF7jCCBNagAwIBAgIQH5TpeUp+Ukx0gMOWeqLCZDANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -51,36 +51,36 @@
 						IP8ivy/IUHCt3nZongEQgQsPnG1m3LHyWdTQ98XeHbgn8YOJdRPbsRFtNIYyXurv
 						PDhe2VbSBBIUxBcGBTWkewIXexyKjQlfjFXQiOdS0M6zfQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cortellis.thomsonreuterslifesciences.com/ngg/sso/saml2/responseGateway.do" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2&amp;auth=Shibboleth" index="111"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=PROF&amp;auth=Shibboleth" index="112"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2ESI&amp;auth=Shibboleth" index="113"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2JCR&amp;auth=Shibboleth" index="114"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2" index="115"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2ESI" index="116"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2JCR" index="117"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_PROF" index="118"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomson Scientific Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Thomson Scientific Inc: Thomson Reuters</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.thomsonreuters.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>European Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:ts.cts.emea@thomson.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:websupp@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cortellis.thomsonreuterslifesciences.com/ngg/sso/saml2/responseGateway.do" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2&amp;auth=Shibboleth" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=PROF&amp;auth=Shibboleth" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2ESI&amp;auth=Shibboleth" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2JCR&amp;auth=Shibboleth" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2ESI" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2JCR" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_PROF" index="118"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomson Scientific Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Thomson Scientific Inc: Thomson Reuters</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.thomsonreuters.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>European Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:ts.cts.emea@thomson.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:websupp@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml b/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml
index 2b95a495..dd32e8a6 100644
--- a/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.uk-plc.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-18T18:08:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-18T18:08:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJAIV70zuQ2vBVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXNwLnVrLXBsYy5uZXQwHhcNMTEwMTE3MTEwNDU5WhcNMjEwMTE0MTEwNDU5
 						WjAYMRYwFAYDVQQDEw1zcC51ay1wbGMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -27,13 +27,13 @@
 						rmLaDUQp1MFaZc8ulVkIJIc2vvj4AdZ5BS3N8qsPc6+l4E7aunsP/WXxxFqT8VVa
 						vkVcbTLRcJHyGdZsf++gt0fT+WmWbQsVC0Y1ILG/LNkfaA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJAIV70zuQ2vBVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXNwLnVrLXBsYy5uZXQwHhcNMTEwMTE3MTEwNDU5WhcNMjEwMTE0MTEwNDU5
 						WjAYMRYwFAYDVQQDEw1zcC51ay1wbGMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -51,37 +51,37 @@
 						rmLaDUQp1MFaZc8ulVkIJIc2vvj4AdZ5BS3N8qsPc6+l4E7aunsP/WXxxFqT8VVa
 						vkVcbTLRcJHyGdZsf++gt0fT+WmWbQsVC0Y1ILG/LNkfaA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cloudbuy PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">@UK PLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uk-plc.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>@UK PLC Customer Support</md:GivenName>
-      <md:EmailAddress>mailto:support@cloudbuy.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Roberts</md:SurName>
-      <md:EmailAddress>mailto:paul.roberts@cloudbuy.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudbuy PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">@UK PLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uk-plc.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>@UK PLC Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:support@cloudbuy.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Roberts</md:SurName>
+    <md:EmailAddress>mailto:paul.roberts@cloudbuy.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml b/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
index 19a978f6..6ccf0396 100644
--- a/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
+++ b/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.upv.es/saml/module.php/saml/sp/metadata.php/upv-sp-saml">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2013-05-15T10:18:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-logout.php/upv-sp-saml"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml/artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Universitat Politècnica de València</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">Universitat Politècnica de València</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Universitat Politècnica de València</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">Universitat Politècnica de València</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upv.es/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.upv.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ASIC-UPV</md:GivenName>
-      <md:EmailAddress>identidades@upv.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2013-05-15T10:18:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-logout.php/upv-sp-saml"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitat Politècnica de València</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">Universitat Politècnica de València</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universitat Politècnica de València</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universitat Politècnica de València</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upv.es/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.upv.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ASIC-UPV</md:GivenName>
+    <md:EmailAddress>identidades@upv.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml b/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml
index 1cedf883..54218ace 100644
--- a/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.vivomiles.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.vivomiles.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.vivomiles.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN66lpSg173QMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNwLnZpdm9taWxlcy5jb20wHhcNMTEwNDA1MTMzMTU5WhcNMjEwNDAyMTMz
 						MTU5WjAbMRkwFwYDVQQDExBzcC52aXZvbWlsZXMuY29tMIIBIjANBgkqhkiG9w0B
@@ -28,13 +28,13 @@
 						zGhDgZb6TogMbP9LbAMiYAX8n5ye3ffm9059+4qUBCaMNwD2zIxvU/5/JNKu3B1G
 						RPjrEJyHJANuvnu/9Nywj3LyZt4iPzxjZchE7n0pyK4SIcMptWwWbJC1wQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN66lpSg173QMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNwLnZpdm9taWxlcy5jb20wHhcNMTEwNDA1MTMzMTU5WhcNMjEwNDAyMTMz
 						MTU5WjAbMRkwFwYDVQQDExBzcC52aXZvbWlsZXMuY29tMIIBIjANBgkqhkiG9w0B
@@ -52,37 +52,37 @@
 						zGhDgZb6TogMbP9LbAMiYAX8n5ye3ffm9059+4qUBCaMNwD2zIxvU/5/JNKu3B1G
 						RPjrEJyHJANuvnu/9Nywj3LyZt4iPzxjZchE7n0pyK4SIcMptWwWbJC1wQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Everlution Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Everlution Software Limited: Vivomiles</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vivomiles.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Thunder</md:GivenName>
-      <md:SurName>Raven-Stoker</md:SurName>
-      <md:EmailAddress>mailto:thunder@everlution.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thunder</md:GivenName>
-      <md:SurName>Raven-Stoker</md:SurName>
-      <md:EmailAddress>mailto:thunder@everlution.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Everlution Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Everlution Software Limited: Vivomiles</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vivomiles.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Thunder</md:GivenName>
+    <md:SurName>Raven-Stoker</md:SurName>
+    <md:EmailAddress>mailto:thunder@everlution.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thunder</md:GivenName>
+    <md:SurName>Raven-Stoker</md:SurName>
+    <md:EmailAddress>mailto:thunder@everlution.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
index 835300cd..f2f597cb 100644
--- a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
+++ b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.vs1.corpora.uni-hamburg.de">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:48:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:48:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hamburger Zentrum für Sprachkorpora</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hamburg Centre for Language Corpora</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</mdui:Description>
+        <mdui:Description xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</mdui:Description>
+        <mdui:Logo height="23" width="153">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo-mittel.png</mdui:Logo>
+        <mdui:Logo height="68" width="453">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://corpora.uni-hamburg.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://corpora.uni-hamburg.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Hamburger Zentrum für Sprachkorpora</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Hamburg Centre for Language Corpora</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</mdui:Description>
-          <mdui:Description xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</mdui:Description>
-          <mdui:Logo height="23" width="153">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo-mittel.png</mdui:Logo>
-          <mdui:Logo height="68" width="453">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://corpora.uni-hamburg.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://corpora.uni-hamburg.de</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>vs1.corpora.uni-hamburg.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=vs1.corpora.uni-hamburg.de</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJANuIbKBKwh2kMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>vs1.corpora.uni-hamburg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=vs1.corpora.uni-hamburg.de</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJANuIbKBKwh2kMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 BAMTGnZzMS5jb3Jwb3JhLnVuaS1oYW1idXJnLmRlMB4XDTE0MDUwNzEwMTUxMFoX
 DTI0MDUwNDEwMTUxMFowJTEjMCEGA1UEAxMadnMxLmNvcnBvcmEudW5pLWhhbWJ1
 cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDu+569Sk8uO4aX
@@ -53,54 +53,54 @@ k1oLIeAl0snOKGd1Cw2MfQYh7QaJdXpM2W3aG6UVLNbzjAvInTjMT6rVJIxxGSdE
 00Ev3tKPZ6iDZDjawwChLxAlfAby3JLylUJ4Lg/bh8/fY0SUFHAYpS8+ZPvdO6iR
 LPhJPdKT3mM=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Hamburger Zentrum für Sprachkorpora</md:ServiceName>
-        <md:ServiceName xml:lang="en">Hamburg Centre for Language Corpora</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Timm</md:GivenName>
-      <md:SurName>Lehmberg</md:SurName>
-      <md:EmailAddress>mailto:timm.lehmberg@uni-hamburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Hanna</md:GivenName>
-      <md:SurName>Hedeland</md:SurName>
-      <md:EmailAddress>mailto:hanna.hedeland@uni-hamburg.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>HZSK</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:corpora@uni-hamburg.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Hamburger Zentrum für Sprachkorpora</md:ServiceName>
+      <md:ServiceName xml:lang="en">Hamburg Centre for Language Corpora</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Timm</md:GivenName>
+    <md:SurName>Lehmberg</md:SurName>
+    <md:EmailAddress>mailto:timm.lehmberg@uni-hamburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Hanna</md:GivenName>
+    <md:SurName>Hedeland</md:SurName>
+    <md:EmailAddress>mailto:hanna.hedeland@uni-hamburg.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>HZSK</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:corpora@uni-hamburg.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
index b61930a0..8c70b7d5 100644
--- a/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
+++ b/swamid-interfederations-2.0/sp.www.kielipankki.fi.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.www.kielipankki.fi">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kielipankki.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
+        <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
+        <mdui:Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Language Bank, Portal, discussion forum</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kielipankki.fi/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Kielipankki</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">Kielipankin portaali</mdui:Description>
-          <mdui:Description xml:lang="en">Web portal of the Language Bank of Finland</mdui:Description>
-          <mdui:Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Language Bank, Portal, discussion forum</mdui:Keywords>
-          <mdui:Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</mdui:Keywords>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIGOjCCBSKgAwIBAgIQBEdR8xdmmq3NYQebTVAwOjANBgkqhkiG9w0BAQ0FADBk
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGOjCCBSKgAwIBAgIQBEdR8xdmmq3NYQebTVAwOjANBgkqhkiG9w0BAQ0FADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMzAeFw0xNTA4MjcwMDAwMDBaFw0xODA4MzExMjAwMDBaMHkxCzAJBgNVBAYT
@@ -62,44 +62,44 @@ fSw3a32LVZuALKrBXeSuO2X2oDEuy3O35NvRwPpuUWUziXytfwYegSZ3mo6MWR3k
 90ctDVYV2+0X2ZKSfU81InaeSbmYV31VUxQzFobhqUlw7laxJrvIGqytZcMc3Tdl
 ig0D0PX/kw4i1YbuckqO1cYbE3GVwZsqN94X6Uh2WWO3x4xWq+5MdP+xhZ4ASbTc
 ukUJvoKA4qzHcF2rQn4=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kielipankki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">Kielipankki</md:ServiceName>
-        <md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Matthiesen</md:SurName>
-      <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tero</md:GivenName>
-      <md:SurName>Aalto</md:SurName>
-      <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kielipankki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Kielipankki</md:ServiceName>
+      <md:ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Kielipankin portaali</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tero</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml
index db1ee9b5..a7de335c 100644
--- a/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp1.colegsirgar.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-20T15:30:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-20T15:30:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Coleg Sir Gar</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Shibboleth Service Provider for Coleg Sir Gar, which
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Coleg Sir Gar</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Shibboleth Service Provider for Coleg Sir Gar, which
 					provides online access to Coleg Sir Gar applications</mdui:Description>
-          <mdui:Logo height="142" width="350">https://shibimages.colegsirgar.ac.uk/csg_logo_350.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="142" width="350">https://shibimages.colegsirgar.ac.uk/csg_logo_350.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0DCCAbigAwIBAgIJANFIrDUvJOlkMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
 						BAMTA3NwMTAeFw0xNTAxMTQxNjE2MDJaFw0yNTAxMTExNjE2MDJaMA4xDDAKBgNV
 						BAMTA3NwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK14YbqRnUY2
@@ -53,42 +53,42 @@
 						0TPj1Uxs5t+3oYBtpACDk2Gx7tjNh42Kdi1hUk6T3BW0GH7NBnzFoLgbUlmELTtU
 						4sgeiw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Coleg Sir Gar</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Coleg Sir Gar</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://colegsirgar.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Palmer</md:SurName>
-      <md:EmailAddress>mailto:simon.palmer@colegsirgar.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Coleg Sir Gar</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Coleg Sir Gar</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://colegsirgar.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Palmer</md:SurName>
+    <md:EmailAddress>mailto:simon.palmer@colegsirgar.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml
index 6f88deb2..a4a4ac03 100644
--- a/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp1.segfl.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T14:50:55Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T14:50:55Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAKo2TwyB3hkyMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCXNlZ2ZsLXNwMTAeFw0xMTEyMTYxNTE0MDBaFw0yMTEyMTMxNTE0MDBaMBQx
 						EjAQBgNVBAMTCXNlZ2ZsLXNwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -29,34 +29,34 @@
 						kVBc8iI75C1//VFt+8CiMkY9rnBRxn5IVAHXxVXnrssB/crrmyckb+YgwBBQ8iZa
 						dCprZdnQx0YClGTn1VG3XHxua2BeCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Bracknell Forest Borough Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SEGfL Website Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.segfl.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Heather</md:GivenName>
-      <md:SurName>Hadfield</md:SurName>
-      <md:EmailAddress>mailto:heather.hadfield@segfl.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Taras</md:GivenName>
-      <md:SurName>Johnson</md:SurName>
-      <md:EmailAddress>mailto:taras@gooii.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Bracknell Forest Borough Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SEGfL Website Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.segfl.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Heather</md:GivenName>
+    <md:SurName>Hadfield</md:SurName>
+    <md:EmailAddress>mailto:heather.hadfield@segfl.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Taras</md:GivenName>
+    <md:SurName>Johnson</md:SurName>
+    <md:EmailAddress>mailto:taras@gooii.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
index e417fb88..b3927146 100644
--- a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp2.kcc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIHADCCBeigAwIBAgIULRvMHnjL6D0AX5xModcnwU4/M9gwDQYJKoZIhvcNAQEL
 						BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
 						BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwNDAxMTIxNzI0WhcN
@@ -50,26 +50,26 @@
 						vvTm3eqQfCh9LxneNPZZ911fnN2nKExJWkLcuv89TaFyktIPYL3Hsg+tdaaKFsbM
 						fq7V+we0vhHSHgskNFgy9NRL0mk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sp2.kcc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sp2.kcc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kcc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIHADCCBeigAwIBAgIULRvMHnjL6D0AX5xModcnwU4/M9gwDQYJKoZIhvcNAQEL
 						BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
 						BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwNDAxMTIxNzI0WhcN
@@ -109,27 +109,27 @@
 						vvTm3eqQfCh9LxneNPZZ911fnN2nKExJWkLcuv89TaFyktIPYL3Hsg+tdaaKFsbM
 						fq7V+we0vhHSHgskNFgy9NRL0mk=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kensington and Chelsea College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kensington and Chelsea College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tony</md:GivenName>
-      <md:SurName>Jack</md:SurName>
-      <md:EmailAddress>mailto:t.jack@kcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:r.williams@kcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kensington and Chelsea College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kensington and Chelsea College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tony</md:GivenName>
+    <md:SurName>Jack</md:SurName>
+    <md:EmailAddress>mailto:t.jack@kcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:r.williams@kcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
index 04365fce..57021817 100644
--- a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
+        <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.idem.garr.it/en/technical-information/176-servizio-sp-test</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
-          <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.idem.garr.it/en/technical-information/176-servizio-sp-test</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
-          <mdui:Logo height="60" width="80" xml:lang="it">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
 DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -49,56 +49,56 @@ uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
 Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
 3Qh4/sKlzs5OMglDOMb5VA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">SP TEST shib 24 Firenze</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">IDEM test sp with optional attributes</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>idem-help</md:SurName>
-      <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SP TEST shib 24 Firenze</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">IDEM test sp with optional attributes</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>idem-help</md:SurName>
+    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
index 7d4382db..bce8ef94 100644
--- a/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spaces.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Internet2 Collaboration Wiki Spaces</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Collaboration spaces to support the activities of Internet2 projects and working groups.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.internet2.edu/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="122" width="91" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/12/02/internet2_logo_colorpos.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Internet2 Collaboration Wiki Spaces</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Collaboration spaces to support the activities of Internet2 projects and working groups.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.internet2.edu/about/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="122" width="91" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/12/02/internet2_logo_colorpos.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
 MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
 dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
@@ -47,42 +47,42 @@ gBAD9negf1qiDeouxjXCiixAMR5XnVd7lyZ7VN3goXIN//4SdCLT5fd1tIspaOOy
 BPE4P/6N3KmAMY7VNejGcpoRKvb0R0Yd7a8aMR7xImUNsycFlthz+sl26fTVNNmz
 /n0PiqFXEkFy
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Internet2 Collaboration Wiki Spaces</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Collaboration spaces to support the activities of Internet2 projects and working groups.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Internet2 Collaboration Wiki Spaces</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Collaboration spaces to support the activities of Internet2 projects and working groups.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml b/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml
index d9574880..30c887b5 100644
--- a/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml
+++ b/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spprod.targetconnect.net/saml2">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T17:19:50Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T17:19:50Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo6gAwIBAgIEUgEctzANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
 						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UE
@@ -29,13 +29,13 @@
 						175GahMvbhwW9kUQ1/Abriss5ugoy+AFSWdCbG9ZBZOhW0rSIcaxqy7/Pp2T2kCD
 						xkcdoYikjlip0bxxjwKiLOa9g5GiFD6ipkc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo6gAwIBAgIEUgEctzANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
 						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UE
@@ -57,25 +57,25 @@
 						175GahMvbhwW9kUQ1/Abriss5ugoy+AFSWdCbG9ZBZOhW0rSIcaxqy7/Pp2T2kCD
 						xkcdoYikjlip0bxxjwKiLOa9g5GiFD6ipkc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine2/shibb/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine2/s2/wbsso/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine2/s2/wbsso/acs" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupgti.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TARGETconnect Support</md:GivenName>
-      <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Masters</md:SurName>
-      <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine2/shibb/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine2/s2/wbsso/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine2/s2/wbsso/acs" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupgti.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TARGETconnect Support</md:GivenName>
+    <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Masters</md:SurName>
+    <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
index 47b0e803..3224cdaa 100644
--- a/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sprovtest.e2bn.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sprovtest.e2bn.org/Shibboleth.sso/DS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://passport.e2bn.org/Shibboleth.sso/DS" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sprovtest.e2bn.org/Shibboleth.sso/DS" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://passport.e2bn.org/Shibboleth.sso/DS" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAME6p5J6275MMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCXNwcm92dGVzdDAeFw0xNTExMjMxMTE0NTZaFw0yNTExMjAxMTE0NTZaMBQx
 						EjAQBgNVBAMTCXNwcm92dGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -30,43 +30,43 @@
 						lnJgP9/GxoLuoFpcJ0el9dqriqw9dcFw7IhWG/SZmZKD6XslLE6YcvKhduBUgBNX
 						Tx92z7ahaw1BOYPfpw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport.e2bn.org/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport.e2bn.org/Shibboleth.sso/SAML/Artifact" index="18"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">East of England Broadband Network</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">E2BN Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.e2bn.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Bright</md:SurName>
-      <md:EmailAddress>mailto:service@e2bn.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Bright</md:SurName>
-      <md:EmailAddress>mailto:service@e2bn.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport.e2bn.org/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport.e2bn.org/Shibboleth.sso/SAML/Artifact" index="18"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">East of England Broadband Network</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">E2BN Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e2bn.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Bright</md:SurName>
+    <md:EmailAddress>mailto:service@e2bn.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Bright</md:SurName>
+    <md:EmailAddress>mailto:service@e2bn.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml b/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml
index f6954f20..2fdb768d 100644
--- a/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml
+++ b/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spuat.targetconnect.net/saml2">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T17:28:30Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T17:28:30Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpDCCAoygAwIBAgIEUgEiyTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
 						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEuMCwGA1UE
@@ -29,13 +29,13 @@
 						abifOAPWD3wj86DWorWsha5J04PK+cCxwPBED4itZVU0I0XnBUPuYKLKxiqXHmip
 						MQ4rGJjqRVRhf5ie/5CbFXJ4httfh87P
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpDCCAoygAwIBAgIEUgEiyTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
 						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEuMCwGA1UE
@@ -57,25 +57,25 @@
 						abifOAPWD3wj86DWorWsha5J04PK+cCxwPBED4itZVU0I0XnBUPuYKLKxiqXHmip
 						MQ4rGJjqRVRhf5ie/5CbFXJ4httfh87P
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samltest.targetconnect.net/samlengine2/shibb/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.targetconnect.net/samlengine2/s2/wbsso/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samltest.targetconnect.net/samlengine2/s2/wbsso/acs" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupgti.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TARGETconnect Support</md:GivenName>
-      <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Masters</md:SurName>
-      <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samltest.targetconnect.net/samlengine2/shibb/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.targetconnect.net/samlengine2/s2/wbsso/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samltest.targetconnect.net/samlengine2/s2/wbsso/acs" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupgti.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TARGETconnect Support</md:GivenName>
+    <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Masters</md:SurName>
+    <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml
index a3185697..8008269a 100644
--- a/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srmo.sagepub.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T09:13:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T09:13:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SAGE Research Methods</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SAGE Research Methods</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8jCCAdqgAwIBAgIEU3YWujANBgkqhkiG9w0BAQUFADA7MR4wHAYDVQQKExVT
 						QUdFIFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20w
 						HhcNMTQwNTE2MTM0NjM0WhcNMjQwNTEzMTM0NjM0WjA7MR4wHAYDVQQKExVTQUdF
@@ -32,13 +32,13 @@
 						dxiaed8zkkHD2w69AjFwKA1RnhTTbrC2bKzUdcqOHonpyPPUap0inRbmqUjKzQCl
 						55ck9QM2cw42xmEUlINH1J6X6dML/U+SLIf6kozvqhrPqJTWnAA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8jCCAdqgAwIBAgIEU3YWujANBgkqhkiG9w0BAQUFADA7MR4wHAYDVQQKExVT
 						QUdFIFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20w
 						HhcNMTQwNTE2MTM0NjM0WhcNMjQwNTEzMTM0NjM0WjA7MR4wHAYDVQQKExVTQUdF
@@ -56,26 +56,26 @@
 						dxiaed8zkkHD2w69AjFwKA1RnhTTbrC2bKzUdcqOHonpyPPUap0inRbmqUjKzQCl
 						55ck9QM2cw42xmEUlINH1J6X6dML/U+SLIf6kozvqhrPqJTWnAA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://srmo.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://srmo.sagepub.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srmo.sagepub.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srmo.sagepub.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SAGE Publications Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SAGE Research Methods</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sagepublications.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sage Online Support</md:GivenName>
-      <md:EmailAddress>mailto:onlinesupport@sagepub.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rob</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:rob.smith@sagepub.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://srmo.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://srmo.sagepub.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srmo.sagepub.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srmo.sagepub.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SAGE Publications Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SAGE Research Methods</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sagepublications.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sage Online Support</md:GivenName>
+    <md:EmailAddress>mailto:onlinesupport@sagepub.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:rob.smith@sagepub.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
index a1719e79..a74d7c8c 100644
--- a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv-cr-idp.crdp-aquitaine.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-21T16:21:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-21T16:21:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crdp-aquitaine.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CRDP d'Aquitaine</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABDlBMVEUASVprpq21194YeYSMvsbe7+8AYXOly85KkpzG4+cAbXt7sr2t09YAdYQphpSlx87G3969y87W6+8AcYSUtr1zrrUxgoycx87v+/+ly9Zzoq0AVWPG194pfYycw85jmqXW5+97pq2cvsbv9/cAaXNakpzW4+cQcXuMur0QdYRChpSlz9YAXWu9294heYze7/fO5+cAcXu909a1x87G3+cQcYSUusYAVWt7qrVjlqVSjpS9194heYSUvsYAZXOty87O4+eEtr2109YIdYStx861z9be6+8IcYSlur17rrX///+ty9bG294xfYycw8YAaXtalpyMusYYdYRKipStz9bn8/cIcXvO3+cAWWuEqrWNTmANAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQY0y3NYU+CUBSA4VPmsVEGNmOVO4nrFpDHClu1gg43hpuUcpujdf3/fyS2+vJ+eL68QFkcky/GKlJsUIFcHf8wGfVhfXvKMwQcOJlDuE3HtxzkU26hP1Fr1t15h5tSM8iNXrCvXDjr4B72EEQsCgkqbiNowCefaP8/SShghFl8sSyEGBgB+dLaUvI9e9mM793uur2MVjHFq6O5Uyy9ftECrh4puXwIN7vLu6T421L4ZiWbpCf6FYSfR5ihFeyMsq1jYcd9n1YXVX0QNdpteodwHtV5NSzyKhgUZfPkQfU57HlpVEbXVVm7+eIXOzYrltYMOjUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDAy95cYAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwQ6ovpAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.crdp-aquitaine.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">CRDP d'Aquitaine</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crdp-aquitaine.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CRDP d'Aquitaine</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABDlBMVEUASVprpq21194YeYSMvsbe7+8AYXOly85KkpzG4+cAbXt7sr2t09YAdYQphpSlx87G3969y87W6+8AcYSUtr1zrrUxgoycx87v+/+ly9Zzoq0AVWPG194pfYycw85jmqXW5+97pq2cvsbv9/cAaXNakpzW4+cQcXuMur0QdYRChpSlz9YAXWu9294heYze7/fO5+cAcXu909a1x87G3+cQcYSUusYAVWt7qrVjlqVSjpS9194heYSUvsYAZXOty87O4+eEtr2109YIdYStx861z9be6+8IcYSlur17rrX///+ty9bG294xfYycw8YAaXtalpyMusYYdYRKipStz9bn8/cIcXvO3+cAWWuEqrWNTmANAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQY0y3NYU+CUBSA4VPmsVEGNmOVO4nrFpDHClu1gg43hpuUcpujdf3/fyS2+vJ+eL68QFkcky/GKlJsUIFcHf8wGfVhfXvKMwQcOJlDuE3HtxzkU26hP1Fr1t15h5tSM8iNXrCvXDjr4B72EEQsCgkqbiNowCefaP8/SShghFl8sSyEGBgB+dLaUvI9e9mM793uur2MVjHFq6O5Uyy9ftECrh4puXwIN7vLu6T421L4ZiWbpCf6FYSfR5ihFeyMsq1jYcd9n1YXVX0QNdpteodwHtV5NSzyKhgUZfPkQfU57HlpVEbXVVm7+eIXOzYrltYMOjUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDAy95cYAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwQ6ovpAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.crdp-aquitaine.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">CRDP d'Aquitaine</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDWzCCAkOgAwIBAgIUZNcfs0me3gJRFzAZsv70xd7o1lAwDQYJKoZIhvcNAQEF
 BQAwJzElMCMGA1UEAxMcc3J2LWNyLWlkcC5jcmRwLWFxdWl0YWluZS5mcjAeFw0x
 MzA0MjIxNTMzMzhaFw0zMzA0MjIxNTMzMzhaMCcxJTAjBgNVBAMTHHNydi1jci1p
@@ -38,26 +38,26 @@ EXRs3cGPkhtUhU+0W1SHJb9LDP/vD0m+mpYJkm21IE/5/Su/W6NU7zGvNx3EusHh
 jpsClKrNMer75H+SrHphN7YBCRYeZcpEjA8axJr06Vddb3VFoWv1snspplQyLmkh
 m2r+TDGDuoziugKpxooCU7iZVaXp06XOnBUTI3mHXcCEHkt48EomwsH95lenRtU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CRDP d'Aquitaine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CRDP d'Aquitaine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crdp-aquitaine.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Alain-Aymerick François</md:SurName>
-      <md:EmailAddress>Alain-Aymerick.Francois@crdp-aquitaine.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Hervé RIVARD</md:SurName>
-      <md:EmailAddress>jean-herve.rivard@crdp-aquitaine.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CRDP d'Aquitaine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CRDP d'Aquitaine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crdp-aquitaine.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alain-Aymerick François</md:SurName>
+    <md:EmailAddress>Alain-Aymerick.Francois@crdp-aquitaine.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Hervé RIVARD</md:SurName>
+    <md:EmailAddress>jean-herve.rivard@crdp-aquitaine.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
index d5a130f2..97c74d4f 100644
--- a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv-fii.insa-toulouse.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-24T14:12:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-24T14:12:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-toulouse.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA de Toulouse</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABp0lEQVQoz83SQUgUYRwF8Pf/dnJm3YVKKg+iLqtYBEEGXQS7CF6EULwUXTt6EDpLSCB48ZAUQV6EDTttHiLIlgIFL6s5ahGk8bVjQzojabM7tvvNfPvv0q0uXsJ3fu/w4EfMjONEHKv9fwY7RMHMI4dob6hffbAlUSy3vg8PfCEqEantLQDfiFyi94+nR0bvCZwFJQRZqM6/AZiAMD+n8q/aHWm04XBynI8qGkAGly1TmKYgARDAEM34tfCSgMT5ZgDeraGm50sXnubCwgID6Qez0ZOJzu5rfz5wDak7d8MXeQDWjb5zhdd62fZ7en9MjEdSNlxtaejIBsXS9fYWAwSAGEgO3i5PzYg0jt4VlOu1MrttpArzrFnb7m5P76kULpYPhN4HhxUNsFLmzT5dgUg1BmP33awV7cC4dKW6uJ5+OJUJAxWCPn1GbX0t9r3qSlEfHsS+V10tchRxpRwvvWW5zczxhs3BT2bWGzY7X+lvGrpez+Weubte05nTXZ0dhml+3NzMZjJhTe37Pv3TklNypJRW0komG4UQda0NIxHHmpnp5OH7Day70xP7LFB/AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwIHfmJQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMFEqXpkAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.insa-toulouse.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">People from INSA Toulouse</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">INSA de Toulouse</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les gens de l'INSA de Toulouse</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-toulouse.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">INSA de Toulouse</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABp0lEQVQoz83SQUgUYRwF8Pf/dnJm3YVKKg+iLqtYBEEGXQS7CF6EULwUXTt6EDpLSCB48ZAUQV6EDTttHiLIlgIFL6s5ahGk8bVjQzojabM7tvvNfPvv0q0uXsJ3fu/w4EfMjONEHKv9fwY7RMHMI4dob6hffbAlUSy3vg8PfCEqEantLQDfiFyi94+nR0bvCZwFJQRZqM6/AZiAMD+n8q/aHWm04XBynI8qGkAGly1TmKYgARDAEM34tfCSgMT5ZgDeraGm50sXnubCwgID6Qez0ZOJzu5rfz5wDak7d8MXeQDWjb5zhdd62fZ7en9MjEdSNlxtaejIBsXS9fYWAwSAGEgO3i5PzYg0jt4VlOu1MrttpArzrFnb7m5P76kULpYPhN4HhxUNsFLmzT5dgUg1BmP33awV7cC4dKW6uJ5+OJUJAxWCPn1GbX0t9r3qSlEfHsS+V10tchRxpRwvvWW5zczxhs3BT2bWGzY7X+lvGrpez+Weubte05nTXZ0dhml+3NzMZjJhTe37Pv3TklNypJRW0komG4UQda0NIxHHmpnp5OH7Day70xP7LFB/AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwIHfmJQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMFEqXpkAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.insa-toulouse.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">People from INSA Toulouse</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">INSA de Toulouse</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Les gens de l'INSA de Toulouse</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAIc+7dsfBy6txSFiZjLaZo7oHPHjMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNydi1maWkuaW5zYS10b3Vsb3VzZS5mcjAeFw0xNDAz
 MTEwOTIyNDNaFw0zNDAzMTEwOTIyNDNaMCMxITAfBgNVBAMTGHNydi1maWkuaW5z
@@ -40,24 +40,24 @@ sSAKnwk3ZDiTJMkOC8JKJSxyHKmdG7tiqdhIxOoGnEa/oPdWgsVTV63xEVXfDHh3
 vVTEoXVyPovJRJieZVJDz0BmEE88Q/pDCAuhUQOCdeC0DX0uN8WrL9oI9WuGbzeD
 dQvqnCF/78eNFMZHSDdbRWgVyZp20ytlaxRlw1cKQ5w=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-fii.insa-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">INSA de Toulouse</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INSA de Toulouse</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.insa-toulouse.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support-federation@insa-toulouse.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-fii.insa-toulouse.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INSA de Toulouse</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INSA de Toulouse</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.insa-toulouse.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support-federation@insa-toulouse.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml
index 357b5499..acfe96bd 100644
--- a/swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/srv-idp-01.uffs.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv-idp-01.uffs.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uffs.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uffs.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uffs.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.uffs.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxNTAzBgNVBAoTLFVGRlMgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBGcm9udGVpcmEgU3VsMQ0wCwYDVQQLEwRE
 SVRJMSgwJgYJKoZIhvcNAQkBFhlqb25lcy5tdW5lcm9uQHVmZnMuZWR1LmJyMREw
@@ -46,26 +46,26 @@ DvjbzZBUvsRdNusIgU9QBTZ3kS+SbZzcHsT3VCykunwGac7FYD7iCMX61iZNemBA
 B55GcBRKlaKXvMOUhzba07OZuOBjee8bd+huiHoW7WaMc6Nux/0/u80VrW1Idsl4
 HMcqUsuZRz3fIkrDrt4eyyxzNMyQv3rMNhv8gc6z
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-idp-01.uffs.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-idp-01.uffs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-idp-01.uffs.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIECjCCAvICAQAwDQYJKoZIhvcNAQEFBQAwgcoxNTAzBgNVBAoTLFVGRlMgLSBV
 bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBGcm9udGVpcmEgU3VsMQ0wCwYDVQQLEwRE
@@ -91,24 +91,24 @@ B55GcBRKlaKXvMOUhzba07OZuOBjee8bd+huiHoW7WaMc6Nux/0/u80VrW1Idsl4
 HMcqUsuZRz3fIkrDrt4eyyxzNMyQv3rMNhv8gc6z
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uffs.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.uffs.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jones J. Muneron</md:SurName>
-      <md:EmailAddress>jones.muneron@uffs.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srv-idp-01.uffs.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFFS - Universidade Federal da Fronteira Sul</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uffs.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uffs.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jones J. Muneron</md:SurName>
+    <md:EmailAddress>jones.muneron@uffs.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
index 2aa3b7fc..f4c024b0 100644
--- a/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv00847.soton.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T09:37:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T09:37:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAIAbqup9yKKMMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHNydjAwODQ3MB4XDTE0MDUwNjExNTY1MFoXDTI0MDUwMzExNTY1MFowEzER
 						MA8GA1UEAxMIc3J2MDA4NDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -42,39 +42,39 @@
 						kUs4VoXiMXI702q9rXK7OH9Qg07bFB20jdoYpw3UfBBPSPylb/SQR9kCRL78JCqY
 						nxbGI9WQz4LJ5w9S87j8jiPEzg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Southampton Test Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.southampton.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serviceline</md:GivenName>
-      <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Clayton</md:GivenName>
-      <md:SurName>Peters</md:SurName>
-      <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Southampton Test Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.southampton.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serviceline</md:GivenName>
+    <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clayton</md:GivenName>
+    <md:SurName>Peters</md:SurName>
+    <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
index 7e49d386..585ed965 100644
--- a/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srvcafe.ifma.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifma.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifma.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:Description>
-          <mdui:Description xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ifma.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ifma.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
 aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
@@ -47,26 +47,26 @@ WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
 FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
 UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
@@ -93,24 +93,24 @@ FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
 UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IFMA - Instituto Federal do Maranhao</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifma.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ifma.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Daniel Torres</md:SurName>
-      <md:EmailAddress>daniel.torres@ifma.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IFMA - Instituto Federal do Maranhao</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifma.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ifma.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Daniel Torres</md:SurName>
+    <md:EmailAddress>daniel.torres@ifma.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
index 61a42210..3bb26916 100644
--- a/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srvcafe.uniso.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniso.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNISO - Universidade de Sorocaba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNISO - Universidade de Sorocaba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uniso.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uniso.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniso.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNISO - Universidade de Sorocaba</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNISO - Universidade de Sorocaba</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uniso.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.uniso.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
 VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
 9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
@@ -45,26 +45,26 @@ u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
 IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
 tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.uniso.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.uniso.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniso.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.uniso.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.uniso.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniso.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
 VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
@@ -89,24 +89,24 @@ IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
 tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Universidade de Sorocaba</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">Universidade de Sorocaba</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNISO - Universidade de Sorocaba</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uniso.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.uniso.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>William A Oliveira</md:SurName>
-      <md:EmailAddress>william.oliveira@uniso.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universidade de Sorocaba</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">Universidade de Sorocaba</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNISO - Universidade de Sorocaba</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniso.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.uniso.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>William A Oliveira</md:SurName>
+    <md:EmailAddress>william.oliveira@uniso.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml
index 209b9566..c9a04bd9 100644
--- a/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srvshibboleth.asfc.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-06T18:30:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-06T18:30:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDiDCCAnACCQCMsALWwQfckDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxGjAYBgNVBAcTEUFzaHRvbiBVbmRlciBM
 						eW5lMSIwIAYDVQQKExlBc2h0b24gU2l4dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQD
@@ -33,26 +33,26 @@
 						AYFpurGaY4Zu2Wvzu3dauyMLbT8YIb+s4esYuWxNhQR4Dt2XA6tEqPww6I86jwqj
 						jMkM6nvuR66jMnzjNEefK7lfmuV48Gk7HFQPcUzx26jpLKNXC/CIZpU/MvQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDiDCCAnACCQCMsALWwQfckDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
 						R0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxGjAYBgNVBAcTEUFzaHRvbiBVbmRlciBM
 						eW5lMSIwIAYDVQQKExlBc2h0b24gU2l4dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQD
@@ -73,27 +73,27 @@
 						AYFpurGaY4Zu2Wvzu3dauyMLbT8YIb+s4esYuWxNhQR4Dt2XA6tEqPww6I86jwqj
 						jMkM6nvuR66jMnzjNEefK7lfmuV48Gk7HFQPcUzx26jpLKNXC/CIZpU/MvQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ashton Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ashton Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:lm@asfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Morris</md:SurName>
-      <md:EmailAddress>mailto:lm@asfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ashton Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ashton Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:lm@asfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Morris</md:SurName>
+    <md:EmailAddress>mailto:lm@asfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
index 1c16c1bf..0ab2b8fa 100644
--- a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sse-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stockholm School of Economics in Riga</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stockholm School of Economics in Riga</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - SSE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics in Riga - SSE IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.sseriga.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - SSE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics in Riga - SSE IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.sseriga.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
index 0da1fab4..8468c963 100644
--- a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssl.education.lu/saml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-09-22T08:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-09-22T08:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MENJE - CGIE IAM Users</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">MENJE - CGIE IAM Utilisateurs</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">MENJE - CGIE IAM Benutzer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="lb">MENJE - CGIE IAM Benotzer</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for IAM end users of the Ministry of Education</mdui:Description>
+        <mdui:Description xml:lang="fr">Fournisseur d'Identité IAM pour les utilisateurs du Ministère de l'Éducation nationale</mdui:Description>
+        <mdui:Description xml:lang="de">Identitätsprovider für die IAM Nutzer des Ministeriums für Bildung</mdui:Description>
+        <mdui:Keywords xml:lang="en">IAM CGIE MENJE luxembourg user users login education</mdui:Keywords>
+        <mdui:Logo width="16" height="16" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0DN9GR/zoAAAEZSURBVDjLndO9SgNBFAXgb0OwFythOxf8IY2ljaQRax/Al7AUQfRRfAAbCxHTCEIQLEVUIiikXbATDDE2WbkZRghON3PmnHvuuTNFXVZn2Pe/dVvUZTXBBEUA0r2/7rSmmyIcxotf+Ax3GvyX004UG+AdPTxjhFV0sZa6aSc2C/RxvDQcXEegLqstnGAnttJKFN9yZFgaDvo4xEN0nGZw05DrsorVG5F7XEZOKxQZ4SlUjNWj4CM+0hYaS+M5Zv8dAp8RWJimLddCcLSOxVyI0K3LajvajuS6rDrYjZzmJcZJ9HCEu0CEDk6xNzP3jAC84gAX0/MNnIcWJ7kpxKe6gs2AL+fIuQyKAI6T5GX+jRauMj9vnlXg5QcATWTFHAxLwAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo width="50" height="50" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0EFUuwKBkAAASRSURBVGje7ZpLjxRlFIaft6Z1JgoZkm7AgdKg02JUMKIbo1ujiQlRkSAiiRsJ6B/QhXGhW1f+ATQBE5SAstGFt40JMSLBEF1YiGi1w8gUlxHkMsO8Lqr6IghUT1e304Rv2zXd3/Od77znnLdGSTgqm1ckbTGsxEYSc3zNAOOYN4Ad5Vp0JsDaLOkp4E7B3IewMciwAHkL8DyAkrB6ALgLmAc4e3wu0xiQDdmZ78TeWAIeyEj74k5lEM52KmAY6cGg+XE/MLRu1c0IGZdaP6d/li7ZrgOukxUUnIS++gNufXbOgly2O192H9QNBgBKhQg7km1Jwhihc8BJQQ2YAgaBYUMZa1h1pksk9f8Ayfbb0JCLoEnsU5JqwFHbY0I/IM4C84ERYJnEcswS4FZgQXYr1GkNK836Ekmt5xhLfAzaCRzETAIDWSvRvFk2FsOSVgKrgfXAkiKCUppFJEAoq58XgG3AHpv9EuPlODrf0g/910omwupewRHgc2AjsNpovjogKrWbCwhsIYiBD4EPynG0r50frcTROeAwcDgJR08YJgRrQCFpH2W1ec3yg1hC6WlJjAG7bV6r1KLpTpK0HB/amyytHkKeAjYAI0phUBvRyS+/zXSctr0VeL1TiAZMLTpm9BbwCfDnbDI+yJ/daYoD2wS7ynH0d5F1oBJHk8bvAl91syDWO87fDTuQ9nejqFXiQz8BnwK/ZMqSu4IGOSLhVKFIgD2CA+U4muni3PS1YSswozTli8wRAZwAPjOc6mbzV6lFRwRfAmdThXQhV0tN8WAC2FspODeusMaA7+owhUTEWRW3/Uc5jiZ61JVfAA5gTisnSZBHrwTjkn7r4VA+BRxDTBWiWvXqZ3sc+LV3459PA/uAv0xBVysbkiezHOkVyrQhyUaAzkHUDM1N2UzRq6tVEgy300JdO9nTGrLMZmUPR/Ah4B7gFgqS37r3MixR6aFFMuTUNBzKa7UFOb60fkIjSVid1yOWm4EV2RRZCEjTGTEhsCoJq73IlYWC++3iQFpmKirAOkO5mwRJWF0MPGp7sdowXfK1KBLYZcMzaszYXVuPgF+SNNCOB5Z/HkkrYwismQhHl3UpGouAJ0CrGu2iip0QlbEY8yrWc4VDLK0OAZuAxzHYqvs0hQ5WDTvAqRS/kITVTQVCDCKeBL8ILPcsXKHcldOpd6LMm1sBbE7C6jzD+5U4Oj5biIlwNATWGtYJ3U3q/Lne6RUOImUakhr6g4aHbRYCQRJWvwDGynE0njMCQaaCI9hPI9YL7q1P1Q2B6aJBpyz3nFk2d0i8g/kWsT0Jqx8BR8tx5Gtk3G2GtYKXQfcBA7PxsjoBaW3wG4dmeAg8IvQY8DZw8CrKVAaeFbwJLEAMNHbfgWs6SxBdYjq7BLodOEn6UvVqaxCzCKWFNfMvnV9oO1WtK87zdbH3eeAMcPEafzeDuPDvnrTz1343Xr3dAOkWSIsB5j7mUMD1gAEKJEXAGdf7AvcFUsOTtplG/BwA24EfsdNqLfrl/1EEqgm+KcfR8cDwHvC9pLP1J/oiIGkV24XYzfW0/gHhg7VpVb73tQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo width="80" height="80" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0FC6ikJDsAAASPSURBVHja7ZhdaBxVFMd/ZzepWGlt2SrUbiO2i1oTpIpWoi8FtVoE9cEaM7Pz0ocIFQWxWKkFKVq1BakPgh8PPnQzs4If4DcRBOmDaJE+qEUrmyKy0aRmK0jUptnk+DA37WJ2N9nNsgg5PxhY7t45c87/nnvOnQHDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAyj9UgpnTkA7G2Bra9SxULvUhRQW2gvkyoWhpeSgImWWlOml1oGJurKETOtMAFMnh9RVQwAOuptb1XuXTNS+HB2oJTOdANfIrISRRGkmYd6fpAEiMLcdLP3qyoiMhOFOW3ShgAJVchH8/vR72dFkDnzEzUyrwgkK8UDSBULJ1LFwqUo+WbFc5QVPef52Y4mAr8BKAtSRvXzRfiwC6UsQtnzg+fmbRbIx3B+/qZaAqoqgrIhVSzM1DKWGil4wOiiuhfSbB140hkAkVsX4UK3SwEFfax+9gWrQLfrBY1uryWgCHipkcLUAhzoanch9PxgOfCQwinQELjI84Onmup3ymZgHNXfQVZ4fnB17cWmj3jLvaWqgnBfLQFnUiOF/EIcSBULUwLjbdbweRfQOyAvurEX+l1NbWgHCFtAJxB5wpWtT+tMfxWYisJcv4ggcEctAScbPLacabOAO13z2ROFue+BibiXcX1DmewFy4AkKqeBDwBBucrzg84qWX+zKgL86IbOuaayeo6ACssaLGSr2rh9BxRWAG9WDrtOdqyxdec25/9oFOb+BD0e71DdVWXufhFQ1R1uZMrtgnVzBBRIltKZexbixHh6Y0Lh8vYlnz4tcUAHK6L7LO4mdHh+cGUDC3+LqoLydVwPpS/exfKyO97MLtpKQbcDY/lo8GT8TPnHGVlftQuDflRKZ2R+H+RE+7Iv2wPShXI0H+Z+mh2PotwkcFhRUM03sBjdLtjj7sT7M4g7deh1F8TQAVQA3q0IfMj96q3ahTVeik/qPb6UzjwMXCttyz4Zcs4/63lBp+fHV7+f7QT2ClJGpNfzg66F6SebBEGEbwHy4WAZ2OdUe6UiSfYjEIW5RypuftuJf1fVg7QgAtxdWpf52715VAp3SSmd+QX0tYpXvXZwhQtuCOEsxJcgZ4G/gKQL6tGFdWDdgChRmPu1ItsOAmVEtnp+sNbzgwdQXY5ytPLeKBx835W7LfO9C19cpbX3AevjRKUtCeh5wTG3UocQdgAPVrnuj98A2O3OivWaUQJkNcgfleP5cHBGYThOC70TGHAZ9czcM6ROAvR72cs66hQ5gJkaHxikTbUviXKjxAX+QNwxawozDqwBssAbdcxucyL8UCXkrQi/gTwO9CAyFoW5L+ZmsJxR1bUi0pPQ1u7EZCuNqcoehCTIkXriOfa5SF6ax+hNKIjIyf/+FYW5UeA0sBmlQ2svxITEKbQxIciRFn0LLKZGFvYxVWFMoSB16mi/F3SI6E5gGHT3fDajMPe6wHegJc8PttUpgNcgFIBvavh2WOEUwiiqh2rMeQ9kGI3PgoZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIbxP+NfTtmklCc4oeQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo width="320" height="240" xml:lang="en">data:image/png;base64,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0bgAZL81rBfVhPg5a3AakdB+uKVzLw5QKd7FBSTvpOKnqAVYPStwZ9xiaq9yLsIlKLiyralrVi/Pv5U05P/Df53s3W1NXUfVZAU5f90huFi7g/rheT6FS7N0W1l+RUVRAey1CCZZkbnWi8W4BAqPypDsXdwypFwDHcqKfR7G4tbCbiNDyGIzpi8C+0pwdG2Tzm6KywByJC5YtVLP9kWxxDuIhF7VJqOoAPavAK6Gm4D4dj9f+p/AEbKkr75IZzcQgd8HN6mxFaXNns/EReq/JPf/+IDvKqcoq7IAigiOwKXKau6Hyy3FLey/oB+3++wPURyKCy5fH5deahhuAft83FKoj4iEFmmTUFQAa1cIw7g1k9VYl2tx+9Re1NbU9Yq+GoqiAliLIjgclyoowpc3pukt03ALyCf3JbegoigqgP0thg24PH274YJ4N5dhXuH+GvNxmTY+xqVGegM3u1x2FmlFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRlleb/A7hhlB7cvnMAAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
+        <mdui:DomainHint>school.lu</mdui:DomainHint>
+        <mdui:DomainHint>iam.education.lu</mdui:DomainHint>
+        <mdui:DomainHint>education.lu</mdui:DomainHint>
+        <mdui:DomainHint>lu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:49.660068, 6.134062</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:49.610136, 6.127278</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MENJE - CGIE IAM Users</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fr">MENJE - CGIE IAM Utilisateurs</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="de">MENJE - CGIE IAM Benutzer</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="lb">MENJE - CGIE IAM Benotzer</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for IAM end users of the Ministry of Education</mdui:Description>
-          <mdui:Description xml:lang="fr">Fournisseur d'Identité IAM pour les utilisateurs du Ministère de l'Éducation nationale</mdui:Description>
-          <mdui:Description xml:lang="de">Identitätsprovider für die IAM Nutzer des Ministeriums für Bildung</mdui:Description>
-          <mdui:Keywords xml:lang="en">IAM CGIE MENJE luxembourg user users login education</mdui:Keywords>
-          <mdui:Logo width="16" height="16" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0DN9GR/zoAAAEZSURBVDjLndO9SgNBFAXgb0OwFythOxf8IY2ljaQRax/Al7AUQfRRfAAbCxHTCEIQLEVUIiikXbATDDE2WbkZRghON3PmnHvuuTNFXVZn2Pe/dVvUZTXBBEUA0r2/7rSmmyIcxotf+Ax3GvyX004UG+AdPTxjhFV0sZa6aSc2C/RxvDQcXEegLqstnGAnttJKFN9yZFgaDvo4xEN0nGZw05DrsorVG5F7XEZOKxQZ4SlUjNWj4CM+0hYaS+M5Zv8dAp8RWJimLddCcLSOxVyI0K3LajvajuS6rDrYjZzmJcZJ9HCEu0CEDk6xNzP3jAC84gAX0/MNnIcWJ7kpxKe6gs2AL+fIuQyKAI6T5GX+jRauMj9vnlXg5QcATWTFHAxLwAAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:Logo width="50" height="50" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0EFUuwKBkAAASRSURBVGje7ZpLjxRlFIaft6Z1JgoZkm7AgdKg02JUMKIbo1ujiQlRkSAiiRsJ6B/QhXGhW1f+ATQBE5SAstGFt40JMSLBEF1YiGi1w8gUlxHkMsO8Lqr6IghUT1e304Rv2zXd3/Od77znnLdGSTgqm1ckbTGsxEYSc3zNAOOYN4Ad5Vp0JsDaLOkp4E7B3IewMciwAHkL8DyAkrB6ALgLmAc4e3wu0xiQDdmZ78TeWAIeyEj74k5lEM52KmAY6cGg+XE/MLRu1c0IGZdaP6d/li7ZrgOukxUUnIS++gNufXbOgly2O192H9QNBgBKhQg7km1Jwhihc8BJQQ2YAgaBYUMZa1h1pksk9f8Ayfbb0JCLoEnsU5JqwFHbY0I/IM4C84ERYJnEcswS4FZgQXYr1GkNK836Ekmt5xhLfAzaCRzETAIDWSvRvFk2FsOSVgKrgfXAkiKCUppFJEAoq58XgG3AHpv9EuPlODrf0g/910omwupewRHgc2AjsNpovjogKrWbCwhsIYiBD4EPynG0r50frcTROeAwcDgJR08YJgRrQCFpH2W1ec3yg1hC6WlJjAG7bV6r1KLpTpK0HB/amyytHkKeAjYAI0phUBvRyS+/zXSctr0VeL1TiAZMLTpm9BbwCfDnbDI+yJ/daYoD2wS7ynH0d5F1oBJHk8bvAl91syDWO87fDTuQ9nejqFXiQz8BnwK/ZMqSu4IGOSLhVKFIgD2CA+U4muni3PS1YSswozTli8wRAZwAPjOc6mbzV6lFRwRfAmdThXQhV0tN8WAC2FspODeusMaA7+owhUTEWRW3/Uc5jiZ61JVfAA5gTisnSZBHrwTjkn7r4VA+BRxDTBWiWvXqZ3sc+LV3459PA/uAv0xBVysbkiezHOkVyrQhyUaAzkHUDM1N2UzRq6tVEgy300JdO9nTGrLMZmUPR/Ah4B7gFgqS37r3MixR6aFFMuTUNBzKa7UFOb60fkIjSVid1yOWm4EV2RRZCEjTGTEhsCoJq73IlYWC++3iQFpmKirAOkO5mwRJWF0MPGp7sdowXfK1KBLYZcMzaszYXVuPgF+SNNCOB5Z/HkkrYwismQhHl3UpGouAJ0CrGu2iip0QlbEY8yrWc4VDLK0OAZuAxzHYqvs0hQ5WDTvAqRS/kITVTQVCDCKeBL8ILPcsXKHcldOpd6LMm1sBbE7C6jzD+5U4Oj5biIlwNATWGtYJ3U3q/Lne6RUOImUakhr6g4aHbRYCQRJWvwDGynE0njMCQaaCI9hPI9YL7q1P1Q2B6aJBpyz3nFk2d0i8g/kWsT0Jqx8BR8tx5Gtk3G2GtYKXQfcBA7PxsjoBaW3wG4dmeAg8IvQY8DZw8CrKVAaeFbwJLEAMNHbfgWs6SxBdYjq7BLodOEn6UvVqaxCzCKWFNfMvnV9oO1WtK87zdbH3eeAMcPEafzeDuPDvnrTz1343Xr3dAOkWSIsB5j7mUMD1gAEKJEXAGdf7AvcFUsOTtplG/BwA24EfsdNqLfrl/1EEqgm+KcfR8cDwHvC9pLP1J/oiIGkV24XYzfW0/gHhg7VpVb73tQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:Logo width="80" height="80" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0FC6ikJDsAAASPSURBVHja7ZhdaBxVFMd/ZzepWGlt2SrUbiO2i1oTpIpWoi8FtVoE9cEaM7Pz0ocIFQWxWKkFKVq1BakPgh8PPnQzs4If4DcRBOmDaJE+qEUrmyKy0aRmK0jUptnk+DA37WJ2N9nNsgg5PxhY7t45c87/nnvOnQHDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAyj9UgpnTkA7G2Bra9SxULvUhRQW2gvkyoWhpeSgImWWlOml1oGJurKETOtMAFMnh9RVQwAOuptb1XuXTNS+HB2oJTOdANfIrISRRGkmYd6fpAEiMLcdLP3qyoiMhOFOW3ShgAJVchH8/vR72dFkDnzEzUyrwgkK8UDSBULJ1LFwqUo+WbFc5QVPef52Y4mAr8BKAtSRvXzRfiwC6UsQtnzg+fmbRbIx3B+/qZaAqoqgrIhVSzM1DKWGil4wOiiuhfSbB140hkAkVsX4UK3SwEFfax+9gWrQLfrBY1uryWgCHipkcLUAhzoanch9PxgOfCQwinQELjI84Onmup3ymZgHNXfQVZ4fnB17cWmj3jLvaWqgnBfLQFnUiOF/EIcSBULUwLjbdbweRfQOyAvurEX+l1NbWgHCFtAJxB5wpWtT+tMfxWYisJcv4ggcEctAScbPLacabOAO13z2ROFue+BibiXcX1DmewFy4AkKqeBDwBBucrzg84qWX+zKgL86IbOuaayeo6ACssaLGSr2rh9BxRWAG9WDrtOdqyxdec25/9oFOb+BD0e71DdVWXufhFQ1R1uZMrtgnVzBBRIltKZexbixHh6Y0Lh8vYlnz4tcUAHK6L7LO4mdHh+cGUDC3+LqoLydVwPpS/exfKyO97MLtpKQbcDY/lo8GT8TPnHGVlftQuDflRKZ2R+H+RE+7Iv2wPShXI0H+Z+mh2PotwkcFhRUM03sBjdLtjj7sT7M4g7deh1F8TQAVQA3q0IfMj96q3ahTVeik/qPb6UzjwMXCttyz4Zcs4/63lBp+fHV7+f7QT2ClJGpNfzg66F6SebBEGEbwHy4WAZ2OdUe6UiSfYjEIW5RypuftuJf1fVg7QgAtxdWpf52715VAp3SSmd+QX0tYpXvXZwhQtuCOEsxJcgZ4G/gKQL6tGFdWDdgChRmPu1ItsOAmVEtnp+sNbzgwdQXY5ytPLeKBx835W7LfO9C19cpbX3AevjRKUtCeh5wTG3UocQdgAPVrnuj98A2O3OivWaUQJkNcgfleP5cHBGYThOC70TGHAZ9czcM6ROAvR72cs66hQ5gJkaHxikTbUviXKjxAX+QNwxawozDqwBssAbdcxucyL8UCXkrQi/gTwO9CAyFoW5L+ZmsJxR1bUi0pPQ1u7EZCuNqcoehCTIkXriOfa5SF6ax+hNKIjIyf/+FYW5UeA0sBmlQ2svxITEKbQxIciRFn0LLKZGFvYxVWFMoSB16mi/F3SI6E5gGHT3fDajMPe6wHegJc8PttUpgNcgFIBvavh2WOEUwiiqh2rMeQ9kGI3PgoZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIbxP+NfTtmklCc4oeQAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:Logo width="320" height="240" xml:lang="en">data:image/png;base64,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0bgAZL81rBfVhPg5a3AakdB+uKVzLw5QKd7FBSTvpOKnqAVYPStwZ9xiaq9yLsIlKLiyralrVi/Pv5U05P/Df53s3W1NXUfVZAU5f90huFi7g/rheT6FS7N0W1l+RUVRAey1CCZZkbnWi8W4BAqPypDsXdwypFwDHcqKfR7G4tbCbiNDyGIzpi8C+0pwdG2Tzm6KywByJC5YtVLP9kWxxDuIhF7VJqOoAPavAK6Gm4D4dj9f+p/AEbKkr75IZzcQgd8HN6mxFaXNns/EReq/JPf/+IDvKqcoq7IAigiOwKXKau6Hyy3FLey/oB+3++wPURyKCy5fH5deahhuAft83FKoj4iEFmmTUFQAa1cIw7g1k9VYl2tx+9Re1NbU9Yq+GoqiAliLIjgclyoowpc3pukt03ALyCf3JbegoigqgP0thg24PH274YJ4N5dhXuH+GvNxmTY+xqVGegM3u1x2FmlFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRlleb/A7hhlB7cvnMAAAAAAElFTkSuQmCC</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
-          <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
-          <mdui:DomainHint>school.lu</mdui:DomainHint>
-          <mdui:DomainHint>iam.education.lu</mdui:DomainHint>
-          <mdui:DomainHint>education.lu</mdui:DomainHint>
-          <mdui:DomainHint>lu</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:49.660068, 6.134062</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:49.610136, 6.127278</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssl.education.lu/saml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssl.education.lu/saml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
-      <md:OrganizationName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cgie.lu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>CGIE</md:SurName>
-      <md:EmailAddress>helpdesk@cgie.lu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssl.education.lu/saml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssl.education.lu/saml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
+    <md:OrganizationName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cgie.lu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>CGIE</md:SurName>
+    <md:EmailAddress>helpdesk@cgie.lu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml
index ee81c69a..e3582ea7 100644
--- a/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml
+++ b/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-demo.proofidcloud.co.uk/idp/pingfederate">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-17T14:25:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-17T14:25:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCDCCAfCgAwIBAgIGAUwSdXIfMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYT
 						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSQwIgYDVQQDExtzc28tZGVtby5wcm9vZmlk
 						Y2xvdWQuY28udWswHhcNMTUwMzEzMDkyNzA5WhcNMjUwMzEwMDkyNzA5WjBFMQsw
@@ -36,22 +36,22 @@
 						StVbzLE1Wc+P/kNGPRD3U1+Mzwa7Y7fZenkuR4xVKGFHJS6NyozJG37FwaWM775s
 						dgZDvrnXtrH7Soum
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/soap.ssaml1" index="0"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso-demo.proofidcloud.co.uk/idp/isx.saml1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-demo.proofidcloud.co.uk/idp/SSO.saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/idp/SSO.saml2"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/soap.ssaml1" index="0"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso-demo.proofidcloud.co.uk/idp/isx.saml1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-demo.proofidcloud.co.uk/idp/SSO.saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/idp/SSO.saml2"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCDCCAfCgAwIBAgIGAUwSdXIfMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYT
 						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSQwIgYDVQQDExtzc28tZGVtby5wcm9vZmlk
 						Y2xvdWQuY28udWswHhcNMTUwMzEzMDkyNzA5WhcNMjUwMzEwMDkyNzA5WjBFMQsw
@@ -70,23 +70,23 @@
 						StVbzLE1Wc+P/kNGPRD3U1+Mzwa7Y7fZenkuR4xVKGFHJS6NyozJG37FwaWM775s
 						dgZDvrnXtrH7Soum
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/attrsvc.ssaml2"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/soap.ssaml1"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProofID PingFederate IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/attrsvc.ssaml2"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/soap.ssaml1"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ProofID Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProofID PingFederate IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.proofid.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@proofid.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml b/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml
index e2a8786d..971e4b79 100644
--- a/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-ed.datamonitor.com/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIJAP/XaizrpNlBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnNzby1lZC5kYXRhbW9uaXRvci5jb20wHhcNMDkwNDA2MTAwNzM0WhcNMTkw
 						NDA0MTAwNzM0WjAhMR8wHQYDVQQDExZzc28tZWQuZGF0YW1vbml0b3IuY29tMIIB
@@ -27,13 +27,13 @@
 						8ms1g13MgOcc5/vHpXn53nSkBQE6vhi8XEUBkJLXu8cqjyat4NGuKAqggr8vdR/z
 						xBD+JarApxQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIJAP/XaizrpNlBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnNzby1lZC5kYXRhbW9uaXRvci5jb20wHhcNMDkwNDA2MTAwNzM0WhcNMTkw
 						NDA0MTAwNzM0WjAhMR8wHQYDVQQDExZzc28tZWQuZGF0YW1vbml0b3IuY29tMIIB
@@ -53,29 +53,29 @@
 						8ms1g13MgOcc5/vHpXn53nSkBQE6vhi8XEUBkJLXu8cqjyat4NGuKAqggr8vdR/z
 						xBD+JarApxQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Datamonitor Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Datamonitor Group - Shibboleth</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.datamonitor.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Arun</md:GivenName>
-      <md:SurName>Dahar</md:SurName>
-      <md:EmailAddress>mailto:arun.dahar@informa.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Arun</md:GivenName>
-      <md:SurName>Dahar</md:SurName>
-      <md:EmailAddress>mailto:arun.dahar@informa.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Datamonitor Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Datamonitor Group - Shibboleth</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.datamonitor.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Arun</md:GivenName>
+    <md:SurName>Dahar</md:SurName>
+    <md:EmailAddress>mailto:arun.dahar@informa.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arun</md:GivenName>
+    <md:SurName>Dahar</md:SurName>
+    <md:EmailAddress>mailto:arun.dahar@informa.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 4ecec6d1..dddab13d 100644
--- a/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T14:43:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T14:43:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE0zCCA7ugAwIBAgIJAI9tj6IHmTuYMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UEBxMJTmV3bWFya2V0MSQw
 						IgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBMdGQxHTAbBgNVBAMTFHNz
@@ -42,13 +42,13 @@
 						M/Ph+msHdZ8pexkctO10JpmiXk3mhKiEmq5QsoVPbifRK4MSm8l9aCcItsOzFzPE
 						SP/Ojg/mfRnlJrCIKN6VuP8hAAJfn5OHrTSYqDwMwGj9zZ6NdXAG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE0zCCA7ugAwIBAgIJAI9tj6IHmTuYMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UEBxMJTmV3bWFya2V0MSQw
 						IgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBMdGQxHTAbBgNVBAMTFHNz
@@ -76,28 +76,28 @@
 						M/Ph+msHdZ8pexkctO10JpmiXk3mhKiEmq5QsoVPbifRK4MSm8l9aCcItsOzFzPE
 						SP/Ojg/mfRnlJrCIKN6VuP8hAAJfn5OHrTSYqDwMwGj9zZ6NdXAG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aluminati Network Group Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aluminati.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Emily</md:GivenName>
-      <md:SurName>Grant</md:SurName>
-      <md:EmailAddress>mailto:help@aluminati.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roger</md:GivenName>
-      <md:SurName>Garner</md:SurName>
-      <md:EmailAddress>mailto:roger@aluminati.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aluminati Network Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aluminati.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Emily</md:GivenName>
+    <md:SurName>Grant</md:SurName>
+    <md:EmailAddress>mailto:help@aluminati.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Garner</md:SurName>
+    <md:EmailAddress>mailto:roger@aluminati.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.3plearning.com-ukfederation.xml b/swamid-interfederations-2.0/sso.3plearning.com-ukfederation.xml
index 8447a2ec..e6b2f784 100644
--- a/swamid-interfederations-2.0/sso.3plearning.com-ukfederation.xml
+++ b/swamid-interfederations-2.0/sso.3plearning.com-ukfederation.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.3plearning.com/ukfederation">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-09T14:51:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-09T14:51:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALGC5IDLLO00MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDWNocmlzb2x2ZXItcGMwHhcNMTYwMjEwMDMxOTA3WhcNMjYwMjA3MDMxOTA3
 						WjAYMRYwFAYDVQQDEw1jaHJpc29sdmVyLXBjMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -47,52 +47,52 @@
 						nvi/ki/C2bnt3csaNwSUckZPtZi7+2p1gPobFkGQIPH+SXZYkGZw9rLeX2nDWFka
 						NZFws21hKWYLfw/6+i9dqdzlCdTZVc5fwc4D/uASerYj/w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">3P Learning (Mathletics, Spellodrome and IntoScience)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.3plearning.com/Shibboleth/Providers/UKFederation/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">3P Learning (Mathletics, Spellodrome and IntoScience)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				3P Learning (Mathletics, Spellodrome and IntoScience)
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">3P Learning Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">3P Learning (Mathletics, Spellodrome and IntoScience)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.3plearning.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>3P Learning Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@3plearning.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>3P Learning Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@3plearning.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">3P Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">3P Learning (Mathletics, Spellodrome and IntoScience)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.3plearning.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>3P Learning Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@3plearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>3P Learning Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@3plearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml b/swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml
index f659aa18..712d1cc8 100644
--- a/swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.artstor.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T13:12:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T13:12:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.artstor.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.artstor.org/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.artstor.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.artstor.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.artstor.org/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.artstor.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAJB3IFCgt5imMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD2lwLTEwLTI4LTcyLTIxOTAeFw0xMjAxMjYxODU5MjJaFw0yMjAxMjMxODU5
 						MjJaMBoxGDAWBgNVBAMTD2lwLTEwLTI4LTcyLTIxOTCCASIwDQYJKoZIhvcNAQEB
@@ -32,45 +32,45 @@
 						u+whYEFiWbeBibbwlYmlIygqNNlNewx8kaP5USX6vM+Dre8C+5tGrBds5fVafpvI
 						Fv9ZTijl7+c/xLmLunvCVeWV12LmrIM/pswE5w1DhxqgZyoL9KslGw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.artstor.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.artstor.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.artstor.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.artstor.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.artstor.org/Shibboleth.sso/SAML/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.artstor.org/Shibboleth.sso/SAML/Artifact" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ARTstor Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Artstor Inc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.artstor.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Riadh</md:GivenName>
-      <md:SurName>Amari</md:SurName>
-      <md:EmailAddress>mailto:Riadh.Amari@ARTstor.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anand</md:GivenName>
-      <md:SurName>Krishnan</md:SurName>
-      <md:EmailAddress>mailto:Anand.Krishnan@ARTstor.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.artstor.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.artstor.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.artstor.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.artstor.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.artstor.org/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.artstor.org/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ARTstor Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Artstor Inc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.artstor.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Riadh</md:GivenName>
+    <md:SurName>Amari</md:SurName>
+    <md:EmailAddress>mailto:Riadh.Amari@ARTstor.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anand</md:GivenName>
+    <md:SurName>Krishnan</md:SurName>
+    <md:EmailAddress>mailto:Anand.Krishnan@ARTstor.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml
index ecd96651..239c9d8a 100644
--- a/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.augsburg.edu/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">augsburg.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Augsburg College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">augsburg.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Augsburg College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFDDCCA/SgAwIBAgIJAN9RPGLGQC4WMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
 VQQGEwJVUzESMBAGA1UECBMJTWlubmVzb3RhMRQwEgYDVQQHEwtNaW5uZWFwb2xp
 czEZMBcGA1UEChMQQXVnc2J1cmcgQ29sbGVnZTEfMB0GA1UECxMWSW5mb3JtYXRp
@@ -47,25 +47,25 @@ H1r9XxjK2lW9PXlCGFGW4Rh4ljVsQqQZXAWUtOpuom+H9TNF4/pzZxdIhUCOyt9v
 NukaLdL+qBhOqX+0/c8TREyoz8esHYXrfpeIW5LjCd0uP+4gKz+xfLbIhPIjf0wB
 MS7pk1MzPh5mGaGDDnSTI0qeaw25K2CtvbzShdcrOdjSk0PQfspH1v/JYIQgxOot
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Augsburg College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Augsburg College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.augsburg.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josef Fortier</md:GivenName>
-      <md:EmailAddress>fortier@augsburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Matthew Schornstein</md:GivenName>
-      <md:EmailAddress>schornst@augsburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Augsburg College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Augsburg College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.augsburg.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josef Fortier</md:GivenName>
+    <md:EmailAddress>fortier@augsburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Matthew Schornstein</md:GivenName>
+    <md:EmailAddress>schornst@augsburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml
index 54a66ed9..a2d9fc9d 100644
--- a/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.brockport.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sso.brockport.edu/idp/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brockport.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SUNY College at Brockport</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNY College at Brockport Shibboleth Identity Provider</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.brockport.edu/privacy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sso.brockport.edu/idp/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brockport.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SUNY College at Brockport</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SUNY College at Brockport Shibboleth Identity Provider</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.brockport.edu/privacy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUSXda9Cn6rn9RL58UpIkGcNAMDzkwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRc3NvLmJyb2NrcG9ydC5lZHUwHhcNMTQwNTAyMTQxMzI1
 WhcNMzQwNTAyMTQxMzI1WjAcMRowGAYDVQQDExFzc28uYnJvY2twb3J0LmVkdTCC
@@ -40,23 +40,23 @@ cqCDBhqRUJe828mS3ErtmfnxOXH6n91qvNX1/wGrrlvCSCZYT4UdgCHU97I7hN/z
 dFjJO/qm55k8j8PB8w9d2Ge93K0lH5OkiWJ54lHwvJTRBBF+w0duZ9Cp+U90+EF8
 tAha
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brockport.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.brockport.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.brockport.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.brockport.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.brockport.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brockport.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brockport.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.brockport.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.brockport.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.brockport.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.brockport.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brockport.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLzCCAhegAwIBAgIUSXda9Cn6rn9RL58UpIkGcNAMDzkwDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRc3NvLmJyb2NrcG9ydC5lZHUwHhcNMTQwNTAyMTQxMzI1
 WhcNMzQwNTAyMTQxMzI1WjAcMRowGAYDVQQDExFzc28uYnJvY2twb3J0LmVkdTCC
@@ -76,30 +76,30 @@ cqCDBhqRUJe828mS3ErtmfnxOXH6n91qvNX1/wGrrlvCSCZYT4UdgCHU97I7hN/z
 dFjJO/qm55k8j8PB8w9d2Ge93K0lH5OkiWJ54lHwvJTRBBF+w0duZ9Cp+U90+EF8
 tAha
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brockport.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SUNY College at Brockport</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SUNY College at Brockport</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brockport.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IDM Team</md:GivenName>
-      <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IDM Team</md:GivenName>
-      <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IDM Team</md:GivenName>
-      <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security Team</md:GivenName>
-      <md:EmailAddress>infosec@brockport.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brockport.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SUNY College at Brockport</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNY College at Brockport</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brockport.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IDM Team</md:GivenName>
+    <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IDM Team</md:GivenName>
+    <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IDM Team</md:GivenName>
+    <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security Team</md:GivenName>
+    <md:EmailAddress>infosec@brockport.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml
index 74f1e9dd..39fe328e 100644
--- a/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.brown.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://wiki.brown.edu/confluence/x/b4D_AQ" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brown.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brown University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://wiki.brown.edu/confluence/x/b4D_AQ" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brown.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brown University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUHPSdb4ae0QA3fyeEIe7wKXi2oT0wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc3NvLmJyb3duLmVkdTAeFw0xMDA1MjEyMTAyMzFaFw0z
 MDA1MjEyMTAyMzFaMBgxFjAUBgNVBAMTDXNzby5icm93bi5lZHUwggEiMA0GCSqG
@@ -40,23 +40,23 @@ wWWC9NYme6HEzs+mXRXD2wxOWUYNKc2xAs3QPOpYmX2g6sZiDPkyQ4KOZT/Vh9BZ
 FTUg9UjnEWqwcmCX02ay5ma5YMkNkyXeetU6HmLRBnpwPcuCgIkzuXP64h+6nVWp
 bLEJHeHIom+fbTMoCnUDbZ0FcmiGxk9Cg6RPORcGztgLcVw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.brown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.brown.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.brown.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.brown.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brown.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.brown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.brown.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.brown.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.brown.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brown.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUHPSdb4ae0QA3fyeEIe7wKXi2oT0wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc3NvLmJyb3duLmVkdTAeFw0xMDA1MjEyMTAyMzFaFw0z
 MDA1MjEyMTAyMzFaMBgxFjAUBgNVBAMTDXNzby5icm93bi5lZHUwggEiMA0GCSqG
@@ -75,26 +75,26 @@ wWWC9NYme6HEzs+mXRXD2wxOWUYNKc2xAs3QPOpYmX2g6sZiDPkyQ4KOZT/Vh9BZ
 FTUg9UjnEWqwcmCX02ay5ma5YMkNkyXeetU6HmLRBnpwPcuCgIkzuXP64h+6nVWp
 bLEJHeHIom+fbTMoCnUDbZ0FcmiGxk9Cg6RPORcGztgLcVw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brown University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brown University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brown.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brown University Shibboleth Administrator</md:GivenName>
-      <md:EmailAddress>CIS-EAS-IdMgmt@brown.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brown University Identity Management</md:GivenName>
-      <md:EmailAddress>CIS-EAS-IdMgmt@brown.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Brown University Help Desk</md:GivenName>
-      <md:EmailAddress>cis-helpdesk@brown.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brown University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brown University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brown.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brown University Shibboleth Administrator</md:GivenName>
+    <md:EmailAddress>CIS-EAS-IdMgmt@brown.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brown University Identity Management</md:GivenName>
+    <md:EmailAddress>CIS-EAS-IdMgmt@brown.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brown University Help Desk</md:GivenName>
+    <md:EmailAddress>cis-helpdesk@brown.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml
index 75d76461..ba3561a6 100644
--- a/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.bsfc.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-04T14:25:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-04T14:25:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsfc.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAJQNNxLqLyuVe5PctJiOH67/djG+MA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51azAeFw0xNDA0MTgxMzEx
 						MDNaFw0zNDA0MTgxMzExMDNaMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51
@@ -32,26 +32,26 @@
 						gCQVhaBRE1QFYK4NBInDyUqmQqreNJNWJHv2Ek89P0pS3cU9QueuoLVNYABQGMIy
 						XbBdS/uPgFA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.bsfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsfc.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.bsfc.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsfc.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAJQNNxLqLyuVe5PctJiOH67/djG+MA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51azAeFw0xNDA0MTgxMzEx
 						MDNaFw0zNDA0MTgxMzExMDNaMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51
@@ -71,27 +71,27 @@
 						gCQVhaBRE1QFYK4NBInDyUqmQqreNJNWJHv2Ek89P0pS3cU9QueuoLVNYABQGMIy
 						XbBdS/uPgFA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Birkenhead Sixth Form College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Birkenhead Sixth Form College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bsfc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John Paul</md:GivenName>
-      <md:SurName>Szkudlapski</md:SurName>
-      <md:EmailAddress>mailto:johns@bsfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Paul</md:GivenName>
-      <md:SurName>Szkudlapski</md:SurName>
-      <md:EmailAddress>mailto:johns@bsfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Birkenhead Sixth Form College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Birkenhead Sixth Form College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bsfc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John Paul</md:GivenName>
+    <md:SurName>Szkudlapski</md:SurName>
+    <md:EmailAddress>mailto:johns@bsfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Paul</md:GivenName>
+    <md:SurName>Szkudlapski</md:SurName>
+    <md:EmailAddress>mailto:johns@bsfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml
index fed4b1c9..b9d4e4df 100644
--- a/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.canterbury.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T14:23:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T14:23:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canterbury.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Canterbury Christ Church University (test)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://www.canterbury.ac.uk/SiteElements/images/cccu-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://www.canterbury.ac.uk/SiteElements/images/cccu-logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canterbury.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Canterbury Christ Church University (test)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">https://www.canterbury.ac.uk/SiteElements/images/cccu-logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://www.canterbury.ac.uk/SiteElements/images/cccu-logo-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVANaQnCAp0hjyfB+AlIzHFLa2I9EvMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFHNzby5jYW50ZXJidXJ5LmFjLnVrMB4XDTEzMDcyNjE0
 						MzQ0M1oXDTE2MDcyNjE0MzQ0M1owHzEdMBsGA1UEAxMUc3NvLmNhbnRlcmJ1cnku
@@ -42,29 +42,29 @@
 						PYL0JTTUP85r329JLjGzXs6PXn82UejbdGBhC/qZMKdqZilqQuniwLfcO2nIsWn5
 						PmiYgLtxTZqsx6k7bEWZMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.canterbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canterbury.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.canterbury.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">canterbury.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIVANaQnCAp0hjyfB+AlIzHFLa2I9EvMA0GCSqGSIb3DQEB
 						BQUAMB8xHTAbBgNVBAMTFHNzby5jYW50ZXJidXJ5LmFjLnVrMB4XDTEzMDcyNjE0
 						MzQ0M1oXDTE2MDcyNjE0MzQ0M1owHzEdMBsGA1UEAxMUc3NvLmNhbnRlcmJ1cnku
@@ -84,25 +84,25 @@
 						PYL0JTTUP85r329JLjGzXs6PXn82UejbdGBhC/qZMKdqZilqQuniwLfcO2nIsWn5
 						PmiYgLtxTZqsx6k7bEWZMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Canterbury Christ Church University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Canterbury Christ Church University (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.canterbury.ac.uk/support/computing-services/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service</md:GivenName>
-      <md:EmailAddress>mailto:it-service@canterbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Linux Admins</md:GivenName>
-      <md:EmailAddress>mailto:linux.admins@canterbury.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Canterbury Christ Church University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Canterbury Christ Church University (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.canterbury.ac.uk/support/computing-services/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service</md:GivenName>
+    <md:EmailAddress>mailto:it-service@canterbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Linux Admins</md:GivenName>
+    <md:EmailAddress>mailto:linux.admins@canterbury.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml
index 7e0c0edb..815920c5 100644
--- a/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.cc.lehigh.edu/sso/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sso.cc.lehigh.edu/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lehigh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lehigh University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lehigh University IDP (SimpleSAMLPHP)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.lehigh.edu/helpdesk/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lehigh.edu/security/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="80" width="201" xml:lang="en">https://sso.cc.lehigh.edu/sso/resources/lehightheme/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sso.cc.lehigh.edu/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lehigh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lehigh University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Lehigh University IDP (SimpleSAMLPHP)</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.lehigh.edu/helpdesk/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lehigh.edu/security/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="80" width="201" xml:lang="en">https://sso.cc.lehigh.edu/sso/resources/lehightheme/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDeDCCAmACCQD2MdQMsOjE8DANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJV
 UzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRIwEAYDVQQHEwlCZXRobGVoZW0xGjAY
 BgNVBAoTEUxlaGlnaCBVbml2ZXJzaXR5MQwwCgYDVQQLEwNMVFMxGjAYBgNVBAMT
@@ -46,35 +46,35 @@ o4JHhUfEezvsGS7z7nDh4ggYZtmePGlN0S1oYuJqPNESb5pkr0Vu8DF3BQRZw7Id
 i3cZL+A/f9dWYzc1xjWd/zW4jOGu1KIFApYnL7DOIRaW1d13OhGk0Ij0TDsO+Qnd
 ipGX2RJcUt6+Q02eiIU9LdOsjOvivr+kUO/bvw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cc.lehigh.edu/sso/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cc.lehigh.edu/sso/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lehigh University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lehigh University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lehigh.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan Schwartz</md:GivenName>
-      <md:EmailAddress>das1@lehigh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Keith Erekson</md:GivenName>
-      <md:EmailAddress>kbe2@lehigh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Keith Hartranft</md:GivenName>
-      <md:EmailAddress>kkh288@lehigh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity and Access Management Team</md:GivenName>
-      <md:EmailAddress>iniam@Lehigh.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Keith Hartranft</md:GivenName>
-      <md:EmailAddress>kkh288@lehigh.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cc.lehigh.edu/sso/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cc.lehigh.edu/sso/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lehigh University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lehigh University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lehigh.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan Schwartz</md:GivenName>
+    <md:EmailAddress>das1@lehigh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Keith Erekson</md:GivenName>
+    <md:EmailAddress>kbe2@lehigh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Keith Hartranft</md:GivenName>
+    <md:EmailAddress>kkh288@lehigh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity and Access Management Team</md:GivenName>
+    <md:EmailAddress>iniam@Lehigh.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Keith Hartranft</md:GivenName>
+    <md:EmailAddress>kkh288@lehigh.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml
index bbe84800..cba25baa 100644
--- a/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.cedarville.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedarville.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cedarville University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedarville.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Cedarville University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGjCCAgKgAwIBAgIUN47xMNeIGq+9fTb4aJR1KEWc7wswDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVyaWRlbnRpdHkuY29tMB4XDTExMTIx
 MjE2NTc0NFoXDTMxMTIxMjE2NTc0NFowIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVy
@@ -37,24 +37,24 @@ pi+52yms2KD8klrC+Ptq76kKetJifRalHNK0cEMzNae6s+sQYxGVhqOHijEgXvTB
 abocdzekYdo3N1BoA3TNcqWvBcVEt6m9iW/cDKMr8xlkpII8A8p9piPozcFmCDll
 ip/lOg2kOdU7AB80pFPqQLvDSArQpzItz88dbws6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.cedarville.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.cedarville.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.cedarville.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cedarville.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.cedarville.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cedarville.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedarville.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.cedarville.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.cedarville.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.cedarville.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cedarville.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.cedarville.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cedarville.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedarville.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGjCCAgKgAwIBAgIUN47xMNeIGq+9fTb4aJR1KEWc7wswDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVyaWRlbnRpdHkuY29tMB4XDTExMTIx
 MjE2NTc0NFoXDTMxMTIxMjE2NTc0NFowIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVy
@@ -73,26 +73,26 @@ pi+52yms2KD8klrC+Ptq76kKetJifRalHNK0cEMzNae6s+sQYxGVhqOHijEgXvTB
 abocdzekYdo3N1BoA3TNcqWvBcVEt6m9iW/cDKMr8xlkpII8A8p9piPozcFmCDll
 ip/lOg2kOdU7AB80pFPqQLvDSArQpzItz88dbws6
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.cedarville.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cedarville University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cedarville University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cedarville.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Rotman</md:GivenName>
-      <md:EmailAddress>rotmand@cedarville.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Alan McCain</md:GivenName>
-      <md:EmailAddress>mccaina@cedarville.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Cedarville Help Desk</md:GivenName>
-      <md:EmailAddress>computerhelp@cedarville.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.cedarville.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cedarville University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cedarville University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cedarville.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Rotman</md:GivenName>
+    <md:EmailAddress>rotmand@cedarville.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Alan McCain</md:GivenName>
+    <md:EmailAddress>mccaina@cedarville.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cedarville Help Desk</md:GivenName>
+    <md:EmailAddress>computerhelp@cedarville.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml b/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml
index e78aa2dc..b2565e1f 100644
--- a/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml
+++ b/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.connectis.nl/broker/sso/tpd-ukf">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-02T15:26:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-02T15:26:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIG1jCCBL6gAwIBAgIQdhfb7fVnOGRYSmoe+FjYWzANBgkqhkiG9w0BAQsFADBd
 						MQswCQYDVQQGEwJOTDEsMCoGA1UECgwjRVNHIGRlIEVsZWN0cm9uaXNjaGUgU2ln
 						bmF0dXVyIEIuVi4xIDAeBgNVBAMMF0VTRyBPcmdhbmlzYXRpZSBDQSAtIEcyMB4X
@@ -48,22 +48,22 @@
 						y3kGImkhUw9/Eyd/EW+y9rNYEbMkbVKptCzmjgSeU3GZSRM0Oyp6JQm62ZE+1miJ
 						NZ8XT1wfFpjxxmjQqfeCijYxXabTYI//XoM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.connectis.nl/broker/acs/tpd-ukf" index="1" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Connected Information Systems B.V.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Connectis Production</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.connectis.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:technicalsupport@connectis.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:technicalsupport@connectis.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.connectis.nl/broker/acs/tpd-ukf" index="1" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Connected Information Systems B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Connectis Production</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.connectis.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:technicalsupport@connectis.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:technicalsupport@connectis.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml
index 8c6fe2a9..c0573bd9 100644
--- a/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.csumb.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csumb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Monterey Bay</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csumb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Monterey Bay</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFizCCBHOgAwIBAgICApswDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAwOTE3MDgzMloXDTExMTAx
@@ -50,13 +50,13 @@ Vlrb/LPwut26OfziQnj+97HTDz4ex2pTkzOuskC7csDQDX4elWGMjYJIDN2dswZI
 NZkp1RZ6ac9X9y7eu9yI5eZGL8Oc9o5btU0A02TwZAheryrarsITh4FLKtVgivk2
 hrxoBGH+jmibPK4kGAdYItS9gF2QBBH+wRoIBWdBkw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAJ4bXqO6GpvPMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNzby5jc3VtYi5lZHUwHhcNMTExMDExMDQxNjU0WhcNMjExMDA4MDQxNjU0
 WjAYMRYwFAYDVQQDEw1zc28uY3N1bWIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -75,24 +75,24 @@ Xf4/+88QgvVLCNwBmDJh/dl+9LgXkYolLyGHHXBkKJpquiCPAKCVu4NXsv4tVxI3
 dMdSS+qrcdWD3HIH2wdkI+i916HBLA9q06HsbrlhSPjphFgYJkjpw0ngKSPmXU39
 q8P6Y9qHgb8m5DEKVxakf/26wy2LraW0P1mxgsZnr5KdMfoK3GWboss9POvErkkp
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.csumb.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.csumb.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.csumb.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.csumb.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.csumb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.csumb.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csumb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.csumb.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.csumb.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.csumb.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.csumb.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.csumb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.csumb.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csumb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFizCCBHOgAwIBAgICApswDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAwOTE3MDgzMloXDTExMTAx
@@ -124,13 +124,13 @@ Vlrb/LPwut26OfziQnj+97HTDz4ex2pTkzOuskC7csDQDX4elWGMjYJIDN2dswZI
 NZkp1RZ6ac9X9y7eu9yI5eZGL8Oc9o5btU0A02TwZAheryrarsITh4FLKtVgivk2
 hrxoBGH+jmibPK4kGAdYItS9gF2QBBH+wRoIBWdBkw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAJ4bXqO6GpvPMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNzby5jc3VtYi5lZHUwHhcNMTExMDExMDQxNjU0WhcNMjExMDA4MDQxNjU0
 WjAYMRYwFAYDVQQDEw1zc28uY3N1bWIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -149,23 +149,23 @@ Xf4/+88QgvVLCNwBmDJh/dl+9LgXkYolLyGHHXBkKJpquiCPAKCVu4NXsv4tVxI3
 dMdSS+qrcdWD3HIH2wdkI+i916HBLA9q06HsbrlhSPjphFgYJkjpw0ngKSPmXU39
 q8P6Y9qHgb8m5DEKVxakf/26wy2LraW0P1mxgsZnr5KdMfoK3GWboss9POvErkkp
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.csumb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.csumb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Monterey Bay</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Monterey Bay</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://csumb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicholas A Rodrigues</md:GivenName>
-      <md:EmailAddress>nrodrigues@csumb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil Hopfner</md:GivenName>
-      <md:EmailAddress>phopfner@csumb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.csumb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.csumb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Monterey Bay</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Monterey Bay</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://csumb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicholas A Rodrigues</md:GivenName>
+    <md:EmailAddress>nrodrigues@csumb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil Hopfner</md:GivenName>
+    <md:EmailAddress>phopfner@csumb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml
index 371a911a..539c7f7c 100644
--- a/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sso.davidson.edu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidson.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Davidson College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Davidson College, Davidson, NC</mdui:Description>
+        <mdui:Logo height="48" width="198" xml:lang="en">https://webapps.davidson.edu/common/davidson.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidson.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Davidson College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Davidson College, Davidson, NC</mdui:Description>
-          <mdui:Logo height="48" width="198" xml:lang="en">https://webapps.davidson.edu/common/davidson.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIGvzCCBaegAwIBAgIQCxJ8Hgj1QRe56BsgKy6pNjANBgkqhkiG9w0BAQUFADBm
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
@@ -59,13 +59,13 @@ J5/m8Euy3gV5/R7kfOyyEG68CRtZ3aT5VNSJvut15tgPfPwhwQFn61nJKUPuLvi2
 UNlna4731ptCSMJZz+fRO1YqlFc1vDz/YB1JShurYQA6MxgISx6Jxk0PtCD+6vb0
 dAKx
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFRDCCBCygAwIBAgIRAJNsEb6MISj3HcRcjGNJ+WUwDQYJKoZIhvcNAQELBQAw
 djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
 EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
@@ -96,23 +96,23 @@ ykopeuwavriM8OuS21HezX+URi4ToROk/uLbnercyXkb68Fu3A7wYw8UILBHu7S4
 gRYwWCgKraWBZgpFj2DYCB8i9TRaw8/gquIaYuv9iGzie190gwp3lQHqkT34sSVc
 6pxe+VUNIrw=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.davidson.edu/adfs/ls"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.davidson.edu/adfs/ls"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Davidson College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Davidson College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www3.davidson.edu/cms/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Robbins</md:GivenName>
-      <md:EmailAddress>jorobbins@davidson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Rob Smith</md:GivenName>
-      <md:EmailAddress>rosmith@davidson.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.davidson.edu/adfs/ls"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.davidson.edu/adfs/ls"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Davidson College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Davidson College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www3.davidson.edu/cms/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Robbins</md:GivenName>
+    <md:EmailAddress>jorobbins@davidson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Rob Smith</md:GivenName>
+    <md:EmailAddress>rosmith@davidson.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml
index fd61f067..7e586c9a 100644
--- a/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.ecu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">East Carolina University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">East Carolina University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIErTCCA5WgAwIBAgIJANboXNbCxTghMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCTkMxEzARBgNVBAcTCkdyZWVudmlsbGUxITAfBgNV
 BAoTGEVhc3QgQ2Fyb2xpbmEgVW5pdmVyc2l0eTENMAsGA1UECxMESVRDUzEUMBIG
@@ -46,24 +46,24 @@ em4BewflobGSobRwz7r5XgIJhxMo3wc01f3akeQJ4O3ZzgIoM+UiBe5DzaUmMQoJ
 X5KQp7NLGaQVmUQOPlUe2xNvmR+lvpkaXZp2S086gS1eWhaiP5h0nASKKd3/rQT1
 kQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.ecu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.ecu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ecu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ecu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.ecu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ecu.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.ecu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.ecu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ecu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ecu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.ecu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ecu.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIErTCCA5WgAwIBAgIJANboXNbCxTghMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCTkMxEzARBgNVBAcTCkdyZWVudmlsbGUxITAfBgNV
 BAoTGEVhc3QgQ2Fyb2xpbmEgVW5pdmVyc2l0eTENMAsGA1UECxMESVRDUzEUMBIG
@@ -91,23 +91,23 @@ em4BewflobGSobRwz7r5XgIJhxMo3wc01f3akeQJ4O3ZzgIoM+UiBe5DzaUmMQoJ
 X5KQp7NLGaQVmUQOPlUe2xNvmR+lvpkaXZp2S086gS1eWhaiP5h0nASKKd3/rQT1
 kQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.ecu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.ecu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">East Carolina University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">East Carolina University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ecu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeremiah Stuever</md:GivenName>
-      <md:EmailAddress>stueverj@ecu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kris Augustus</md:GivenName>
-      <md:EmailAddress>augustusk@ecu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.ecu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.ecu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">East Carolina University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">East Carolina University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ecu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeremiah Stuever</md:GivenName>
+    <md:EmailAddress>stueverj@ecu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kris Augustus</md:GivenName>
+    <md:EmailAddress>augustusk@ecu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.educause.edu-sp.xml b/swamid-interfederations-2.0/sso.educause.edu-sp.xml
index 031aee58..cc48a0b8 100644
--- a/swamid-interfederations-2.0/sso.educause.edu-sp.xml
+++ b/swamid-interfederations-2.0/sso.educause.edu-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.educause.edu/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EDUCAUSE SSO</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDUCAUSE is a nonprofit association and the foremost community of IT leaders and professionals committed to advancing higher education.  This service provides access to collaborative and informative services for faculty and staff if the form of curated content, publications, IT benchmarking data and research, list servers, blogs, wikis, and events.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="57" width="225" xml:lang="en">https://www.educause.edu/sites/all/themes/edutheme/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EDUCAUSE SSO</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDUCAUSE is a nonprofit association and the foremost community of IT leaders and professionals committed to advancing higher education.  This service provides access to collaborative and informative services for faculty and staff if the form of curated content, publications, IT benchmarking data and research, list servers, blogs, wikis, and events.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="57" width="225" xml:lang="en">https://www.educause.edu/sites/all/themes/edutheme/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC+jCCAeKgAwIBAgIGAVKap2yFMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNVBAYTAlVTMREwDwYD
 VQQKEwhlZHVjYXVzZTEcMBoGA1UEAxMTc3NvLWRzLmVkdWNhdXNlLmVkdTAeFw0xNjAyMDEwMjI2
 NDlaFw0xODAxMzEwMjI2NDlaMD4xCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhlZHVjYXVzZTEcMBoG
@@ -38,35 +38,35 @@ wIYcfJLdh1HhzGUEwzLOEyjWJmZBKq3PLRD+8ikpL0FXry9i4Jp0OE5UrnvNRn77WAtXAQEu7hsO
 NdqWxNaWjSX5B9mtseJPAPCRU1LJjqMO8LSVbe3HlfKqqZ0pcRwqWFobiKuDe6UeG4AZy+iI3hH1
 DjG7U+yjWFViwzT+zlX+3ZOrtEj4J1/vLw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.educause.edu/sp/ACS.saml2" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">EDUCAUSE SSO</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">EDUCAUSE is a nonprofit association and the foremost community of IT leaders and professionals committed to advancing higher education.  This service provides access to collaborative and informative services for faculty and staff if the form of curated content, publications, IT benchmarking data and research, list servers, blogs, wikis, and events.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex Chaux</md:GivenName>
-      <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IT Administrative Support</md:GivenName>
-      <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.educause.edu/sp/ACS.saml2" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">EDUCAUSE SSO</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EDUCAUSE is a nonprofit association and the foremost community of IT leaders and professionals committed to advancing higher education.  This service provides access to collaborative and informative services for faculty and staff if the form of curated content, publications, IT benchmarking data and research, list servers, blogs, wikis, and events.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex Chaux</md:GivenName>
+    <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IT Administrative Support</md:GivenName>
+    <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.eur.nl-opensso.xml b/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
index 647b4218..16a8dc47 100644
--- a/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
+++ b/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.eur.nl/opensso">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-30T13:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-30T13:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eur.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Erasmus University Rotterdam</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:Description>
+        <mdui:Description xml:lang="en">Erasmus University Rotterdam</mdui:Description>
+        <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/eur.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eur.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Erasmus University Rotterdam</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:Description>
-          <mdui:Description xml:lang="en">Erasmus University Rotterdam</mdui:Description>
-          <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/eur.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/80e917885da2dd2624b1408b6b69fa2a"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Erasmus University Rotterdam</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Erasmus University Rotterdam</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eur.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/80e917885da2dd2624b1408b6b69fa2a"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Erasmus University Rotterdam</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Erasmus University Rotterdam</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eur.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml
index 8591d52f..3c8a33f2 100644
--- a/swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.fau.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://wordpress.fau.edu/irm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Florida Atlantic University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Florida Atlantic Test IDP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fau.edu/oit/accounts/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.fau.edu/oit/accounts/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="150" xml:lang="en">https://www.fau.edu/images/shibboleth.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://wordpress.fau.edu/irm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Florida Atlantic University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Florida Atlantic Test IDP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fau.edu/oit/accounts/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.fau.edu/oit/accounts/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="150" xml:lang="en">https://www.fau.edu/images/shibboleth.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPXvW42xKsbM/hd7Kz3NbFQcB2eYMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC3Nzby5mYXUuZWR1MB4XDTEyMDYwMjIwMDUxNFoXDTMy
 MDYwMjIwMDUxNFowFjEUMBIGA1UEAxMLc3NvLmZhdS5lZHUwggEiMA0GCSqGSIb3
@@ -41,26 +41,26 @@ NVUVQWYfRbQOFizPJBtA+QdWDB/tHnMgOm+jjgwVXupex20rdV6vVq/sKTzE1tCn
 Sy7y61N6qVJjnmbH4IdFnrQib4jc16mOWBob8JUD/nSozArIjurFPIBCZWtfkqhb
 8RgOqewQBP/7Gw84rIidKEycldMKMkP7EtKyeQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.fau.edu:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.fau.edu:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fau.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.fau.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fau.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.fau.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fau.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fau.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.fau.edu:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.fau.edu:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fau.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.fau.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fau.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.fau.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fau.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fau.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPXvW42xKsbM/hd7Kz3NbFQcB2eYMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC3Nzby5mYXUuZWR1MB4XDTEyMDYwMjIwMDUxNFoXDTMy
 MDYwMjIwMDUxNFowFjEUMBIGA1UEAxMLc3NvLmZhdS5lZHUwggEiMA0GCSqGSIb3
@@ -79,26 +79,26 @@ NVUVQWYfRbQOFizPJBtA+QdWDB/tHnMgOm+jjgwVXupex20rdV6vVq/sKTzE1tCn
 Sy7y61N6qVJjnmbH4IdFnrQib4jc16mOWBob8JUD/nSozArIjurFPIBCZWtfkqhb
 8RgOqewQBP/7Gw84rIidKEycldMKMkP7EtKyeQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.fau.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Florida Atlantic University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Florida Atlantic University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fau.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Florida Atlantic University Support Services</md:GivenName>
-      <md:EmailAddress>fau.us@fau.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Rhian Resnick</md:GivenName>
-      <md:EmailAddress>rresnick@fau.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank Rodriguez</md:GivenName>
-      <md:EmailAddress>frodrig6@fau.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.fau.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Florida Atlantic University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Florida Atlantic University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fau.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Florida Atlantic University Support Services</md:GivenName>
+    <md:EmailAddress>fau.us@fau.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Rhian Resnick</md:GivenName>
+    <md:EmailAddress>rresnick@fau.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank Rodriguez</md:GivenName>
+    <md:EmailAddress>frodrig6@fau.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml
index 00a2e1dc..4b6832ed 100644
--- a/swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.fh-salzburg.ac.at-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.fh-salzburg.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-salzburg.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Fachhochschule Salzburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Salzburg University of Applied Sciences</mdui:DisplayName>
+        <mdui:Logo width="80" height="60">https://sso.fh-salzburg.ac.at/images/fhs_logo_80_60.png</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://sso.fh-salzburg.ac.at/images/fhs_logo_16_16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-salzburg.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Fachhochschule Salzburg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Salzburg University of Applied Sciences</mdui:DisplayName>
-          <mdui:Logo width="80" height="60">https://sso.fh-salzburg.ac.at/images/fhs_logo_80_60.png</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://sso.fh-salzburg.ac.at/images/fhs_logo_16_16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPzCCAiegAwIBAgIUeFyQRjNS1xdQA/IhbscIB+iGNc0wDQYJKoZIhvcNAQEF
 BQAwIDEeMBwGA1UEAxMVc3NvLmZoLXNhbHpidXJnLmFjLmF0MB4XDTA5MDcwOTEz
 NDk0N1oXDTI5MDcwOTEzNDk0N1owIDEeMBwGA1UEAxMVc3NvLmZoLXNhbHpidXJn
@@ -36,27 +36,27 @@ AIxGRgnuyptAjR8b52K+b6ulQ7fmNZghE8/DgOWz+XiIed7Q6fNp+frTsHD2sP/t
 3AGZtUbc+1qY/MVys1XAryOD6xUrg3oNDgobviNeAaAyckNI/lYs7SqVkxGKmRB0
 nrHqzrR12bmzu2xBInQmirFzcg==
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.fh-salzburg.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Fachhochschule Salzburg GmbH</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Salzburg University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Fachhochschule Salzburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Salzburg University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.fh-salzburg.ac.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.fh-salzburg.ac.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO</md:GivenName>
-      <md:SurName>Admins</md:SurName>
-      <md:EmailAddress>mailto:ssomaster@fh-salzburg.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.fh-salzburg.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fh-salzburg.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Fachhochschule Salzburg GmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Salzburg University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Salzburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Salzburg University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fh-salzburg.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fh-salzburg.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:ssomaster@fh-salzburg.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml b/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml
index 42c3fcd6..47658d4b 100644
--- a/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml
+++ b/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.ft.com/sso/sp/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-18T09:41:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-18T09:41:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Financial Times</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The latest news and analysis on international business, finance, economics and politics from the Financial Times.</mdui:Description>
+        <mdui:Logo height="150" width="150">https://sso.ft.com/sso/assets/images/ft.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Financial Times</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The latest news and analysis on international business, finance, economics and politics from the Financial Times.</mdui:Description>
-          <mdui:Logo height="150" width="150">https://sso.ft.com/sso/assets/images/ft.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+zCCAeOgAwIBAgIEafPFVDANBgkqhkiG9w0BAQsFADAuMRcwFQYDVQQKEw5G
 						aW5hbmNpYWxUaW1lczETMBEGA1UEAxMKc3NvLmZ0LmNvbTAeFw0xNDA3MDMxMzQy
 						MDZaFw0yNDA2MzAxMzQyMDZaMC4xFzAVBgNVBAoTDkZpbmFuY2lhbFRpbWVzMRMw
@@ -34,13 +34,13 @@
 						CLgmgL6RED7Xhbm3j3jlKWT6KRvDl/VsuMLuedxERMiogME5cnxSTBubVVvHpcGk
 						XypQ8WvVlNV0wyxpR6ClzTZwAFx+Wlc2CZ7ucw0s1nZreHpMfwjI9roszznrrjs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC+zCCAeOgAwIBAgIEafPFVDANBgkqhkiG9w0BAQsFADAuMRcwFQYDVQQKEw5G
 						aW5hbmNpYWxUaW1lczETMBEGA1UEAxMKc3NvLmZ0LmNvbTAeFw0xNDA3MDMxMzQy
 						MDZaFw0yNDA2MzAxMzQyMDZaMC4xFzAVBgNVBAoTDkZpbmFuY2lhbFRpbWVzMRMw
@@ -58,25 +58,25 @@
 						CLgmgL6RED7Xhbm3j3jlKWT6KRvDl/VsuMLuedxERMiogME5cnxSTBubVVvHpcGk
 						XypQ8WvVlNV0wyxpR6ClzTZwAFx+Wlc2CZ7ucw0s1nZreHpMfwjI9roszznrrjs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Financial Times Limited (The)</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Financial Times</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ft.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Membership AIM</md:GivenName>
-      <md:EmailAddress>mailto:membership.aim@ft.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Membership AIM</md:GivenName>
-      <md:EmailAddress>mailto:membership.aim@ft.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Financial Times Limited (The)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Financial Times</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ft.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Membership AIM</md:GivenName>
+    <md:EmailAddress>mailto:membership.aim@ft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Membership AIM</md:GivenName>
+    <md:EmailAddress>mailto:membership.aim@ft.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.han.nl-ssp.xml b/swamid-interfederations-2.0/sso.han.nl-ssp.xml
index dafc174d..99d86936 100644
--- a/swamid-interfederations-2.0/sso.han.nl-ssp.xml
+++ b/swamid-interfederations-2.0/sso.han.nl-ssp.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.han.nl/ssp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-30T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">han.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HAN University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:Description>
+        <mdui:Description xml:lang="en">Hogeschool van Arnhem en Nijmegen</mdui:Description>
+        <mdui:Logo height="21" width="108">https://static.surfconext.nl/logos/idp/han.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">han.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">HAN University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:Description>
-          <mdui:Description xml:lang="en">Hogeschool van Arnhem en Nijmegen</mdui:Description>
-          <mdui:Logo height="21" width="108">https://static.surfconext.nl/logos/idp/han.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2bcc4b974a6b5107c3cd0f0aba1d73ef"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hogeschool van Arnhem en Nijmegen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hogeschool van Arnhem en Nijmegen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.han.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2bcc4b974a6b5107c3cd0f0aba1d73ef"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hogeschool van Arnhem en Nijmegen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hogeschool van Arnhem en Nijmegen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.han.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml
index f85fdbe1..58551910 100644
--- a/swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.hsc.edu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Hampden-Sydney College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Hampden-Sydney College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC0jCCAbqgAwIBAgIQMVbE9OvX1phCDtqNX/GNcDANBgkqhkiG9w0BAQsFADAl
 MSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBzc28uaHNjLmVkdTAeFw0xNTA2MTgx
 NjA3MzhaFw0xNjA2MTcxNjA3MzhaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAt
@@ -36,25 +36,25 @@ xeWDHu0oHrKhg0Gs/mBwEvb0KDyKx9tHKswqt1/9sd+auBg1meE8zEfIe83pMaHw
 OvoT768NOgsXeSGCu11mAjjxek36EyTV99dg2vloqXzQtliKIIomQfWOc8qcwUpY
 rAFrZ5o1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.hsc.edu/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.hsc.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.hsc.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.hsc.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Hampden-Sydney College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Hampden-Sydney College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hsc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Todd Pugh</md:GivenName>
-      <md:EmailAddress>tpugh@hsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tom Raisbeck</md:GivenName>
-      <md:EmailAddress>traisbeck@sycomtech.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.hsc.edu/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.hsc.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.hsc.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.hsc.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Hampden-Sydney College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Hampden-Sydney College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hsc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Todd Pugh</md:GivenName>
+    <md:EmailAddress>tpugh@hsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tom Raisbeck</md:GivenName>
+    <md:EmailAddress>traisbeck@sycomtech.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.idm.uni-hannover.de-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.idm.uni-hannover.de-idp-shibboleth.xml
index 26064b24..c92b25b6 100644
--- a/swamid-interfederations-2.0/sso.idm.uni-hannover.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.idm.uni-hannover.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.idm.uni-hannover.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-23T07:36:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-23T07:36:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hannover.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Leibniz-Universität Hannover</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Leibniz-Universität Hannover</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Shibboleth-IdP für den WebSSO-Dienst der Leibniz-Universität Hannover</mdui:Description>
+        <mdui:Description xml:lang="en">Shibboleth IdP of the service "WebSSO" at the Leibniz-Universität Hannover</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.uni-hannover.de/de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-hannover.de/en</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hannover.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Leibniz-Universität Hannover</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Leibniz-Universität Hannover</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Shibboleth-IdP für den WebSSO-Dienst der Leibniz-Universität Hannover</mdui:Description>
-          <mdui:Description xml:lang="en">Shibboleth IdP of the service "WebSSO" at the Leibniz-Universität Hannover</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.uni-hannover.de/de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-hannover.de/en</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
 EwJERTEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJzaXRhZXQgSGFubm92ZXIxDTAL
 BgNVBAsTBFJSWk4xITAfBgNVBAMTGENBIGRlciBMVUggKFVILUNBKSAtIEcwMzAe
 Fw0xNTA1MTIwOTI2MzRaFw0xODA4MDgwOTI2MzRaMIGRMQswCQYDVQQGEwJERTEW
@@ -55,15 +55,15 @@ dJEbLihoRVKi48YWWMM7w+Uu6Pa5Iln37CUQa0lPSOCwbJVcNCb/6GK95KTHUIlm
 Rn5xVkGx6QdQhYzK64WT6MCg38ngdPModLUjUazdfRHhraWHSbOjCuvbllvvLleZ
 IJU1fC4KKXY54mjD3AkQa56u58KyT9g=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
 EwJERTEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJzaXRhZXQgSGFubm92ZXIxDTAL
 BgNVBAsTBFJSWk4xITAfBgNVBAMTGENBIGRlciBMVUggKFVILUNBKSAtIEcwMzAe
 Fw0xNTA1MTIwOTI2MzRaFw0xODA4MDgwOTI2MzRaMIGRMQswCQYDVQQGEwJERTEW
@@ -95,29 +95,29 @@ dJEbLihoRVKi48YWWMM7w+Uu6Pa5Iln37CUQa0lPSOCwbJVcNCb/6GK95KTHUIlm
 Rn5xVkGx6QdQhYzK64WT6MCg38ngdPModLUjUazdfRHhraWHSbOjCuvbllvvLleZ
 IJU1fC4KKXY54mjD3AkQa56u58KyT9g=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.idm.uni-hannover.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.idm.uni-hannover.de/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.idm.uni-hannover.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.idm.uni-hannover.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hannover.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.idm.uni-hannover.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.idm.uni-hannover.de/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.idm.uni-hannover.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.idm.uni-hannover.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hannover.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
 EwJERTEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJzaXRhZXQgSGFubm92ZXIxDTAL
 BgNVBAsTBFJSWk4xITAfBgNVBAMTGENBIGRlciBMVUggKFVILUNBKSAtIEcwMzAe
 Fw0xNTA1MTIwOTI2MzRaFw0xODA4MDgwOTI2MzRaMIGRMQswCQYDVQQGEwJERTEW
@@ -149,15 +149,15 @@ dJEbLihoRVKi48YWWMM7w+Uu6Pa5Iln37CUQa0lPSOCwbJVcNCb/6GK95KTHUIlm
 Rn5xVkGx6QdQhYzK64WT6MCg38ngdPModLUjUazdfRHhraWHSbOjCuvbllvvLleZ
 IJU1fC4KKXY54mjD3AkQa56u58KyT9g=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.idm.uni-hannover.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.idm.uni-hannover.de,OU=LUIS,O=Leibniz Universitaet Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHGXFE2RydJTANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
 EwJERTEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJzaXRhZXQgSGFubm92ZXIxDTAL
 BgNVBAsTBFJSWk4xITAfBgNVBAMTGENBIGRlciBMVUggKFVILUNBKSAtIEcwMzAe
 Fw0xNTA1MTIwOTI2MzRaFw0xODA4MDgwOTI2MzRaMIGRMQswCQYDVQQGEwJERTEW
@@ -189,31 +189,31 @@ dJEbLihoRVKi48YWWMM7w+Uu6Pa5Iln37CUQa0lPSOCwbJVcNCb/6GK95KTHUIlm
 Rn5xVkGx6QdQhYzK64WT6MCg38ngdPModLUjUazdfRHhraWHSbOjCuvbllvvLleZ
 IJU1fC4KKXY54mjD3AkQa56u58KyT9g=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e159</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e159</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Leibniz Universität Hannover</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Leibniz Universitaet Hannover</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-hannover.de/de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-hannover.de/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sascha</md:GivenName>
-      <md:SurName>Klopp</md:SurName>
-      <md:EmailAddress>mailto:technik@idm.uni-hannover.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sascha</md:GivenName>
-      <md:SurName>Klopp</md:SurName>
-      <md:EmailAddress>mailto:support@idm.uni-hannover.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.idm.uni-hannover.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e159</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e159</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Leibniz Universität Hannover</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Leibniz Universitaet Hannover</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-hannover.de/de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-hannover.de/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sascha</md:GivenName>
+    <md:SurName>Klopp</md:SurName>
+    <md:EmailAddress>mailto:technik@idm.uni-hannover.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sascha</md:GivenName>
+    <md:SurName>Klopp</md:SurName>
+    <md:EmailAddress>mailto:support@idm.uni-hannover.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
index bc3f4c1e..0163cf5a 100644
--- a/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.institutoptique.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-28T09:58:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-28T09:58:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">institutoptique.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institut Optique Graduate School</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABc0lEQVQoz41RvS9DcRQ99/WnLa1qWh9FiRiYSCwSCbPZIGwmsZr8K0Ji7mK0WHw0JUFEDBIEHTqIkpbW63tef+9eQ5+PoDjJ3c65595zSETwNz5Yxj/YEMH71n8JmOWxZNUViEBq84bNzFmxZAJSz0G8AUzbWUntas39yVaAvHe+gIVZWGu9fXAxu7i6sXXKHlxml5jZZanYTijoZxHTcrK5+/TRZeb4aqAvsTQ/GWkO4lOQnmDn8PLs6vYml/eREQ4FRof6xkb6Yy2h7+cSM1cs5zx75zMMgyBAVbuuZkfrlxddMu37Yrn4ZFbs6vz0RHciqgA8W87+yTURAbBsxyBDNfiCfhVuCsQijcODya72lo54JOBXnoNTdfOF8s8VEHm5Cdpi4UCDUgAeHs3lVBpUi61u2Qsz472dMWLmqsuFYhl/KBCPhpTyKYE8FJ7X1vd+Idd6nJsa60lEidmtHQsQ1RHJe/UEg4i8ziG/GgAACV4BLLDekh6QMW0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTQrMDI6MDDs3ea7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjE0KzAyOjAwnYBeBwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.institutoptique.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students, Research, Teachers</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Institut Optique Graduate School</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants, Chercheurs, Enseignants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">institutoptique.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Institut Optique Graduate School</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABc0lEQVQoz41RvS9DcRQ99/WnLa1qWh9FiRiYSCwSCbPZIGwmsZr8K0Ji7mK0WHw0JUFEDBIEHTqIkpbW63tef+9eQ5+PoDjJ3c65595zSETwNz5Yxj/YEMH71n8JmOWxZNUViEBq84bNzFmxZAJSz0G8AUzbWUntas39yVaAvHe+gIVZWGu9fXAxu7i6sXXKHlxml5jZZanYTijoZxHTcrK5+/TRZeb4aqAvsTQ/GWkO4lOQnmDn8PLs6vYml/eREQ4FRof6xkb6Yy2h7+cSM1cs5zx75zMMgyBAVbuuZkfrlxddMu37Yrn4ZFbs6vz0RHciqgA8W87+yTURAbBsxyBDNfiCfhVuCsQijcODya72lo54JOBXnoNTdfOF8s8VEHm5Cdpi4UCDUgAeHs3lVBpUi61u2Qsz472dMWLmqsuFYhl/KBCPhpTyKYE8FJ7X1vd+Idd6nJsa60lEidmtHQsQ1RHJe/UEg4i8ziG/GgAACV4BLLDekh6QMW0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTQrMDI6MDDs3ea7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjE0KzAyOjAwnYBeBwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.institutoptique.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students, Research, Teachers</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Institut Optique Graduate School</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants, Chercheurs, Enseignants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIFejCCBGKgAwIBAgIRAKt1DGxPKyjT+KkLO4BnO6YwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEQxITAfBgNV
@@ -52,13 +52,13 @@ aA9g6qNL/9BruQSSjfgt4HrJUi+agJVEbXDumUNkulhD3QRJroMgZsooizhdfdpz
 r2c1GxaK4fuoO5o/aTwbFses0hEp90ifjjWFNdbgbXKbGavGvkHWEe99mSgqvI/T
 LO/bpMuPwFH27VaJTuo=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIHeTCCBmGgAwIBAgIQWjSQUhWiEPpRYjoY6ThcITANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMTAyODAwMDAwMFoXDTE2MTAyNzIzNTk1OVowRDEhMB8GA1UE
@@ -100,21 +100,21 @@ JIscj5oZrqDXjdb0meoWDILiKwy+kr11Lu4Wf3wncg+0FR3OdlhJtTXpX0YtrZZR
 kL2Het7Oq+k/IfazfLgyefA0ePXmqqtlJPG0YP+MX/t2tympn8mP0Bt2vcpuv2sy
 rfK4yIfD2vtoGN7lNMyamyMzlgmgILv8/anc8mkamyETrRiWjS1RPu74fEku
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.institutoptique.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.institutoptique.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.institutoptique.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institut Optique Graduate School</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institut Optique Graduate School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.institutoptique.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>service.info@institutoptique.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.institutoptique.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.institutoptique.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.institutoptique.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institut Optique Graduate School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institut Optique Graduate School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.institutoptique.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>service.info@institutoptique.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
index 805851b6..8e9ca615 100644
--- a/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.ird.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-05T17:22:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-05T17:22:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ird.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABy0lEQVQ4y9WTP2gUYRDFf9+3u+cll4tHVDAhoJhUQbAQhGBnJXbXRLEQtBQrS7GxExuxiIWIpBBiFxsJ2FiFgKLxIgTEyykh5CKXmNzl/u/t9yx2/dfYxMapHm+YmTfMGyOJ/YTdV/W/aOAXtrklgTEx8ftGP7i/8ebSi7KaPZGyhgiInMh4hlYk6k4MpSxhBJLo8wz1SDQjcTCwpCzA/aIk6cHbb7r5clOS5BRHudETjz5remlHkhQl/F7odHW+LKZX5efHMwCMZgNSiTY7swZO6Noxnp87Qs/F+r17RRjw+DA1wpPzR/FfVbBhknQCl+Bsn2VqOA3A8lbn5775iQGujPUz+7EOwJlDKfzAJlMN2ATXLo4CsFhus7jZ4dTh1B9n2+46ANKBwc6VGgCUqiErlXiaefyFh0u7TA6nmd/qUqqGAMytNpj51ODkoA/A3eUafv54PwDjuYDBxBU3xjK8rnS4DsyeHeKAFyu7fTrH5EiaCycyLKy3mMh4+FhDYaNFaSek2o4obLRo9cRux7Gw1qTTday3I95/bXN5Istes8fTlRrPig1ygcXceac3LQdBYpCuIG1i3HbgAQYI9ctEHhAkas3//0zfATNp25O1dnrGAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.ird.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ird.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABy0lEQVQ4y9WTP2gUYRDFf9+3u+cll4tHVDAhoJhUQbAQhGBnJXbXRLEQtBQrS7GxExuxiIWIpBBiFxsJ2FiFgKLxIgTEyykh5CKXmNzl/u/t9yx2/dfYxMapHm+YmTfMGyOJ/YTdV/W/aOAXtrklgTEx8ftGP7i/8ebSi7KaPZGyhgiInMh4hlYk6k4MpSxhBJLo8wz1SDQjcTCwpCzA/aIk6cHbb7r5clOS5BRHudETjz5remlHkhQl/F7odHW+LKZX5efHMwCMZgNSiTY7swZO6Noxnp87Qs/F+r17RRjw+DA1wpPzR/FfVbBhknQCl+Bsn2VqOA3A8lbn5775iQGujPUz+7EOwJlDKfzAJlMN2ATXLo4CsFhus7jZ4dTh1B9n2+46ANKBwc6VGgCUqiErlXiaefyFh0u7TA6nmd/qUqqGAMytNpj51ODkoA/A3eUafv54PwDjuYDBxBU3xjK8rnS4DsyeHeKAFyu7fTrH5EiaCycyLKy3mMh4+FhDYaNFaSek2o4obLRo9cRux7Gw1qTTday3I95/bXN5Istes8fTlRrPig1ygcXceac3LQdBYpCuIG1i3HbgAQYI9ctEHhAkas3//0zfATNp25O1dnrGAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.ird.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDEzCCAfugAwIBAgIUVaH89Xx207IW1cTeMZoDrJ2S8cMwDQYJKoZIhvcNAQEF
 BQAwFTETMBEGA1UEAxMKc3NvLmlyZC5mcjAeFw0xMjEyMDQwODUzMTJaFw0zMjEy
 MDQwODUzMTJaMBUxEzARBgNVBAMTCnNzby5pcmQuZnIwggEiMA0GCSqGSIb3DQEB
@@ -37,26 +37,26 @@ XmxFE6G9gZKzMxZsGStIeip2XgtC8+XSS5mO9sXG2AciRYb9A6yAbq1H6UHgCA4+
 pNLOn4jzVVeC76NhcjDI5Uqx+XbQXfZoVsft8i6RsNXGCHWst5dsepdXMoeJOfkP
 kkuzfMwgp7mBgkel9B3MiVnSCXPSNNU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ird.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ird.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ird.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRD - Institut de Recherche pour le Développement</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ird.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>calvayrac</md:SurName>
-      <md:EmailAddress>didier.calvayrac@ird.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>rouquette</md:SurName>
-      <md:EmailAddress>julien.rouquette@ird.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ird.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ird.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ird.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRD - Institut de Recherche pour le Développement</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ird.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>calvayrac</md:SurName>
+    <md:EmailAddress>didier.calvayrac@ird.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>rouquette</md:SurName>
+    <md:EmailAddress>julien.rouquette@ird.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml
index a0587e35..d75236cf 100644
--- a/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.it.utsa.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://www.utsa.edu/oit/oitConnect.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsa.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Texas at San Antonio</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Use your myUTSA ID to login to services across the UT System federation, other Universities worldwide, and 3rd party applications affiliated with UTSA.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.utsa.edu/policies/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="54" width="338" xml:lang="en">https://sso.it.utsa.edu/images/utsa-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://www.utsa.edu/oit/oitConnect.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsa.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Texas at San Antonio</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Use your myUTSA ID to login to services across the UT System federation, other Universities worldwide, and 3rd party applications affiliated with UTSA.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.utsa.edu/policies/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="54" width="338" xml:lang="en">https://sso.it.utsa.edu/images/utsa-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAM22PHlkUkZ7H2NuIyyIWIZjQU43MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTAeFw0xMjA2MTgxOTQ5MjJa
 Fw0zMjA2MTgxOTQ5MjJaMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTCCASIw
@@ -40,24 +40,24 @@ iQ5fliYThKrJqgk6ednPEtrrPilgj6Uf3xDhgEUpwz3BnaD+wspgy8Q5bMopemQP
 e8g7uW6MNZsIkFmTB9uoLKl8uR1ZltQ5yUbsAGX/quNNp90GfSQ6+yGoCgzKB7Y+
 9VJ4X+72+6wE0PfyOB3MGALob67EhNvVLTo+NdYVUd87EYCbcRgbTdAsbes=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.it.utsa.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.it.utsa.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.it.utsa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.it.utsa.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsa.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.it.utsa.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.it.utsa.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.it.utsa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.it.utsa.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsa.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAM22PHlkUkZ7H2NuIyyIWIZjQU43MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTAeFw0xMjA2MTgxOTQ5MjJa
 Fw0zMjA2MTgxOTQ5MjJaMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTCCASIw
@@ -76,27 +76,27 @@ iQ5fliYThKrJqgk6ednPEtrrPilgj6Uf3xDhgEUpwz3BnaD+wspgy8Q5bMopemQP
 e8g7uW6MNZsIkFmTB9uoLKl8uR1ZltQ5yUbsAGX/quNNp90GfSQ6+yGoCgzKB7Y+
 9VJ4X+72+6wE0PfyOB3MGALob67EhNvVLTo+NdYVUd87EYCbcRgbTdAsbes=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Texas at San Antonio</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Texas at San Antonio</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utsa.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark McCoy</md:GivenName>
-      <md:EmailAddress>mark.mccoy@utsa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Anthony Espinoza</md:GivenName>
-      <md:EmailAddress>anthony.espinoza@utsa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support - OIT Connect</md:GivenName>
-      <md:EmailAddress>oitconnect@utsa.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Texas at San Antonio</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Texas at San Antonio</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utsa.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark McCoy</md:GivenName>
+    <md:EmailAddress>mark.mccoy@utsa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anthony Espinoza</md:GivenName>
+    <md:EmailAddress>anthony.espinoza@utsa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support - OIT Connect</md:GivenName>
+    <md:EmailAddress>oitconnect@utsa.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml
index eb11443c..a22b3c2c 100644
--- a/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.kenyon.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://lbis.kenyon.edu/facilities-technology/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kenyon.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kenyon College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://lbis.kenyon.edu/facilities-technology/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kenyon.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kenyon College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAK2tE/i3d4cbJjnF+rIPl/2yeGs7MA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDnNzby5rZW55b24uZWR1MB4XDTE1MTAyMjIwMzk1MVoX
 DTM1MTAyMjIwMzk1MVowGTEXMBUGA1UEAwwOc3NvLmtlbnlvbi5lZHUwggEiMA0G
@@ -37,13 +37,13 @@ J0HQGT3NstNQjx/goFWRZMrI0mBm33FX1bmMNaSaUzJQ1yK3KjCOxYySbGDV87QE
 LkWOh5+fHd7q2DPFtok5j37RUr3hmISN7RGNQqDn7WExZxL+rw8twptbjLuRzuaf
 q+cjT7zoWgOltRQimTXSpr3o4+dhKHnttZ/r6k+m0jjfKeJzueOnwQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAKh5Jzh1FnqrN8RCEbmOwhRu1fwZMA0GCSqGSIb3DQEB
 CwUAMBkxFzAVBgNVBAMMDnNzby5rZW55b24uZWR1MB4XDTE1MTAyMjIwMzk0OVoX
 DTM1MTAyMjIwMzk0OVowGTEXMBUGA1UEAwwOc3NvLmtlbnlvbi5lZHUwggEiMA0G
@@ -62,28 +62,28 @@ efnPBJ6bU12geroCPRri6dtE57PxfaR6PLxUZQzkR4z2Nkj1injgyl/+pAQrbbre
 tAyR/K8zodgqRQTLQ8SNVIFBGGwfxfknwsQAfnPGV5f53HQGfTxtoJnn/xzkZsI+
 KIV7jeKH4X9c2EWe5OCrzq1lK8pTN5rdICjsVTE1ULAWyQsBKmjlzA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kenyon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kenyon.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kenyon.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kenyon College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kenyon College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kenyon.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jared Hoffman</md:GivenName>
-      <md:EmailAddress>hoffmanj@kenyon.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Weylin Burgett</md:GivenName>
-      <md:EmailAddress>burgettw@kenyon.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Niranjan Davray</md:GivenName>
-      <md:EmailAddress>davrayn@kenyon.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kenyon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kenyon.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kenyon.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kenyon College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kenyon College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kenyon.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jared Hoffman</md:GivenName>
+    <md:EmailAddress>hoffmanj@kenyon.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Weylin Burgett</md:GivenName>
+    <md:EmailAddress>burgettw@kenyon.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Niranjan Davray</md:GivenName>
+    <md:EmailAddress>davrayn@kenyon.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml
index 0523b549..e63859ff 100644
--- a/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.kgv.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-14T15:39:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-14T15:39:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE4TCCA8mgAwIBAgIRAOgdNtecQeRkdUUz80ab59kwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTAwMDAwMDBaFw0xNjA1MDkyMzU5NTlaMIGzMQswCQYD
@@ -41,26 +41,26 @@
 						84TLS0UyU2VwGJ9b2iXEnX2uQ4p6hN6x/WdmGwrqxGmxmbcD7WLAvo7WnmdPThB8
 						gtXXhng=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.kgv.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.kgv.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kgv.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE4TCCA8mgAwIBAgIRAOgdNtecQeRkdUUz80ab59kwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMzA1MTAwMDAwMDBaFw0xNjA1MDkyMzU5NTlaMIGzMQswCQYD
@@ -89,27 +89,27 @@
 						84TLS0UyU2VwGJ9b2iXEnX2uQ4p6hN6x/WdmGwrqxGmxmbcD7WLAvo7WnmdPThB8
 						gtXXhng=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">King George V College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">King George V College, Southport</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kgv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martyn</md:GivenName>
-      <md:SurName>Coleman</md:SurName>
-      <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martyn</md:GivenName>
-      <md:SurName>Coleman</md:SurName>
-      <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">King George V College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">King George V College, Southport</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kgv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martyn</md:GivenName>
+    <md:SurName>Coleman</md:SurName>
+    <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martyn</md:GivenName>
+    <md:SurName>Coleman</md:SurName>
+    <md:EmailAddress>mailto:mpc@kgv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.kolola.net-default-sp-.xml b/swamid-interfederations-2.0/sso.kolola.net-default-sp-.xml
index 38c301dd..dba7e420 100644
--- a/swamid-interfederations-2.0/sso.kolola.net-default-sp-.xml
+++ b/swamid-interfederations-2.0/sso.kolola.net-default-sp-.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.kolola.net/default-sp/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-04T10:42:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-04T10:42:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KOLOLA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">KOLOLA collaborative e-portfolio platform</mdui:Description>
+        <mdui:Logo height="89" width="260">https://sso.kolola.net/logo-ext.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">KOLOLA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">KOLOLA collaborative e-portfolio platform</mdui:Description>
-          <mdui:Logo height="89" width="260">https://sso.kolola.net/logo-ext.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5TCCAs2gAwIBAgIJALchZtem4xoGMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYD
 						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRQwEgYDVQQHDAtTb3V0aGFtcHRv
 						bjETMBEGA1UECgwKS09MT0xBIEx0ZDEXMBUGA1UEAwwOc3NvLmtvbG9sYS5uZXQx
@@ -39,13 +39,13 @@
 						drFk5UcJ9mN85bZspWkaNkNTk3jI/6Ix5wiClVlxgIGe+/boRTyFqx8RJcMKiVKV
 						Su6P/A7hxpUS7LZ5rDB6ifXGAGPWOeYdvT6NJefkpqCJU4NySMH2kp0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5TCCAs2gAwIBAgIJALchZtem4xoGMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYD
 						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRQwEgYDVQQHDAtTb3V0aGFtcHRv
 						bjETMBEGA1UECgwKS09MT0xBIEx0ZDEXMBUGA1UEAwwOc3NvLmtvbG9sYS5uZXQx
@@ -68,27 +68,27 @@
 						drFk5UcJ9mN85bZspWkaNkNTk3jI/6Ix5wiClVlxgIGe+/boRTyFqx8RJcMKiVKV
 						Su6P/A7hxpUS7LZ5rDB6ifXGAGPWOeYdvT6NJefkpqCJU4NySMH2kp0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kolola.net/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kolola.net/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.kolola.net/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.kolola.net/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.kolola.net/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">KOLOLA Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KOLOLA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.kolola.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>KOLOLA Support</md:GivenName>
-      <md:EmailAddress>mailto:support@kolola.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Gomer</md:SurName>
-      <md:EmailAddress>mailto:richard@kolola.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kolola.net/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kolola.net/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.kolola.net/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.kolola.net/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.kolola.net/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KOLOLA Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KOLOLA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kolola.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KOLOLA Support</md:GivenName>
+    <md:EmailAddress>mailto:support@kolola.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Gomer</md:SurName>
+    <md:EmailAddress>mailto:richard@kolola.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml
index bc6f1829..2e917004 100644
--- a/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml
@@ -1,34 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.legendonlineservices.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-12T08:07:20Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-12T08:07:20Z">
-		</mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICzTCCAbWgAwIBAgIJAJobCx55lv5EMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
 						BAMTAncxMB4XDTExMDgxMTA4NDkyNFoXDTIxMDgwODA4NDkyNFowDTELMAkGA1UE
 						AxMCdzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhMOvBTMzwJXzE
@@ -46,42 +45,42 @@
 						t3NdGb/WFfWxBSl2R2zNf9/vhRN+Senh5iasZaoZyaGSF1SZtyskYNDLshiBG/FS
 						7Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Serco Leisure Operating Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Serco Leisure Operating Limited: Legend Online Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.legendware.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@legendware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Robertson</md:SurName>
-      <md:EmailAddress>mailto:paul.robertson@legendware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Serco Leisure Operating Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Serco Leisure Operating Limited: Legend Online Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.legendware.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@legendware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Robertson</md:SurName>
+    <md:EmailAddress>mailto:paul.robertson@legendware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml
index faee1959..ab77629d 100644
--- a/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.loucoll.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-22T11:31:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-22T11:31:30Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loucoll.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loucoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQCHK+i1QORh+TANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEVMBMGA1UECBMMTG91Z2hib3JvdWdoMRUwEwYDVQQHEwxMb3VnaGJvcm91Z2gx
 						HTAbBgNVBAoTFExvdWdoYm9yb3VnaCBDb2xsZWdlMRowGAYDVQQDExFzc28ubG91
@@ -33,26 +33,26 @@
 						Wfn32Jf8HxqrKO+YSsxnnTrquO7HI1d2vaN7N07YiycbQGv7YhPb/1xbVyIH6iCH
 						yUtE78S0KocB9mjJ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.loucoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loucoll.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.loucoll.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loucoll.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaDCCAlACCQCHK+i1QORh+TANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
 						QjEVMBMGA1UECBMMTG91Z2hib3JvdWdoMRUwEwYDVQQHEwxMb3VnaGJvcm91Z2gx
 						HTAbBgNVBAoTFExvdWdoYm9yb3VnaCBDb2xsZWdlMRowGAYDVQQDExFzc28ubG91
@@ -73,27 +73,27 @@
 						Wfn32Jf8HxqrKO+YSsxnnTrquO7HI1d2vaN7N07YiycbQGv7YhPb/1xbVyIH6iCH
 						yUtE78S0KocB9mjJ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Loughborough College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Loughborough College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.loucoll.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mick</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:mick.bennett@loucoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mick</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:mick.bennett@loucoll.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Loughborough College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Loughborough College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.loucoll.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mick</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:mick.bennett@loucoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mick</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:mick.bennett@loucoll.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
index 9a8ce6fe..ef52b09b 100644
--- a/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-02-11T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-02-11T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">man.poznan.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The PSNC Identity Provider is used by PSNC staff members.</mdui:Description>
+        <mdui:Description xml:lang="pl">Centralny Punkt Logowania dla pracowników PCSS.</mdui:Description>
+        <mdui:Logo height="110" width="300" xml:lang="en">https://sso.man.poznan.pl/logo/psnc.png</mdui:Logo>
+        <mdui:Logo height="110" width="300" xml:lang="pl">https://sso.man.poznan.pl/logo/pcss.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>man.poznan.pl</mdui:DomainHint>
+        <mdui:IPHint>150.254.148.16/28</mdui:IPHint>
+        <mdui:IPHint>150.254.149.0/24</mdui:IPHint>
+        <mdui:IPHint>150.254.170.64/26</mdui:IPHint>
+        <mdui:IPHint>150.254.170.128/25</mdui:IPHint>
+        <mdui:IPHint>150.254.166.56/32</mdui:IPHint>
+        <mdui:IPHint>150.254.166.63/32</mdui:IPHint>
+        <mdui:IPHint>150.254.169.99/32</mdui:IPHint>
+        <mdui:IPHint>150.254.169.100/32</mdui:IPHint>
+        <mdui:IPHint>2001:808:0:1000::/64</mdui:IPHint>
+        <mdui:IPHint>2001:808:0:6::/64</mdui:IPHint>
+        <mdui:IPHint>2001:808:2:3003::/64</mdui:IPHint>
+        <mdui:GeolocationHint>geo:52.41180,16.91625</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.41160,16.91610</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.41400,16.89900</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.43140,16.80900</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.41140,16.91778</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.40840,16.90830</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:52.40680,16.95320</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">man.poznan.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The PSNC Identity Provider is used by PSNC staff members.</mdui:Description>
-          <mdui:Description xml:lang="pl">Centralny Punkt Logowania dla pracowników PCSS.</mdui:Description>
-          <mdui:Logo height="110" width="300" xml:lang="en">https://sso.man.poznan.pl/logo/psnc.png</mdui:Logo>
-          <mdui:Logo height="110" width="300" xml:lang="pl">https://sso.man.poznan.pl/logo/pcss.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>man.poznan.pl</mdui:DomainHint>
-          <mdui:IPHint>150.254.148.16/28</mdui:IPHint>
-          <mdui:IPHint>150.254.149.0/24</mdui:IPHint>
-          <mdui:IPHint>150.254.170.64/26</mdui:IPHint>
-          <mdui:IPHint>150.254.170.128/25</mdui:IPHint>
-          <mdui:IPHint>150.254.166.56/32</mdui:IPHint>
-          <mdui:IPHint>150.254.166.63/32</mdui:IPHint>
-          <mdui:IPHint>150.254.169.99/32</mdui:IPHint>
-          <mdui:IPHint>150.254.169.100/32</mdui:IPHint>
-          <mdui:IPHint>2001:808:0:1000::/64</mdui:IPHint>
-          <mdui:IPHint>2001:808:0:6::/64</mdui:IPHint>
-          <mdui:IPHint>2001:808:2:3003::/64</mdui:IPHint>
-          <mdui:GeolocationHint>geo:52.41180,16.91625</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.41160,16.91610</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.41400,16.89900</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.43140,16.80900</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.41140,16.91778</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.40840,16.90830</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:52.40680,16.95320</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
 NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
@@ -59,29 +59,29 @@ vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
 BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
 PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
 IxWl2w==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.man.poznan.pl/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">man.poznan.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.man.poznan.pl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">man.poznan.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
 NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
@@ -99,25 +99,25 @@ vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
 BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
 PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
 IxWl2w==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Poznan Supercomputing and Networking Center</md:OrganizationName>
-      <md:OrganizationName xml:lang="pl">Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>PSNC</md:GivenName>
-      <md:SurName>SSO Team</md:SurName>
-      <md:EmailAddress>mailto:sso@man.poznan.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Poznan Supercomputing and Networking Center</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>PSNC</md:GivenName>
+    <md:SurName>SSO Team</md:SurName>
+    <md:EmailAddress>mailto:sso@man.poznan.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml b/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml
index 7bdf6c15..00bbf51f 100644
--- a/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml
+++ b/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.mathletics.com/ukfederation">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAP4D/fTY0gATMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3dpbi1vaDJvMW1tZDM5MzAeFw0xMDA3MDIxNDQzMThaFw0yMDA2MjkxNDQz
 						MThaMBoxGDAWBgNVBAMTD3dpbi1vaDJvMW1tZDM5MzCCASIwDQYJKoZIhvcNAQEB
@@ -25,13 +25,13 @@
 						NWK1rVTqrnuIil6Sx2eifjXd8KSGi5N223oCZ4SV+Httbr+TmL2dTl+YNPn9DguP
 						LkR1mUqyrB/LlLXkJ/GZyTYpfsN+AATxyzg5Jtsn3c8rbkkPf/KfZw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAP4D/fTY0gATMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3dpbi1vaDJvMW1tZDM5MzAeFw0xMDA3MDIxNDQzMThaFw0yMDA2MjkxNDQz
 						MThaMBoxGDAWBgNVBAMTD3dpbi1vaDJvMW1tZDM5MzCCASIwDQYJKoZIhvcNAQEB
@@ -49,47 +49,47 @@
 						NWK1rVTqrnuIil6Sx2eifjXd8KSGi5N223oCZ4SV+Httbr+TmL2dTl+YNPn9DguP
 						LkR1mUqyrB/LlLXkJ/GZyTYpfsN+AATxyzg5Jtsn3c8rbkkPf/KfZw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.mathletics.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.mathletics.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">3P Learning Limited: Mathletics</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.mathletics.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.mathletics.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">3P Learning Limited: Mathletics</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				3P Learning Limited: Mathletics
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">3P Learning Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">3P Learning Limited: Mathletics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mathletics.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@3plearning.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@3plearning.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">3P Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">3P Learning Limited: Mathletics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mathletics.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@3plearning.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@3plearning.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.medicatconnect.com-shibboleth.xml b/swamid-interfederations-2.0/sso.medicatconnect.com-shibboleth.xml
index e1d6cd39..3e54a111 100644
--- a/swamid-interfederations-2.0/sso.medicatconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.medicatconnect.com-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.medicatconnect.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.medicatconnect.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Medicat</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.medicatconnect.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Medicat</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCTCCAfGgAwIBAgIJALOtPy7A4o18MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFnNzby5tZWRpY2F0Y29ubmVjdC5jb20wHhcNMTYwNTEwMTgzMDA3WhcNMjYw
 NTA4MTgzMDA3WjAhMR8wHQYDVQQDExZzc28ubWVkaWNhdGNvbm5lY3QuY29tMIIB
@@ -37,26 +37,26 @@ wZifcfIO0oEwyK8Khds91xv8kNpOF9f+RkVo1GwASEflROhSPhWGBGvlv9YsqS2Q
 QlrHWlRjG8pJhaVYWXqSAnr3gcyZ1R9sm7GSovp4ZidFS4RsT7fMtKhenHw615zF
 IF8F2HbwzhaYBR43PA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Medicat</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Medicat, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Medicat, LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://medicat.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Short</md:GivenName>
-      <md:EmailAddress>its@medicat.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.medicatconnect.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Medicat</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Medicat, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Medicat, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://medicat.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Short</md:GivenName>
+    <md:EmailAddress>its@medicat.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml
index cc18d1e3..46b81882 100644
--- a/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.memphis.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">memphis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Memphis</mdui:DisplayName>
+        <mdui:Logo height="118" width="350" xml:lang="en">https://sso.memphis.edu/idp/images/uofmlogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">memphis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The University of Memphis</mdui:DisplayName>
-          <mdui:Logo height="118" width="350" xml:lang="en">https://sso.memphis.edu/idp/images/uofmlogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIVAMRzm6r0KEI0aMxpj+07KHii/Em0MA0GCSqGSIb3DQEB
 BQUAMBoxGDAWBgNVBAMTD3Nzby5tZW1waGlzLmVkdTAeFw0xMDA1MDQxNjQzMjla
 Fw0zMDA1MDQxNjQzMjlaMBoxGDAWBgNVBAMTD3Nzby5tZW1waGlzLmVkdTCCASIw
@@ -41,23 +41,23 @@ zs2YddbosZ2kbcEmAUoIuuiBRf37fQDj7b84ri6XusWphMBuQdMG2hRFXAVKXMas
 MNVw3x0YwNgpXojdR/YaOD7FVhMSdU5dpafnBngseJgY0bWb0RFIFaa8TFwaxze4
 +UQ7IWMgsQsCScGpJnaOU2KXOQrF5zPSxsKLS07rJlGUEszyfaRblzJEwNU=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.memphis.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.memphis.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Memphis</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Memphis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.memphis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Patrick Hood</md:GivenName>
-      <md:EmailAddress>pchood@memphis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Walter Hoehn</md:GivenName>
-      <md:EmailAddress>wassa@memphis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.memphis.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.memphis.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Memphis</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Memphis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.memphis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Patrick Hood</md:GivenName>
+    <md:EmailAddress>pchood@memphis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Walter Hoehn</md:GivenName>
+    <md:EmailAddress>wassa@memphis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.nelnet.net.xml b/swamid-interfederations-2.0/sso.nelnet.net.xml
index 2e60891c..97eb89eb 100644
--- a/swamid-interfederations-2.0/sso.nelnet.net.xml
+++ b/swamid-interfederations-2.0/sso.nelnet.net.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.nelnet.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nelnet Business Solutions</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nelnet Business Solutions</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWDCCAkCgAwIBAgIGAU9vsMY4MA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNVBAYTAlVTMQswCQYD
 VQQIEwJORTEQMA4GA1UEBxMHTGluY29sbjEMMAoGA1UEChMDTkJTMQ8wDQYDVQQLEwZOZWxuZXQx
 IDAeBgNVBAMTF2dhdGVrZWVwZXIuZmFjdHNtZ3QuY29tMB4XDTE1MDgyNzE1MDUwMFoXDTMwMDgy
@@ -35,22 +35,22 @@ Md8rH2VyQc5dLAxyNFfNmKprtXXDZf2pjR8JX8lWMcSDGUZ/++jUFlKRnS3+Dt1WYomoFVdYvZWr
 Cmhe6LS64j//8rgjaSgsAZ037lKxMS9mlc38UZqnGQDl0Q6x+hzbfJc0Xoo0vS7Lj0bVoxybNIV9
 LxKK+M8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.factsmgt.com/sp/ACS.saml2" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Nelnet Business Solutions</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nelnet Business Solutions</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nelnet Business Solutions</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nelnet.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Todd Bryant</md:GivenName>
-      <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.factsmgt.com/sp/ACS.saml2" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Nelnet Business Solutions</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nelnet Business Solutions</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nelnet Business Solutions</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nelnet.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Todd Bryant</md:GivenName>
+    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
index 1c473d13..164f38bd 100644
--- a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
@@ -1,63 +1,63 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.nikhef.nl/sso/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nikhef.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Nikhef</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Nikhef</mdui:Description>
+        <mdui:Description xml:lang="en">Nikhef - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</mdui:Description>
+        <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/nikhef.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nikhef.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Nikhef</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Nikhef</mdui:Description>
-          <mdui:Description xml:lang="en">Nikhef - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</mdui:Description>
-          <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/nikhef.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9b3c7c0e251cbaa2fe441bf93e1e07bc"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nikhef - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.nikhef.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9b3c7c0e251cbaa2fe441bf93e1e07bc"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nikhef - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.nikhef.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml
index b26a5952..ea6259da 100644
--- a/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.pacificu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pacificu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Pacific University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Pacific University's Identity Provider for production environments.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.pacificu.edu/legal-disclaimers/internet-privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="118" width="175" xml:lang="en">https://sso.pacificu.edu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pacificu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Pacific University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Pacific University's Identity Provider for production environments.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.pacificu.edu/legal-disclaimers/internet-privacy-policy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="118" width="175" xml:lang="en">https://sso.pacificu.edu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUP7F3C0Cew/N7b1z2Pd6yhr7hr/UwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQc3NvLnBhY2lmaWN1LmVkdTAeFw0xMzEyMTYxNjEyNDFa
 Fw0zMzEyMTYxNjEyNDFaMBsxGTAXBgNVBAMTEHNzby5wYWNpZmljdS5lZHUwggEi
@@ -40,22 +40,22 @@ zeLppydpYB31PQomzIOcPEBrupQz4OaCwZzTdND9XBFbSGkNNZsXTzNZmOgPuIQM
 ZmC7WJamw/WUg0AV+Z0oM9i99MQhQImUvFyCMumUABHkMACV3WGfuB+RaNOtZEFB
 +eMN5ZdK6JGDq7/xNBcEhmyV/NznXH52ymuyXDLkAamIbyYSDmz8CYZui1Bty1E=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.pacificu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.pacificu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.pacificu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.pacificu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pacificu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.pacificu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.pacificu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.pacificu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.pacificu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pacificu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUP7F3C0Cew/N7b1z2Pd6yhr7hr/UwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQc3NvLnBhY2lmaWN1LmVkdTAeFw0xMzEyMTYxNjEyNDFa
 Fw0zMzEyMTYxNjEyNDFaMBsxGTAXBgNVBAMTEHNzby5wYWNpZmljdS5lZHUwggEi
@@ -74,27 +74,27 @@ zeLppydpYB31PQomzIOcPEBrupQz4OaCwZzTdND9XBFbSGkNNZsXTzNZmOgPuIQM
 ZmC7WJamw/WUg0AV+Z0oM9i99MQhQImUvFyCMumUABHkMACV3WGfuB+RaNOtZEFB
 +eMN5ZdK6JGDq7/xNBcEhmyV/NznXH52ymuyXDLkAamIbyYSDmz8CYZui1Bty1E=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.pacificu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.pacificu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pacific University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pacific University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pacificu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brandon M. Browning</md:GivenName>
-      <md:EmailAddress>browning@pacificu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ted Krupicka</md:GivenName>
-      <md:EmailAddress>tedk@pacificu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technology Information Center</md:GivenName>
-      <md:EmailAddress>help@pacificu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.pacificu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.pacificu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pacific University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pacific University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pacificu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brandon M. Browning</md:GivenName>
+    <md:EmailAddress>browning@pacificu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ted Krupicka</md:GivenName>
+    <md:EmailAddress>tedk@pacificu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technology Information Center</md:GivenName>
+    <md:EmailAddress>help@pacificu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.pdx.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.pdx.edu-idp-shibboleth.xml
index a7893014..85fcf7bc 100644
--- a/swamid-interfederations-2.0/sso.pdx.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.pdx.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.pdx.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pdx.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Portland State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Portland State Identity Provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.pdx.edu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pdx.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Portland State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Portland State Identity Provider</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.pdx.edu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUdzBvspR9IxIcNVecJ9uYqw2FxOkwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLc3NvLnBkeC5lZHUwHhcNMTUwODE5MTc1NzUyWhcNMzUw
 ODE5MTc1NzUyWjAWMRQwEgYDVQQDDAtzc28ucGR4LmVkdTCCASIwDQYJKoZIhvcN
@@ -39,31 +39,31 @@ EA/tefxebhlDaSIgbJxVU2dReIbV8rjFNWfjp6wksbSvj/isU7KuzPODe2Kxt8S8
 4Rn1ZTKf1dn6ThoNInVnrIGNHt0hC1S6ijthjE5dB4hos6ndOVUHrjtWSxA0Nd5o
 XIfa61/C4DF+ni+CfZSdcGSigYeyYVIroMpB
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.pdx.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.pdx.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Portland State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Portland State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pdx.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>PSU Unix Team</md:GivenName>
-      <md:EmailAddress>cis-unix@pdx.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>PSU IAM Team</md:GivenName>
-      <md:EmailAddress>cis-iam@pdx.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>PSU Helpdesk</md:GivenName>
-      <md:EmailAddress>help@pdx.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>PSU Security Team</md:GivenName>
-      <md:EmailAddress>sec-requests@pdx.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.pdx.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.pdx.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Portland State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Portland State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pdx.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>PSU Unix Team</md:GivenName>
+    <md:EmailAddress>cis-unix@pdx.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>PSU IAM Team</md:GivenName>
+    <md:EmailAddress>cis-iam@pdx.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>PSU Helpdesk</md:GivenName>
+    <md:EmailAddress>help@pdx.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>PSU Security Team</md:GivenName>
+    <md:EmailAddress>sec-requests@pdx.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
index fd01c1a5..698ed1e6 100644
--- a/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sso.sandburg.edu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandburg.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Carl Sandburg College</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.sandburg.edu/about-us/incommon-pop</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.sandburg.edu/about-us/incommon-pop</mdui:PrivacyStatementURL>
+        <mdui:Logo height="41" width="150" xml:lang="en">https://www.sandburg.edu/incommon/InCommonLogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandburg.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Carl Sandburg College</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.sandburg.edu/about-us/incommon-pop</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.sandburg.edu/about-us/incommon-pop</mdui:PrivacyStatementURL>
-          <mdui:Logo height="41" width="150" xml:lang="en">https://www.sandburg.edu/incommon/InCommonLogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC3DCCAcSgAwIBAgIQPt0bxkiQr5BF6L3KT/y9lTANBgkqhkiG9w0BAQsFADAq
 MSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBzc28uc2FuZGJ1cmcuZWR1MB4XDTE0
 MDYwNjIwMzcxM1oXDTE3MDYwNTIwMzcxM1owKjEoMCYGA1UEAxMfQURGUyBTaWdu
@@ -39,20 +39,20 @@ X4fEJaGeAhZjgOo/1x2hpavUnO7ypsTQOgkFbv2MDOeNhjkg0qggFlfintLAnhj8
 WO14ShXejUnH39hGHNJMTh81Pb45U4204XfQcGAt2amoD9VzMYNjyf0z/VbmsqML
 Pm/hEI8PBxwYY7bgY1iVzQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sandburg.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sandburg.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandburg.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sandburg.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sandburg.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandburg.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC3DCCAcSgAwIBAgIQPt0bxkiQr5BF6L3KT/y9lTANBgkqhkiG9w0BAQsFADAq
 MSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBzc28uc2FuZGJ1cmcuZWR1MB4XDTE0
 MDYwNjIwMzcxM1oXDTE3MDYwNTIwMzcxM1owKjEoMCYGA1UEAxMfQURGUyBTaWdu
@@ -70,26 +70,26 @@ X4fEJaGeAhZjgOo/1x2hpavUnO7ypsTQOgkFbv2MDOeNhjkg0qggFlfintLAnhj8
 WO14ShXejUnH39hGHNJMTh81Pb45U4204XfQcGAt2amoD9VzMYNjyf0z/VbmsqML
 Pm/hEI8PBxwYY7bgY1iVzQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sandburg.edu/adfs/ls/"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Carl Sandburg College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Carl Sandburg College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sandburg.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert W. Stevens</md:GivenName>
-      <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert W. Stevens</md:GivenName>
-      <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Linda Lee</md:GivenName>
-      <md:EmailAddress>llee@sandburg.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sandburg.edu/adfs/ls/"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Carl Sandburg College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carl Sandburg College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sandburg.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert W. Stevens</md:GivenName>
+    <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert W. Stevens</md:GivenName>
+    <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Linda Lee</md:GivenName>
+    <md:EmailAddress>llee@sandburg.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml b/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
index b0cfcc75..569e077e 100644
--- a/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
+++ b/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.saxion.nl/opensso">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Saxion</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Saxion University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Saxion</mdui:Description>
+        <mdui:Description xml:lang="en">Saxion University of Applied Sciences</mdui:Description>
+        <mdui:Logo height="46" width="108">https://static.surfconext.nl/logos/idp/saxion.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Saxion University of Applied Sciences</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Saxion University of Applied Sciences</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Saxion</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Saxion University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Saxion</mdui:Description>
-          <mdui:Description xml:lang="en">Saxion University of Applied Sciences</mdui:Description>
-          <mdui:Logo height="46" width="108">https://static.surfconext.nl/logos/idp/saxion.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Saxion University of Applied Sciences</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Saxion University of Applied Sciences</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2b2c18e5b3bde6129f0e388ab85541c4"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Saxion</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Saxion University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Saxion</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Saxion University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://saxion.nl</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://saxion.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2b2c18e5b3bde6129f0e388ab85541c4"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Saxion</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Saxion University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Saxion</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Saxion University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://saxion.nl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://saxion.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
index b8d8f447..fece70a6 100644
--- a/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.sbg.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2010-04-26T14:16:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2010-04-26T14:16:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbg.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Salzburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Salzburg</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbg.ac.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Salzburg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Salzburg</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
 MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
@@ -40,27 +40,27 @@ mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
 m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
 VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sbg.ac.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sbg.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbg.ac.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sbg.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sbg.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbg.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
 MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
@@ -79,27 +79,27 @@ mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
 m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
 VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Universität Salzburg</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Salzburg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Salzburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Salzburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-salzburg.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-salzburg.at/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Clemens</md:GivenName>
-      <md:SurName>Renzl</md:SurName>
-      <md:EmailAddress>mailto:clemens.renzl@sbg.ac.at</md:EmailAddress>
-      <md:TelephoneNumber>+43 662 8044 6761</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Salzburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Salzburg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Salzburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salzburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-salzburg.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-salzburg.at/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clemens</md:GivenName>
+    <md:SurName>Renzl</md:SurName>
+    <md:EmailAddress>mailto:clemens.renzl@sbg.ac.at</md:EmailAddress>
+    <md:TelephoneNumber>+43 662 8044 6761</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
index ba20a83d..e883b2cb 100644
--- a/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.siropglobal.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-27T10:55:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-01-27T10:55:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.siropglobal.org/app/about?l=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.siropglobal.org/app/terms?l=en</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.siropglobal.org/app/about?l=en</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.siropglobal.org/app/terms?l=en</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKDCCAhCgAwIBAgIJALzQmVldx2A3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTQxMDI4MDgxNzI5WhcNMTcxMDI3
 MDgxNzI5WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
@@ -42,42 +42,42 @@ I29JZYw3d817h4Jqi20lasU++TfHMYGmnN7Wv9OjIQbOHIIZBGqyL7z7cTLYybT3
 L7afxqiM5NYZ1c/id4cxXS2tptR943z6Kzfyw6pEClx/1QOWd+muOiE87QTv8ACS
 KnGGy1QRuuesWG8bve/GvCzKfjPNQDlJZv69Hchj3OmVnUVfVBhFKXjlCEQ=
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">SiROP platform (www.siropglobal.org)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">siropglobal.org</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiROP Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siropglobal.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andreas</md:GivenName>
-      <md:SurName>Brodbeck</md:SurName>
-      <md:EmailAddress>mailto:it@siropglobal.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andreas</md:GivenName>
-      <md:SurName>Brodbeck</md:SurName>
-      <md:EmailAddress>mailto:it@siropglobal.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SiROP platform (www.siropglobal.org)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">siropglobal.org</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiROP Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siropglobal.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Brodbeck</md:SurName>
+    <md:EmailAddress>mailto:it@siropglobal.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Brodbeck</md:SurName>
+    <md:EmailAddress>mailto:it@siropglobal.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sron.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/sso.sron.nl-nidp-saml2-metadata.xml
index dae26671..93d37dc5 100644
--- a/swamid-interfederations-2.0/sso.sron.nl-nidp-saml2-metadata.xml
+++ b/swamid-interfederations-2.0/sso.sron.nl-nidp-saml2-metadata.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.sron.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-04-13T11:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-04-13T11:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SRON Netherlands Institute for Space Research</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SRON Netherlands Institute for Space Research</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SRON Netherlands Institute for Space Research</mdui:Description>
+        <mdui:Description xml:lang="en">SRON Netherlands Institute for Space Research</mdui:Description>
+        <mdui:Logo height="42" width="120">https://static.surfconext.nl/logos/idp/sron.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">sron</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">sron</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">SRON Netherlands Institute for Space Research</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SRON Netherlands Institute for Space Research</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">SRON Netherlands Institute for Space Research</mdui:Description>
-          <mdui:Description xml:lang="en">SRON Netherlands Institute for Space Research</mdui:Description>
-          <mdui:Logo height="42" width="120">https://static.surfconext.nl/logos/idp/sron.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">sron</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">sron</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/71006b868fab1717d248f85576cced01"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">SRON Netherlands Institute for Space Research</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">SRON Netherlands Institute for Space Research</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">SRON Netherlands Institute for Space Research</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">SRON Netherlands Institute for Space Research</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.sron.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.sron.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/71006b868fab1717d248f85576cced01"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">SRON Netherlands Institute for Space Research</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SRON Netherlands Institute for Space Research</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">SRON Netherlands Institute for Space Research</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SRON Netherlands Institute for Space Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.sron.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.sron.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml b/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml
index 29097124..94dcb76f 100644
--- a/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml
+++ b/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sso.sunderland.ac.uk/auth/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunderland.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunderland.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIILQ5N0azZci0wDQYJKoZIhvcNAQEFBQAwQjEhMB8GA1UE
 						CgwYVW5pdmVyc2l0eSBvZiBTdW5kZXJsYW5kMR0wGwYDVQQDDBRzc28uc3VuZGVy
 						bGFuZC5hYy51azAeFw0xNDA2MTcwNzQ0NDJaFw0yNDA2MTcwNzQ0NDJaMEIxITAf
@@ -30,13 +30,13 @@
 						UF4nDkcqtwcThIfvtOrNtEG0rwb9ENXL1VNiP1cJZHqyttTQY+vC8quwhnsGeJzk
 						aQg21GPVp0vGTWHkB+0uti2fwkky/onzGlsYr8IfXu0Yw3tBwQy8kHn+                        
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIILQ5N0azZci0wDQYJKoZIhvcNAQEFBQAwQjEhMB8GA1UE
 						CgwYVW5pdmVyc2l0eSBvZiBTdW5kZXJsYW5kMR0wGwYDVQQDDBRzc28uc3VuZGVy
 						bGFuZC5hYy51azAeFw0xNDA2MTcwNzQ0NDJaFw0yNDA2MTcwNzQ0NDJaMEIxITAf
@@ -56,60 +56,60 @@
 						UF4nDkcqtwcThIfvtOrNtEG0rwb9ENXL1VNiP1cJZHqyttTQY+vC8quwhnsGeJzk
 						aQg21GPVp0vGTWHkB+0uti2fwkky/onzGlsYr8IfXu0Yw3tBwQy8kHn+                        
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sunderland.ac.uk/auth/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sunderland.ac.uk/auth/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Sunderland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sunderland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sunderland.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Lundell</md:SurName>
-      <md:EmailAddress>mailto:ian.lundell@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rachel</md:GivenName>
-      <md:SurName>Webb</md:SurName>
-      <md:EmailAddress>mailto:rachel.webb@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Laura</md:GivenName>
-      <md:SurName>Wilkinson</md:SurName>
-      <md:EmailAddress>mailto:laura.wilkinson@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Frost</md:SurName>
-      <md:EmailAddress>mailto:ian.frost@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Sweeting</md:SurName>
-      <md:EmailAddress>mailto:scott.sweeting@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dean</md:GivenName>
-      <md:SurName>Hale</md:SurName>
-      <md:EmailAddress>mailto:dean.hale@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adil</md:GivenName>
-      <md:SurName>Khan</md:SurName>
-      <md:EmailAddress>mailto:adil.khan@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel</md:GivenName>
-      <md:SurName>Dixon</md:SurName>
-      <md:EmailAddress>mailto:daniel.dixon@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Frost</md:SurName>
-      <md:EmailAddress>mailto:ian.frost@sunderland.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sunderland.ac.uk/auth/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sunderland.ac.uk/auth/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Sunderland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sunderland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sunderland.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Lundell</md:SurName>
+    <md:EmailAddress>mailto:ian.lundell@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rachel</md:GivenName>
+    <md:SurName>Webb</md:SurName>
+    <md:EmailAddress>mailto:rachel.webb@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Laura</md:GivenName>
+    <md:SurName>Wilkinson</md:SurName>
+    <md:EmailAddress>mailto:laura.wilkinson@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Frost</md:SurName>
+    <md:EmailAddress>mailto:ian.frost@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Sweeting</md:SurName>
+    <md:EmailAddress>mailto:scott.sweeting@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dean</md:GivenName>
+    <md:SurName>Hale</md:SurName>
+    <md:EmailAddress>mailto:dean.hale@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adil</md:GivenName>
+    <md:SurName>Khan</md:SurName>
+    <md:EmailAddress>mailto:adil.khan@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Dixon</md:SurName>
+    <md:EmailAddress>mailto:daniel.dixon@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Frost</md:SurName>
+    <md:EmailAddress>mailto:ian.frost@sunderland.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
index 2c957835..bc79c9c0 100644
--- a/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.surfsara.nl/saml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-14T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-14T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sara.nl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfsara.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">SURFsara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFsara</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFsara (test)</mdui:Description>
+        <mdui:Description xml:lang="en">SURFsara (test)</mdui:Description>
+        <mdui:Logo height="77" width="204">https://static.surfconext.nl/logos/idp/SURFsara.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">computing center surfsara</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">rekencentrum surfsara</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sara.nl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfsara.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">SURFsara</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">SURFsara</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">SURFsara (test)</mdui:Description>
-          <mdui:Description xml:lang="en">SURFsara (test)</mdui:Description>
-          <mdui:Logo height="77" width="204">https://static.surfconext.nl/logos/idp/SURFsara.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">computing center surfsara</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">rekencentrum surfsara</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2e25879eaa8c4047b72ef7cc3b1f5662"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">SURFsara</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">SURFsara</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">SURFsara</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">SURFsara</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">https://surfsara.nl/nl</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://surfsara.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2e25879eaa8c4047b72ef7cc3b1f5662"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">SURFsara</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SURFsara</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">SURFsara</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SURFsara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">https://surfsara.nl/nl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://surfsara.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
index 09a5c61d..865c3ec0 100644
--- a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.tugraz.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tugraz.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Technische Universität Graz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Graz University of Technology</mdui:DisplayName>
+        <mdui:Logo width="200" height="77">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
+        <mdui:Logo width="16" height="16">https://bigmail.tugraz.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tugraz.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Technische Universität Graz</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Graz University of Technology</mdui:DisplayName>
-          <mdui:Logo width="200" height="77">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
-          <mdui:Logo width="16" height="16">https://bigmail.tugraz.at/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
 MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
@@ -37,26 +37,26 @@ OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
 Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
 OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.tugraz.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.tugraz.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.tugraz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.tugraz.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tugraz.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.tugraz.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.tugraz.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.tugraz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.tugraz.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tugraz.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
 MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
@@ -75,25 +75,25 @@ OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
 Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
 OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Technische Universität Graz</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Graz University of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Technische Universität Graz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Graz University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.zid.tugraz.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.tugraz.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO</md:GivenName>
-      <md:SurName>Admins</md:SurName>
-      <md:EmailAddress>mailto:sso@tugraz.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Technische Universität Graz</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Graz University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität Graz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Graz University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.zid.tugraz.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tugraz.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:sso@tugraz.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml
index c3c14352..ad0ac1f7 100644
--- a/swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.uah.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uah.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Alabama in Huntsville</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Alabama in Huntsville</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://uah.edusupportcenter.com/sims/helpcenter/layoutSix/SelfhelpArticleView.seam?source=Selfhelp&amp;amp;parature_id=8572-8231-5478&amp;amp;inst_name=uah&amp;amp;cid=16749</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uah.edu/oit/policies/computer-use</mdui:PrivacyStatementURL>
+        <mdui:Logo height="48" width="120" xml:lang="en">https://sso.uah.edu/cas/images/UAH_4c_blue_small.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uah.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Alabama in Huntsville</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Alabama in Huntsville</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://uah.edusupportcenter.com/sims/helpcenter/layoutSix/SelfhelpArticleView.seam?source=Selfhelp&amp;amp;parature_id=8572-8231-5478&amp;amp;inst_name=uah&amp;amp;cid=16749</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uah.edu/oit/policies/computer-use</mdui:PrivacyStatementURL>
-          <mdui:Logo height="48" width="120" xml:lang="en">https://sso.uah.edu/cas/images/UAH_4c_blue_small.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAIi9i4vXOYWFrAIWOwFcSA6H38ANMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC3Nzby51YWguZWR1MB4XDTEzMDQyNTIwNTEwMloXDTMz
 MDQyNTIwNTEwMlowFjEUMBIGA1UEAxMLc3NvLnVhaC5lZHUwggEiMA0GCSqGSIb3
@@ -41,24 +41,24 @@ MLt/DOZ9iEoSSQ6OQPcrTF4wUGG7Ni4xEOT7Jm5ahUo3t4IuCaD0U8PwlLC2PS3c
 KJVYNsyf9Jo0eapWbBe5PJmeu3ZwiOVuDkk0PYn6Y2bu7XDYeyYaK0/zKD1erhoQ
 zGnfCmQ4c7IwxqAs5KghmtZqrZRjTWvX7Da3wQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uah.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uah.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uah.edu/cas/logout.jsp"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.uah.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uah.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uah.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uah.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uah.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uah.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uah.edu/cas/logout.jsp"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.uah.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uah.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uah.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uah.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAIi9i4vXOYWFrAIWOwFcSA6H38ANMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC3Nzby51YWguZWR1MB4XDTEzMDQyNTIwNTEwMloXDTMz
 MDQyNTIwNTEwMlowFjEUMBIGA1UEAxMLc3NvLnVhaC5lZHUwggEiMA0GCSqGSIb3
@@ -77,26 +77,26 @@ MLt/DOZ9iEoSSQ6OQPcrTF4wUGG7Ni4xEOT7Jm5ahUo3t4IuCaD0U8PwlLC2PS3c
 KJVYNsyf9Jo0eapWbBe5PJmeu3ZwiOVuDkk0PYn6Y2bu7XDYeyYaK0/zKD1erhoQ
 zGnfCmQ4c7IwxqAs5KghmtZqrZRjTWvX7Da3wQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uah.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Alabama in Huntsville</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Alabama in Huntsville</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uah.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>William Eubank</md:GivenName>
-      <md:EmailAddress>william.eubank@uah.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jill Casey</md:GivenName>
-      <md:EmailAddress>jill.casey@uah.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>CISO</md:GivenName>
-      <md:EmailAddress>ciso@uah.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uah.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Alabama in Huntsville</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Alabama in Huntsville</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uah.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>William Eubank</md:GivenName>
+    <md:EmailAddress>william.eubank@uah.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jill Casey</md:GivenName>
+    <md:EmailAddress>jill.casey@uah.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>CISO</md:GivenName>
+    <md:EmailAddress>ciso@uah.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml
index 5f23a648..b727a237 100644
--- a/swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.ucd.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-30T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-30T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.heanet.ie/services/identity-access/edugate#join</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucd.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University College Dublin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ga">An Coláiste Ollscoile, Baile Átha Cliath</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ucd.ie/itservices/itsupport</mdui:InformationURL>
+        <mdui:Logo height="104" width="147">https://edugate.heanet.ie/rr3/logos/ucd.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.306364866424765,-6.222467422485352</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.29502908341082,-6.182220992006933</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucd.ie</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University College Dublin</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ga">An Coláiste Ollscoile, Baile Átha Cliath</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ucd.ie/itservices/itsupport</mdui:InformationURL>
-          <mdui:Logo height="104" width="147">https://edugate.heanet.ie/rr3/logos/ucd.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:53.306364866424765,-6.222467422485352</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:53.29502908341082,-6.182220992006933</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC+DCCAeACCQD+AjICuJh2gzANBgkqhkiG9w0BAQsFADA+MQswCQYDVQQGEwJJ
 RTEQMA4GA1UECAwHSXJlbGFuZDEPMA0GA1UEBwwGRHVibGluMQwwCgYDVQQKDANV
 Q0QwHhcNMTYwMjE1MTExMjE3WhcNMjYwMjEyMTExMjE3WjA+MQswCQYDVQQGEwJJ
@@ -46,38 +46,38 @@ TNXg6MfYFVyDcyGOR9p9biTLUd0q2/eVgSCmGf0F1PBNvjYj4qKCM4U5iMbIHxP4
 dZLQjBeaUZu/K6BgFtApplISVVRdF53Cw2Z0Sf5UoG0IzQg6bCVzOH1Oz2j0PKMT
 Nu9boPs/fyjVT6B3qX0Od2Nk+/FEk2dWrZXlsMarvhoNxzFb5NNpVKsgKzY=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ucd.ie/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ucd.ie/idp/profile/SAML2/POST/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ucd.ie/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ucd.ie/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.ucd.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ucd.ie/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University College Dublin</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College Dublin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucd.ie/itservices/itsupport</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UCD</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:ucdssoalert@ucd.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UCD</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:ucdssoalert@ucd.ie</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Coughlan</md:SurName>
-      <md:EmailAddress>mailto:david.coughlan@ucd.ie</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ucd.ie/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ucd.ie/idp/profile/SAML2/POST/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ucd.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ucd.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.ucd.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ucd.ie/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University College Dublin</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College Dublin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucd.ie/itservices/itsupport</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UCD</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:ucdssoalert@ucd.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UCD</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:ucdssoalert@ucd.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Coughlan</md:SurName>
+    <md:EmailAddress>mailto:david.coughlan@ucd.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml
index eef31633..5cc54e4f 100644
--- a/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.umk.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-03-12T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-03-12T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">doktorant.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fizyka.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">law.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chem.umk.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University in Torun</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Nicolaus Copernicus University Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:Description>
+        <mdui:Logo height="148" width="320" xml:lang="pl">https://sso.umk.pl/idp/images/logo-umk.png</mdui:Logo>
+        <mdui:Logo height="148" width="320" xml:lang="en">https://sso.umk.pl/idp/images/logo-umk-en.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.75.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>uni.torun.pl</mdui:DomainHint>
+        <mdui:DomainHint>umk.pl</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.1234804,18.0084378</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">doktorant.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fizyka.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">law.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chem.umk.pl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University in Torun</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Nicolaus Copernicus University Identity Provider</mdui:Description>
-          <mdui:Description xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:Description>
-          <mdui:Logo height="148" width="320" xml:lang="pl">https://sso.umk.pl/idp/images/logo-umk.png</mdui:Logo>
-          <mdui:Logo height="148" width="320" xml:lang="en">https://sso.umk.pl/idp/images/logo-umk-en.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>158.75.0.0/16</mdui:IPHint>
-          <mdui:DomainHint>uni.torun.pl</mdui:DomainHint>
-          <mdui:DomainHint>umk.pl</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:53.1234804,18.0084378</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAPR3G60XyyVMaO42PwDaBIGiNSg5MA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCnNzby51bWsucGwwHhcNMTUwMzExMDc0NjQwWhcNMzUw
 MzExMDc0NjQwWjAVMRMwEQYDVQQDDApzc28udW1rLnBsMIIBIjANBgkqhkiG9w0B
@@ -58,13 +58,13 @@ d9x+Jpzyp/5Bk0n0jRUkjNvDgS6wj4JP2ozrFxK47OYKiEzUOZCC2yXeDf/Ig2cK
 I7GPEGabHbXwpIbRZHH2yOI4MYgOTftE4Uj53xuNvJ33Fe5zlXDg2hwxiX7amo5h
 qL72eT24RW2Lv9WyljSYKwyKJkEzwucO
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUWIZMrGT9/FIBX0hdLCptqQJ1RiswDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
 MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
@@ -83,13 +83,13 @@ Au7I/pBdX7RsgM/LoOen/aw6Uj+LPoWy6RwL563KH7NhJF+KeB00yQIxVN0k+f3D
 TAbD2blb/PZi/TcO/MHmmPJMutH4X5Inc1kqhjR5w3aPaBNjYjsA6alHizFxtmV1
 TNQf6/ZTV5LWHf9ohPRNsqTx690Na8c=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUdaR0NptdV+hiD4OR814FPAcQA04wDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
 MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
@@ -108,35 +108,35 @@ yBy/DCDjRpHD8Bb6k7s2VfpXLwf7QqqJjNDBPxIG1CxH/l+8FG1ChIFPt26YSqHx
 48/XpTdlAhk7g/zGBonRl6fVH+KNxAED6Jxv5oSyYKn6/pYYeUm303r0NOERzY4g
 5aEMEFYvVdebuDfvZkViQQnpWhUUBlw=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umk.pl/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umk.pl/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.umk.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umk.pl/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.umk.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umk.pl/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">doktorant.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fizyka.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">law.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.umk.pl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chem.umk.pl</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umk.pl/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umk.pl/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.umk.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umk.pl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.umk.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umk.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">doktorant.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fizyka.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">law.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.umk.pl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chem.umk.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAPR3G60XyyVMaO42PwDaBIGiNSg5MA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCnNzby51bWsucGwwHhcNMTUwMzExMDc0NjQwWhcNMzUw
 MzExMDc0NjQwWjAVMRMwEQYDVQQDDApzc28udW1rLnBsMIIBIjANBgkqhkiG9w0B
@@ -155,13 +155,13 @@ d9x+Jpzyp/5Bk0n0jRUkjNvDgS6wj4JP2ozrFxK47OYKiEzUOZCC2yXeDf/Ig2cK
 I7GPEGabHbXwpIbRZHH2yOI4MYgOTftE4Uj53xuNvJ33Fe5zlXDg2hwxiX7amo5h
 qL72eT24RW2Lv9WyljSYKwyKJkEzwucO
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUWIZMrGT9/FIBX0hdLCptqQJ1RiswDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
 MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
@@ -180,13 +180,13 @@ Au7I/pBdX7RsgM/LoOen/aw6Uj+LPoWy6RwL563KH7NhJF+KeB00yQIxVN0k+f3D
 TAbD2blb/PZi/TcO/MHmmPJMutH4X5Inc1kqhjR5w3aPaBNjYjsA6alHizFxtmV1
 TNQf6/ZTV5LWHf9ohPRNsqTx690Na8c=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEzCCAfugAwIBAgIUdaR0NptdV+hiD4OR814FPAcQA04wDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
 MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
@@ -205,21 +205,21 @@ yBy/DCDjRpHD8Bb6k7s2VfpXLwf7QqqJjNDBPxIG1CxH/l+8FG1ChIFPt26YSqHx
 48/XpTdlAhk7g/zGBonRl6fVH+KNxAED6Jxv5oSyYKn6/pYYeUm303r0NOERzY4g
 5aEMEFYvVdebuDfvZkViQQnpWhUUBlw=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationName>
-      <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NCU IdP</md:GivenName>
-      <md:SurName>Team</md:SurName>
-      <md:EmailAddress>mailto:admin@umk.pl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NCU IdP</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>mailto:admin@umk.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml
index 00d50099..e975d8de 100644
--- a/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.umuc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umuc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Of Maryland University College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umuc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Of Maryland University College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUaSvdAzFQk6GsFqHActLJhebXr8swDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MB4XDTExMTExNTIwMDMwMFoXDTMx
 MTExNTIwMDMwMFowFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MIIBIjANBgkqhkiG
@@ -37,23 +37,23 @@ MXTcEOw2c0JU6Szl0RWSfQXUXml/pRRNnrEaXOJ0/0csWPvAweg9P8fZ82Qij8Fn
 7y02/wW5+M3h7IvaIZq3KsTwLWfY1WNlk/C4zh5hb8miEt8Le7YJwP/1S8NpsSUg
 n5i8VuQd1o2O7rPL9ogFsvto7gjmgl7z0XQ7g2zlbA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.umuc.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umuc.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.umuc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umuc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umuc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umuc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.umuc.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umuc.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.umuc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umuc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umuc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umuc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUaSvdAzFQk6GsFqHActLJhebXr8swDQYJKoZIhvcNAQEF
 BQAwFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MB4XDTExMTExNTIwMDMwMFoXDTMx
 MTExNTIwMDMwMFowFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MIIBIjANBgkqhkiG
@@ -72,26 +72,26 @@ MXTcEOw2c0JU6Szl0RWSfQXUXml/pRRNnrEaXOJ0/0csWPvAweg9P8fZ82Qij8Fn
 7y02/wW5+M3h7IvaIZq3KsTwLWfY1WNlk/C4zh5hb8miEt8Le7YJwP/1S8NpsSUg
 n5i8VuQd1o2O7rPL9ogFsvto7gjmgl7z0XQ7g2zlbA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.umuc.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University Of Maryland University College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University Of Maryland University College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umuc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter Friedman</md:GivenName>
-      <md:EmailAddress>Peter.Friedman@umuc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul Randall</md:GivenName>
-      <md:EmailAddress>Paul.Randall@umuc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Server Operations Group</md:GivenName>
-      <md:EmailAddress>SOP@umuc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.umuc.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University Of Maryland University College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University Of Maryland University College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umuc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter Friedman</md:GivenName>
+    <md:EmailAddress>Peter.Friedman@umuc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul Randall</md:GivenName>
+    <md:EmailAddress>Paul.Randall@umuc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Server Operations Group</md:GivenName>
+    <md:EmailAddress>SOP@umuc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml
index c3991062..1caef132 100644
--- a/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.unt.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sso.unt.edu/error/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untsystem.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unt.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unthsc.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untsystem.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untdallas.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of North Texas System</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for UNT (Denton), UNT Health Science Center, UNT Dallas, and UNT System.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sso.unt.edu/error/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untsystem.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unt.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unthsc.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untsystem.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untdallas.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of North Texas System</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for UNT (Denton), UNT Health Science Center, UNT Dallas, and UNT System.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPTkPnFeEQriNu0kKxDjCOeiKxITMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC3Nzby51bnQuZWR1MB4XDTEwMTAwMTE4MjgzMloXDTMw
 MTAwMTE4MjgzMlowFjEUMBIGA1UEAxMLc3NvLnVudC5lZHUwggEiMA0GCSqGSIb3
@@ -42,27 +42,27 @@ KCGYmKWOmg5ZT/a8aJZ5FEryy5Z9cOdrgK8KaYXpB7nvXvonGmCbakmE2a6okszF
 zZ1Ow0IRVl+nB1IHBZ20Tfo9JcrHSbHDT1/BLhGZ1Cb+6lTfgHH+lKDQkjmIPJ+x
 h+1Xx63dQAtHY7dZh0dxtwfqKg2YtR6sldg3Qg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.unt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.unt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of North Texas System</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of North Texas System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://untsystem.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UNT System Directory Services Team</md:GivenName>
-      <md:EmailAddress>shibboleth@untsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Yancey Yeargan</md:GivenName>
-      <md:EmailAddress>shibboleth@untsystem.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UNT Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@unt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.unt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.unt.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of North Texas System</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of North Texas System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://untsystem.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UNT System Directory Services Team</md:GivenName>
+    <md:EmailAddress>shibboleth@untsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Yancey Yeargan</md:GivenName>
+    <md:EmailAddress>shibboleth@untsystem.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UNT Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@unt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index 01023e59..97724e30 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.utu.fi/sso-idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIHPjCCBiagAwIBAgIQCIdeZB1qcIkU4tTDCYnlyjANBgkqhkiG9w0BAQsFADB1
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHPjCCBiagAwIBAgIQCIdeZB1qcIkU4tTDCYnlyjANBgkqhkiG9w0BAQsFADB1
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMTQwMgYDVQQDEytEaWdpQ2VydCBTSEEyIEV4dGVuZGVk
 IFZhbGlkYXRpb24gU2VydmVyIENBMB4XDTE1MDYwMjAwMDAwMFoXDTE3MDgzMDEy
@@ -61,37 +61,37 @@ b9UtpmzrTKwj8L/rSk1FyxpkY+FYdmI30LEk4I5D6qvFbP6PouCM4bdCU7Wzupv9
 yfh+syJZH6UmmHPrvElMtz1uXasR2UN+Vcj70T8siI8SG8MxTW3fTMw3s6EgF8nZ
 JlBClCkL32lcBnmiy96Y0afwQX28fKm0BxO8n86KkRcofaJEI3dC+/SMKnIIqzPf
 svl3XMWQ/VvQVSDEFjiZHOWDKJSxYtqL2mvzXRfEdY74Pw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tuomas</md:GivenName>
-      <md:SurName>Honkala</md:SurName>
-      <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Petri</md:GivenName>
-      <md:SurName>Teraspuro</md:SurName>
-      <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Elina</md:GivenName>
-      <md:SurName>Toivanen</md:SurName>
-      <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tuomas</md:GivenName>
+    <md:SurName>Honkala</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petri</md:GivenName>
+    <md:SurName>Teraspuro</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elina</md:GivenName>
+    <md:SurName>Toivanen</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
index 50fa0663..18970bec 100644
--- a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.vgtu.lt/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2013-10-15T07:19:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2013-10-15T07:19:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/informacija/tvarka</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgtu.lt</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vilnius Gediminas Technical University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</mdui:DisplayName>
+        <mdui:Description xml:lang="lt">VGTU vieningas prisijungimas</mdui:Description>
+        <mdui:Description xml:lang="en">VGTU SSO</mdui:Description>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:54.722310,25.335782</mdui:GeolocationHint>
+        <mdui:DomainHint>vgtu.lt</mdui:DomainHint>
+        <mdui:IPHint>158.129.192.0/19</mdui:IPHint>
+        <mdui:IPHint>158.129.224.0/20</mdui:IPHint>
+        <mdui:IPHint>2001:778:6204::/48</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgtu.lt</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Vilnius Gediminas Technical University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</mdui:DisplayName>
-          <mdui:Description xml:lang="lt">VGTU vieningas prisijungimas</mdui:Description>
-          <mdui:Description xml:lang="en">VGTU SSO</mdui:Description>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:54.722310,25.335782</mdui:GeolocationHint>
-          <mdui:DomainHint>vgtu.lt</mdui:DomainHint>
-          <mdui:IPHint>158.129.192.0/19</mdui:IPHint>
-          <mdui:IPHint>158.129.224.0/20</mdui:IPHint>
-          <mdui:IPHint>2001:778:6204::/48</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYD
 VQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsG
 A1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0w
@@ -49,13 +49,13 @@ ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3Tg
 jL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8
 RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYD
 VQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsG
 A1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0w
@@ -78,23 +78,23 @@ ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3Tg
 jL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8
 RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="lt">http://www.vgtu.lt</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.vgtu.lt/index.php?lang=2</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pylyp</md:GivenName>
-      <md:SurName>Savin</md:SurName>
-      <md:EmailAddress>mailto:sso@vgtu.lt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="lt">http://www.vgtu.lt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vgtu.lt/index.php?lang=2</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pylyp</md:GivenName>
+    <md:SurName>Savin</md:SurName>
+    <md:EmailAddress>mailto:sso@vgtu.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.vito.be.xml b/swamid-interfederations-2.0/sso.vito.be.xml
index 7f47bdc5..f7cf74d2 100644
--- a/swamid-interfederations-2.0/sso.vito.be.xml
+++ b/swamid-interfederations-2.0/sso.vito.be.xml
@@ -1,46 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.vito.be">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">VITO</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">VITO</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vlaamse Instelling voor Technologisch Onderzoek</mdui:Description>
+        <mdui:Logo height="16" width="16">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_smaller.jpg</mdui:Logo>
+        <mdui:Logo height="75" width="153">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_larger.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.190.188.0/22</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:0a50:8000::0/49</mdui:IPHint>
+        <mdui:DomainHint>vito.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.218543,5.090905</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">VITO</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">VITO</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Vlaamse Instelling voor Technologisch Onderzoek</mdui:Description>
-          <mdui:Logo height="16" width="16">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_smaller.jpg</mdui:Logo>
-          <mdui:Logo height="75" width="153">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_larger.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:IPHint>193.190.188.0/22</mdui:IPHint>
-          <mdui:IPHint>2001:06a8:0a50:8000::0/49</mdui:IPHint>
-          <mdui:DomainHint>vito.be</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:51.218543,5.090905</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3TCCAsWgAwIBAgIJALl3yBmvtc6zMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdBbnR3ZXJwMQwwCgYDVQQHEwNNb2wxDTALBgNVBAoTBFZpdG8xFDASBgNVBAMTC3Nzby52aXRvLmJlMB4XDTE1MDkxNTA3MzgyMloXDTQzMDEzMTA3MzgyMlowUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhiX+4KHkneW8gdSKV+2piklMrolgprQ7anUqP8znpOznPaBH9060ECJQUw4k+PQ1O92NUEODgQe35/K2DuA6vuiMFlmwce87O5kq1ri6VHeIjTF5jxtLZ9o6EHXFR0W1WuC5AWTsVg3sjdVVQc0EoWXOCn0cwwR24Ni6B7G9PT3VIFI/UuNxD5nAR564H2yCOSbEVdasN9xvjO5wSzIgmuxLQT4IDy4Ez3L5RDK7OZTAjVwHwKCkLe0Ndx89BY/WzTrZCa/dMDIbGeee1bDeQ5fjqXqUssZwrXqNJkL27KYOJZv+UWEmEyhzaSGpyGiPZHlN0liHarpR3Hb0MSYcDAgMBAAGjgbUwgbIwHQYDVR0OBBYEFDzHYTGcKe8VZxOVMTvIK5UMRMtDMIGCBgNVHSMEezB5gBQ8x2ExnCnvFWcTlTE7yCuVDETLQ6FWpFQwUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmWCCQC5d8gZr7XOszAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABXKgnPs452tJLsfw4kzCF2lO0ZsUfInFoU+o9EK+JO1i6Hzn1euFb5LzCWSDBtwJuqRVpOkyAmjZ3CQrR4DY/Zlbffki701nAoSSS1S56aggOYF6DvqYfoxuyiF6I89NvjC1LP+RX1IoIsljRr6aeKu1Jfp+vT2yr3PnhAP0Cn+3sGIbaOyF9Y9ZLXo4BTQmpQhsnBwrXy5zJ6oeVZI1xsNNbdMacNIcCffsyYhJGLB7/M7YuUtZR0qZmeyjdR8Clxd7uLx0k9qOs6SYIGWRWeBuhXShDvAx4JNNQc9kkhOEOJyK0v4PpF6m19d/aVSuQCeJsaK553npGMhYSj64q</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso">
-		</md:SingleSignOnService>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso">
-		</md:SingleSignOnService>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Vito</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Vito</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vito.be/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>SAML IdP Support</md:SurName>
-      <md:EmailAddress>mailto:snb@vito.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3TCCAsWgAwIBAgIJALl3yBmvtc6zMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdBbnR3ZXJwMQwwCgYDVQQHEwNNb2wxDTALBgNVBAoTBFZpdG8xFDASBgNVBAMTC3Nzby52aXRvLmJlMB4XDTE1MDkxNTA3MzgyMloXDTQzMDEzMTA3MzgyMlowUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhiX+4KHkneW8gdSKV+2piklMrolgprQ7anUqP8znpOznPaBH9060ECJQUw4k+PQ1O92NUEODgQe35/K2DuA6vuiMFlmwce87O5kq1ri6VHeIjTF5jxtLZ9o6EHXFR0W1WuC5AWTsVg3sjdVVQc0EoWXOCn0cwwR24Ni6B7G9PT3VIFI/UuNxD5nAR564H2yCOSbEVdasN9xvjO5wSzIgmuxLQT4IDy4Ez3L5RDK7OZTAjVwHwKCkLe0Ndx89BY/WzTrZCa/dMDIbGeee1bDeQ5fjqXqUssZwrXqNJkL27KYOJZv+UWEmEyhzaSGpyGiPZHlN0liHarpR3Hb0MSYcDAgMBAAGjgbUwgbIwHQYDVR0OBBYEFDzHYTGcKe8VZxOVMTvIK5UMRMtDMIGCBgNVHSMEezB5gBQ8x2ExnCnvFWcTlTE7yCuVDETLQ6FWpFQwUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmWCCQC5d8gZr7XOszAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABXKgnPs452tJLsfw4kzCF2lO0ZsUfInFoU+o9EK+JO1i6Hzn1euFb5LzCWSDBtwJuqRVpOkyAmjZ3CQrR4DY/Zlbffki701nAoSSS1S56aggOYF6DvqYfoxuyiF6I89NvjC1LP+RX1IoIsljRr6aeKu1Jfp+vT2yr3PnhAP0Cn+3sGIbaOyF9Y9ZLXo4BTQmpQhsnBwrXy5zJ6oeVZI1xsNNbdMacNIcCffsyYhJGLB7/M7YuUtZR0qZmeyjdR8Clxd7uLx0k9qOs6SYIGWRWeBuhXShDvAx4JNNQc9kkhOEOJyK0v4PpF6m19d/aVSuQCeJsaK553npGMhYSj64q</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vito</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vito</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vito.be/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>SAML IdP Support</md:SurName>
+    <md:EmailAddress>mailto:snb@vito.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssoa.bl.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ssoa.bl.uk-idp-shibboleth.xml
index 29a40ace..e9fa8d78 100644
--- a/swamid-interfederations-2.0/ssoa.bl.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ssoa.bl.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssoa.bl.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T10:59:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T10:59:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">British Library</mdui:DisplayName>
+        <mdui:Logo height="100" width="52">https://www.bl.uk/britishlibrary/resources/global/images/bl_logo_100.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.bl.uk/britishlibrary/resources/global/images/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">British Library</mdui:DisplayName>
-          <mdui:Logo height="100" width="52">https://www.bl.uk/britishlibrary/resources/global/images/bl_logo_100.gif</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://www.bl.uk/britishlibrary/resources/global/images/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEqzCCA5OgAwIBAgIRAKbzyiWmB9ZYla77tsXwrh8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMDExMDkwMDAwMDBaFw0xMzExMDgyMzU5NTlaMIGLMQswCQYD
@@ -44,13 +44,13 @@
 						mkrUBytQQkH0ArbduBcUdD19CHy1IOVVOWb9rKAQBgNlhsDxgH8fd4EQ4web5y5u
 						xCVniBRw93GpO8Zk69qYRW/tSMymIHmbENElRYe9Eo/CwW1N00QmBRqdpQPgjZo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAigCCQDYEyKkNeyBzDANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHDAaBgNVBAoTE1Ro
 						ZSBCcml0aXNoIExpYnJhcnkxEzARBgNVBAMTCnNzb2EuYmwudWswHhcNMTYwNDE0
@@ -70,29 +70,29 @@
 						HDFiDzlSul4/9maA5yjNROCXMTWl9DBrw37IHLG1vO8KWeKBjaaE70YoWIh7KU45
 						oAlVnUEwLutU6sbbkH6PgM1D6Yw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ssoa.bl.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssoa.bl.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssoa.bl.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssoa.bl.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssoa.bl.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ssoa.bl.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssoa.bl.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssoa.bl.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssoa.bl.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ssoa.bl.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssoa.bl.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssoa.bl.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssoa.bl.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssoa.bl.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ssoa.bl.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssoa.bl.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssoa.bl.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssoa.bl.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bl.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEqzCCA5OgAwIBAgIRAKbzyiWmB9ZYla77tsXwrh8wDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xMDExMDkwMDAwMDBaFw0xMzExMDgyMzU5NTlaMIGLMQswCQYD
@@ -119,13 +119,13 @@
 						mkrUBytQQkH0ArbduBcUdD19CHy1IOVVOWb9rKAQBgNlhsDxgH8fd4EQ4web5y5u
 						xCVniBRw93GpO8Zk69qYRW/tSMymIHmbENElRYe9Eo/CwW1N00QmBRqdpQPgjZo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAigCCQDYEyKkNeyBzDANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHDAaBgNVBAoTE1Ro
 						ZSBCcml0aXNoIExpYnJhcnkxEzARBgNVBAMTCnNzb2EuYmwudWswHhcNMTYwNDE0
@@ -145,27 +145,27 @@
 						HDFiDzlSul4/9maA5yjNROCXMTWl9DBrw37IHLG1vO8KWeKBjaaE70YoWIh7KU45
 						oAlVnUEwLutU6sbbkH6PgM1D6Yw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ssoa.bl.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssoa.bl.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The British Library</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bl.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Janice</md:GivenName>
-      <md:SurName>Mulholand</md:SurName>
-      <md:EmailAddress>mailto:janice.mulholland@bl.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Guy</md:GivenName>
-      <md:SurName>Wicks</md:SurName>
-      <md:EmailAddress>mailto:Guy.Wicks@bl.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ssoa.bl.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssoa.bl.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The British Library</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bl.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Janice</md:GivenName>
+    <md:SurName>Mulholand</md:SurName>
+    <md:EmailAddress>mailto:janice.mulholland@bl.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Guy</md:GivenName>
+    <md:SurName>Wicks</md:SurName>
+    <md:EmailAddress>mailto:Guy.Wicks@bl.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml
index a329e452..5ade429f 100644
--- a/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Qualtrics Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Qualtrics Surveys Test instance</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://ssotesteu.eu.qualtrics.com/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Qualtrics Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Qualtrics Surveys Test instance</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://ssotesteu.eu.qualtrics.com/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFbDCCA1QCCQC8OqKPlGUkRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJV
 UzENMAsGA1UECBMEVXRhaDEOMAwGA1UEBxMFUHJvdm8xGDAWBgNVBAoTD1F1YWx0
 cmljcywgSW5jLjEgMB4GCSqGSIb3DQEJARYRZGJhQHF1YWx0cmljcy5jb20wHhcN
@@ -45,13 +45,13 @@ GpRsLwFSwma0/Vtlfxr/KtaKsk2zlOOJ6RF33MUyZvw8N+tybY0yHJ40aBZKFr9r
 r3j//DUU8zi4qvNP5z19kS08sZ7mtNK2sKBPWVSYB2HDtyrBSRupHBYeIxlfGKd6
 uVUusHTyyVjDKbuMHCw+DEp0VXmCIAv5Jf+SKZ7DOkw8cxcdL67gEc9NjAmsfmKy
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFbDCCA1QCCQC8OqKPlGUkRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJV
 UzENMAsGA1UECBMEVXRhaDEOMAwGA1UEBxMFUHJvdm8xGDAWBgNVBAoTD1F1YWx0
 cmljcywgSW5jLjEgMB4GCSqGSIb3DQEJARYRZGJhQHF1YWx0cmljcy5jb20wHhcN
@@ -82,38 +82,38 @@ GpRsLwFSwma0/Vtlfxr/KtaKsk2zlOOJ6RF33MUyZvw8N+tybY0yHJ40aBZKFr9r
 r3j//DUU8zi4qvNP5z19kS08sZ7mtNK2sKBPWVSYB2HDtyrBSRupHBYeIxlfGKd6
 uVUusHTyyVjDKbuMHCw+DEp0VXmCIAv5Jf+SKZ7DOkw8cxcdL67gEc9NjAmsfmKy
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Qualtrics Test SP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Qualtrics Surveys Test instance</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Qualtrics LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Qualtrics</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qualtrics.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Administrator</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth@qualtrics.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Qualtrics Test SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Qualtrics Surveys Test instance</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Qualtrics LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Qualtrics</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qualtrics.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth@qualtrics.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssp-dev.data.alpha.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ssp-dev.data.alpha.jisc.ac.uk-shibboleth.xml
index 8cc1957e..105182ed 100644
--- a/swamid-interfederations-2.0/ssp-dev.data.alpha.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ssp-dev.data.alpha.jisc.ac.uk-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssp-dev.data.alpha.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-17T11:17:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-17T11:17:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Student Success Planner (Development)</mdui:DisplayName>
+        <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Access to the Development version of the Jisc Student Success Planner</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Student Success Planner (Development)</mdui:DisplayName>
-          <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Access to the Development version of the Jisc Student Success Planner</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHjCCAgagAwIBAgIJAKYa1eymRKyTMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHXNzcC1kZXYuZGF0YS5hbHBoYS5qaXNjLmFjLnVrMB4XDTE2MDIxMDA5MjAx
 						MFoXDTI2MDIwNzA5MjAxMFowKDEmMCQGA1UEAxMdc3NwLWRldi5kYXRhLmFscGhh
@@ -52,52 +52,52 @@
 						Pi5X8ZdGWC5t1XlUScpXMcxvNEJAD4OJ5EI+OrjpWKkNc3vIae10xBnf/a3Kzngi
 						kJ7iQp3l8CU7AsqKSHqBcJJh+paZb1hULlB7rEzo8YOZww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Jisc Student Success Planner (Development)</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc Student Success Planner (Development)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.jisc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Baylis</md:SurName>
-      <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Baylis</md:SurName>
-      <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssp-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Jisc Student Success Planner (Development)</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc Student Success Planner (Development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Baylis</md:SurName>
+    <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Baylis</md:SurName>
+    <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml
index 2a27bd20..ccc85b45 100644
--- a/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssp.kennedy.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-19T12:23:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-19T12:23:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIJAKA5lz2cCSdXMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNzcC5rZW5uZWR5Lm94LmFjLnVrMB4XDTE2MDExNDE0MzQwMFoXDTI2MDEx
 						MTE0MzQwMFowHzEdMBsGA1UEAxMUc3NwLmtlbm5lZHkub3guYWMudWswggEiMA0G
@@ -47,42 +47,42 @@
 						t7lCrX6c6vFUpYm+MG953JCIFO4jR+qRTRbGH8vep7i7EZWfIVCwO+Z6QvCr3lQc
 						YS69W08VipSY/2dpHXFVFzTTP9FTSehQU7oPKjHzgKWZsq8iVBIq5Z/FjS+FNr3R
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford, Kennedy Institute of Rheumatology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kennedy.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kennedy Institute IT</md:GivenName>
-      <md:EmailAddress>mailto:kirit@kennedy.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>Marsden</md:SurName>
-      <md:EmailAddress>mailto:brian.marsden@kennedy.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, Kennedy Institute of Rheumatology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kennedy.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kennedy Institute IT</md:GivenName>
+    <md:EmailAddress>mailto:kirit@kennedy.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>Marsden</md:SurName>
+    <md:EmailAddress>mailto:brian.marsden@kennedy.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml b/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
index 225a6586..8fb5ae2b 100644
--- a/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssso.uni-muenster.de/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-24T12:09:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-24T12:09:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster.</mdui:Description>
+        <mdui:Description xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster.</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="64" width="80">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu.svg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster.</mdui:Description>
-          <mdui:Description xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster.</mdui:Description>
-          <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-          <mdui:Logo height="64" width="80">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu.svg</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>ssso.uni-muenster.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCsvNcBjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ssso.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCsvNcBjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
 MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
@@ -59,44 +59,44 @@ VE1gq/ydqHWTm0eLfdk0sHgyxEG4WkafWA0KiIafFbOvhZwAUqygruJjzMlUfxxf
 OL9csVR39I5uyveJQpy+J4omKyte4S+Rp8NpI6DW1d8x9kBm2SqLYqMhYTtEYfhi
 k3o3LoCiTxnN6qevn4y3u2a+q1WFEgbdKc+MiKRKeJqmQdHC4CEB5QYztA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Universität Münster</md:ServiceName>
-        <md:ServiceName xml:lang="en">Universität Münster</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rainer</md:GivenName>
-      <md:SurName>Perske</md:SurName>
-      <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rainer</md:GivenName>
-      <md:SurName>Perske</md:SurName>
-      <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Universität Münster</md:ServiceName>
+      <md:ServiceName xml:lang="en">Universität Münster</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rainer</md:GivenName>
+    <md:SurName>Perske</md:SurName>
+    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rainer</md:GivenName>
+    <md:SurName>Perske</md:SurName>
+    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml
index 5e1b8024..5fd1f7ce 100644
--- a/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://stage.mahara.qmul.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T09:07:23Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T09:07:23Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAMZqbUlmc/4pMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF3N0YWdlLm1haGFyYS5xbXVsLmFjLnVrMB4XDTEyMDYwNzE0NTU0N1oXDTIy
 						MDYwNTE0NTU0N1owIjEgMB4GA1UEAxMXc3RhZ2UubWFoYXJhLnFtdWwuYWMudWsw
@@ -29,32 +29,32 @@
 						TO8QG6ljEC4VQMB4AzASlawzv7IGaLbVJqIfypibgAuTMIio35JNpt+h92ySdMX5
 						Mp+1A9Jpnpwe7nn45pBkBA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Staging Mahara</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Moodle Support</md:GivenName>
-      <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Staging Mahara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Moodle Support</md:GivenName>
+    <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml
index e721b19d..45bb1955 100644
--- a/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://stage.qmplus.qmul.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T08:25:32Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T08:25:32Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJALKxAgePakkwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF3N0YWdlLnFtcGx1cy5xbXVsLmFjLnVrMB4XDTEyMDYwNzE0NTMzMFoXDTIy
 						MDYwNTE0NTMzMFowIjEgMB4GA1UEAxMXc3RhZ2UucW1wbHVzLnFtdWwuYWMudWsw
@@ -29,32 +29,32 @@
 						ikizbM30rhdKp+IkmknYtk/BD69rNZRebjpTLH2VXDqgfF5/Ebg9DV7HZA2x4um5
 						KM/oUrQbIhU0GvL2LaL7rQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Staging QMPlus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Moodle Support</md:GivenName>
-      <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Staging QMPlus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Moodle Support</md:GivenName>
+    <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml
index 8abad8bc..680cf280 100644
--- a/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging-secure.nature.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZzCCAk+gAwIBAgIEGVG+zDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEiMCAGA1UEAxMZc3RhZ2luZy1zZWN1cmUubmF0dXJlLmNvbTAeFw0xNTAz
@@ -28,27 +28,27 @@
 						/dsJRiCxnXPAWkZNFFGDxmrfQ7cKEzWHnwCLtm9lHD1/3nT0nCurPEY+M/y9d6C4
 						g+RioiRha4Eokfc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (staging)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (staging)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml
index a1caa12d..a39272a0 100644
--- a/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging-secure.palgrave-journals.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfTCCAmWgAwIBAgIEOa48azANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEtMCsGA1UEAxMkc3RhZ2luZy1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMu
@@ -28,27 +28,27 @@
 						bk/F7uyBln0L09JM6rlMstHeSBimlO2jKJTfM9LTAMOG8Ddu5awfbfsihHyq0Bq0
 						ocWH6VvJL9PvUxqsi0VS1X6BdlITJA1Kryhk6tGsWl28
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Palgrave Journals (staging)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Palgrave Journals (staging)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml
index 164d27cb..a15b7e54 100644
--- a/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging-secure.palgraveconnect.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-23T15:28:40Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-23T15:28:40Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIETIS9pTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzErMCkGA1UEAxMic3RhZ2luZy1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNv
@@ -27,13 +27,13 @@
 						DRK2bX6SwjzZMWXqMrT3T6Fy807j34fd2Il4zESu0465u5kwhPCoLeujZ2ctilpg
 						cYGMbKh1v9ug3txsqBdCDX/JLCgXEDRx8XSXtYqMg1s2VwMSDQceuIi1
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIETIS9pTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzErMCkGA1UEAxMic3RhZ2luZy1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNv
@@ -53,27 +53,27 @@
 						DRK2bX6SwjzZMWXqMrT3T6Fy807j34fd2Il4zESu0465u5kwhPCoLeujZ2ctilpg
 						cYGMbKh1v9ug3txsqBdCDX/JLCgXEDRx8XSXtYqMg1s2VwMSDQceuIi1
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Palgrave Macmillan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgraveconnect.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chike</md:GivenName>
-      <md:SurName>Abia</md:SurName>
-      <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Palgrave Macmillan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgraveconnect.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chike</md:GivenName>
+    <md:SurName>Abia</md:SurName>
+    <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml b/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml
index 7c1b1692..f9349c22 100644
--- a/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml
+++ b/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.anatomy.tv/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-16T14:39:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-16T14:39:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIJANetmNOVoSNmMA0GCSqGSIb3DQEBBQUAMEgxKTAnBgNV
 						BAoTIEFuYXRvbXkudHYgLSBQcmltYWwgUGljdHVyZXMgTHRkMRswGQYDVQQDExJz
 						dGFnaW5nLmFuYXRvbXkudHYwHhcNMTMxMDMxMTExNjQ3WhcNMjMxMDI5MTExNjQ3
@@ -32,26 +32,26 @@
 						Z7J78e6jozliz4p+J0yRNZHUQ5cUhTh5pymiB5FceS696P8GR+497l95ATBme12S
 						G1M=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Primal Pictures Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Primal Pictures Limited: www.anatomy.tv - Test server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.primalpictures.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:techsupport@primalpictures.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Deepesh</md:GivenName>
-      <md:SurName>Shah</md:SurName>
-      <md:EmailAddress>mailto:deepesh@primalpictures.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Primal Pictures Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Primal Pictures Limited: www.anatomy.tv - Test server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.primalpictures.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:techsupport@primalpictures.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Deepesh</md:GivenName>
+    <md:SurName>Shah</md:SurName>
+    <md:EmailAddress>mailto:deepesh@primalpictures.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml
index 72e4bad5..bbed5aae 100644
--- a/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.jorum.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T15:33:29Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T15:33:29Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login" index="3"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login" index="4"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login" index="2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login" index="3"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login" index="4"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIJAMvDRTJflddLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3N0YWdpbmcuam9ydW0uYWMudWswHhcNMTMwMjAxMTE0MjMyWhcNMjMwMTMw
 						MTE0MjMyWjAeMRwwGgYDVQQDExNzdGFnaW5nLmpvcnVtLmFjLnVrMIIBIjANBgkq
@@ -51,54 +51,54 @@
 						A21yBq6YB6zqgnzFWuIGyb+2nluyUEi3NG0Qg6w6sv9ouZl+LM1kUmfyFYHOogJZ
 						XEkxDTRCPMvlCw7I3BmOYjXH2WiVhzM8ytwkOdu12ZtJGSUqFoUhE1YNUdo=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum Staging</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jorum Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:support@jorum.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum Staging</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jorum Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@jorum.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml b/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml
index e7a1ace7..5085cb0d 100644
--- a/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml
+++ b/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.portal.euromonitor.com/athens">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-29T10:53:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-29T10:53:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Passport (Staging) - Euromonitor International</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Passport is Euromonitor International's gateway to global strategic intelligence.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Passport (Staging) - Euromonitor International</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Passport is Euromonitor International's gateway to global strategic intelligence.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzTCCArWgAwIBAgIJAKY1zcaXHG70MA0GCSqGSIb3DQEBBQUAME0xIjAgBgNV
 						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcu
 						cG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMzEwMDMwOTQ1NDFaFw0yMzEwMDEw
@@ -38,13 +38,13 @@
 						rlPlWyGoSgT23vdw9IKNL7msMOA8dOfzIClDtBbcOYlDpGI5gEMTiSbBhKLwuMT5
 						zcL17P70Sn+9n3DUm+MpLWw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzTCCArWgAwIBAgIJAKY1zcaXHG70MA0GCSqGSIb3DQEBBQUAME0xIjAgBgNV
 						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcu
 						cG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMzEwMDMwOTQ1NDFaFw0yMzEwMDEw
@@ -67,29 +67,29 @@
 						rlPlWyGoSgT23vdw9IKNL7msMOA8dOfzIClDtBbcOYlDpGI5gEMTiSbBhKLwuMT5
 						zcL17P70Sn+9n3DUm+MpLWw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Passport (Staging) - Euromonitor International</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jürgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jürgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Passport (Staging) - Euromonitor International</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jürgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jürgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml b/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml
index 04f7d1aa..6cb09660 100644
--- a/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml
+++ b/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.researchmonitor.euromonitor.com/web/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T15:13:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T15:13:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIJAK7CyN11IEtLMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
 						BAoTC0V1cm9tb25pdG9yMTAwLgYDVQQDEydzdGFnaW5nLnJlc2VhcmNobW9uaXRv
 						ci5ldXJvbW9uaXRvci5jb20wHhcNMTMwOTEzMDcxNTIyWhcNMjMwOTExMDcxNTIy
@@ -32,13 +32,13 @@
 						MEtQ0lp7WfwA2jm+nn0iJpl7MSyJGpmBOyr0TvV0G+UPTYmDmWQ/6wNHbnoC5uXY
 						970=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIJAK7CyN11IEtLMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
 						BAoTC0V1cm9tb25pdG9yMTAwLgYDVQQDEydzdGFnaW5nLnJlc2VhcmNobW9uaXRv
 						ci5ldXJvbW9uaXRvci5jb20wHhcNMTMwOTEzMDcxNTIyWhcNMjMwOTExMDcxNTIy
@@ -61,27 +61,27 @@
 						MEtQ0lp7WfwA2jm+nn0iJpl7MSyJGpmBOyr0TvV0G+UPTYmDmWQ/6wNHbnoC5uXY
 						970=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research Monitor (Staging) - Euromonitor International</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jürgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jürgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research Monitor (Staging) - Euromonitor International</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jürgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jürgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml b/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml
index 0947ad09..1330643b 100644
--- a/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.researchprofessional.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-08T14:22:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-08T14:22:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Research Professional is an intuitive platform for online access to news and funding services.</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.researchprofessional.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Research Professional is an intuitive platform for online access to news and funding services.</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.researchprofessional.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+jCCAuKgAwIBAgIJANtavlaD4gXtMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
 						BAYTAlVLMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZMb25kb24xHjAc
 						BgNVBAoTFVJlc2VhcmNoIFJlc2VhcmNoIEx0ZDEpMCcGA1UEAxMgc3RhZ2luZy5y
@@ -57,54 +57,54 @@
 						3kv1D2xEO0C7BaEihoy7KNWgAuhE/r9pM4nuN8s67A1PauUX+24rOtDWpf2D6IWZ
 						HvPzwSwM7ejfr+CISQ4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Research Professional</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">A service that provides access to research opportunities and funding</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Research Research Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research Professional (Staging)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.researchresearch.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Potter</md:SurName>
-      <md:EmailAddress>mailto:sso@researchresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Potter</md:SurName>
-      <md:EmailAddress>mailto:sso@researchresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Research Professional</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A service that provides access to research opportunities and funding</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Research Research Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research Professional (Staging)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.researchresearch.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Potter</md:SurName>
+    <md:EmailAddress>mailto:sso@researchresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Potter</md:SurName>
+    <md:EmailAddress>mailto:sso@researchresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
index 7c6ceef5..5e2019e9 100644
--- a/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://stats-qa.ukdataservice.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T10:10:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T10:10:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAPpH6NVGj1XdMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB4XDTE1MDIxMjE0NTQxM1oXDTI1
 						MDIwOTE0NTQxM1owIjEgMB4GA1UEAxMXZGFkb3Rzd2Vic3QuZXNzZXguYWMudWsw
@@ -48,43 +48,43 @@
 						6W8wXxM6Bx2xperc3d0sbkT3cbAnZwz5BWQHhsGZjHjRY/NzVLGwXgvG5w3VfDby
 						yMJeeTVd+zS0q0I6Z0aHYA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Quality Assurance server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Susan</md:GivenName>
-      <md:SurName>Noble</md:SurName>
-      <md:EmailAddress>mailto:Susan.Noble@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Syrotiuk</md:SurName>
-      <md:EmailAddress>mailto:nicholas.syrotiuk@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Essex</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Quality Assurance server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Susan</md:GivenName>
+    <md:SurName>Noble</md:SurName>
+    <md:EmailAddress>mailto:Susan.Noble@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Syrotiuk</md:SurName>
+    <md:EmailAddress>mailto:nicholas.syrotiuk@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml b/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml
index 22c4ef0c..a866fb26 100644
--- a/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://stg.reachoutcpd.com/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-05T07:38:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-05T07:38:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/shibtest"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/RMUnify"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ReachOutCPD</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to ReachOutCPD</mdui:Description>
+        <mdui:Logo height="153" width="202">https://stg.reachoutcpd.com/mdui-reachoutcpd-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/shibtest"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/RMUnify"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ReachOutCPD</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access to ReachOutCPD</mdui:Description>
-          <mdui:Logo height="153" width="202">https://stg.reachoutcpd.com/mdui-reachoutcpd-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIJAL30gKs3VPdtMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3N0Zy5yZWFjaG91dGNwZC5jb20wHhcNMTUwNDI0MTQ1MTQzWhcNMjUwNDIx
 						MTQ1MTQzWjAeMRwwGgYDVQQDExNzdGcucmVhY2hvdXRjcGQuY29tMIIBIjANBgkq
@@ -55,47 +55,47 @@
 						tMZ4fmJjde6k1L39lWxloxotW2pn7EdExhBXSSHB7ZLxSh2Sw+jzVC3wVJExCDd9
 						P4qiW5N5wrp2gPuwfYg5+XLezOQ9qGVeNKKJrCZu24pR6d/y/6D/5m/XsEXIxfU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ReachOutCPD</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stg.reachoutcpd.com/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ReachOutCPD</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stg.reachoutcpd.com/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
index 86ded82b..7f39bd42 100644
--- a/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://strong.renater.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-06T11:04:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-06T11:04:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - 2FA</mdui:DisplayName>
+        <mdui:Logo height="15" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAIAAABiEdh4AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADwCRnKNdAAACBElEQVQoz22RPWgTcRjGn/vf5S7XJk1Ja0mDpEYF0cZmMwhpcRI/6GIpXTToIjpUnERQUHQoioM4FQoOFSo6qB3EoKCoKFIdbEBqMKDRpDS9NunFXD7v/q9DNe3VPuvz/njf53lBm2nFqOLI1dv3X/5vMWymh88/olg5fyd++saDDZYNePc5xYkACAAgwC1PxGd7Y7eevEnwfzPC96yWyRXcLU6PWx1//F6VpcP7d+8LBTXd6D83npwvQGQo1eFSrg1HBgf6hKlnM5+SGVVxMECRJSLUGqa/s+3M0IAF6hwe00tViAxEKFQux6ICEf1cyE+/ThR+l0X290LT4opDunjyYHohv23oJtqdAJArfX10gQEI+LyjIwdcqkJEq4AkslrDnHz6ocfnPXUohLoFvXp8MLwr0LUWOtLb07Ca2SCJbO7HolGpHY2GsFK5FOu/d+WEraU92/2c0/rSZElM/dJ8XhcY69vZremGDSgalY3vEGBaVlbT4RRHRieXi2UbsFQoMUGwAYS2VnX67RcoEtyyLEs2IJHKiqLtj0RUrptTr+bgEAGoirwGVOuNVGaZrVvAOYV2dF+/G4eDAYDH6T82pukGa26PhoOAUK2bnMi0uMV5Ir3Y4BQOdGCpDJPPTpzd4mkVmt2v6ls692ImubXLE9kb7Gx3i0wAkC+WSUCHuwXAH/rb+m9hYGX6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwck/JggAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMSswMjowMAMScT4AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">RENATER 2FA authentication Identity Provider</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">GIP RENATER - Authentification forte</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Fournisseur d'identités à authentification forte pour le personnel du GIP RENATER</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RENATER - 2FA</mdui:DisplayName>
-          <mdui:Logo height="15" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAIAAABiEdh4AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADwCRnKNdAAACBElEQVQoz22RPWgTcRjGn/vf5S7XJk1Ja0mDpEYF0cZmMwhpcRI/6GIpXTToIjpUnERQUHQoioM4FQoOFSo6qB3EoKCoKFIdbEBqMKDRpDS9NunFXD7v/q9DNe3VPuvz/njf53lBm2nFqOLI1dv3X/5vMWymh88/olg5fyd++saDDZYNePc5xYkACAAgwC1PxGd7Y7eevEnwfzPC96yWyRXcLU6PWx1//F6VpcP7d+8LBTXd6D83npwvQGQo1eFSrg1HBgf6hKlnM5+SGVVxMECRJSLUGqa/s+3M0IAF6hwe00tViAxEKFQux6ICEf1cyE+/ThR+l0X290LT4opDunjyYHohv23oJtqdAJArfX10gQEI+LyjIwdcqkJEq4AkslrDnHz6ocfnPXUohLoFvXp8MLwr0LUWOtLb07Ca2SCJbO7HolGpHY2GsFK5FOu/d+WEraU92/2c0/rSZElM/dJ8XhcY69vZremGDSgalY3vEGBaVlbT4RRHRieXi2UbsFQoMUGwAYS2VnX67RcoEtyyLEs2IJHKiqLtj0RUrptTr+bgEAGoirwGVOuNVGaZrVvAOYV2dF+/G4eDAYDH6T82pukGa26PhoOAUK2bnMi0uMV5Ir3Y4BQOdGCpDJPPTpzd4mkVmt2v6ls692ImubXLE9kb7Gx3i0wAkC+WSUCHuwXAH/rb+m9hYGX6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwck/JggAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMSswMjowMAMScT4AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">RENATER 2FA authentication Identity Provider</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">GIP RENATER - Authentification forte</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Fournisseur d'identités à authentification forte pour le personnel du GIP RENATER</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVAKDRx8im6zJdLQ5NHz5dmbcaOBjOMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMMEXN0cm9uZy5yZW5hdGVyLmZyMB4XDTE0MTAwNjA3NDIx
 OFoXDTM0MTAwNjA3NDIxOFowHDEaMBgGA1UEAwwRc3Ryb25nLnJlbmF0ZXIuZnIw
@@ -40,21 +40,21 @@ rlzS4uoe3sVAeC3OBKLjHEWy4/NybEmhfjFbIlqrPc579lsn6mJKvrf82Gx6PDry
 OnHGNIjw12pVU5I3hY1A7X/xRZLG0U90KdPekhyE4KXeutJumdwGYj/pC21jsOzy
 gshHXw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://strong.renater.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://strong.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://strong.renater.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER - Authentification forte</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER - Authentification forte</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>support@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://strong.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://strong.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://strong.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER - Authentification forte</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER - Authentification forte</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>support@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
index bba56d07..f0b8a0d4 100644
--- a/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.deltion.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Deltion College</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Deltion College</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Deltion College</mdui:Description>
+        <mdui:Description xml:lang="en">Deltion College</mdui:Description>
+        <mdui:Logo height="38" width="108">https://static.surfconext.nl/logos/idp/deltion-companylogo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">ROC MBO Zwolle Deltion College</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">ROC MBO Zwolle Deltion College</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Deltion College</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Deltion College</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Deltion College</mdui:Description>
-          <mdui:Description xml:lang="en">Deltion College</mdui:Description>
-          <mdui:Logo height="38" width="108">https://static.surfconext.nl/logos/idp/deltion-companylogo.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">ROC MBO Zwolle Deltion College</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">ROC MBO Zwolle Deltion College</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d6417b895cf5178b82879f0f2396e457"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Deltion College</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Deltion College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Deltion College</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Deltion College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.deltion.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.deltion.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d6417b895cf5178b82879f0f2396e457"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Deltion College</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Deltion College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Deltion College</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Deltion College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.deltion.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.deltion.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml
index 4a705593..b6ecbbfd 100644
--- a/swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.edugroepen.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-07T20:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-07T20:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">EDUgroepen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">EDUgroepen</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Samenwerkingsplatform om in groepen samen te werken in de educatieve sector.</mdui:Description>
+        <mdui:Description xml:lang="en">Collaboration platform for working in groups in the educational sector.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="nl">http://login.edugroepen.nl/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://login.edugroepen.nl/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">EDUgroepen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">EDUgroepen</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Samenwerkingsplatform om in groepen samen te werken in de educatieve sector.</mdui:Description>
-          <mdui:Description xml:lang="en">Collaboration platform for working in groups in the educational sector.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="nl">http://login.edugroepen.nl/privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://login.edugroepen.nl/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFNTCCBB2gAwIBAgIQG6tbAOzniu8D0e+s7836IjANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEpMCcGA1UECxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxJjAkBgNVBAMTHVN0YXJ0Q29tIENsYXNzIDMgT1YgU2VydmVyIENBMB4XDTE2MDMxNTEyNDMzMFoXDTE5MDMxNTEyNDMzMFowYjELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcMB1V0cmVjaHQxETAPBgNVBAoMCDJBVCBCLlYuMRwwGgYDVQQDDBNsb2dpbi5lZHVncm9lcGVuLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0o++QF7kL+T29xA6F3bYXSs7wSW1YH0wuJt/iomMWlirFNd5WNn68dV8iZTc981ZqsOpW6TpyWk10CYVkpGzcCinYWB+NqjVWsmUntm4ghUiHUQTAmXukRNF2GX+toWnYAbJkgFhQ/nYqIvc0mJwzXx5jJaitd+NBuEDEuSIzVqli7EWMFLzAL5ZsP7TxTiaV3sJpKLwK1/UStynng61DX+j+GKy3EMPsy4b9C0Y8Yp5ks85dgb5PS6x1dy6qoEN0t+EqfXsPe0OWt7UkngsOdxVs8p/5fsu5LeZPBdJBgn7QIbet/V4LIKDX9WrOQVF6SqzyHHZYMUYtkM6khxVQQIDAQABo4IBzzCCAcswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBSfp9I2xHSEn7sjC+DS0v/NS3rnPjAfBgNVHSMEGDAWgBSxPxySe5KwWiWzOPucB6QmUDLjUTBvBggrBgEFBQcBAQRjMGEwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc2NhLnNlcnZlcjMuY3J0MDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL3NjYS1zZXJ2ZXIzLmNybDAtBgNVHREEJjAkghNsb2dpbi5lZHVncm9lcGVuLm5sgg1lZHVncm9lcGVuLm5sMCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzBQBgNVHSAESTBHMAgGBmeBDAECAjA7BgsrBgEEAYG1NwECBDAsMCoGCCsGAQUFBwIBFh5odHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kwDQYJKoZIhvcNAQELBQADggEBAHzbJ2i0EHcoanOcJjdD3ceI6ui+Jd/CUmxRiuYcAIksONE3DeSrGAgeF6wNkqGHm6GqkrTrnN1om8tce1ImjgK7zaLWC3YL5j4caLi/T3WatyqCzHrI3OoSx/xED7/f3QVF1XfONwGJ/biLXL3Dnx9w0jIFe4brsFYiJCLtxe9tatoDiQgPfuBdssyw9PirQIy1ypggTXHdnuS18vefEWrY5T1cXFmhZWPbEVOsrgpR3Y/GEvcRVuK5Fm+0A7ZBdOtMPwRldGsZ4EQL8LGnwHC+QMJRWNzTcvAJV1mFVDPL7NVvPVPDfefQvWVOmeoHOtWy2VWAq6r2ALVF96Ko+lY=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.edugroepen.nl/signin-edugain" index="0"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">2AT BV</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">2AT BV</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">2AT BV</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">2AT BV</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.2at.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.2at.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDUgroepen</md:GivenName>
-      <md:SurName>2AT</md:SurName>
-      <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>EDUgroepen</md:GivenName>
-      <md:SurName>2AT</md:SurName>
-      <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>EDUgroepen</md:GivenName>
-      <md:SurName>2AT</md:SurName>
-      <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFNTCCBB2gAwIBAgIQG6tbAOzniu8D0e+s7836IjANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEpMCcGA1UECxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxJjAkBgNVBAMTHVN0YXJ0Q29tIENsYXNzIDMgT1YgU2VydmVyIENBMB4XDTE2MDMxNTEyNDMzMFoXDTE5MDMxNTEyNDMzMFowYjELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcMB1V0cmVjaHQxETAPBgNVBAoMCDJBVCBCLlYuMRwwGgYDVQQDDBNsb2dpbi5lZHVncm9lcGVuLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0o++QF7kL+T29xA6F3bYXSs7wSW1YH0wuJt/iomMWlirFNd5WNn68dV8iZTc981ZqsOpW6TpyWk10CYVkpGzcCinYWB+NqjVWsmUntm4ghUiHUQTAmXukRNF2GX+toWnYAbJkgFhQ/nYqIvc0mJwzXx5jJaitd+NBuEDEuSIzVqli7EWMFLzAL5ZsP7TxTiaV3sJpKLwK1/UStynng61DX+j+GKy3EMPsy4b9C0Y8Yp5ks85dgb5PS6x1dy6qoEN0t+EqfXsPe0OWt7UkngsOdxVs8p/5fsu5LeZPBdJBgn7QIbet/V4LIKDX9WrOQVF6SqzyHHZYMUYtkM6khxVQQIDAQABo4IBzzCCAcswDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBSfp9I2xHSEn7sjC+DS0v/NS3rnPjAfBgNVHSMEGDAWgBSxPxySe5KwWiWzOPucB6QmUDLjUTBvBggrBgEFBQcBAQRjMGEwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc2NhLnNlcnZlcjMuY3J0MDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL3NjYS1zZXJ2ZXIzLmNybDAtBgNVHREEJjAkghNsb2dpbi5lZHVncm9lcGVuLm5sgg1lZHVncm9lcGVuLm5sMCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzBQBgNVHSAESTBHMAgGBmeBDAECAjA7BgsrBgEEAYG1NwECBDAsMCoGCCsGAQUFBwIBFh5odHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kwDQYJKoZIhvcNAQELBQADggEBAHzbJ2i0EHcoanOcJjdD3ceI6ui+Jd/CUmxRiuYcAIksONE3DeSrGAgeF6wNkqGHm6GqkrTrnN1om8tce1ImjgK7zaLWC3YL5j4caLi/T3WatyqCzHrI3OoSx/xED7/f3QVF1XfONwGJ/biLXL3Dnx9w0jIFe4brsFYiJCLtxe9tatoDiQgPfuBdssyw9PirQIy1ypggTXHdnuS18vefEWrY5T1cXFmhZWPbEVOsrgpR3Y/GEvcRVuK5Fm+0A7ZBdOtMPwRldGsZ4EQL8LGnwHC+QMJRWNzTcvAJV1mFVDPL7NVvPVPDfefQvWVOmeoHOtWy2VWAq6r2ALVF96Ko+lY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.edugroepen.nl/signin-edugain" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">2AT BV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">2AT BV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">2AT BV</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">2AT BV</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.2at.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.2at.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDUgroepen</md:GivenName>
+    <md:SurName>2AT</md:SurName>
+    <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>EDUgroepen</md:GivenName>
+    <md:SurName>2AT</md:SurName>
+    <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>EDUgroepen</md:GivenName>
+    <md:SurName>2AT</md:SurName>
+    <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.learnium.net-entity.xml b/swamid-interfederations-2.0/sts.learnium.net-entity.xml
index 20d69357..db097e6f 100644
--- a/swamid-interfederations-2.0/sts.learnium.net-entity.xml
+++ b/swamid-interfederations-2.0/sts.learnium.net-entity.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sts.learnium.net/entity">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T12:34:24Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T12:34:24Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE+jCCA+KgAwIBAgIJAO4YoaUX4maKMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 						VQQGEwJHQjEOMAwGA1UECBMFR3dlbnQxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
 						BAoTF1RoZSBBbGFjcml0eSBGb3VuZGF0aW9uMREwDwYDVQQLEwhMZWFybml1bTEZ
@@ -36,13 +36,13 @@
 						xMwg3id/eGcieKkMTZ6UmrKAPvN+9pr1fUedp8kFlnTNJJ9manlE9KIjNWuhX8l3
 						zblMCr3htJ+JowBQNDrmfFz0yCR8VZlzh5JsEs+W
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE+jCCA+KgAwIBAgIJAO4YoaUX4maKMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 						VQQGEwJHQjEOMAwGA1UECBMFR3dlbnQxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
 						BAoTF1RoZSBBbGFjcml0eSBGb3VuZGF0aW9uMREwDwYDVQQLEwhMZWFybml1bTEZ
@@ -71,27 +71,27 @@
 						xMwg3id/eGcieKkMTZ6UmrKAPvN+9pr1fUedp8kFlnTNJJ9manlE9KIjNWuhX8l3
 						zblMCr3htJ+JowBQNDrmfFz0yCR8VZlzh5JsEs+W
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Alacrity Foundation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Learnium</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.alacrityfoundation.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Learnium Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:support@learnium.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Toby</md:GivenName>
-      <md:SurName>Hughes</md:SurName>
-      <md:EmailAddress>mailto:thughes@alacrityfoundation.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Alacrity Foundation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Learnium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.alacrityfoundation.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Learnium Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:support@learnium.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Toby</md:GivenName>
+    <md:SurName>Hughes</md:SurName>
+    <md:EmailAddress>mailto:thughes@alacrityfoundation.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
index a2ed60d8..727801ee 100644
--- a/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.roc-nijmegen.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-07-30T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-07-30T10:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">ROC Nijmegen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ROC Nijmegen</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">ROC Nijmegen</mdui:Description>
+        <mdui:Description xml:lang="en">ROC Nijmegen</mdui:Description>
+        <mdui:Logo height="15" width="108">https://static.surfconext.nl/logos/idp/roc-nijmegen.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">MBO ROC Nijmegen</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">MBO ROC Nijmegen</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">ROC Nijmegen</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">ROC Nijmegen</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">ROC Nijmegen</mdui:Description>
-          <mdui:Description xml:lang="en">ROC Nijmegen</mdui:Description>
-          <mdui:Logo height="15" width="108">https://static.surfconext.nl/logos/idp/roc-nijmegen.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">MBO ROC Nijmegen</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">MBO ROC Nijmegen</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d8ea069ad0633af0a11fe741f3ceb585"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ROC Nijmegen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ROC Nijmegen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.roc-nijmegen.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d8ea069ad0633af0a11fe741f3ceb585"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ROC Nijmegen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ROC Nijmegen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.roc-nijmegen.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
index c6de3ec1..e245b2b1 100644
--- a/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.talnet.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="nl">ROC van Amsterdam</mdui:Description>
+        <mdui:Description xml:lang="en">ROC van Amsterdam</mdui:Description>
+        <mdui:Logo height="288" width="263">https://static.surfconext.nl/logos/idp/ROCvA_logo2.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="nl">ROC van Amsterdam</mdui:Description>
-          <mdui:Description xml:lang="en">ROC van Amsterdam</mdui:Description>
-          <mdui:Logo height="288" width="263">https://static.surfconext.nl/logos/idp/ROCvA_logo2.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/700f5baa5be6a812bb8917e9e54d2756"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">ROC van Amsterdam Flevoland en VOvA</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ROC van Amsterdam Flevoland en VOvA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">ROC van Amsterdam Flevoland en VOvA</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ROC van Amsterdam Flevoland en VOvA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.rocva.nl/organisatie/pages/english.aspx</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.rocva.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/700f5baa5be6a812bb8917e9e54d2756"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">ROC van Amsterdam Flevoland en VOvA</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ROC van Amsterdam Flevoland en VOvA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">ROC van Amsterdam Flevoland en VOvA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ROC van Amsterdam Flevoland en VOvA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.rocva.nl/organisatie/pages/english.aspx</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.rocva.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml
index 27ab1227..c4da8564 100644
--- a/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.tue.nl-adfs-services-trust.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.tue.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-03-20T12:22:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-03-20T12:22:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Description xml:lang="en">Eindhoven University of Technology</mdui:Description>
+        <mdui:Logo height="160" width="200">https://static.surfconext.nl/logos/idp/tue.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Eindhoven University of Technology tue</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Technische Universiteit Eindhoven tue</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
-          <mdui:Description xml:lang="en">Eindhoven University of Technology</mdui:Description>
-          <mdui:Logo height="160" width="200">https://static.surfconext.nl/logos/idp/tue.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Eindhoven University of Technology tue</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Technische Universiteit Eindhoven tue</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/81e25d2c888ac3f473762b387192f452"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Eindhoven University of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Eindhoven University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">https://www.tue.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.tue.nl/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/81e25d2c888ac3f473762b387192f452"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Eindhoven University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Eindhoven University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">https://www.tue.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.tue.nl/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml
index bdd990f9..bafc9958 100644
--- a/swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.uidaho.edu/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uidaho.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Idaho</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uidaho.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Idaho</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC2DCCAcCgAwIBAgIQanGKteQbqaJAlcgB3suvTDANBgkqhkiG9w0BAQsFADAo
 MSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBzdHMudWlkYWhvLmVkdTAeFw0xMzEx
 MjEwMjAzNDBaFw0yMzExMTkwMjAzNDBaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmlu
@@ -36,34 +36,34 @@ QXa2fVyd3xEe7FAoaisTPVMi6e8MQ4Jcu/bgBG52rAg+Y/Sgz+D2EIbgTDc0+xGY
 MGhvxW12UxkimmJ8rN9492Znq/GewfKGTTZHhIFvPfRsrSEcUphmwD+V2boyAs2b
 3kFlhhPzSTF6fK6w
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.uidaho.edu/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.uidaho.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sts.uidaho.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.uidaho.edu/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.uidaho.edu/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Idaho</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Idaho</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uidaho.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Team</md:GivenName>
-      <md:EmailAddress>systems@uidaho.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Security Office</md:GivenName>
-      <md:EmailAddress>its-security@uidaho.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@uidaho.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security Office</md:GivenName>
-      <md:EmailAddress>its-security@uidaho.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.uidaho.edu/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.uidaho.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sts.uidaho.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.uidaho.edu/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.uidaho.edu/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Idaho</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Idaho</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uidaho.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Team</md:GivenName>
+    <md:EmailAddress>systems@uidaho.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Security Office</md:GivenName>
+    <md:EmailAddress>its-security@uidaho.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@uidaho.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security Office</md:GivenName>
+    <md:EmailAddress>its-security@uidaho.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
index ed1c680f..92366fcc 100644
--- a/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.windesheim.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-30T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-30T16:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Hogeschool Windesheim</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Windesheim University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Hogeschool Windesheim</mdui:Description>
+        <mdui:Description xml:lang="en">Hogeschool Windesheim</mdui:Description>
+        <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/windesheim.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Hogeschool Windesheim</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Windesheim University of Applied Sciences</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Hogeschool Windesheim</mdui:Description>
-          <mdui:Description xml:lang="en">Hogeschool Windesheim</mdui:Description>
-          <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/windesheim.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/7c588283e83a906442b0591b722db36b"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Hogeschool Windesheim</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Hogeschool Windesheim University of Applied Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Hogeschool Windesheim</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Hogeschool Windesheim University of Applied Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.windesheim.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.windesheim.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/7c588283e83a906442b0591b722db36b"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Hogeschool Windesheim</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Hogeschool Windesheim University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Hogeschool Windesheim</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hogeschool Windesheim University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.windesheim.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.windesheim.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
index 3aab349b..04f2ef33 100644
--- a/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
+++ b/swamid-interfederations-2.0/sts.windows.net-a1bce70e-1f36-4e8c-b4f3-48980a5f78ee-.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sts.windows.net/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-20T10:07:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-20T10:07:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier-bs.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Montpellier Business School</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQklEQVQoz+2NS07CYBhF7/+opUBboISHAiZKQlyAiQtw7shVuAQX4TZ0D04cuQITElAMUB+8SmnLo6X9nOjQBOee4ck9uUw7v85qqTjacinmC3+7WgFMSe9dXV4UTTOO45gQJ+AMCUFwyNNmIaXI4cQXnNUK+Wbl0J563c/IMvQwisKYWRnsm/TusrKejH0m61ZG2xMlQw2CTbmYPakVnvpj4nHLipxgM/HIEOgOI0tXVkvSJROonx1XjJc39+gg1xk6r2Pv9r7dapQaluoH/nTu9T4W1ZxoD2Z6Ch3bleW8OXCTIJG9SWiP19VKvl7OZdLq47MDAMDICWbLJTGxsZP+aMFu7h70tOqvNkRQpFAVORg5pbwuOOccAFuuQyJoqgRYGG0ZEQEggGEnZJIQGECgH0Ug9nv+/bA7/E/r/2BHvgBoo5Hqom3djQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.montpellier-bs.com/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Montpellier Business School - IDP - Production</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Montpellier Business School</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Montpellier Business School - IDP - Production</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier-bs.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Montpellier Business School</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQklEQVQoz+2NS07CYBhF7/+opUBboISHAiZKQlyAiQtw7shVuAQX4TZ0D04cuQITElAMUB+8SmnLo6X9nOjQBOee4ck9uUw7v85qqTjacinmC3+7WgFMSe9dXV4UTTOO45gQJ+AMCUFwyNNmIaXI4cQXnNUK+Wbl0J563c/IMvQwisKYWRnsm/TusrKejH0m61ZG2xMlQw2CTbmYPakVnvpj4nHLipxgM/HIEOgOI0tXVkvSJROonx1XjJc39+gg1xk6r2Pv9r7dapQaluoH/nTu9T4W1ZxoD2Z6Ch3bleW8OXCTIJG9SWiP19VKvl7OZdLq47MDAMDICWbLJTGxsZP+aMFu7h70tOqvNkRQpFAVORg5pbwuOOccAFuuQyJoqgRYGG0ZEQEggGEnZJIQGECgH0Ug9nv+/bA7/E/r/2BHvgBoo5Hqom3djQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.montpellier-bs.com/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Montpellier Business School - IDP - Production</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Montpellier Business School</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Montpellier Business School - IDP - Production</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC8DCCAdigAwIBAgIQXSgdF4VvUKdOvLSOLVR20TANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylNaWNyb3NvZnQgQXp1cmUgRmVkZXJhdGVkIFNTTyBDZXJ0aWZpY2F0ZTAeFw0xNjA0MTMyMDM3MzJaFw0xNzA0MTMyMDM3MzJaMDQxMjAwBgNVBAMTKU1pY3Jvc29mdCBBenVyZSBGZWRlcmF0ZWQgU1NPIENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq7IxRqzY4NabTsYHB6PBHtHB0VQ6hiGO1DmRwtgKtDWQaRlVkpeTVv6SPdRX4PYjlthHDYsOObGh78zhyio/4hSQWdbQ65LRzxEkMy/lcKIHNsVTqBVWze+LlMbFdsjNZ97zW0QpzGZsz0aF2n2Ak7m2FQ/zQ0tLKiPPD2OkmsTL1ZYnqiAIoEAzlyhQUasm1SG/ureDA0xsu50T272Uwpil3W4Ii+F0sbIg9Fx7FmuQYtTu1wAK75I53Q1KuEgiiuJIvhcmkHN1czZlseLJcPkXLrLwJX6RZIdCZqpKqub2MycUNHW67ws9+TkXMsSiMoyWmhU0onhBhfeOfn4qRwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAhbLi1H5kupCWh3Eluxo1g1B/gclkBBEhS4vxyFXdS4X1B36ffyQqijTRF9gi0XMHy5xsvLiu7Eksh7Gilj1+uqhTuuqHhvzPxRICoGZqfLjfcmk5qyNte1BnrN34TCfb1iuAMuJBT+wrA8DCnYTOTYZ+55LrPpoEdVIPorgMna920LRmPbOVQaoazEfgHQtOI8sJo3ImNl0/9p7RyuxcRLUjL+aaCqrj2rXv3FVaGPfWwKgRQ2V1lZhhx3aDgu3MzOOoXbZrojm/OEcQ7LGYMsLWKXO0ZILsFsg8Tx1tRvGeCoOHBuYEs0A86Rd7fk+kYwOISX5JgIrpfQ902LHK2
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Montpellier Business School</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Montpellier Business School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.montpellier-bs.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin.infra.dsi@montpellier-bs.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.microsoftonline.com/a1bce70e-1f36-4e8c-b4f3-48980a5f78ee/saml2"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Montpellier Business School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Montpellier Business School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.montpellier-bs.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin.infra.dsi@montpellier-bs.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
index cef2f31b..21a84df5 100644
--- a/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.wur.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T20:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T20:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wur.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Wageningen UR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Wageningen UR</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Wageningen UR</mdui:Description>
+        <mdui:Description xml:lang="en">Wageningen UR</mdui:Description>
+        <mdui:Logo height="17" width="108">https://static.surfconext.nl/logos/idp/wur.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Wageningen Universiteit university WUR UR</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Wageningen Universiteit WUR UR</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wur.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Wageningen UR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Wageningen UR</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Wageningen UR</mdui:Description>
-          <mdui:Description xml:lang="en">Wageningen UR</mdui:Description>
-          <mdui:Logo height="17" width="108">https://static.surfconext.nl/logos/idp/wur.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Wageningen Universiteit university WUR UR</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Wageningen Universiteit WUR UR</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4ff1ecb290680df5b2ee5c631c2fc102"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wageningen UR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wageningen UR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wageningenur.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4ff1ecb290680df5b2ee5c631c2fc102"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wageningen UR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wageningen UR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wageningenur.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
index 14780b5e..c03457fc 100644
--- a/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.zadkine.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="nl">Zadkine (nieuw)</mdui:Description>
+        <mdui:Description xml:lang="en">Zadkine (nieuw)</mdui:Description>
+        <mdui:Logo height="86" width="86">https://static.surfconext.nl/logos/idp/zadkine.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Zadkine ROC MBO</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Zadkine ROC MBO</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="nl">Zadkine (nieuw)</mdui:Description>
-          <mdui:Description xml:lang="en">Zadkine (nieuw)</mdui:Description>
-          <mdui:Logo height="86" width="86">https://static.surfconext.nl/logos/idp/zadkine.gif</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Zadkine ROC MBO</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Zadkine ROC MBO</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/16af967ce379fb1cc54bbe2e8ad5d565"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Zadkine</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Zadkine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Zadkine</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Zadkine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.zadkine.nl</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.zadkine.nl</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/16af967ce379fb1cc54bbe2e8ad5d565"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Zadkine</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Zadkine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Zadkine</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Zadkine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.zadkine.nl</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.zadkine.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
index 3ae6ae12..fff28857 100644
--- a/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://stsfed.login.vu.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-26T16:10:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-26T16:10:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Vrije Universiteit Amsterdam</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vrije Universiteit Amsterdam</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Vrije Universiteit Amsterdam</mdui:Description>
+        <mdui:Description xml:lang="en">Vrije Universiteit Amsterdam</mdui:Description>
+        <mdui:Logo height="51" width="107">https://static.surfconext.nl/logos/idp/vu.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">VU Vrije Universiteit Amsterdam</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">VU Vrije Universiteit Amsterdam</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Vrije Universiteit Amsterdam</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Vrije Universiteit Amsterdam</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Vrije Universiteit Amsterdam</mdui:Description>
-          <mdui:Description xml:lang="en">Vrije Universiteit Amsterdam</mdui:Description>
-          <mdui:Logo height="51" width="107">https://static.surfconext.nl/logos/idp/vu.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">VU Vrije Universiteit Amsterdam</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">VU Vrije Universiteit Amsterdam</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/f5fc4ac4149942d16a3ad9e1d2c82065"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Vrije Universiteit Amsterdam</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Vrije Universiteit Amsterdam</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vu.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/f5fc4ac4149942d16a3ad9e1d2c82065"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vrije Universiteit Amsterdam</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vrije Universiteit Amsterdam</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vu.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml b/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
index bb8da0ce..7c474af7 100644
--- a/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://stsr4l.who.int/adfs/services/trust">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T13:21:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T13:21:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">r4l.who.int</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">r4l.who.int</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGiDCCBXCgAwIBAgIKYVPlegAAAAAABTANBgkqhkiG9w0BAQUFADBcMRMwEQYK
 						CZImiZPyLGQBGRYDaW50MRMwEQYKCZImiZPyLGQBGRYDd2hvMRMwEQYKCZImiZPy
 						LGQBGRYDcjRsMRswGQYDVQQDExJyNGwtR1ZBMVNXRkFVTlMtQ0EwHhcNMTIwNTA2
@@ -54,13 +54,13 @@
 						MkaycTbjne8hZvyAE+pky6gOfSqel1sK0shc6884l/MYpFtPeQqEAfgRhgpqBfLa
 						Az0acO7R8jZkOciJKqgkuko1GYl2ipGTlDrAJs9IIUxIW8elG1WqegohJFE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGcjCCBVqgAwIBAgIKYSsQ1wAAAAAABDANBgkqhkiG9w0BAQUFADBcMRMwEQYK
 						CZImiZPyLGQBGRYDaW50MRMwEQYKCZImiZPyLGQBGRYDd2hvMRMwEQYKCZImiZPy
 						LGQBGRYDcjRsMRswGQYDVQQDExJyNGwtR1ZBMVNXRkFVTlMtQ0EwHhcNMTIwNTA2
@@ -97,30 +97,30 @@
 						zqYtQCwKgqVbXc24yBta07RnmrOl1+dWA6ACzGRp0iqCxx2WCkUBzIkWOy6olTYc
 						n9UIkmXwvsC7ywdo45OLLuqcKXRiDw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">World Health Organisation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research4Life</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.research4life.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ged</md:GivenName>
-      <md:SurName>Cheng</md:SurName>
-      <md:EmailAddress>mailto:gedatwho@gmail.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ged</md:GivenName>
-      <md:SurName>Cheng</md:SurName>
-      <md:EmailAddress>mailto:gedatwho@gmail.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">World Health Organisation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research4Life</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.research4life.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ged</md:GivenName>
+    <md:SurName>Cheng</md:SurName>
+    <md:EmailAddress>mailto:gedatwho@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ged</md:GivenName>
+    <md:SurName>Cheng</md:SurName>
+    <md:EmailAddress>mailto:gedatwho@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml b/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml
index 7a53276c..bba10fbd 100644
--- a/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studentstore.phoenixs.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-10T11:56:28Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-10T11:56:28Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIJAMKtTUHoN0LYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG3N0dWRlbnRzdG9yZS5waG9lbml4cy5jby51azAeFw0xMjA4MDkxNTMxMTBa
 						Fw0yMjA4MDcxNTMxMTBaMCYxJDAiBgNVBAMTG3N0dWRlbnRzdG9yZS5waG9lbml4
@@ -47,43 +47,43 @@
 						pMO1+iiqwJHHCnZnmAStXECu/j1i6BIvFX0bdK9imOuA+euujEfCf3E6evJvsCeu
 						gYsJPfcJiOV+ZzJTGZE2VhUvF3MAeThxL44KmQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Phoenix Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Phoenix Student Store</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.phoenixs.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Leighton</md:SurName>
-      <md:EmailAddress>mailto:Gary-Leighton@phoenixs.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gary</md:GivenName>
-      <md:SurName>Leighton</md:SurName>
-      <md:EmailAddress>mailto:Gary-Leighton@phoenixs.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Phoenix Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Phoenix Student Store</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.phoenixs.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Leighton</md:SurName>
+    <md:EmailAddress>mailto:Gary-Leighton@phoenixs.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gary</md:GivenName>
+    <md:SurName>Leighton</md:SurName>
+    <md:EmailAddress>mailto:Gary-Leighton@phoenixs.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml
index 3da08040..381ddbce 100644
--- a/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://submissions.ref.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-20T10:40:56Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-20T10:40:56Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="100" width="360">https://submissions.ref.ac.uk/i/reflogo_subs.gif</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">REF 2014 Submission system</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="100" width="360">https://submissions.ref.ac.uk/i/reflogo_subs.gif</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">REF 2014 Submission system</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAP8XeLlAC0V5MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHJlZi13ZWIxMB4XDTEyMDYxMjA3MjYyNVoXDTIyMDYxMDA3MjYyNVowEzER
 						MA8GA1UEAxMIcmVmLXdlYjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -33,33 +33,33 @@
 						K52v8ZbRnOSnk0ruip+qXPv6p4fpyJ8yKaUb4uPgtglChLINS8Zgw81aXqGDYY6Y
 						VUVYKKdPUd+3m5jTxdJth8UmPg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Higher Education Funding Council for England</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">REF 2014 Submission system</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hefce.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>User support</md:GivenName>
-      <md:EmailAddress>mailto:user-support@ref.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Gareth</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:g.edwards@hefce.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Higher Education Funding Council for England</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">REF 2014 Submission system</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hefce.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>User support</md:GivenName>
+    <md:EmailAddress>mailto:user-support@ref.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Gareth</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:g.edwards@hefce.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml b/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml
index c969be30..e3fad701 100644
--- a/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://subscription.echalk.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://subscription.echalk.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://subscription.echalk.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUjCCAjqgAwIBAgIJAIxk1ZoatOwHMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXN1YnNjcmlwdGlvbi5lY2hhbGsuY28udWswHhcNMDkwODE0MTAyNDMyWhcN
 						MTkwODEyMTAyNDMyWjAkMSIwIAYDVQQDExlzdWJzY3JpcHRpb24uZWNoYWxrLmNv
@@ -46,13 +46,13 @@
 						yLoqT2I7utT6SVExQtH+R3jpEPqKRR2/ct8B9Yc+MaaWwU2CTYsvDydLgGgp7Ar/
 						j4zX/I526fHsI+R5AO9HpeyqGRBhxBBsymL4bb9BZ/Ew43NokdM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUjCCAjqgAwIBAgIJAIxk1ZoatOwHMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXN1YnNjcmlwdGlvbi5lY2hhbGsuY28udWswHhcNMDkwODE0MTAyNDMyWhcN
 						MTkwODEyMTAyNDMyWjAkMSIwIAYDVQQDExlzdWJzY3JpcHRpb24uZWNoYWxrLmNv
@@ -72,44 +72,44 @@
 						yLoqT2I7utT6SVExQtH+R3jpEPqKRR2/ct8B9Yc+MaaWwU2CTYsvDydLgGgp7Ar/
 						j4zX/I526fHsI+R5AO9HpeyqGRBhxBBsymL4bb9BZ/Ew43NokdM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">eChalk Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">eChalk: Interactive resources for whole-class teaching</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.echalk.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>eChalk</md:GivenName>
-      <md:EmailAddress>mailto:info@echalk.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eChalk</md:GivenName>
-      <md:EmailAddress>mailto:info@echalk.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eChalk Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eChalk: Interactive resources for whole-class teaching</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.echalk.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eChalk</md:GivenName>
+    <md:EmailAddress>mailto:info@echalk.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eChalk</md:GivenName>
+    <md:EmailAddress>mailto:info@echalk.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml b/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml
index 7f8b500e..5ee005ab 100644
--- a/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml
+++ b/swamid-interfederations-2.0/support.roaming.dev.ja.net-saml.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://support.roaming.dev.ja.net/saml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-24T13:56:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" WantAssertionsSigned="1" errorURL="https://support.roaming.dev.ja.net/saml/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-24T13:56:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" WantAssertionsSigned="1" errorURL="https://support.roaming.dev.ja.net/saml/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">eduroam UK management portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Web based interface for managing the interactions between
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduroam UK management portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Web based interface for managing the interactions between
 					eduroam member institutions' radius servers (ORPS) and the national proxies (NRPS)</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGYDCCBEigAwIBAgIRAM6COi/QvNiOFGY9MD/7H6wwDQYJKoZIhvcNAQELBQAw
 						OzELMAkGA1UEBhMCR0IxEzARBgNVBAoMCmVkdXJvYW0gVUsxFzAVBgNVBAMMDmVk
 						dXJvYW0gU3ViIENBMB4XDTE2MDUyMzE0NTcyMloXDTE3MDUyMzE0NTcyMlowRzEL
@@ -53,32 +53,32 @@
 						kOlS4wPY5PKQ/2hjuZ0Li8Ig766finif4MOtFzqPNL4YYvLu9I1as2SZQtjld4GN
 						XczVHg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://support.roaming.dev.ja.net/saml/slo-soap"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://support.roaming.dev.ja.net/saml/sls-redirect-response"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://support.roaming.dev.ja.net/saml/consumer-post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://support.roaming.dev.ja.net/saml/consumer-artifact" index="2" isDefault="false"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">eduroam UK management portal</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">eduroam UK management portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://eduroam.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mitev</md:GivenName>
-      <md:SurName>Nik</md:SurName>
-      <md:EmailAddress>mailto:nik.mitev@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mitev</md:GivenName>
-      <md:SurName>Nik</md:SurName>
-      <md:EmailAddress>mailto:nik.mitev@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://support.roaming.dev.ja.net/saml/slo-soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://support.roaming.dev.ja.net/saml/sls-redirect-response"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://support.roaming.dev.ja.net/saml/consumer-post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://support.roaming.dev.ja.net/saml/consumer-artifact" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">eduroam UK management portal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduroam UK management portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://eduroam.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mitev</md:GivenName>
+    <md:SurName>Nik</md:SurName>
+    <md:EmailAddress>mailto:nik.mitev@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mitev</md:GivenName>
+    <md:SurName>Nik</md:SurName>
+    <md:EmailAddress>mailto:nik.mitev@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml
index def155ac..a05bc306 100644
--- a/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sus-primo.hosted.exlibrisgroup.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-14T12:59:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-14T12:59:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJANjfMJJw+7nwMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
 						BAMTJWRjMDNrZzAxNDhldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTIx
 						MTEyMTMwOTMwWhcNMjIxMTEwMTMwOTMwWjAwMS4wLAYDVQQDEyVkYzAza2cwMTQ4
@@ -44,40 +44,40 @@
 						FkKvnBLwGTSx564XFgYDoKw1HRQuxMkcXir8AXvYJyCm4Sh8UM1FdFOnVeluvJ8R
 						8APd8wDeJjJ0zQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ex Libris: University of Sussex Primo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ex Libris: University of Sussex Primo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml
index 5f0c3fad..559f817f 100644
--- a/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sus-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-09T09:18:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-09T09:18:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Of Sussex - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of University Of Sussex</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University Of Sussex - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of University Of Sussex</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAIJI2WEAW9Y7MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjUwHhcNMTUwNDAyMTkyMDI3WhcNMjUwMzMwMTkyMDI3WjASMRAw
 						DgYDVQQDEwdhaW8wMDI1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -50,43 +50,43 @@
 						V379XyFD4ydqADU0uPiyX1VrYoVqBhzt81A5NqVrS+ebSGkkQbgXV/1wH416tGay
 						BqUkPiCh/jaWeBCQR1PCrQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for University Of Sussex</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for University Of Sussex</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml
index eca5c21c..852234c3 100644
--- a/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swa-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-09T12:55:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-09T12:55:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Swansea University - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Swansea University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Swansea University - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Swansea University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAJQumskVB5uCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjQwHhcNMTUwNDAyMTkxOTEzWhcNMjUwMzMwMTkxOTEzWjASMRAw
 						DgYDVQQDEwdhaW8wMDI0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -50,43 +50,43 @@
 						Vbb1WFs9FFgRruuBYRJX3XfmU6xcxg7m1usTCCkYZ3JBpSJy1ljVTzGTP+kaFAYB
 						C9TeNwf53LIMxLBZhVSF8Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Swansea University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Swansea University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml
index ccf4cd11..1d305241 100644
--- a/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/swamid.vr.se-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.vr.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
+        <mdui:DisplayName xml:lang="en">The Swedish Research Council</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>vr.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Vetenskapsrådet</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">IDP på Vetenskapsrådet</mdui:Description>
-          <mdui:DisplayName xml:lang="en">The Swedish Research Council</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IDP at Swedish Research Council</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.vr.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.vr.se/english/</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="111" width="225">https://www.vr.se/images/18.12fff4451215cbd83e4800013838/vetenskapsradet-logotyp.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">vr vetenskapsrådet vrpunktse</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">vr the+swedish+research+council vrpunktse</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>vr.se</mdui:DomainHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
 NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -46,13 +46,13 @@ r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
 UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
 spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
 MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
@@ -71,13 +71,13 @@ ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
 SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
 KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
 NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -96,25 +96,25 @@ zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
 mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
 ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.vr.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.vr.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.vr.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.vr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.vr.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.vr.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.vr.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vr.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKdD1Rjdxk5H7ZVxQK4E87QLjAUaMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTFaFw0z
 NjA1MzExMjQ0MTFaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -133,13 +133,13 @@ r6BYicgEVxuiwC0Ti5PIhIuE/qepoRAtF9C2BbW0ns6mhXh07nQpPnUOTtcBQpm0
 UjdiwlVx2MI6pNqAhs6CyGLbl24pX2ZSIeQANV6EyC/2gwYVoCEiKy4y2rLEj/gn
 spRe2TjMjBpOrQ3a0jWGQNY2xJ9Wh8deLv4jBXxvolk=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUW8VbDedRqzlrcKGuwXrMfP/ZhtkwDQYJKoZIhvcNAQEL
 BQAwFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMB4XDTE2MDUzMTEyNDQxMFoXDTM2
 MDUzMTEyNDQxMFowFzEVMBMGA1UEAwwMc3dhbWlkLnZyLnNlMIIBIjANBgkqhkiG
@@ -158,13 +158,13 @@ ZJlqm3ZacbC47MoJJbdLBq3IDGBcZOCsjTHZCZiHDIKUaZwgmIJUD4tAHBlYxpu2
 SW6ArEDHwaWpsBcWi0kF+nPjmMHVuAEIyiOz5g8kMUDtFQC0ohxS4yDftv72iEut
 KBGBXPCezbVPs7lue7sIDzcUbtrWlrtkJoPc1K6fYA==
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAImv4R6xSBeJSVpZiQBiD6Fd37SsMA0GCSqGSIb3DQEB
 CwUAMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTAeFw0xNjA1MzExMjQ0MTBaFw0z
 NjA1MzExMjQ0MTBaMBcxFTATBgNVBAMMDHN3YW1pZC52ci5zZTCCASIwDQYJKoZI
@@ -183,19 +183,19 @@ zg16ulEpuBcRdMhEzCTDNiu7tLwqfaH2JlmPx3rvqJf6MTiq1BJSZiwtXciqruUi
 mSKBUbKat2Zu8OPeCvOLRTStArYkB4IC0d/1x1EaTIsS0szzAnQZeQ0fdHKVoTKX
 ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">VR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vr.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Robert Chrudina</md:SurName>
-      <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">VR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Robert Chrudina</md:SurName>
+    <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
index 7b2ba9a7..486ae339 100644
--- a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid2.shh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sophiahemmet Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sophiahemmet University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Sophiahemmet Högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Sophiahemmet University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.sophiahemmet.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.sophiahemmet.se/</mdui:InformationURL>
+        <mdui:Logo height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>sophiahemmet.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.34547,18.07525</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shh.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Sophiahemmet Högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Sophiahemmet University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för Sophiahemmet Högskola.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for Sophiahemmet University.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.sophiahemmet.se/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.sophiahemmet.se/</mdui:InformationURL>
-          <mdui:Logo height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-          <mdui:Keywords xml:lang="sv">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>sophiahemmet.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:59.34547,18.07525</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
 DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
@@ -51,27 +51,27 @@ m0uLanEaWsDW7eegsQ2krvzhMd7E2IxvgnVFhL8cr/blHzUTqu1wjNT69xEYLjMk
 UOVyoxnOo5Fi2BoLNACADCZXl8OjW+v+GYh0YpJ617ijB3zfL+nyta9Y8gn+xIpT
 YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
 URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid2.shh.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid2.shh.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid2.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid2.shh.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shh.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid2.shh.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid2.shh.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid2.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid2.shh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shh.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
 DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
@@ -88,37 +88,37 @@ m0uLanEaWsDW7eegsQ2krvzhMd7E2IxvgnVFhL8cr/blHzUTqu1wjNT69xEYLjMk
 UOVyoxnOo5Fi2BoLNACADCZXl8OjW+v+GYh0YpJ617ijB3zfL+nyta9Y8gn+xIpT
 YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
 URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SHH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Sophiahemmet University</md:Company>
-      <md:SurName>Sophiahemmet IT</md:SurName>
-      <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Sophiahemmet University</md:Company>
-      <md:SurName>Sophiahemmet IT</md:SurName>
-      <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Sophiahemmet University</md:Company>
-      <md:SurName>Sophiahemmet IT</md:SurName>
-      <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SHH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Sophiahemmet University</md:Company>
+    <md:SurName>Sophiahemmet IT</md:SurName>
+    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Sophiahemmet University</md:Company>
+    <md:SurName>Sophiahemmet IT</md:SurName>
+    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Sophiahemmet University</md:Company>
+    <md:SurName>Sophiahemmet IT</md:SurName>
+    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml b/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml
index 0675c3d1..f8b30eff 100644
--- a/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swlite.sci-ware-customer.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-06T13:31:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-06T13:31:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIJANYEwhA2kYlcMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
 						BAMTK2lwLTEwLTEwNi0xNDUtMjguZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
 						HhcNMTQwNjA1MTQzMTMzWhcNMjQwNjAyMTQzMTMzWjA2MTQwMgYDVQQDEytpcC0x
@@ -44,42 +44,42 @@
 						Ypbx1Yg1LWzRNl/NZHRL2Pag7RYbB13G+4m5i1Yni2EwmnRDc5GgI1FrVfpopH5B
 						2lziDoipQufnV3DqtGQGUpN2BSVKkjXigpFeJg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science Warehouse ITE Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Application Support</md:GivenName>
-      <md:EmailAddress>mailto:SupportTeam@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Application Support</md:GivenName>
-      <md:EmailAddress>mailto:SupportTeam@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science Warehouse ITE Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Application Support</md:GivenName>
+    <md:EmailAddress>mailto:SupportTeam@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Application Support</md:GivenName>
+    <md:EmailAddress>mailto:SupportTeam@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sztaki.cloud.mta.hu-shibboleth.xml b/swamid-interfederations-2.0/sztaki.cloud.mta.hu-shibboleth.xml
index f46f4074..9137803d 100644
--- a/swamid-interfederations-2.0/sztaki.cloud.mta.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/sztaki.cloud.mta.hu-shibboleth.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sztaki.cloud.mta.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>sztaki</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>sztaki</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Cloud@Sztaki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MTA Cloud@Sztaki</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Az MTA Cloud SZTAKI-s telephelyének erőforrásai.</mdui:Description>
+        <mdui:Description xml:lang="en">A node of the Cloud of Hungarian Academy of Sciences located at MTA SZTAKI</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://cloud.mta.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">https://sztaki.cloud.mta.hu/docs/policy.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">MTA Cloud@Sztaki</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">MTA Cloud@Sztaki</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Az MTA Cloud SZTAKI-s telephelyének erőforrásai.</mdui:Description>
-          <mdui:Description xml:lang="en">A node of the Cloud of Hungarian Academy of Sciences located at MTA SZTAKI</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://cloud.mta.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">https://sztaki.cloud.mta.hu/docs/policy.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAJ1PxANUccd6MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGMyNGZmZWU1YjJiODAeFw0xNjAzMTYxMzExMjlaFw0yNjAzMTQxMzExMjlaMBcxFTATBgNVBAMTDGMyNGZmZWU1YjJiODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6qdTlKmt0axqmZL6TXw0CidQ0qF0B9KXTp6PQQ2awPpnkV8WiEVEaMrzir7Xty0kexl23842+UdRDlxIW7GpJT7Bva7ZGc7Quow9LYOlPRSiBL4wpFJDdb/NNGz2NJQvbbVQsCo10kOdv7jCPqZbFVClbwYvaztbNXJylETmOJGRnt4rYANFznZCyusPTmn1KcMIJKw+nsTXjsKgnptAM6OvPIhP9Fi6AvQISWQudJIGljcBeop99SmqPmy0NMfbDI9ME/oNbZdPfnTmfBbfgZvQ4aJ2Ll4zbsydZfV11hFWz5s8Y+yI/pr9UQ4AIydLQn4rNthLvddTcEDPXhTV0CAwEAAaM6MDgwFwYDVR0RBBAwDoIMYzI0ZmZlZTViMmI4MB0GA1UdDgQWBBRrru+01zhheqDdd9HsOlyOHXRafDANBgkqhkiG9w0BAQUFAAOCAQEAAi0UnentiFmU/meC/aTB1GgMJYkjGjnoTnZSedYfIOPC5Lx4wjT/g6jXnNwwFk3fkvLvj089T3Cl1VoJ8TUPeAUNA/UuVbSWP8d0aginYsdZyPYbWGqh4NiMs+rkmy0yeKzHmZC9E87+oTyO6RUNpPo+yUS685IHn8KU6BOFoEsQd6BXv6cvm6qDmCKrQacDdYjxHtXh4t1D7O4BGDrFIz4RyX8SDHgPLBtRN1t2CYeuIN3Ak2jDIdGWZavuDOQewqxQURwbzbKRaydEOhwlVcVVK4esUwNeTPAHMkU0FX8fsichWpjRCgnbSYs+IyDtMmZEtt4KEPSHFV9n5WYNBQ==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>c24ffee5b2b8</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">MTA Cloud@Sztaki</md:ServiceName>
-        <md:ServiceName xml:lang="en">MTA Cloud@Sztaki</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Mihály Héder</md:SurName>
-      <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Mihály Héder</md:SurName>
-      <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Mihály Héder</md:SurName>
-      <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAJ1PxANUccd6MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGMyNGZmZWU1YjJiODAeFw0xNjAzMTYxMzExMjlaFw0yNjAzMTQxMzExMjlaMBcxFTATBgNVBAMTDGMyNGZmZWU1YjJiODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6qdTlKmt0axqmZL6TXw0CidQ0qF0B9KXTp6PQQ2awPpnkV8WiEVEaMrzir7Xty0kexl23842+UdRDlxIW7GpJT7Bva7ZGc7Quow9LYOlPRSiBL4wpFJDdb/NNGz2NJQvbbVQsCo10kOdv7jCPqZbFVClbwYvaztbNXJylETmOJGRnt4rYANFznZCyusPTmn1KcMIJKw+nsTXjsKgnptAM6OvPIhP9Fi6AvQISWQudJIGljcBeop99SmqPmy0NMfbDI9ME/oNbZdPfnTmfBbfgZvQ4aJ2Ll4zbsydZfV11hFWz5s8Y+yI/pr9UQ4AIydLQn4rNthLvddTcEDPXhTV0CAwEAAaM6MDgwFwYDVR0RBBAwDoIMYzI0ZmZlZTViMmI4MB0GA1UdDgQWBBRrru+01zhheqDdd9HsOlyOHXRafDANBgkqhkiG9w0BAQUFAAOCAQEAAi0UnentiFmU/meC/aTB1GgMJYkjGjnoTnZSedYfIOPC5Lx4wjT/g6jXnNwwFk3fkvLvj089T3Cl1VoJ8TUPeAUNA/UuVbSWP8d0aginYsdZyPYbWGqh4NiMs+rkmy0yeKzHmZC9E87+oTyO6RUNpPo+yUS685IHn8KU6BOFoEsQd6BXv6cvm6qDmCKrQacDdYjxHtXh4t1D7O4BGDrFIz4RyX8SDHgPLBtRN1t2CYeuIN3Ak2jDIdGWZavuDOQewqxQURwbzbKRaydEOhwlVcVVK4esUwNeTPAHMkU0FX8fsichWpjRCgnbSYs+IyDtMmZEtt4KEPSHFV9n5WYNBQ==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>c24ffee5b2b8</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sztaki.cloud.mta.hu:5000/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">MTA Cloud@Sztaki</md:ServiceName>
+      <md:ServiceName xml:lang="en">MTA Cloud@Sztaki</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Mihály Héder</md:SurName>
+    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Mihály Héder</md:SurName>
+    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Mihály Héder</md:SurName>
+    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml
index 6f061a94..451752d1 100644
--- a/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://take-shape-share.fenc.org.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T11:32:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T11:32:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Take-shape-share</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Take-shape-share</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJANjHSyxzQmcZMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCXMxNTUzMjEwNDAeFw0xMTA3MTQyMDM5MTNaFw0yMTA3MTEyMDM5MTNaMBQx
 						EjAQBgNVBAMTCXMxNTUzMjEwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -37,38 +37,38 @@
 						aKNTf017WLf8E/w+70rFWe08qZmLjJnhzKe/RFkQJf5jURb2RKzY72o6dr960FH7
 						CThSkJwcMk7Kdl9gQTSxlOAxstLZBg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML/POST" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Adaptable Learning Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Take-shape-share</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://take-shape-share.fenc.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>James</md:SurName>
-      <md:EmailAddress>mailto:richard.james@adaptablelearning.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Porter</md:SurName>
-      <md:EmailAddress>mailto:ian.porter@adaptablelearning.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adaptable Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Take-shape-share</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://take-shape-share.fenc.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>James</md:SurName>
+    <md:EmailAddress>mailto:richard.james@adaptablelearning.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Porter</md:SurName>
+    <md:EmailAddress>mailto:ian.porter@adaptablelearning.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml b/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
index d5c37486..2b67966f 100644
--- a/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://talkbank.talkbank.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:52:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:52:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://talkbank.talkbank.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TalkBank</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TalkBank</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Transcript Korpora Gesprächs Wechselwirkungen mit älteren Kindern und Erwachsenen.</mdui:Description>
+        <mdui:Description xml:lang="en">Transcript corpora of conversational interactions involving older children and adults.</mdui:Description>
+        <mdui:Logo height="16" width="25">https://talkbank.talkbank.org/images/clarin16.png</mdui:Logo>
+        <mdui:Logo height="60" width="92">https://talkbank.talkbank.org/images/clarin80.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://talkbank.org/share/irb/options.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://talkbank.talkbank.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">TalkBank</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">TalkBank</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Transcript Korpora Gesprächs Wechselwirkungen mit älteren Kindern und Erwachsenen.</mdui:Description>
-          <mdui:Description xml:lang="en">Transcript corpora of conversational interactions involving older children and adults.</mdui:Description>
-          <mdui:Logo height="16" width="25">https://talkbank.talkbank.org/images/clarin16.png</mdui:Logo>
-          <mdui:Logo height="60" width="92">https://talkbank.talkbank.org/images/clarin80.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="en">http://talkbank.org/share/irb/options.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>talkbank.talkbank.org</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=talkbank.talkbank.org</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAIzKsiKO/JQPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>talkbank.talkbank.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=talkbank.talkbank.org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAIzKsiKO/JQPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFXRhbGtiYW5rLnRhbGtiYW5rLm9yZzAeFw0xNDAzMTgxOTEzMDlaFw0yNDAz
 MTUxOTEzMDlaMCAxHjAcBgNVBAMTFXRhbGtiYW5rLnRhbGtiYW5rLm9yZzCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALno8eiR+W6+ZX3Yn5g7QNWUYues
@@ -47,45 +47,45 @@ M7H5R35g3WcjoBPdGHTSValup4MaMhz3dbLzS+X4s97XjIYVuaJFags+JZz+79b6
 xPttj9gCJKXC12f60rCBFakal1AEmL9GnYf2jyKaxkot5rxU053SU5ahhUAJpCoU
 nqtFHmhEv2mrhA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">TalkBank</md:ServiceName>
-        <md:ServiceName xml:lang="en">TalkBank</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Transcript Korpora Gesprächs Wechselwirkungen mit älteren Kindern und Erwachsenen.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Transcript corpora of conversational interactions involving older children and adults.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Franklin</md:GivenName>
-      <md:SurName>Chen</md:SurName>
-      <md:EmailAddress>mailto:FranklinChen@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brian</md:GivenName>
-      <md:SurName>MacWhinney</md:SurName>
-      <md:EmailAddress>mailto:macw@cmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">TalkBank</md:ServiceName>
+      <md:ServiceName xml:lang="en">TalkBank</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Transcript Korpora Gesprächs Wechselwirkungen mit älteren Kindern und Erwachsenen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Transcript corpora of conversational interactions involving older children and adults.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franklin</md:GivenName>
+    <md:SurName>Chen</md:SurName>
+    <md:EmailAddress>mailto:FranklinChen@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brian</md:GivenName>
+    <md:SurName>MacWhinney</md:SurName>
+    <md:EmailAddress>mailto:macw@cmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml
index 4ca84d7a..a96e1961 100644
--- a/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tamana.msh-paris.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-03T19:29:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-03T19:29:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msh-paris.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7klEQVQoz42ST0iUQRjGH5eByq5Bh8AOXbx0WSI8LNgmFB8uQoshbaWFHupgCUV/DgULoRiSYYQEBrkiUphLSCwJHjYNLPeg7IJ/YmPRDsWC2u5+336zM9+Mh3d36OjwMrzv730e5p1h6l68ncWBlwZYyeEHNwBgTplrIHCmMRT0E5pOLO0V7J6Olt2C/TGx1NPRQjCV+QWAOW4FQCjo/776M72+tfOv1NtpAXgVSwDo7bTG3s+fbmxot5oWUusAfC6vuLwCYDG1sZzOZrf+9j17ByCzuZ3Z3AawnM4upjYAkJJxLmmSe90hAPcHJop2GYDhnEshpCGMi2rjSt8IgJMnjlV1QhoopGcIEzWDEPJm+7nW2tWnXt7J7xQG33zK/c5L6ZEAABOyZpCyNeifmv1GowO4e8O6bDX1j8alp0gAgFEBgBKt9cpajkh0ZPp1tFt6ylPKCJhXM3ieis/9iLQFIm0B23EfDE4S/zz2yAgAMKWqBqXU6ORcLP4VwKmG488fXr10e4jeDcDQ4+uk9CmtldYAbkUu1B85VLTLRbv8J78HgPjKWo6GJCXTWgMYn0l2hZvDF8/SaSXHfTL8gVq0m6Tu/LUo1UfrD5sfZjuugZTPTzwdn0nG4kmf1qAo2a6J/yElXxZWu8LNWmMfhRI+0YUdVTgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDArMDI6MDDUOMI2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAwpWV6igAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.fmsh.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">FMSH Paris</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">FMSH Fondation Maison des Sciences de l'Homme</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">FMSH Paris</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msh-paris.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7klEQVQoz42ST0iUQRjGH5eByq5Bh8AOXbx0WSI8LNgmFB8uQoshbaWFHupgCUV/DgULoRiSYYQEBrkiUphLSCwJHjYNLPeg7IJ/YmPRDsWC2u5+336zM9+Mh3d36OjwMrzv730e5p1h6l68ncWBlwZYyeEHNwBgTplrIHCmMRT0E5pOLO0V7J6Olt2C/TGx1NPRQjCV+QWAOW4FQCjo/776M72+tfOv1NtpAXgVSwDo7bTG3s+fbmxot5oWUusAfC6vuLwCYDG1sZzOZrf+9j17ByCzuZ3Z3AawnM4upjYAkJJxLmmSe90hAPcHJop2GYDhnEshpCGMi2rjSt8IgJMnjlV1QhoopGcIEzWDEPJm+7nW2tWnXt7J7xQG33zK/c5L6ZEAABOyZpCyNeifmv1GowO4e8O6bDX1j8alp0gAgFEBgBKt9cpajkh0ZPp1tFt6ylPKCJhXM3ieis/9iLQFIm0B23EfDE4S/zz2yAgAMKWqBqXU6ORcLP4VwKmG488fXr10e4jeDcDQ4+uk9CmtldYAbkUu1B85VLTLRbv8J78HgPjKWo6GJCXTWgMYn0l2hZvDF8/SaSXHfTL8gVq0m6Tu/LUo1UfrD5sfZjuugZTPTzwdn0nG4kmf1qAo2a6J/yElXxZWu8LNWmMfhRI+0YUdVTgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDArMDI6MDDUOMI2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAwpWV6igAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.fmsh.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">FMSH Paris</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">FMSH Fondation Maison des Sciences de l'Homme</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">FMSH Paris</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAKvJWtrrkP8adBVhhIy9uth+6L9WMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMME3RhbWFuYS5tc2gtcGFyaXMuZnIwHhcNMTUwNTE1MTUy
 NDI2WhcNMzUwNTE1MTUyNDI2WjAeMRwwGgYDVQQDDBN0YW1hbmEubXNoLXBhcmlz
@@ -40,22 +40,22 @@ eOXNzvbSj8sW5gaZB0wQgWWr1ngCblvUniPoaQVbqagTX34O5NuACADINIcIdrYl
 hXqn2Gjg9LULbyLEM0BGvZyvUeUm8GWHKTZpm8NXiNQHMUXZfrFwBJAfFkO02gRP
 WmnsnSPqzRlVSb0u
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tamana.msh-paris.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tamana.msh-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tamana.msh-paris.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fmsh.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Hoby Ratsihoarana</md:SurName>
-      <md:EmailAddress>hoby.ratsihoarana@msh-paris.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tamana.msh-paris.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tamana.msh-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tamana.msh-paris.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fmsh.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Hoby Ratsihoarana</md:SurName>
+    <md:EmailAddress>hoby.ratsihoarana@msh-paris.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml
index 0b68d9f6..1239632b 100644
--- a/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tandfbooks-test.literatumonline.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDyzCCArOgAwIBAgIJAIr2ZmL2om1kMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -30,24 +30,24 @@
 						fwhfCgtmUCCKSxeFrM/rL4i3oMMGh5x4b2CkxjXrRM5trBiYL5HVkva6/FJ+IOjG
 						AOJoFMvbih3XH45xRSUg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandfbooks-test.literatumonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfbooks-test.literatumonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandfbooks-test.literatumonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Group eBooks (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://tandfbooks-test.literatumonline.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandfbooks-test.literatumonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfbooks-test.literatumonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandfbooks-test.literatumonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Group eBooks (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://tandfbooks-test.literatumonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml
index cfb4c165..7c26d01a 100644
--- a/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tandfqa.literatumonline.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
 						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
@@ -26,24 +26,24 @@
 						hNI51amuMNcL46a8+E1IW8L59W656YzJnJ8I2A9nuHdmWQGs5jICuG4dr7+70wCP
 						Lv0VNFSwnTxjA5Rocmae95yzHIE0I4tW7VD+q+yeEStXHCCN1rWHgLWJb/U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandfqa.literatumonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfqa.literatumonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandfqa.literatumonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Atypon T and F QA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.atypon.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandfqa.literatumonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfqa.literatumonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandfqa.literatumonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Atypon T and F QA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.atypon.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml
index a1226329..4da314e3 100644
--- a/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tandftest.literatumonline.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
 						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
@@ -26,24 +26,24 @@
 						hNI51amuMNcL46a8+E1IW8L59W656YzJnJ8I2A9nuHdmWQGs5jICuG4dr7+70wCP
 						Lv0VNFSwnTxjA5Rocmae95yzHIE0I4tW7VD+q+yeEStXHCCN1rWHgLWJb/U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandftest.literatumonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandftest.literatumonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandftest.literatumonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Atypon T and F Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.atypon.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandftest.literatumonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandftest.literatumonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandftest.literatumonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Atypon T and F Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.atypon.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml
index 925812d1..f2e6eeb2 100644
--- a/swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tc-web-01.groupgti.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJALr1RvO8/Hs1MA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -33,13 +33,13 @@
 						jE1agxgsSIXSbxHwZZE2S/mQZYD5SS3pjfCv5NVLar1+78ltc0UrtuAYAzNWS1JO
 						d7WVmWXEHEPJ0nj/KHfo0tLf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJALr1RvO8/Hs1MA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -65,25 +65,25 @@
 						jE1agxgsSIXSbxHwZZE2S/mQZYD5SS3pjfCv5NVLar1+78ltc0UrtuAYAzNWS1JO
 						d7WVmWXEHEPJ0nj/KHfo0tLf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TARGETconnect Support</md:GivenName>
-      <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Masters</md:SurName>
-      <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TARGETconnect Support</md:GivenName>
+    <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Masters</md:SurName>
+    <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml
index d30db4a9..b5d18680 100644
--- a/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tc-web-02.groupgti.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJAJEc5gsxNUbCMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -33,13 +33,13 @@
 						kAjByRAB/7Jw+b2CkaFGfozXh4W2ALsg7F3noW0S77LHMAcnuWEozfjc7QA8w8jV
 						Oij+zsSTj3QSvhRz5A2Dqv1F
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJAJEc5gsxNUbCMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -65,25 +65,25 @@
 						kAjByRAB/7Jw+b2CkaFGfozXh4W2ALsg7F3noW0S77LHMAcnuWEozfjc7QA8w8jV
 						Oij+zsSTj3QSvhRz5A2Dqv1F
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TARGETconnect Support</md:GivenName>
-      <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Masters</md:SurName>
-      <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TARGETconnect Support</md:GivenName>
+    <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Masters</md:SurName>
+    <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml
index b0b39b8a..f764c2fa 100644
--- a/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tc-web-03.groupgti.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJAPnTayEZXM7VMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -33,13 +33,13 @@
 						rjQUyxNGUVhJ++5dcBsCpBcyGgwKLSx5nJY72lDMkWJvAj7ihi+x+hL8gIvPfkmm
 						yiu2mVZwNVkxuVjfZ9eLiYR7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJAPnTayEZXM7VMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -65,25 +65,25 @@
 						rjQUyxNGUVhJ++5dcBsCpBcyGgwKLSx5nJY72lDMkWJvAj7ihi+x+hL8gIvPfkmm
 						yiu2mVZwNVkxuVjfZ9eLiYR7
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web3</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TARGETconnect Support</md:GivenName>
-      <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Masters</md:SurName>
-      <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TARGETconnect Support</md:GivenName>
+    <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Masters</md:SurName>
+    <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml
index 6b8135a0..e12dc923 100644
--- a/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tc-web-04.groupgti.net/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJAMke5AjSxi5OMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -33,13 +33,13 @@
 						/Og+MVynXgDdcG9XgVroHCR8TqohFzzmtK1Wl+Hbew5/xwi3Tzm44ZyUj00hyxAG
 						yD3GZhGlZ1YZtg+2iJdZmyox
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEXjCCA0agAwIBAgIJAMke5AjSxi5OMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
 						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
 						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
@@ -65,25 +65,25 @@
 						/Og+MVynXgDdcG9XgVroHCR8TqohFzzmtK1Wl+Hbew5/xwi3Tzm44ZyUj00hyxAG
 						yD3GZhGlZ1YZtg+2iJdZmyox
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web4</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TARGETconnect Support</md:GivenName>
-      <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Masters</md:SurName>
-      <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTI Media Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web4</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.groupgti.com/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TARGETconnect Support</md:GivenName>
+    <md:EmailAddress>mailto:targetconnect.support@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Masters</md:SurName>
+    <md:EmailAddress>mailto:chris.masters@groupgti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org-sp.xml b/swamid-interfederations-2.0/terena.org-sp.xml
index 56af513a..ed38f0a2 100644
--- a/swamid-interfederations-2.0/terena.org-sp.xml
+++ b/swamid-interfederations-2.0/terena.org-sp.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all GÉANT federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.geant.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.org/Policies</mdui:PrivacyStatementURL>
+        <mdui:Logo width="175" height="73">https://login.terena.org/wayf/module.php/terena/gfx/New_GEANT_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT Service Provider Proxy</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A service provider proxy for all GÉANT federated services</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.geant.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.org/Policies</mdui:PrivacyStatementURL>
-          <mdui:Logo width="175" height="73">https://login.terena.org/wayf/module.php/terena/gfx/New_GEANT_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>TERENA</md:GivenName>
-      <md:SurName>AAI team</md:SurName>
-      <md:EmailAddress>aai@terena.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
index 66a9aac7..b3aaf6da 100644
--- a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="http://test-adfs.geant.net/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Intranet Test Instance</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Provides access to GÉANT project documents and internas. Test instance.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT Intranet Test Instance</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Provides access to GÉANT project documents and internas. Test instance.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEcjCCA1qgAwIBAgIHFoCBhVY+iTANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQG
 EwJERTEPMA0GA1UEChMGZWR1UEtJMRcwFQYDVQQDEw5lZHVQS0kgVGVzdCBDQTAe
 Fw0xMzEwMTgwOTQ4MzdaFw0xODEwMTcwOTQ4MzdaMG0xCzAJBgNVBAYTAkRFMTEw
@@ -41,42 +41,42 @@ OVRy4URr0xxsk41aMJbyW8G9g8TmHMUwY+SwfvYXziQ4Jf67MMMf4a8c2ywZJXTz
 8Yu/S/of6N7uF5SXxIAsTqBWPsFm5Fs9MbAjqH5+itfgPbvh2OsigzD5yODRBfDV
 +i8UK1ae+ilwPcADJEuc04gZiy3dz1a4rhRmDg+bleNBtH2J/JQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">GÉANT Intranet Test Instance</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="surname" isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="commonName" isRequired="true" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">geant.net</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>eduGAIN</md:GivenName>
-      <md:SurName>Integration</md:SurName>
-      <md:EmailAddress>mailto:edugain-integration@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eduGAIN</md:GivenName>
-      <md:SurName>Operation</md:SurName>
-      <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT Intranet Test Instance</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="commonName" isRequired="true" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">geant.net</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduGAIN</md:GivenName>
+    <md:SurName>Integration</md:SurName>
+    <md:EmailAddress>mailto:edugain-integration@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduGAIN</md:GivenName>
+    <md:SurName>Operation</md:SurName>
+    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml b/swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml
index 6db2efd4..ca884c3a 100644
--- a/swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-auth.galegroup.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDTzCCAjegAwIBAgIJAJeid8J1f6CuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNvbTAeFw0xMjAzMTIxNzMwMjNaFw0z
 						MjAzMDcxNzMwMjNaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNv
@@ -27,31 +27,31 @@
 						/tapXMzigHNS/YoxpEmtKkUrnkBm3nrWeF0Z6sqYEz49xS6NdnKLTSVQHyJ413LZ
 						WQSvXs7RDm/214HIimD/TkaDp1Yv0Yk2iQAeO7fucXAIAv4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tg-dxpres1.oh.ggtest.com:8445/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev1.ggdev.com/Shibboleth.sso/SAML/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.ggtest.com/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev.ggtest.com/Shibboleth.sso/SAML/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML2/POST" index="8"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cengage Learning Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Gale Databases from Cengage Learning - Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cengage.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joe</md:GivenName>
-      <md:SurName>Mathews</md:SurName>
-      <md:EmailAddress>mailto:Joe.Mathews@cengage.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Selva</md:GivenName>
-      <md:SurName>Rengarajan</md:SurName>
-      <md:EmailAddress>mailto:Selva.Kumar@cengage.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tg-dxpres1.oh.ggtest.com:8445/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev1.ggdev.com/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.ggtest.com/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev.ggtest.com/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML2/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cengage Learning Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Gale Databases from Cengage Learning - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cengage.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joe</md:GivenName>
+    <md:SurName>Mathews</md:SurName>
+    <md:EmailAddress>mailto:Joe.Mathews@cengage.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Selva</md:GivenName>
+    <md:SurName>Rengarajan</md:SurName>
+    <md:EmailAddress>mailto:Selva.Kumar@cengage.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
index 0010a684..84e2ae45 100644
--- a/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
+++ b/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-bod-gui.geant.net/autobahn-gui">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-08T15:01:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-08T15:01:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BoD Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">BoD Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
 						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
@@ -35,13 +35,13 @@
 						4XvylEUggQ7GT7X7IMNh4wh29P6NkOeY/5kGJBqt5TjecDECqYLSBalEXhaMO4h4
 						zpPvtpSGaL5QrQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
 						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
@@ -61,36 +61,36 @@
 						4XvylEUggQ7GT7X7IMNh4wh29P6NkOeY/5kGJBqt5TjecDECqYLSBalEXhaMO4h4
 						zpPvtpSGaL5QrQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">BoD Portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">BoD Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
index e958044b..b2063b92 100644
--- a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-dcs.cla.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T08:35:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T08:35:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJANN7j8TZENUbMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCG5zMzczMTUzMB4XDTE1MDQyNzEzNDMzOVoXDTI1MDQyNDEzNDMzOVowEzER
 						MA8GA1UEAxMIbnMzNzMxNTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -47,46 +47,46 @@
 						vI2el1erTkBgTf/qHvtskD/N1KTxz9oZV/bTpkype7gRaya8jguEmXqz0fyt9ohB
 						kep+2TUr/H4eYqGM0KNkWWD8FA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Copyright Licensing Agency Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Content Store</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://cla.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dev Team</md:GivenName>
-      <md:EmailAddress>mailto:dev@cloudspringtech.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dev Team</md:GivenName>
-      <md:EmailAddress>mailto:dev@cloudspringtech.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Amyotte</md:SurName>
-      <md:EmailAddress>mailto:phil@cloudspringtech.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Copyright Licensing Agency Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Content Store</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://cla.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dev Team</md:GivenName>
+    <md:EmailAddress>mailto:dev@cloudspringtech.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dev Team</md:GivenName>
+    <md:EmailAddress>mailto:dev@cloudspringtech.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Amyotte</md:SurName>
+    <md:EmailAddress>mailto:phil@cloudspringtech.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml b/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml
index ee6fb528..7b60b533 100644
--- a/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-idp.dante.net/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-10T16:24:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-10T16:24:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider (test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://test-idp.dante.net/idp/images/geant_logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://test-idp.dante.net/idp/images/geant_logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>dante.net</mdui:DomainHint>
+        <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider (test)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">GÉANT plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
-          <mdui:Logo height="16" width="16">https://test-idp.dante.net/idp/images/geant_logo-16x16.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://test-idp.dante.net/idp/images/geant_logo-80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>dante.net</mdui:DomainHint>
-          <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
-          <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAKY6eNYR8734HaAHYHoKauOUXUzyMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5ldDAeFw0xMzExMjgxMTI4
 						MzZaFw0zMzExMjgxMTI4MzZaMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5l
@@ -49,29 +49,29 @@
 						yuTd0QvUiAwqymNY7bW1igPR3ZwrolsVTPGzSwYA1uz9ossTEeBiA9hc0p7fUZMQ
 						cD03d90l9es=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://test-idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-idp.dante.net/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-idp.dante.net:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://test-idp.dante.net/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-idp.dante.net/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-idp.dante.net/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://test-idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-idp.dante.net/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-idp.dante.net:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://test-idp.dante.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-idp.dante.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-idp.dante.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAKY6eNYR8734HaAHYHoKauOUXUzyMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5ldDAeFw0xMzExMjgxMTI4
 						MzZaFw0zMzExMjgxMTI4MzZaMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5l
@@ -91,25 +91,25 @@
 						yuTd0QvUiAwqymNY7bW1igPR3ZwrolsVTPGzSwYA1uz9ossTEeBiA9hc0p7fUZMQ
 						cD03d90l9es=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://test-idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-idp.dante.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Staff Identity Provider (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DANTE Support</md:GivenName>
-      <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DANTE Support</md:GivenName>
-      <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://test-idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-idp.dante.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Staff Identity Provider (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DANTE Support</md:GivenName>
+    <md:EmailAddress>mailto:idp-support@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml b/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
index 9d8b1f67..a7496d3e 100644
--- a/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
+++ b/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-imagenweb.cambridgeimaging.co.uk/entityid">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-25T12:21:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-25T12:21:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ImagenWeb (beta)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ImagenWeb 2.9 (beta), used for testing only</mdui:Description>
+        <mdui:Logo height="64" width="224">https://test-imagenweb.cambridgeimaging.co.uk/user/templates/global/site-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ImagenWeb (beta)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">ImagenWeb 2.9 (beta), used for testing only</mdui:Description>
-          <mdui:Logo height="64" width="224">https://test-imagenweb.cambridgeimaging.co.uk/user/templates/global/site-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
 						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
 						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
@@ -37,13 +37,13 @@
 						ueK+2BMrsfZchYNf/qH9nRbVS5phEo+RZJbJnqRG7KwVHRMyMNJblleLKqj29Yup
 						fscUgPXFf8x5UJOqq1DjJ+coYkXNsNRtZZy5uH/2nA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
 						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
 						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
@@ -64,37 +64,37 @@
 						ueK+2BMrsfZchYNf/qH9nRbVS5phEo+RZJbJnqRG7KwVHRMyMNJblleLKqj29Yup
 						fscUgPXFf8x5UJOqq1DjJ+coYkXNsNRtZZy5uH/2nA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Test ImagenWeb for federated SSO</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cambridge Imaging Systems Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ImagenWeb (beta)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Jobling</md:SurName>
-      <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Jobling</md:SurName>
-      <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Test ImagenWeb for federated SSO</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cambridge Imaging Systems Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ImagenWeb (beta)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Jobling</md:SurName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Jobling</md:SurName>
+    <md:EmailAddress>mailto:support@cambridgeimaging.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
index 1a1e3940..61af4fa6 100644
--- a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.nature.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYTCCAkmgAwIBAgIEEtvGRDANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xNTAzMTMw
@@ -28,27 +28,27 @@
 						fnksTUIwbxyHGAEh+bqqgcm1tQi/auufi2bQHPQ77DJSGuVzUgz/qbZU8CJ7uATR
 						wsW5loM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
index 05ffdf03..0530fd76 100644
--- a/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.palgrave-journals.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDdzCCAl+gAwIBAgIEZnzg8DANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEqMCgGA1UEAxMhdGVzdC1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29t
@@ -28,27 +28,27 @@
 						bwzZO2QIVKM8zXA7VVC8XVdIOfG5LDb98EU7kqyMxPFcBk78kM7HIM13rX5mY5Yl
 						uU1h/2oAHZduSdY55wvXQYvJQCCwh5IFMgPf
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Palgrave Journals (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Palgrave Journals (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
index 7191382a..9f55c44e 100644
--- a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.palgraveconnect.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-08T17:38:32Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-08T17:38:32Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIEUiiGYTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEoMCYGA1UEAxMfdGVzdC1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNvbTAe
@@ -27,37 +27,37 @@
 						c5kRAY+dxwWbALv8WroHrVqTX6LhKujTWkxzh/xQg8hQ7tji/kcDLFi2ymeSpVmX
 						xSAwo3R1lMXGqwWXGZzadVh5xcajQcO2OX6Ce10amprpfM64
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chike</md:GivenName>
-      <md:SurName>Abia</md:SurName>
-      <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chike</md:GivenName>
-      <md:SurName>Abia</md:SurName>
-      <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Ollier</md:SurName>
-      <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chike</md:GivenName>
+    <md:SurName>Abia</md:SurName>
+    <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chike</md:GivenName>
+    <md:SurName>Abia</md:SurName>
+    <md:EmailAddress>mailto:C.Abia@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
index 734022bd..aea1c055 100644
--- a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.aco.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.eduid.at/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eduid.at/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">eduID.at Demo Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduID.at Demo Service</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
+        <mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
+        <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.eduid.at/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eduid.at/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">eduID.at Demo Service</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">eduID.at Demo Service</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
-          <mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
-          <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3Rlc3Qtc3AuYWNvLm5ldDAeFw0wODA3MDkxMTQ1NTVaFw0xODA3MDcxMTQ1
 NTVaMBoxGDAWBgNVBAMTD3Rlc3Qtc3AuYWNvLm5ldDCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALZXEDbiffZnDnsWcJlVUBlaAyEycf+0Bjg/DjsQAz4l
@@ -47,57 +47,57 @@ ejLfUgi137jrXaP7jlGSL85aFIWTGoBT6IZu+qiVo8qbWY5EH+3gSIQYCYpfKuaJ
 6EbpYsqZ1tEg6tfUGJK4Ly87HHBCRNwDV9/85yGt+puwvjsPeaXELsGOpTaA8lGJ
 i0o8V/egkPa0mbqghudG9cwZluJCJSWxvxv7yersHIdedRwZyv7vSGu4FI4g39Km
 vNzoGHMHg8pOo6cx9Arah88V+SEsBxtCh3V9Fg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eduid.at/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SLO/POST"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="de">eduID.at Demo Service</md:ServiceName>
-        <md:ServiceName xml:lang="en">eduID.at Demo Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>eduID.at</md:GivenName>
-      <md:SurName>Federation Operator</md:SurName>
-      <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eduid.at/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="de">eduID.at Demo Service</md:ServiceName>
+      <md:ServiceName xml:lang="en">eduID.at Demo Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduID.at</md:GivenName>
+    <md:SurName>Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml b/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml
index c0de4138..ededb516 100644
--- a/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml
+++ b/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.ihs.com/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-19T16:18:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-19T16:18:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ihssso.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ihssso.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ihssso.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ihssso.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGjCCAwKgAwIBAgIJANbtDttZCw1wMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDESMBAGA1UEBxMJQnJhY2tuZWxsMQww
 						CgYDVQQKEwNJSFMxCzAJBgNVBAsTAklUMRYwFAYDVQQDEw13d3cuaWhzdGkuY29t
@@ -53,42 +53,42 @@
 						DzE+93eMDZMqxG6X3jyYtfF9f551vCFvTDvOxkDd9dnSYPzb+++8BfTYtEnwpNiK
 						yKYcCFVxFCy1km7h2HBrOZMLUAbs0gGoTmSRAEByt0E3C8xzV1Ywu9htzRHmog==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ihssso.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihssso.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IHS (Global) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a test Shibboleth SP for IHS (Global) Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://uk.ihs.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Support</md:GivenName>
-      <md:EmailAddress>mailto:customer.support@ihs.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Trevor</md:GivenName>
-      <md:SurName>Cooley</md:SurName>
-      <md:EmailAddress>mailto:trevor.cooley@ihs.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ihssso.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihssso.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IHS (Global) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a test Shibboleth SP for IHS (Global) Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uk.ihs.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:customer.support@ihs.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Trevor</md:GivenName>
+    <md:SurName>Cooley</md:SurName>
+    <md:EmailAddress>mailto:trevor.cooley@ihs.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
index 0501236c..72d515da 100644
--- a/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.collectionsmanager.is.ed.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-15T13:32:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-15T13:32:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Edinburgh Collections Manager Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test DSpace installation for managing the University
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Edinburgh Collections Manager Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test DSpace installation for managing the University
 					of Edinburgh collection level descriptions and collection items.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJANfNVj1DnlqLMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG2xhYy1yZXBvLXRlc3QxMS5pcy5lZC5hYy51azAeFw0xNDA3MDcwOTE1NTha
 						Fw0yNDA3MDQwOTE1NThaMCYxJDAiBgNVBAMTG2xhYy1yZXBvLXRlc3QxMS5pcy5l
@@ -47,38 +47,38 @@
 						4nY9Dg5OwBp5mrZBQp4YLIznVWFaUUz/LilBSy+/c2hbHU6PxEuPuICmkjBtCK++
 						IMaAEqSt8zXvVR4i6AWj28qMBpSYddx6Pr5SFw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh Collections Manager Test</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Systems</md:GivenName>
-      <md:EmailAddress>mailto:information.systems@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Library Digital Development Team</md:GivenName>
-      <md:EmailAddress>mailto:lddt@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh Collections Manager Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Systems</md:GivenName>
+    <md:EmailAddress>mailto:information.systems@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Library Digital Development Team</md:GivenName>
+    <md:EmailAddress>mailto:lddt@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
index 8666ff48..22304654 100644
--- a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
+++ b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.federation.renater.fr/validation/ressource">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:20:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:20:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RENATER - validation service</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://test.federation.renater.fr/validation/ressource</mdui:InformationURL>
-          <mdui:Description xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - validation service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://test.federation.renater.fr/validation/ressource</mdui:InformationURL>
+        <mdui:Description xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
 Il faut configurer manuellement les filtres d'attributs pour cette ressource.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
 MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
@@ -45,13 +45,13 @@ aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
 PbS4vQ==
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
 MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
@@ -71,144 +71,87 @@ aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
 PbS4vQ==
 
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</md:ServiceName>
-        <md:ServiceName xml:lang="en">RENATER - validation service</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</md:ServiceName>
+      <md:ServiceName xml:lang="en">RENATER - validation service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
 Il faut configurer manuellement les filtres d'attributs pour cette ressource.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Mehdi Hached</md:SurName>
-      <md:EmailAddress>mehdi.hached@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Olivier Salaün</md:SurName>
-      <md:EmailAddress>olivier.salaun@renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Mehdi Hached</md:SurName>
+    <md:EmailAddress>mehdi.hached@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Olivier Salaün</md:SurName>
+    <md:EmailAddress>olivier.salaun@renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml
index 8d0b4358..ebfd26a8 100644
--- a/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ingentaconnect.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcDCCAligAwIBAgIES2K84DANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEiMCAGA1UE
 						ChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEgMB4GA1UEAxMXdGVzdC5pbmdl
@@ -28,23 +28,23 @@
 						CfTNe3AJxwMb0WenBMV9/65e9j5e4a+TT6pGthSpscXCD04BLKY217eNAQYNjP5o
 						omCKo319LoqKvn9D58kqlXlKNrc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ingentaconnect.com/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Publishing Technology: IngentaConnect (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:help@ingentaconnect.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ingentaconnect.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology: IngentaConnect (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:help@ingentaconnect.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.j2e.com-shibboleth.xml b/swamid-interfederations-2.0/test.j2e.com-shibboleth.xml
index 6d170094..c0aa1fe0 100644
--- a/swamid-interfederations-2.0/test.j2e.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.j2e.com-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.j2e.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-27T11:41:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-27T11:41:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.j2e.com/secure/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.j2e.com/secure/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.j2e.com/secure/Shibboleth.sso/USO"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.j2e.com/secure/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.j2e.com/secure/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.j2e.com/secure/Shibboleth.sso/USO"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAPqSMDPu7s7hMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnNlcnZlcjQwMjE1LnVrMm5ldC5jb20wHhcNMTAwODEyMTE0MTU2WhcNMjAw
 						ODA5MTE0MTU2WjAhMR8wHQYDVQQDExZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMIIB
@@ -44,40 +44,40 @@
 						i291jv0WzvQWVDfWSxY3Z869r+Y/bFqbhv9YXKwDSOx52sscAl1yjy0vDwuMKHyr
 						FzKrATccENnvJUM7hQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.j2e.com/secure/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Just2easy Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">A test server for just2easy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://just2easy.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Danny</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Danny</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.j2e.com/secure/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Just2easy Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">A test server for just2easy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://just2easy.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Danny</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Danny</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml
index 0becfff2..404debff 100644
--- a/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.myplace.strath.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-13T11:41:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-13T11:41:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6zCCAdOgAwIBAgIJAO7nQtYFnLcLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDG1vby10ZXN0LXdlYjAeFw0xNDA2MjUxNDMxMzhaFw0yNDA2MjIxNDMxMzha
 						MBcxFTATBgNVBAMTDG1vby10ZXN0LXdlYjCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -42,44 +42,44 @@
 						BRaRRbVGnjCpokPlIXUH82qKedSLn5O4XEr1hHhKjP3zIgExQqKw3ulXO6ZZ6gzY
 						M4FvArC++SGhK6YOaX2wH7KB8mWKKYtTM2ykDky3xw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Strathclyde</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Myplace test server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.strath.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Iain</md:GivenName>
-      <md:SurName>Todd</md:SurName>
-      <md:EmailAddress>mailto:iain.todd@strath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Iain</md:GivenName>
-      <md:SurName>Todd</md:SurName>
-      <md:EmailAddress>mailto:iain.todd@strath.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Strathclyde</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Myplace test server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.strath.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Iain</md:GivenName>
+    <md:SurName>Todd</md:SurName>
+    <md:EmailAddress>mailto:iain.todd@strath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Iain</md:GivenName>
+    <md:SurName>Todd</md:SurName>
+    <md:EmailAddress>mailto:iain.todd@strath.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
index 1e3a1f9f..4303a0b3 100644
--- a/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.oecd-ilibrary.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T13:56:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T13:56:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnDCCAoSgAwIBAgIEU2tkWDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
@@ -31,24 +31,24 @@
 						4kBuxFmldtOEJF/FwAZ6NMc0fUJJhCwRo03DDlL6heFyG/eU8XsyjVqt5ccS2QZ0
 						uHVkvFNSMPSdP9/x/ASMxQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.oecd-ilibrary.org/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OECD iLibrary</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://test.oecd-ilibrary.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Talvinder</md:GivenName>
-      <md:SurName>Matharu</md:SurName>
-      <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.oecd-ilibrary.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OECD iLibrary</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://test.oecd-ilibrary.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml
index ae52bde9..e1105334 100644
--- a/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.qmplus.qmul.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-07T11:59:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-07T11:59:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAI8TavPBUIURMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnRlc3QucW1wbHVzLnFtdWwuYWMudWswHhcNMTIwNjA3MTQ1MTAzWhcNMjIw
 						NjA1MTQ1MTAzWjAhMR8wHQYDVQQDExZ0ZXN0LnFtcGx1cy5xbXVsLmFjLnVrMIIB
@@ -42,38 +42,38 @@
 						1VdfmxX2wDjXzO43DSdmkvNEIPVrt4BLWwu9ZfK3fmnXyzpqhaJ0Be3sJ3KbLi7B
 						XZ0xC3fsbFJvZqOC1w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College: Test QMPlus service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Academic Applications</md:GivenName>
-      <md:EmailAddress>mailto:its-aa@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Moodle Support</md:GivenName>
-      <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Academic Applications</md:GivenName>
-      <md:EmailAddress>mailto:its-aa@qmul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College: Test QMPlus service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Academic Applications</md:GivenName>
+    <md:EmailAddress>mailto:its-aa@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Moodle Support</md:GivenName>
+    <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Academic Applications</md:GivenName>
+    <md:EmailAddress>mailto:its-aa@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml
index 8e8ff440..b33e140f 100644
--- a/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.repository.abertay.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-12T14:54:50Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-12T14:54:50Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAJjxlcGvVj5jMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDmxhYy1yZXBvLXRlc3Q5MB4XDTEyMTAwOTA5MDA0OVoXDTIyMTAwNzA5MDA0
 						OVowGTEXMBUGA1UEAxMObGFjLXJlcG8tdGVzdDkwggEiMA0GCSqGSIb3DQEBAQUA
@@ -39,39 +39,39 @@
 						qlS9ap7Hl3ajmRv/REjbGOZhZuThU5O65cQSp2PSKnSKV88iFVSLWU2l6TlqKrjt
 						eWJEDVhvk1nZNZXZyVnoEuC0WzGA315+yKjno4H6Ys1Q7B/SiQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Abertay Dundee</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Research Repository (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:isservicedesk@abertay.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Colin</md:GivenName>
-      <md:SurName>Watt</md:SurName>
-      <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Abertay Dundee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Research Repository (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:isservicedesk@abertay.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.rpharms.com-entity.xml b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
index b9aeae23..152a1622 100644
--- a/swamid-interfederations-2.0/test.rpharms.com-entity.xml
+++ b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.rpharms.com/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-04T12:21:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-04T12:21:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CBCL Test Site</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Development site for CBCL</mdui:Description>
+        <mdui:Logo height="64" width="139">https://staging.cbcl.co.uk/ukfed/cbcl_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CBCL Test Site</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Development site for CBCL</mdui:Description>
-          <mdui:Logo height="64" width="139">https://staging.cbcl.co.uk/ukfed/cbcl_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 			MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
 			BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
 			DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
@@ -37,13 +37,13 @@
 			lZykRhgMXr+w93jt0q0k8Teq3TwMBZPl1Qqwp/UbbXm4zf3uRhlKqnJaS75Xx7Yq
 			DEV9gsXy2u5SnEMxi5z04whSE1/zOY+XRy3xUBbh9doePRw91wE=
 		</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 			MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
 			BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
 			DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
@@ -64,25 +64,25 @@
 			lZykRhgMXr+w93jt0q0k8Teq3TwMBZPl1Qqwp/UbbXm4zf3uRhlKqnJaS75Xx7Yq
 			DEV9gsXy2u5SnEMxi5z04whSE1/zOY+XRy3xUBbh9doePRw91wE=
 		</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CBCL Test Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cbcl.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Micah</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Micah</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CBCL Test Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cbcl.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Micah</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Micah</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ufit.onecampus.com.xml b/swamid-interfederations-2.0/test.ufit.onecampus.com.xml
index 6eb5624d..81f7c58f 100644
--- a/swamid-interfederations-2.0/test.ufit.onecampus.com.xml
+++ b/swamid-interfederations-2.0/test.ufit.onecampus.com.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ufit.onecampus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Florida - IT_TEST</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Florida - IT_TEST</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFgjCCBGqgAwIBAgIIPonQRl6+sRswDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
 BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
 GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
@@ -51,21 +51,21 @@ DX/omW8DHrG3VYEfmGjnuwzL8Bm7Skh51w51SM18bKqKQ0n5egk8TKnIlYccY8dF
 nH5otsDvcIH8ufCvgtMEYHaCoJBsF6+sPdOInsbBz7CcJuQZEgt7uYD73peThM2D
 r5n4bRxg+vpuTaMcDvkx5GVQGSTsSA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cloud Ops Support</md:GivenName>
-      <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.services.it.ufl.edu/saml/SSO/alias/ufittest" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cloud Ops Support</md:GivenName>
+    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
index 4b07eccf..069e65c6 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This test service provider allows you to see the attributes your identity provider is releasing.</mdui:Description>
+        <mdui:Logo height="216" width="500">https://test.ukfederation.org.uk/images/twigs_500x216.jpg</mdui:Logo>
+        <mdui:Logo height="104" width="240">https://test.ukfederation.org.uk/images/twigs_240x104.jpg</mdui:Logo>
+        <mdui:Logo height="43" width="100">https://test.ukfederation.org.uk/images/twigs_100x43.jpg</mdui:Logo>
+        <mdui:Logo height="75" width="75">https://test.ukfederation.org.uk/images/twigs_75x75.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/DS" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedWAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedDS" index="3"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedWAYFall"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKtestWAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKtestDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKtestDS" index="4"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedWAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedDS" index="5"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedWAYFall"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTtestWAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTtestDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTtestDS" index="6"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/EDS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/EDS" index="7"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This test service provider allows you to see the attributes your identity provider is releasing.</mdui:Description>
-          <mdui:Logo height="216" width="500">https://test.ukfederation.org.uk/images/twigs_500x216.jpg</mdui:Logo>
-          <mdui:Logo height="104" width="240">https://test.ukfederation.org.uk/images/twigs_240x104.jpg</mdui:Logo>
-          <mdui:Logo height="43" width="100">https://test.ukfederation.org.uk/images/twigs_100x43.jpg</mdui:Logo>
-          <mdui:Logo height="75" width="75">https://test.ukfederation.org.uk/images/twigs_75x75.jpg</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/DS" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedWAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedDS" index="3"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKfedWAYFall"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKtestWAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKtestDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/UKtestDS" index="4"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedWAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedDS" index="5"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTfedWAYFall"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTtestWAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTtestDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/TESTtestDS" index="6"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/EDS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/EDS" index="7"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJALYNI4chorkFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3VrZi1zdmMuZWRpbmEuYWMudWswHhcNMTEwMTI4MTY1MjQ2WhcNMjEwMTI1
 						MTY1MjQ2WjAeMRwwGgYDVQQDExN1a2Ytc3ZjLmVkaW5hLmFjLnVrMIIBIjANBgkq
@@ -70,116 +70,116 @@
 						2UAEC+Ir/a8rk/IjmVn+uHAyFUJCizUMUiYXlaJSiV3ltexNYOMgj/llrYMKgIjS
 						0HjUig==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				This test service provider allows you to see the attributes
 				your identity provider is releasing.
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UK federation helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:service@ukfederation.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UK federation infrastructure</md:GivenName>
-      <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UK federation helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:service@ukfederation.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UK federation infrastructure</md:GivenName>
+    <md:EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml
index e49f3b85..2abd392a 100644
--- a/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.vpp.midlands3cities.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T11:05:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T11:05:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Test M3C VPP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Virtual Postgraduate Platform (Test)</mdui:Description>
+        <mdui:Logo height="64" width="143">https://test.vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Test M3C VPP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Virtual Postgraduate Platform (Test)</mdui:Description>
-          <mdui:Logo height="64" width="143">https://test.vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjygAwIBAgIJAN7ZAAJNPeUPMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHnRlc3QudnBwLm1pZGxhbmRzM2NpdGllcy5hYy51azAeFw0xNTA5MDgxMDQz
 						MTFaFw0yNTA5MDUxMDQzMTFaMCkxJzAlBgNVBAMTHnRlc3QudnBwLm1pZGxhbmRz
@@ -54,42 +54,42 @@
 						ElHNeykkog1Bc/VQfYhB/x6uS+G/BMGKUMWHM/lw1n63G+xjAcge2Zd5tsE9Xlv7
 						EMC0Aw8aFtO/f3rbkV8veNp4kgaxP2fF1LctGuFKMQThYzwcd9rjZQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Test M3C VPP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Betts</md:SurName>
-      <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Test M3C VPP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.worktribe.com-shibboleth.xml b/swamid-interfederations-2.0/test.worktribe.com-shibboleth.xml
index b4e7134e..83e0020f 100644
--- a/swamid-interfederations-2.0/test.worktribe.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.worktribe.com-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.worktribe.com/shibboleth">
-    <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T11:06:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T11:06:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIJANKtI4K3sa/aMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEnRlc3Qud29ya3RyaWJlLmNvbTAeFw0xNjA0MTkxNTEzMzRaFw0zMTA0MTYx
 						NTEzMzRaMB0xGzAZBgNVBAMTEnRlc3Qud29ya3RyaWJlLmNvbTCCASIwDQYJKoZI
@@ -44,78 +44,78 @@
 						ftYsictt2ddAC5ov68rAwNQ7uH/XZI6wMPXcYubEvzRCHXEGypRvejZt2uMlWgOh
 						kcw/XrGgcFyLltmhtKMqas3/n0Vh3efiwd4/Pqv32xjWQvfIU3wodg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Worktribe Test</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Worktribe Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Worktribe (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.worktribe.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@worktribe.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Southall</md:SurName>
-      <md:EmailAddress>mailto:matt.southall@worktribe.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul-research-dev.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hull-research-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan-curriculum-train.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton-curriculum-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Worktribe Test</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Worktribe Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Worktribe (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worktribe.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@worktribe.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Southall</md:SurName>
+    <md:EmailAddress>mailto:matt.southall@worktribe.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml
index 8394a84e..03902d29 100644
--- a/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.worldbank.pub2web.ingenta.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDkjCCAnqgAwIBAgIES9lH8TANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcx
@@ -29,23 +29,23 @@
 						JdA9lUQxOvtCDKAPP7YxJIzndGVi6xXGAUme1jYdTBlao5zzM1TtIPe/3XyDjeau 
 						fIrj0KcQ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.worldbank.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.worldbank.pub2web.ingenta.com/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Publishing Technology: World Bank e-Library TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://elibrary.worldbank.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:help@ingentaconnect.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.worldbank.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.worldbank.pub2web.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology: World Bank e-Library TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://elibrary.worldbank.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:help@ingentaconnect.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml
index ce63746a..0b87ad3e 100644
--- a/swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/testbed.tier.internet2.edu-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testbed.tier.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TIER Testbed</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">TIER Testbed</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVjCCAj4CCQCxK8dYunQUsjANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
 UzERMA8GA1UECAwITWljaGlnYW4xEjAQBgNVBAcMCUFubiBBcmJvcjESMBAGA1UE
 CgwJSW50ZXJuZXQyMSMwIQYDVQQDDBp0ZXN0YmVkLnRpZXIuaW50ZXJuZXQyLmVk
@@ -38,33 +38,33 @@ TMirq1O+wkTTt16SND5W54/qCDu3nsk6EL++D5QLyDFHzcksXG84vUHajnhsjVph
 iDF+FXy/yDzafEk3UNjrsFZucB2b+2E6jw4zykVDDWDFD1f5scTM/7AVG5j8iSdQ
 5sCWp8xNzxsYu/ZpKMHIIvF0t84XclaWe2BPIm9RvbZfHYrrjTqrB+kE
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James Jokl</md:GivenName>
-      <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>James Jokl</md:GivenName>
-      <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James Jokl</md:GivenName>
-      <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>James Jokl</md:GivenName>
-      <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testbed.tier.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>James Jokl</md:GivenName>
+    <md:EmailAddress>jaj@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
index ab026b37..85948117 100644
--- a/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testidp.nottingham.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T16:32:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T16:32:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpDCCA4ygAwIBAgIJAPJoOXh5jZZuMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
 						aW5naGFtMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtMR0w
@@ -44,26 +44,26 @@
 						sGNabQO4+KddI+mjILyUTXkJmairCoNWz8TdyAvK/kcWjVku8pA3I75NUucMb254
 						7oz4jJB8gYgsY42b/0ls6sHuUILxKUZ4gTneeYN6L/MPfCAO74kEAQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nottingham.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpDCCA4ygAwIBAgIJAPJoOXh5jZZuMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
 						aW5naGFtMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtMR0w
@@ -90,26 +90,26 @@
 						sGNabQO4+KddI+mjILyUTXkJmairCoNWz8TdyAvK/kcWjVku8pA3I75NUucMb254
 						7oz4jJB8gYgsY42b/0ls6sHuUILxKUZ4gTneeYN6L/MPfCAO74kEAQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Nottingham: TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Betts</md:SurName>
-      <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Nottingham: TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Nottingham IT Helpline</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml
index caab15d8..1fe10ed5 100644
--- a/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testidp1.ntu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-10T18:01:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-10T18:01:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAJU+7E5FEOoPw9AauWJ7dKmuIXdNMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMMEnRlc3RpZHAxLm50dS5hYy51azAeFw0xNjA0MjIxMjUx
 						NDNaFw0zNjA0MjIxMjUxNDNaMB0xGzAZBgNVBAMMEnRlc3RpZHAxLm50dS5hYy51
@@ -37,26 +37,26 @@
 						uaXolnVsKXeN9Fg8ptpY82FvHX8GQlLqEaj5ntA+mr66A5jwHokDKnmB2KYSWOxD
 						INbdUxA9LCE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidp1.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidp1.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIVAJU+7E5FEOoPw9AauWJ7dKmuIXdNMA0GCSqGSIb3DQEB
 						BQUAMB0xGzAZBgNVBAMMEnRlc3RpZHAxLm50dS5hYy51azAeFw0xNjA0MjIxMjUx
 						NDNaFw0zNjA0MjIxMjUxNDNaMB0xGzAZBgNVBAMMEnRlc3RpZHAxLm50dS5hYy51
@@ -76,27 +76,27 @@
 						uaXolnVsKXeN9Fg8ptpY82FvHX8GQlLqEaj5ntA+mr66A5jwHokDKnmB2KYSWOxD
 						INbdUxA9LCE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nottingham Trent University (testidp1)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Cross</md:SurName>
-      <md:EmailAddress>mailto:richard.cross@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Hallam</md:SurName>
-      <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nottingham Trent University (testidp1)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Cross</md:SurName>
+    <md:EmailAddress>mailto:richard.cross@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Hallam</md:SurName>
+    <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testidp1v3.ntu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/testidp1v3.ntu.ac.uk-idp-shibboleth.xml
index 9062931e..30ea4610 100644
--- a/swamid-interfederations-2.0/testidp1v3.ntu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/testidp1v3.ntu.ac.uk-idp-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testidp1v3.ntu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T17:34:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T17:34:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFBDCCA+ygAwIBAgIUMIcVod2I3flKNSO7K5gy8g0IHpUwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQxMTEzMjQx
@@ -46,26 +46,26 @@
 						KAgDNCYkpPDy9Wvu076HgGTy9BOTAaBUKUXgm/3rsAQtUBvnxvYzhaiQQNclGKZK
 						t8OlNtlsDEctuSOMKCLMKIWf/eKHSe4yAw/UZ4jw0OIZn1CE88pmTw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidp1v3.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp1v3.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp1v3.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp1v3.ntu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidp1v3.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp1v3.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp1v3.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp1v3.ntu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFBDCCA+ygAwIBAgIUMIcVod2I3flKNSO7K5gy8g0IHpUwDQYJKoZIhvcNAQEL
 						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
 						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE2MDQxMTEzMjQx
@@ -94,27 +94,27 @@
 						KAgDNCYkpPDy9Wvu076HgGTy9BOTAaBUKUXgm/3rsAQtUBvnxvYzhaiQQNclGKZK
 						t8OlNtlsDEctuSOMKCLMKIWf/eKHSe4yAw/UZ4jw0OIZn1CE88pmTw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NTU Test V3 IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Richard</md:GivenName>
-      <md:SurName>Cross</md:SurName>
-      <md:EmailAddress>mailto:Richard.cross@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Hallam</md:SurName>
-      <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1v3.ntu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NTU Test V3 IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Cross</md:SurName>
+    <md:EmailAddress>mailto:Richard.cross@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Hallam</md:SurName>
+    <md:EmailAddress>mailto:lee.hallam@ntu.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml
index 7ac5a5b6..5ecbb5c4 100644
--- a/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testoala.surrey.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T16:18:51Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T16:18:51Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surrey.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surrey.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIIRNFxRp/Jwa8wDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
 						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxHjAcBgNVBAMMFXRlc3RvYWxhLnN1cnJl
 						eS5hYy51azAeFw0xMjAzMjkxNTM1MThaFw0yMjAzMjkxNTM1MThaMD8xHTAbBgNV
@@ -35,13 +35,13 @@
 						cQZH5tf4evWS55wxZai4h9IipxrFvVzizvIhYiiZl1LVAKu/L2JrabFjH0wkWYMK
 						s4lnRLncL6eQ8Adihl6jJY+qwdJLBoms/5AD7cJ1qPw0qkLS
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIIRNFxRp/Jwa8wDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
 						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxHjAcBgNVBAMMFXRlc3RvYWxhLnN1cnJl
 						eS5hYy51azAeFw0xMjAzMjkxNTM1MThaFw0yMjAzMjkxNTM1MThaMD8xHTAbBgNV
@@ -61,25 +61,25 @@
 						cQZH5tf4evWS55wxZai4h9IipxrFvVzizvIhYiiZl1LVAKu/L2JrabFjH0wkWYMK
 						s4lnRLncL6eQ8Adihl6jJY+qwdJLBoms/5AD7cJ1qPw0qkLS
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testoala.surrey.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testoala.surrey.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Surrey</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Surrey (OALA TEST)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Claire</md:GivenName>
-      <md:SurName>Gill</md:SurName>
-      <md:EmailAddress>mailto:c.j.gill@surrey.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Abdul</md:GivenName>
-      <md:SurName>Minhas</md:SurName>
-      <md:EmailAddress>mailto:a.minhas@surrey.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testoala.surrey.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testoala.surrey.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Surrey</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Surrey (OALA TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Claire</md:GivenName>
+    <md:SurName>Gill</md:SurName>
+    <md:EmailAddress>mailto:c.j.gill@surrey.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Abdul</md:GivenName>
+    <md:SurName>Minhas</md:SurName>
+    <md:EmailAddress>mailto:a.minhas@surrey.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml b/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
index de0a5e70..2fd6bdf7 100644
--- a/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testshib.msacademicverify.com/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-18T09:49:34Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-18T09:49:34Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testshib.msacademicverify.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Microsoft uses the Academic Verification Engine (AVE) to determine client academic eligibility</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testshib.msacademicverify.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Microsoft uses the Academic Verification Engine (AVE) to determine client academic eligibility</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPTCCAiWgAwIBAgIJAJrH6geQXck0MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHXRlc3RzaGliLm1zYWNhZGVtaWN2ZXJpZnkuY29tMB4XDTE2MDMxMTE5NDIz
 						M1oXDTIxMDMxMDE5NDIzM1owKDEmMCQGA1UEAxMddGVzdHNoaWIubXNhY2FkZW1p
@@ -50,41 +50,41 @@
 						gn8j5J+iK6w5feOilz/dDL66zitxLhOm2IKF5tw7Z7dHShic3JR9qZ9rj3oBfn5j
 						7ioqQaver65PjgkNAMUtvRM=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.msacademicverify.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Microsoft Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Microsoft Academic Verification Engine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.microsoft.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>AVE Support</md:GivenName>
-      <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AVE Support</md:GivenName>
-      <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.msacademicverify.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Microsoft Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Microsoft Academic Verification Engine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.microsoft.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>AVE Support</md:GivenName>
+    <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AVE Support</md:GivenName>
+    <md:EmailAddress>mailto:avesupp@microsoft.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml b/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
index 897e56a8..b9b77ba2 100644
--- a/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testssso.uni-muenster.de/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-13T10:36:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-13T10:36:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster (Erprobung)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. (Alternativzugang)</mdui:Description>
+        <mdui:Description xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster. (Alternative entry point)</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="64" width="80">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu.svg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Münster (Erprobung)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. (Alternativzugang)</mdui:Description>
-          <mdui:Description xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster. (Alternative entry point)</mdui:Description>
-          <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-          <mdui:Logo height="64" width="80">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu.svg</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCs6pz9jANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCs6pz9jANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
 MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
@@ -59,44 +59,44 @@ Uq1uiMlySocFWLW0F+yEfHu50NmuNm7sYCjhzB0aIksNQq8oSRdioN7Wk8AeNHUO
 bOH9nkcrbf9+K4i8zJGCCl0e+ekwdSqMjX3bS+JcnonHH76QPiFP7d/ndahgGknK
 FayundglgK5Mny/HWnaA/ugqZLUeGb6N7vcRs20Q3Bm+rrv2y7PBPWH4yw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Universität Münster (Erprobung)</md:ServiceName>
-        <md:ServiceName xml:lang="en">Universität Münster (Staging)</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. (Alternativzugang)</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster. (Alternative entry point)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rainer</md:GivenName>
-      <md:SurName>Perske</md:SurName>
-      <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rainer</md:GivenName>
-      <md:SurName>Perske</md:SurName>
-      <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Universität Münster (Erprobung)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Universität Münster (Staging)</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. (Alternativzugang)</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster. (Alternative entry point)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rainer</md:GivenName>
+    <md:SurName>Perske</md:SurName>
+    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rainer</md:GivenName>
+    <md:SurName>Perske</md:SurName>
+    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml b/swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml
index 34fdfcce..03ee0c4e 100644
--- a/swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml
+++ b/swamid-interfederations-2.0/teton.accessiblelearning.com-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://teton.accessiblelearning.com/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://teton.accessiblelearning.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Accessible Information Management, LLC</mdui:DisplayName>
+        <mdui:Description xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.accessiblelearning.com</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.accessiblelearning.com/Policies.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://www.accessiblelearning.com/Shibboleth/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://teton.accessiblelearning.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Accessible Information Management, LLC</mdui:DisplayName>
-          <mdui:Description xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.accessiblelearning.com</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.accessiblelearning.com/Policies.aspx</mdui:PrivacyStatementURL>
-          <mdui:Logo height="64" width="350" xml:lang="en">https://www.accessiblelearning.com/Shibboleth/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFVjCCBD6gAwIBAgIJAPw5+wFnu56MMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
 MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
@@ -53,37 +53,37 @@ xaoo3uQ1sfeeCuAFycecH0b5n6DE6TydC/KyPTNJ/uBVVhB5fxtyR+IsL8OFn3ZU
 ENqPeEB2aGX/xBWLgXLr/wU/XULpX0jDk0oNJI38MWIuGThEx5aMNUzQXGdU0VoY
 TzxgcDbG96dYGaEDayPv2UC1/5/X8IEw8E8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Accessible Information Management, LLC</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Accessible Information Management, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Accessible Information Management, LLC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://accessiblelearning.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert Armas</md:GivenName>
-      <md:EmailAddress>rob.armas@dsaim.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Haris Gunadi</md:GivenName>
-      <md:EmailAddress>haris.gunadi@dsaim.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://teton.accessiblelearning.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Accessible Information Management, LLC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">AIM LLC provides software and support, systems implementation and integration, strategic consulting, and technology management services to help colleges and universities build, unify, and manage their disability services accommodations. Enterprise solutions for administration and recordkeeping. Portal solutions to enhance Web-based experiences and support community building Technology management services to better manage technology resources and provide metrics on demand. Bringing together people, processes, and technology, AIM LLC works with colleges and universities to help them strengthen performance and services through improved data accuracy and integrity, increased accountability, and enhanced educational experiences.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Accessible Information Management, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Accessible Information Management, LLC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://accessiblelearning.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert Armas</md:GivenName>
+    <md:EmailAddress>rob.armas@dsaim.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Haris Gunadi</md:GivenName>
+    <md:EmailAddress>haris.gunadi@dsaim.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
index 46573338..735eac86 100644
--- a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
+++ b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://thalamoss-data.ics.muni.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-07T17:17:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-07T17:17:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">THALAMOSS Data Management Platform</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">System pro spravu dat projektu THALAMOSS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Management and distribution platform for THALAMOSS project on personalized therapy of b-thalassaemia</mdui:Description>
+        <mdui:Description xml:lang="cs">System pro spravu a distribuci dat projektu THALAMOSS pro personalizovanou lecbu b-thalassemie</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">THALAMOSS Data Management Platform</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">System pro spravu dat projektu THALAMOSS</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Management and distribution platform for THALAMOSS project on personalized therapy of b-thalassaemia</mdui:Description>
-          <mdui:Description xml:lang="cs">System pro spravu a distribuci dat projektu THALAMOSS pro personalizovanou lecbu b-thalassemie</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>thalamoss-data.ics.muni.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=thalamoss-data.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-            <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIQNd5X+bSLsMpg3WZ/IC3PmjANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>thalamoss-data.ics.muni.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=thalamoss-data.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIQNd5X+bSLsMpg3WZ/IC3PmjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMTIxODAwMDAwMFoXDTE2MTIxNzIzNTk1OVowSDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExp0aGFsYW1vc3Mt
@@ -53,63 +53,63 @@ BOn8kS74xu0s1frpPS3rn23kRY/3LsQORCi0RUhNcio1LcGbkUQ1J7nlEYXt62rH
 gRtPrP5JXkY5jYK6rsPAUltcTEPXxRkxG7CX92WXKlX5/1MXRk3wZV5ZYyh+TGKe
 3EudFd0=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/artifact/soap" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/soap"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/post"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/soap"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/post"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post-simplesign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/ecp" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/post" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">THALAMOSS Data Management Platform</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Management platform for THALAMOSS project on personalized therapy of b-thalassaemia</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ics.muni.cz/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.ics.muni.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Petr</md:GivenName>
-      <md:SurName>Holub</md:SurName>
-      <md:EmailAddress>holub@ics.muni.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Sochor</md:SurName>
-      <md:EmailAddress>325304@mail.muni.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/artifact/soap" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/soap"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/post"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post-simplesign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/ecp" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">THALAMOSS Data Management Platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Management platform for THALAMOSS project on personalized therapy of b-thalassaemia</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ics.muni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ics.muni.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Holub</md:SurName>
+    <md:EmailAddress>holub@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Sochor</md:SurName>
+    <md:EmailAddress>325304@mail.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml b/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml
index 3d5e175c..8c6818d2 100644
--- a/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://the.sketchengine.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-04T10:45:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-04T10:45:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://the.sketchengine.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://the.sketchengine.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sketch Engine</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Sketch Engine is a Corpus Query System allowing you to research how words behave.</mdui:Description>
+        <mdui:Logo height="139" width="350">https://the.sketchengine.co.uk/media/img/sketch_engine_logo_sso.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://the.sketchengine.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://the.sketchengine.co.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sketch Engine</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Sketch Engine is a Corpus Query System allowing you to research how words behave.</mdui:Description>
-          <mdui:Logo height="139" width="350">https://the.sketchengine.co.uk/media/img/sketch_engine_logo_sso.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJANfd9uOTdW5iMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnRoZS5za2V0Y2hlbmdpbmUuY28udWswHhcNMTQxMTE5MTAyMDQ1WhcNMjQx
 						MTE2MTAyMDQ1WjAhMR8wHQYDVQQDExZ0aGUuc2tldGNoZW5naW5lLmNvLnVrMIIB
@@ -53,41 +53,41 @@
 						J/+AKKMeZuCX9RmVvsXC1vPAtxQR8ssPdZZF1mApT2Vr/DGHGMe/wyx19Cgz2NxK
 						/NTHeUzRgS0hN9qLFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://the.sketchengine.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lexical Computing Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sketch Engine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.sketchengine.co.uk/documentation/wiki/Website/LexicalComputing/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@sketchengine.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@sketchengine.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://the.sketchengine.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lexical Computing Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sketch Engine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sketchengine.co.uk/documentation/wiki/Website/LexicalComputing/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@sketchengine.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@sketchengine.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml b/swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml
index 83671ade..e6c6e177 100644
--- a/swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://thelonious.campusguard.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusguard.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Merchant Preservation Services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test - CG IdP</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusguard.com</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Merchant Preservation Services</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test - CG IdP</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVAIDF43Kla6YOJ6zTgKwSAHivI1/yMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnRoZWxvbmlvdXMuY2FtcHVzZ3VhcmQuY29tMB4XDTEz
 MTAxNzAxMTMzMloXDTMzMTAxNzAxMTMzMlowJTEjMCEGA1UEAxMadGhlbG9uaW91
@@ -39,23 +39,23 @@ ag0lU0mXOukNKI3DwuVXunDCBmBEricdSjKS6cmrUxjaokpHANW/5810SxFQFCcn
 4x37ocZoks4+689UIXJjd9Zi61zHN6qTjF+nIyfa1DMrysZXiUa2olTJ3AT5sZbF
 bMCG+OEJspI9w0kKBGO/CLEmA4cTUzyhIlndmQfPj2JhyRjIHujmVQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://thelonious.campusguard.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thelonious.campusguard.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thelonious.campusguard.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusguard.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://thelonious.campusguard.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thelonious.campusguard.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thelonious.campusguard.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusguard.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVAIDF43Kla6YOJ6zTgKwSAHivI1/yMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGnRoZWxvbmlvdXMuY2FtcHVzZ3VhcmQuY29tMB4XDTEz
 MTAxNzAxMTMzMloXDTMzMTAxNzAxMTMzMlowJTEjMCEGA1UEAxMadGhlbG9uaW91
@@ -75,26 +75,26 @@ ag0lU0mXOukNKI3DwuVXunDCBmBEricdSjKS6cmrUxjaokpHANW/5810SxFQFCcn
 4x37ocZoks4+689UIXJjd9Zi61zHN6qTjF+nIyfa1DMrysZXiUa2olTJ3AT5sZbF
 bMCG+OEJspI9w0kKBGO/CLEmA4cTUzyhIlndmQfPj2JhyRjIHujmVQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Merchant Preservation Services</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Merchant Preservation Services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.campusguard.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Edward Ko</md:GivenName>
-      <md:EmailAddress>edko@campusguard.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Owen Davies</md:GivenName>
-      <md:EmailAddress>odavies@campusguard.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Craig Henninger</md:GivenName>
-      <md:EmailAddress>chenninger@campusguard.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Merchant Preservation Services</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Merchant Preservation Services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.campusguard.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Edward Ko</md:GivenName>
+    <md:EmailAddress>edko@campusguard.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Owen Davies</md:GivenName>
+    <md:EmailAddress>odavies@campusguard.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Craig Henninger</md:GivenName>
+    <md:EmailAddress>chenninger@campusguard.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml b/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml
index 1ac425f9..6d7dc1dd 100644
--- a/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://thinkit.oneteamlogic.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-14T10:50:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-14T10:50:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MyConcern ThinkIt Demo Site</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The MyConcern ThinkIt Demo Site is used for demonstrations
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MyConcern ThinkIt Demo Site</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The MyConcern ThinkIt Demo Site is used for demonstrations
 				</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIJAMwlTWVQn6vNMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH21jczAxLmRlbW9hZC5vbmV0ZWFtbG9naWMuY28udWswHhcNMTQxMTEyMTUz
 						MDUwWhcNMjQxMTA5MTUzMDUwWjAqMSgwJgYDVQQDEx9tY3MwMS5kZW1vYWQub25l
@@ -52,43 +52,43 @@
 						gmKz4CPKwjUCQW4MdGQoj8YWCj9Bs8brseOcDP8JGeYZau1VeiUR7ZPR/nOZFKc/
 						+wLoAUq6JcuHgpkOdZm8cimD8N5DZAbauTyOqJB9pI7GYiWazj5GkA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">One Team Logic Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MyConcern ThinkIt Demo Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nick</md:GivenName>
-      <md:SurName>Bennett</md:SurName>
-      <md:EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Tucker</md:SurName>
-      <md:EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">One Team Logic Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MyConcern ThinkIt Demo Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nick</md:GivenName>
+    <md:SurName>Bennett</md:SurName>
+    <md:EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Tucker</md:SurName>
+    <md:EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
index fb665119..4cf0643a 100644
--- a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T16:45:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T16:45:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -44,13 +44,13 @@
 						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
 						m7g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -85,62 +85,62 @@
 						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
 						m7g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IOP Publishing Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IOP online services</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iop.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Hayes</md:SurName>
-      <md:EmailAddress>mailto:Chris.Hayes@iop.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Estela</md:GivenName>
-      <md:SurName>Garcia</md:SurName>
-      <md:EmailAddress>mailto:estela.garcia@iop.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IOP Publishing Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IOP online services</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iop.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Hayes</md:SurName>
+    <md:EmailAddress>mailto:Chris.Hayes@iop.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Estela</md:GivenName>
+    <md:SurName>Garcia</md:SurName>
+    <md:EmailAddress>mailto:estela.garcia@iop.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml
index 010a8138..d62bc6ec 100644
--- a/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tickets.sheffieldstudentsunion.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-14T15:02:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-14T15:02:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,33 +30,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sheffield Students Union Tickets</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://tickets.sheffieldstudentsunion.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sheffield Students Union Tickets</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://tickets.sheffieldstudentsunion.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tierprogram.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/tierprogram.internet2.edu-shibboleth.xml
index 46328f5c..8c96a8fe 100644
--- a/swamid-interfederations-2.0/tierprogram.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/tierprogram.internet2.edu-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tierprogram.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tierprogram.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Trust and Identity Projects Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This Portal contains all Internet2 Trust and Identity Related projects and timelines.  Its primary purpose is to serve as the authoritative repository for all cross-functional, community-facing activities.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.internet2.edu/products-services/trust-identity/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tierprogram.internet2.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Trust and Identity Projects Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This Portal contains all Internet2 Trust and Identity Related projects and timelines.  Its primary purpose is to serve as the authoritative repository for all cross-functional, community-facing activities.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.internet2.edu/products-services/trust-identity/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDrzCCApegAwIBAgIJAJFeMqbmRrpuMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMSIwIAYDVQQDExl0aWVycHJvZ3JhbS5pbnRlcm5l
@@ -43,43 +43,43 @@ JScJjGQbaBl7W7ilHa6OCquhdJPzYUDYgEliyw3Uox7ywejJX6SLw3I/eeP5SA3d
 z170cmWqwK/6IHvLYYIEAIUpoKylltBfNWZzwyRkrlWoj9e7P0FNUG2cCmXjVmfD
 3WfuGt4wqUQbMHXkIjaURBAUNDgKb0Rz/Zu6ujEVmXgWHgc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Trust and Identity Projects Portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This Portal contains all Internet2 Trust and Identity Related projects and timelines.  Its primary purpose is to serve as the authoritative repository for all cross-functional, community-facing activities.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Services Group</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Technical Services Group</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Services Group</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Technical Services Group</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tierprogram.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Trust and Identity Projects Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This Portal contains all Internet2 Trust and Identity Related projects and timelines.  Its primary purpose is to serve as the authoritative repository for all cross-functional, community-facing activities.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Services Group</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Technical Services Group</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Services Group</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Technical Services Group</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml
index 8edb752d..6bf7b0a3 100644
--- a/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tkakin.nii.ac.jp/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-12T11:59:25Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-12T11:59:25Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMDCCAxgCCQCgtKNkkJv8CzANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UEBhMC
 						SlAxDjAMBgNVBAgMBVRva3lvMRMwEQYDVQQHDApDaGl5b2RhLWt1MSowKAYDVQQK
 						DCFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxOzA5BgNVBAsMMkN5
@@ -47,42 +47,42 @@
 						4Zyc42lx2nPIF7lCMjmydh184cZvZkmVL0oB+h8oqqdPpW0aINiFiqfRM3xlQcBG
 						sF+zFamYAWFcrdCjb0I6xYLkLgc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institute of Informatics</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CiNii test (test SP for system migration)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Portal Service Unit</md:GivenName>
-      <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Portal Service Unit</md:GivenName>
-      <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institute of Informatics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CiNii test (test SP for system migration)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Portal Service Unit</md:GivenName>
+    <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Portal Service Unit</md:GivenName>
+    <md:EmailAddress>mailto:co_portal@nii.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tkeystone.cloud.wigner.mta.hu-shibboleth.xml b/swamid-interfederations-2.0/tkeystone.cloud.wigner.mta.hu-shibboleth.xml
index 808c65f8..0f48ffbd 100644
--- a/swamid-interfederations-2.0/tkeystone.cloud.wigner.mta.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/tkeystone.cloud.wigner.mta.hu-shibboleth.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tkeystone.cloud.wigner.mta.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>kfki</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>kfki</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">MTA Cloud@Wigner Adatközpont</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MTA Cloud@Wigner Datacenter</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Az MTA/Wigner IaaS felhő infrastruktúra dashboard-ja</mdui:Description>
+        <mdui:Description xml:lang="en">Dashboard of the MTA/Wigner Cloud IaaS Infrastructure</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">https://cloud.mta.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://www.cloud.wigner.mta.hu/policy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="121" width="108">https://cdashboard.cloud.wigner.mta.hu/horizon/static/dashboard/img/logo-splash.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">MTA Cloud@Wigner Adatközpont</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">MTA Cloud@Wigner Datacenter</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Az MTA/Wigner IaaS felhő infrastruktúra dashboard-ja</mdui:Description>
-          <mdui:Description xml:lang="en">Dashboard of the MTA/Wigner Cloud IaaS Infrastructure</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">https://cloud.mta.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://www.cloud.wigner.mta.hu/policy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="121" width="108">https://cdashboard.cloud.wigner.mta.hu/horizon/static/dashboard/img/logo-splash.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDHjCCAgagAwIBAgIJAO+Uquy3rv/tMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXRrZXlzdG9uZS5jbG91ZC53aWduZXIubXRhLmh1MB4XDTE2MDUyMDEwNDEwMFoXDTI2MDUxODEwNDEwMFowKDEmMCQGA1UEAxMddGtleXN0b25lLmNsb3VkLndpZ25lci5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRBmUO+HhgcuhZCPu5uT46oePyjVU8Mj+dbnkUzcdelyK3AndpvKDif9Ry52qwfJxeHLzhk5kMqrfPoTGVPwuP2NSHy9SfisYWDW1Dl3aP0tT3T7TFEQvSrN1LN60ukyeoRkul4u6+sBvo1/wmkAbQMif2UE3vytMwpvZYqoPpSlxWPAVI/CcdvOXJtJTmoV62DptaA0rDSfT3o44w2wNohKvE3iIOJ0vhEgfT7dQII+84qXzInDE5oSVpYf1eAJFpopKtsB9ZQl1bJkVAGduvcZSj5niW4XCy11QOn9fQu6nfilzO/wOCnmOTVycBYc6yPBXPtz+1QloEVvD61ivJAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXRrZXlzdG9uZS5jbG91ZC53aWduZXIubXRhLmh1MB0GA1UdDgQWBBSYSMvN5SI+sg+GIdm9kw4Kz8EsuzANBgkqhkiG9w0BAQUFAAOCAQEABuAfFT7zZCgSOrFva44y757/YE8LFEw8NMYhO/2XcnbC/eA44Jf2H1voZ5HeyxsE5ByJGNtFgYwiqzzmGxOGSI5a5DDcpnJ9TG7Oyt8bkO1IBnq3HjYzEKu6rf41WcWaLB1mbIg2Z5pkWshWZrnACLc3OUPSmE3O5u+aNGleaKA1XQEMz2qtx9LCSo039f4K7mTu84WTaxTH8ALtWZsrSwvlrjuZsn7iV8XzEOTPgHlpjuaR83nR2J8Lec9BMBBZFsma1U9TlOG04ZgbIi82OLz8+w4wPcSg8qTWqCt1TwCavx3OnjKs0YkK9zaMY/0WJukTJ+bj+rgxx9vCatfgRg==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>tkeystone.cloud.wigner.mta.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">MTA Cloud@Wigner Adatközpont</md:ServiceName>
-        <md:ServiceName xml:lang="en">MTA Cloud@Wigner Datacenter</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.kfki.hu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.kfki.hu/indexeng.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Hernáth Szabolcs</md:SurName>
-      <md:EmailAddress>mailto:hernath.szabolcs@wigner.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Török Ferenc</md:SurName>
-      <md:EmailAddress>mailto:torok.ferenc@wigner.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Hernáth Szabolcs</md:SurName>
-      <md:EmailAddress>mailto:hernath.szabolcs@wigner.mta.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHjCCAgagAwIBAgIJAO+Uquy3rv/tMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXRrZXlzdG9uZS5jbG91ZC53aWduZXIubXRhLmh1MB4XDTE2MDUyMDEwNDEwMFoXDTI2MDUxODEwNDEwMFowKDEmMCQGA1UEAxMddGtleXN0b25lLmNsb3VkLndpZ25lci5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRBmUO+HhgcuhZCPu5uT46oePyjVU8Mj+dbnkUzcdelyK3AndpvKDif9Ry52qwfJxeHLzhk5kMqrfPoTGVPwuP2NSHy9SfisYWDW1Dl3aP0tT3T7TFEQvSrN1LN60ukyeoRkul4u6+sBvo1/wmkAbQMif2UE3vytMwpvZYqoPpSlxWPAVI/CcdvOXJtJTmoV62DptaA0rDSfT3o44w2wNohKvE3iIOJ0vhEgfT7dQII+84qXzInDE5oSVpYf1eAJFpopKtsB9ZQl1bJkVAGduvcZSj5niW4XCy11QOn9fQu6nfilzO/wOCnmOTVycBYc6yPBXPtz+1QloEVvD61ivJAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXRrZXlzdG9uZS5jbG91ZC53aWduZXIubXRhLmh1MB0GA1UdDgQWBBSYSMvN5SI+sg+GIdm9kw4Kz8EsuzANBgkqhkiG9w0BAQUFAAOCAQEABuAfFT7zZCgSOrFva44y757/YE8LFEw8NMYhO/2XcnbC/eA44Jf2H1voZ5HeyxsE5ByJGNtFgYwiqzzmGxOGSI5a5DDcpnJ9TG7Oyt8bkO1IBnq3HjYzEKu6rf41WcWaLB1mbIg2Z5pkWshWZrnACLc3OUPSmE3O5u+aNGleaKA1XQEMz2qtx9LCSo039f4K7mTu84WTaxTH8ALtWZsrSwvlrjuZsn7iV8XzEOTPgHlpjuaR83nR2J8Lec9BMBBZFsma1U9TlOG04ZgbIi82OLz8+w4wPcSg8qTWqCt1TwCavx3OnjKs0YkK9zaMY/0WJukTJ+bj+rgxx9vCatfgRg==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>tkeystone.cloud.wigner.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkeystone.cloud.wigner.mta.hu:5000/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">MTA Cloud@Wigner Adatközpont</md:ServiceName>
+      <md:ServiceName xml:lang="en">MTA Cloud@Wigner Datacenter</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.kfki.hu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kfki.hu/indexeng.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Hernáth Szabolcs</md:SurName>
+    <md:EmailAddress>mailto:hernath.szabolcs@wigner.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Török Ferenc</md:SurName>
+    <md:EmailAddress>mailto:torok.ferenc@wigner.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Hernáth Szabolcs</md:SurName>
+    <md:EmailAddress>mailto:hernath.szabolcs@wigner.mta.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
index c7068406..e74298c2 100644
--- a/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tonga.univ-tlse2.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-16T16:09:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-16T16:09:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-tlse2.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Toulouse 2 - Mirail</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACVklEQVQ4y52RTUhUYRSG3+/n3hk09VoOSrSYfojAhSNpkBtnqHaFBS1q1QwV7YpWLWXWESpCLaRmWkTtEiLCVVq6kxwxshBjrKwhpvF6nTtzf777fa2KGR1COrv3cJ6X855D8J818rwzDjg5vltgeLjH0JpYUmupXOF73BgRHhjnCbYb+M7VoTgl/BXluESY6qJMgTAJwuTa3w2Gni5Ho1TFDElyp3JL8SCsTSbSF8xbZ64nhWVnKFUgXIFqAjLkg+oMirEecuLZymsAsb1QxlES4OK7pRShJAMASqns7PtP5wvON0OPmAh1mKa2z5oOtZcXeavdxptcgzdDgQJGOyRCkDkQDP7ZihCS7D18CLMfK6hUyumyFR4dG58ya+PxIyTIUwBtUAhLFSUgfwc8T2BqbsW0fZGYWHySa3Qful/KmS4ZICQCeH5glHXNgOMDpTLyX9bghn6lJxbvNoQBgKYvd2cdV+SrnoDrBVilehT5n8B6CcUgn38wNz5aCyygM1pnAACOELcdT8DxBD60thp+YROkuIVjdsvj7bBgfKfB2LW+yYorUlVX4GzkPj73+EDVRYfdMlg7HGj6CKfK3GEAAI9unsxaZjU1EHmB0wMPsdxdgeIs/ubcvcwC2ox5/UAGBLFe/3vdPUit8F4iKRyW8Ysc3jrH1moEG4V+qPkc4LhQIkj0B+vTdW+sFb7JhwKbQZQYxCYFsS2EC2/heDogVapvG1wXAQCERU2/yOCXKPwNBmExyCqmpQwSx/2v2UZvJI2aP240x50iB4rIHZzZNPGP+g3XoQ6HfEwnbQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMAlAiYEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NTkrMDI6MDB4HTE9AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-tlse2.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Toulouse 2 - Mirail</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-tlse2.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Toulouse 2 - Mirail</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACVklEQVQ4y52RTUhUYRSG3+/n3hk09VoOSrSYfojAhSNpkBtnqHaFBS1q1QwV7YpWLWXWESpCLaRmWkTtEiLCVVq6kxwxshBjrKwhpvF6nTtzf777fa2KGR1COrv3cJ6X855D8J818rwzDjg5vltgeLjH0JpYUmupXOF73BgRHhjnCbYb+M7VoTgl/BXluESY6qJMgTAJwuTa3w2Gni5Ho1TFDElyp3JL8SCsTSbSF8xbZ64nhWVnKFUgXIFqAjLkg+oMirEecuLZymsAsb1QxlES4OK7pRShJAMASqns7PtP5wvON0OPmAh1mKa2z5oOtZcXeavdxptcgzdDgQJGOyRCkDkQDP7ZihCS7D18CLMfK6hUyumyFR4dG58ya+PxIyTIUwBtUAhLFSUgfwc8T2BqbsW0fZGYWHySa3Qful/KmS4ZICQCeH5glHXNgOMDpTLyX9bghn6lJxbvNoQBgKYvd2cdV+SrnoDrBVilehT5n8B6CcUgn38wNz5aCyygM1pnAACOELcdT8DxBD60thp+YROkuIVjdsvj7bBgfKfB2LW+yYorUlVX4GzkPj73+EDVRYfdMlg7HGj6CKfK3GEAAI9unsxaZjU1EHmB0wMPsdxdgeIs/ubcvcwC2ox5/UAGBLFe/3vdPUit8F4iKRyW8Ysc3jrH1moEG4V+qPkc4LhQIkj0B+vTdW+sFb7JhwKbQZQYxCYFsS2EC2/heDogVapvG1wXAQCERU2/yOCXKPwNBmExyCqmpQwSx/2v2UZvJI2aP240x50iB4rIHZzZNPGP+g3XoQ6HfEwnbQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMAlAiYEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NTkrMDI6MDB4HTE9AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-tlse2.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Toulouse 2 - Mirail</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNzCCAh+gAwIBAgIUQbZllpbGntiDN9DdmDU44ciWEDswDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTdG9uZ2EudW5pdi10bHNlMi5mcjAeFw0xNjAxMTMxMDUx
 NDJaFw0zNjAxMTMxMDUxNDJaMB4xHDAaBgNVBAMTE3RvbmdhLnVuaXYtdGxzZTIu
@@ -39,13 +39,13 @@ dsHfixpvq7vbAS6Oo+UR0zrKG8BEjeP2tFQ8Y7U7DLrATeJZvMn1qVbNB9X274Vu
 EDB2WEO1/Lcq5hSZZVBL8UGwoDmsn6qOW9t5/cyg/PUwB1ekdNWJvf6ctNIN1Xem
 Fy4XmXwhuCgSQF4=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
@@ -71,24 +71,24 @@ yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
 4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
 2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tonga.univ-tlse2.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-tlse2.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tonga.univ-tlse2.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-tlse2.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNzCCAh+gAwIBAgIUQbZllpbGntiDN9DdmDU44ciWEDswDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTdG9uZ2EudW5pdi10bHNlMi5mcjAeFw0xNjAxMTMxMDUx
 NDJaFw0zNjAxMTMxMDUxNDJaMB4xHDAaBgNVBAMTE3RvbmdhLnVuaXYtdGxzZTIu
@@ -108,13 +108,13 @@ dsHfixpvq7vbAS6Oo+UR0zrKG8BEjeP2tFQ8Y7U7DLrATeJZvMn1qVbNB9X274Vu
 EDB2WEO1/Lcq5hSZZVBL8UGwoDmsn6qOW9t5/cyg/PUwB1ekdNWJvf6ctNIN1Xem
 Fy4XmXwhuCgSQF4=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
@@ -140,19 +140,19 @@ yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
 4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
 2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Toulouse 2 - Mirail</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Toulouse 2 - Mirail</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-tlse2.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sos-ent@univ-tlse2.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Toulouse 2 - Mirail</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Toulouse 2 - Mirail</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-tlse2.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sos-ent@univ-tlse2.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tophat.com-sso-shibboleth-sp.xml b/swamid-interfederations-2.0/tophat.com-sso-shibboleth-sp.xml
index aed072f7..2d62e3da 100644
--- a/swamid-interfederations-2.0/tophat.com-sso-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/tophat.com-sso-shibboleth-sp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tophat.com/sso/shibboleth/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-14T12:45:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-14T12:45:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Top Hat</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Top Hat Classroom Response System</mdui:Description>
+        <mdui:Logo height="30" width="110">https://s3.amazonaws.com/thm-corporate/tophat-logo-blue.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Top Hat</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Top Hat Classroom Response System</mdui:Description>
-          <mdui:Logo height="30" width="110">https://s3.amazonaws.com/thm-corporate/tophat-logo-blue.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBTCCAe2gAwIBAgIJAJBdLHPlzYOPMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTCnRvcGhhdC5jb20wHhcNMTQxMDE2MTg0OTU4WhcNMjQxMDEzMTg0OTU4WjAV
 						MRMwEQYDVQQDEwp0b3BoYXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -35,13 +35,13 @@
 						DsQPDtPsT1ONS2VZMmtQir8qUybJV5BfREoepLCOMIAbCRrRM0dQKK9C0HVXsNe3
 						F3yzDCsg02aQ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBTCCAe2gAwIBAgIJAJBdLHPlzYOPMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTCnRvcGhhdC5jb20wHhcNMTQxMDE2MTg0OTU4WhcNMjQxMDEzMTg0OTU4WjAV
 						MRMwEQYDVQQDEwp0b3BoYXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -60,34 +60,34 @@
 						DsQPDtPsT1ONS2VZMmtQir8qUybJV5BfREoepLCOMIAbCRrRM0dQKK9C0HVXsNe3
 						F3yzDCsg02aQ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.tophat.com/sso/shibboleth/slo"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.tophat.com/sso/shibboleth/acs" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Top Hat</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Top Hat Monocle</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Top Hat</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tophat.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@tophat.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Brennan</md:GivenName>
-      <md:SurName>Green</md:SurName>
-      <md:EmailAddress>mailto:brennen@tophat.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh</md:GivenName>
-      <md:SurName>Jones</md:SurName>
-      <md:EmailAddress>mailto:josh@tophat.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.tophat.com/sso/shibboleth/slo"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.tophat.com/sso/shibboleth/acs" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Top Hat</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Top Hat Monocle</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Top Hat</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tophat.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@tophat.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Brennan</md:GivenName>
+    <md:SurName>Green</md:SurName>
+    <md:EmailAddress>mailto:brennen@tophat.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:josh@tophat.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml
index a4756c9f..1660c5db 100644
--- a/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topsy.ncl.ac.uk/shibboleth/metadata">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-09T15:37:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-09T15:37:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAPBsTOlcp3T8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3RvcHN5Lm5jbC5hYy51azAeFw0xNTExMDIwODU0MzVaFw0yNTEwMzAwODU0
 						MzVaMBoxGDAWBgNVBAMTD3RvcHN5Lm5jbC5hYy51azCCASIwDQYJKoZIhvcNAQEB
@@ -46,43 +46,43 @@
 						Y0z2EV2wo0KW+VslQnBrD671nwFn+mblKs7fcPj73bKOcWn9zkF5jMSvIwNY/mXl
 						dcIZsmnjhF5GCaYywNqr7GIHRaTzghpCWRYepkoaXLxoq3mKXOsdAg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle University HPC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Beaty</md:SurName>
-      <md:EmailAddress>mailto:michael.beaty@newcastle.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Beaty</md:SurName>
-      <md:EmailAddress>mailto:michael.beaty@newcastle.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle University HPC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Beaty</md:SurName>
+    <md:EmailAddress>mailto:michael.beaty@newcastle.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Beaty</md:SurName>
+    <md:EmailAddress>mailto:michael.beaty@newcastle.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml b/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml
index dd70b499..b1fce67a 100644
--- a/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://training.nicurriculum.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T15:33:11Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T15:33:11Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://training.ccea.org.uk/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/Login1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://training.ccea.org.uk/Shibboleth.sso/DS" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.org.uk/Shibboleth.sso/Login1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJAM1uIbHlDY9TMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHRyYWluaW5nLmNjZWEub3JnLnVrMB4XDTEyMTEwNzExMTgxM1oXDTIyMTEw
 						NTExMTgxM1owHzEdMBsGA1UEAxMUdHJhaW5pbmcuY2NlYS5vcmcudWswggEiMA0G
@@ -44,54 +44,54 @@
 						JHaQ6tFjNL4fGdsNXQftF1JkcqTLZts4USDG8yFKxyN2VODC1DcjSAbm33sJpo9J
 						ceK3gd6V5Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northern Ireland Council for the Curriculum Examinations and Assessment</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northern Ireland Council for the Curriculum Examinations and Assessment: CCEA VLE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rewardinglearning.org.uk/about/index.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Stephanie</md:GivenName>
-      <md:SurName>Doran</md:SurName>
-      <md:EmailAddress>mailto:sdoran@ccea.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>McAfee</md:SurName>
-      <md:EmailAddress>mailto:amcafee@ccea.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephanie</md:GivenName>
-      <md:SurName>Doran</md:SurName>
-      <md:EmailAddress>mailto:sdoran@ccea.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>McAfee</md:SurName>
-      <md:EmailAddress>mailto:amcafee@ccea.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northern Ireland Council for the Curriculum Examinations and Assessment</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northern Ireland Council for the Curriculum Examinations and Assessment: CCEA VLE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rewardinglearning.org.uk/about/index.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Stephanie</md:GivenName>
+    <md:SurName>Doran</md:SurName>
+    <md:EmailAddress>mailto:sdoran@ccea.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McAfee</md:SurName>
+    <md:EmailAddress>mailto:amcafee@ccea.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephanie</md:GivenName>
+    <md:SurName>Doran</md:SurName>
+    <md:EmailAddress>mailto:sdoran@ccea.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McAfee</md:SurName>
+    <md:EmailAddress>mailto:amcafee@ccea.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
index e0e971f2..2d67a95e 100644
--- a/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/trshibtest.falmouth.ac.uk-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://trshibtest.falmouth.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T16:06:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-24T16:06:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Falmouth University TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Falmouth University &amp; FXPlus IdP</mdui:Description>
+        <mdui:Logo height="80" width="80">https://trshibtest.falmouth.ac.uk/idp/images/falmouth-university-logo-print.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Falmouth University TEST</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Falmouth University &amp; FXPlus IdP</mdui:Description>
-          <mdui:Logo height="80" width="80">https://trshibtest.falmouth.ac.uk/idp/images/falmouth-university-logo-print.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
 						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -43,31 +43,31 @@
 						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
 						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://trshibtest.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://trshibtest.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://trshibtest.falmouth.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fxplus.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
 						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
 						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -87,24 +87,24 @@
 						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
 						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Falmouth University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Falmouth University TEST</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Pellow</md:SurName>
-      <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Pellow</md:SurName>
-      <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://trshibtest.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Falmouth University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Falmouth University TEST</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Pellow</md:SurName>
+    <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Pellow</md:SurName>
+    <md:EmailAddress>mailto:steve.pellow@fxplus.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
index bb555083..4fbc1b5c 100644
--- a/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -57,15 +57,15 @@ qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
 EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
 GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -99,28 +99,28 @@ qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
 EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
 GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -154,15 +154,15 @@ qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
 EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
 GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
 BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
 VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
@@ -196,36 +196,36 @@ qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
 EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
 GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e8</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e8</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Technische Universität München</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Technische Universität München</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.tum.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.tum.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Ralf</md:GivenName>
-      <md:SurName>Ebner</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ralf</md:GivenName>
-      <md:SurName>Ebner</md:SurName>
-      <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TUM IT-Support</md:GivenName>
-      <md:SurName>TUM IT-Support</md:SurName>
-      <md:EmailAddress>mailto:it-support@tum.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e8</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e8</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität München</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Technische Universität München</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.tum.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tum.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Ebner</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ralf</md:GivenName>
+    <md:SurName>Ebner</md:SurName>
+    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TUM IT-Support</md:GivenName>
+    <md:SurName>TUM IT-Support</md:SurName>
+    <md:EmailAddress>mailto:it-support@tum.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ua.ssbbartgroup.com-shibboleth.xml b/swamid-interfederations-2.0/ua.ssbbartgroup.com-shibboleth.xml
index 8bead8da..ff5bdbc2 100644
--- a/swamid-interfederations-2.0/ua.ssbbartgroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/ua.ssbbartgroup.com-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ua.ssbbartgroup.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AMP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Accessibility Management Platform </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ssbbartgroup.com/amp/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ssbbartgroup.com/privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="53" width="86" xml:lang="en">https://amp.ssbbartgroup.com//img/amp-logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">AMP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Accessibility Management Platform </mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ssbbartgroup.com/amp/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ssbbartgroup.com/privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="53" width="86" xml:lang="en">https://amp.ssbbartgroup.com//img/amp-logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDADCCAeigAwIBAgIJAMjOQ+3etMBhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3VhLnNzYmJhcnRncm91cC5jb20wHhcNMTYwNTE4MjMwMTQ2WhcNMjYwNTE2
 MjMwMTQ2WjAeMRwwGgYDVQQDExN1YS5zc2JiYXJ0Z3JvdXAuY29tMIIBIjANBgkq
@@ -41,37 +41,37 @@ zgPl/jL52IF2RnfbLHYBg1aIMFbOh7bRGTUwP/o7FU54JgKG+00uc542P08oAa0O
 sc6X6YdLBPYPekq1jIpAPk8R0kBx9POqnZ73INB2ZPxgpOrUPq2y4+44tkm/Kmm2
 vDjSWg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ua.ssbbartgroup.com/Logout"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">AMP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Accessibility Management Platform </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SSB Bart Group</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SSB Bart Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ssbbartgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Matt Baillargeon</md:GivenName>
-      <md:EmailAddress>matt.baillargeon@ssbbartgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ross Schlie</md:GivenName>
-      <md:EmailAddress>ross.schlie@ssbbartgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jerry Palmisano</md:GivenName>
-      <md:EmailAddress>jerry.palmisano@ssbbartgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ua.ssbbartgroup.com/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ua.ssbbartgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">AMP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Accessibility Management Platform </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SSB Bart Group</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SSB Bart Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ssbbartgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matt Baillargeon</md:GivenName>
+    <md:EmailAddress>matt.baillargeon@ssbbartgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ross Schlie</md:GivenName>
+    <md:EmailAddress>ross.schlie@ssbbartgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jerry Palmisano</md:GivenName>
+    <md:EmailAddress>jerry.palmisano@ssbbartgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
index 7b133712..3a31dcb8 100644
--- a/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://uat-adfs.geant.net/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT ADFS (User Acceptance Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT ADFS (User Acceptance Test)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
@@ -64,13 +64,13 @@
 						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
 						MuFyz7mc
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
 						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
@@ -119,41 +119,41 @@
 						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
 						MuFyz7mc
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-adfs.geant.net/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-adfs.geant.net/adfs/ls/" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">GÉANT ADFS (User Acceptance Test)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-adfs.geant.net/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-adfs.geant.net/adfs/ls/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GÉANT ADFS (User Acceptance Test)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
index 06db0dfb..8b39d0f0 100644
--- a/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
+++ b/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat-bod-gui.geant.net/autobahn-gui">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:01:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:01:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BoD Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">BoD Portal</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
 						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
@@ -35,13 +35,13 @@
 						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
 						xYkpdcr0
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
 						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
@@ -61,36 +61,36 @@
 						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
 						xYkpdcr0
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">BoD Portal</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dante.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>GÉANT IT</md:GivenName>
-      <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">BoD Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dante.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>GÉANT IT</md:GivenName>
+    <md:EmailAddress>mailto:it@geant.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml b/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml
index 975a7e4b..5ce5f7cc 100644
--- a/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat-nsuk.elsevieremea.com/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T15:51:46Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T15:51:46Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDgjCCAmqgAwIBAgIJAIPaQ409Yt0iMA0GCSqGSIb3DQEBBQUAMDQxDjAMBgNV
 						BAoTBU1OU1VLMSIwIAYDVQQDExl1YXQtbnN1ay5lbHNldmllcmVtZWEuY29tMB4X
 						DTEyMTEyOTAyNTIxM1oXDTIyMTEyNzAyNTIxM1owNDEOMAwGA1UEChMFTU5TVUsx
@@ -28,13 +28,13 @@
 						jPtJI7U9vKBxMR021fjAxGMnKeJfhh4QJRD+mwdOJdiQ+G7GiswHRNQP+IOPufWl
 						Rs0tLu8YVVeOHOZilxI8ij68b5gcBJozjTOBwwH0BTCLt1Q7dj4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDgjCCAmqgAwIBAgIJAIPaQ409Yt0iMA0GCSqGSIb3DQEBBQUAMDQxDjAMBgNV
 						BAoTBU1OU1VLMSIwIAYDVQQDExl1YXQtbnN1ay5lbHNldmllcmVtZWEuY29tMB4X
 						DTEyMTEyOTAyNTIxM1oXDTIyMTEyNzAyNTIxM1owNDEOMAwGA1UEChMFTU5TVUsx
@@ -55,27 +55,27 @@
 						jPtJI7U9vKBxMR021fjAxGMnKeJfhh4QJRD+mwdOJdiQ+G7GiswHRNQP+IOPufWl
 						Rs0tLu8YVVeOHOZilxI8ij68b5gcBJozjTOBwwH0BTCLt1Q7dj4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Elsevier Clinical Skills (UAT)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.elsevierclinicalskills.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Isaacs</md:SurName>
-      <md:EmailAddress>mailto:g.isaacs@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Terence</md:GivenName>
-      <md:SurName>Clifton</md:SurName>
-      <md:EmailAddress>mailto:t.clifton@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Elsevier Clinical Skills (UAT)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.elsevierclinicalskills.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Isaacs</md:SurName>
+    <md:EmailAddress>mailto:g.isaacs@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Terence</md:GivenName>
+    <md:SurName>Clifton</md:SurName>
+    <md:EmailAddress>mailto:t.clifton@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
index 257a3775..c5a0de00 100644
--- a/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
+++ b/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.digitaltheatreplus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T15:29:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T15:29:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="60" width="104">https://digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Digital Theatre Plus (test site)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="60" width="104">https://digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">Digital Theatre Plus (test site)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJANaX6ppqsyTMMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFWR0cGx1cy51YXQudnVhbHRvLmNvbTAeFw0xNDA4MDQwOTM2MzNaFw0yNDA4
 						MDEwOTM2MzNaMCAxHjAcBgNVBAMTFWR0cGx1cy51YXQudnVhbHRvLmNvbTCCASIw
@@ -35,34 +35,34 @@
 						GJtmUCj7yfMyg2p+o//EKOqTkWlM+TsmWAYIEmO6GT7OJDNrMyDNqXCnOdArvj/V
 						/Vn1hQzMvWYnqQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digital Theatre.com Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Theatre Plus (test site)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.digitaltheatreplus.com/about-us</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Ware</md:SurName>
-      <md:EmailAddress>mailto:support@digitaltheatre.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Carly</md:GivenName>
-      <md:SurName>Britton</md:SurName>
-      <md:EmailAddress>mailto:support@vualto.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digital Theatre.com Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Theatre Plus (test site)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.digitaltheatreplus.com/about-us</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Ware</md:SurName>
+    <md:EmailAddress>mailto:support@digitaltheatre.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carly</md:GivenName>
+    <md:SurName>Britton</md:SurName>
+    <md:EmailAddress>mailto:support@vualto.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml b/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml
index fed2063d..38fa20bc 100644
--- a/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.twigonglow.com/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-03T10:13:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-03T10:13:34Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/shibtest"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/RMUnify"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/shibtest"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/RMUnify"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uat.twigonglow.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIJAJxETCSASpdZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEnVhdC50d2lnb25nbG93LmNvbTAeFw0xNDA5MDIxMDUwMTdaFw0yNDA4MzAx
 						MDUwMTdaMB0xGzAZBgNVBAMTEnVhdC50d2lnb25nbG93LmNvbTCCASIwDQYJKoZI
@@ -45,44 +45,44 @@
 						V5r+0fJYmxEwam5sooQ/BmF9vKWiqi2sqRFP/W6JWq2m8/wqtqqovWMKvgwxrLTt
 						wE/tNsBL7C5AePts/W1CF4B+atCSb7LhcxF52bAOC3MBJwO58/xv1A2AeA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Twig World Limited: Web Team UAT TwigOnGlow Shibboleth SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.twig-world.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Twig World Limited: Web Team UAT TwigOnGlow Shibboleth SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.twig-world.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml b/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml
index cddc30dc..ab3f5924 100644
--- a/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.v-scene.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-26T10:19:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-26T10:19:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://v-scene.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://v-scene.ja.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://v-scene.ja.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://v-scene.ja.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbjCCA1agAwIBAgIRAPLs2fw5NrHY6vHiBUWhWeIwDQYJKoZIhvcNAQEFBQAw
 						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 						IFNTTCBDQTAeFw0xNDA1MTYwMDAwMDBaFw0xNzA1MTUyMzU5NTlaMD4xITAfBgNV
@@ -50,38 +50,38 @@
 						3U0pLrCAHTghWhbyfXiqeijWivQ/0Jz5aiRX8738f5L/LN/fqGe0xFQaZoCeeSc/
 						8dBRNpkZmtznEg7VKwGKeYuntpvomaA18BEpsQZjgZMHNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">v-scene</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>v-scene Service Management Centre</md:GivenName>
-      <md:EmailAddress>mailto:vidconf@jvcs.ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>v-scene Service Management Centre</md:GivenName>
-      <md:EmailAddress>mailto:vidconf@jvcs.ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">v-scene</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>v-scene Service Management Centre</md:GivenName>
+    <md:EmailAddress>mailto:vidconf@jvcs.ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>v-scene Service Management Centre</md:GivenName>
+    <md:EmailAddress>mailto:vidconf@jvcs.ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucdavis.curricunet.com-shibboleth.xml b/swamid-interfederations-2.0/ucdavis.curricunet.com-shibboleth.xml
index 76284ab9..029a79c3 100644
--- a/swamid-interfederations-2.0/ucdavis.curricunet.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/ucdavis.curricunet.com-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucdavis.curricunet.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ucdavis.curricunet.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CurricUNET META</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CurricUNET Meta Service Provider</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ucdavis.curricunet.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CurricUNET META</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CurricUNET Meta Service Provider</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDDzCCAfegAwIBAgIJAKtQbfEjwTUHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGGlkY3Ytd3MyMC5nb3Zlcm5ldC5sb2NhbDAeFw0xNDA5MDkxNTA0NDFaFw0y
 NDA5MDYxNTA0NDFaMCMxITAfBgNVBAMTGGlkY3Ytd3MyMC5nb3Zlcm5ldC5sb2Nh
@@ -38,26 +38,26 @@ rFN1tFyYTCPuH+h6lR9guljXWPccEW6ryDkc5kqkibMDHVVbnGlJrDYH9qlXDf0K
 lcTNlMImd4y6cZBNgJbehBPK5q1Yh5+EnY8whbGjxBYiEt/S69WWG7+QEUSbeTKI
 s9ANtb7VZ8K8EP0TK1vskWcHxQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">CurricUNET META</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">CurricUNET Meta Service Provider</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Governet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Governet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://governet.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shawn McDaniel</md:GivenName>
-      <md:EmailAddress>smcdaniel@governet.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucdavis.curricunet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CurricUNET META</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">CurricUNET Meta Service Provider</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Governet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Governet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://governet.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shawn McDaniel</md:GivenName>
+    <md:EmailAddress>smcdaniel@governet.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml b/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml
index a5d60008..0457eb69 100644
--- a/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucl-research-test.worktribe.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-13T10:15:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-13T10:15:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIJALJ6YNn8QO6YMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH3VjbC1yZXNlYXJjaC10ZXN0Lndvcmt0cmliZS5jb20wHhcNMTUxMTA5MTU0
 						NjEzWhcNMjUxMTA2MTU0NjEzWjAqMSgwJgYDVQQDEx91Y2wtcmVzZWFyY2gtdGVz
@@ -47,42 +47,42 @@
 						DqlP/Xl8qSeRDuZ2BGHaRY9L9tv83/wmgDw5M9aD6mnitldU42OaaRgOZfz9IJw8
 						wEizXjk+w4nXfsGJx17O8t3uXHElZVQeCtUfiAR7QL+9hmQGhhTvMA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Worktribe Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UCL Worktribe Research Management (Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.worktribe.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@worktribe.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Southall</md:SurName>
-      <md:EmailAddress>mailto:matt.southall@worktribe.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Worktribe Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UCL Worktribe Research Management (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worktribe.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@worktribe.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Southall</md:SurName>
+    <md:EmailAddress>mailto:matt.southall@worktribe.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
index 6d108564..6d21d372 100644
--- a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucl-safety.co.uk/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAKIVioCG3ZBZMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3MwMzUyLTA1NDgtd2IwMTAeFw0xMDEwMDQxNzIxNTZaFw0yMDEwMDExNzIx
 						NTZaMBoxGDAWBgNVBAMTD3MwMzUyLTA1NDgtd2IwMTCCASIwDQYJKoZIhvcNAQEB
@@ -25,13 +25,13 @@
 						LARNtvz6YagTchFGL4rQoMZaGUforT1pH/2SLFRSIQvB7KE/L9KAiq0J0VtcRQeO
 						E1JMlcamLZgO4OOfUch9qY3mzMk4ILX5fzEHzXPCC+ck3uV39/1/7A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAKIVioCG3ZBZMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3MwMzUyLTA1NDgtd2IwMTAeFw0xMDEwMDQxNzIxNTZaFw0yMDEwMDExNzIx
 						NTZaMBoxGDAWBgNVBAMTD3MwMzUyLTA1NDgtd2IwMTCCASIwDQYJKoZIhvcNAQEB
@@ -49,38 +49,38 @@
 						LARNtvz6YagTchFGL4rQoMZaGUforT1pH/2SLFRSIQvB7KE/L9KAiq0J0VtcRQeO
 						E1JMlcamLZgO4OOfUch9qY3mzMk4ILX5fzEHzXPCC+ck3uV39/1/7A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Optima Diagnostics Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Optima Diagnostics Limited: Oshens Software for UCL</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oshens.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Layton</md:SurName>
-      <md:EmailAddress>mailto:Simonl@optimadiagnostics.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Layton</md:SurName>
-      <md:EmailAddress>mailto:Simonl@optimadiagnostics.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Optima Diagnostics Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Optima Diagnostics Limited: Oshens Software for UCL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oshens.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Layton</md:SurName>
+    <md:EmailAddress>mailto:Simonl@optimadiagnostics.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Layton</md:SurName>
+    <md:EmailAddress>mailto:Simonl@optimadiagnostics.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml b/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
index 14582360..1adf1a6d 100644
--- a/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucl.epiclearninggroup.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T17:04:02Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T17:04:02Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://extend.ucl.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://extend.ucl.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0DCCAbigAwIBAgIJAKNyH/gxrpu9MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
 						BAMTA3VjbDAeFw0xMjEyMTQwOTQ4NDBaFw0yMjEyMTIwOTQ4NDBaMA4xDDAKBgNV
 						BAMTA3VjbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/YpbWoOORQ
@@ -44,43 +44,43 @@
 						0bjeFxeLtcvlKpoHb4l1zh3bEr5kuP9LM830xgN0mAhqZN7tMdDURPdMuqCNOoyh 
 						gNNnjA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://extend.ucl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Epic Performance Improvement Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ExtendUCL</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://epiclearninggroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Bannister</md:SurName>
-      <md:EmailAddress>mailto:ABannister@epiclearninggroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Avey</md:SurName>
-      <md:EmailAddress>mailto:steve.avey@leolearning.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://extend.ucl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Epic Performance Improvement Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ExtendUCL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://epiclearninggroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Bannister</md:SurName>
+    <md:EmailAddress>mailto:ABannister@epiclearninggroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Avey</md:SurName>
+    <md:EmailAddress>mailto:steve.avey@leolearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml
index 7ccd0a99..eaae084f 100644
--- a/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucl.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-17T14:43:39Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-17T14:43:39Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="60" width="60">https://www.siso.co/siso-logo60x60.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">SiSo University College London Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo University College London Online Resource Booking</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="60" width="60">https://www.siso.co/siso-logo60x60.jpg</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">SiSo University College London Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo University College London Online Resource Booking</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -49,34 +49,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo University College London Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo University College London Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml b/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
index 1d5e1cae..0deeeb6c 100644
--- a/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uclu.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-21T11:06:06Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-21T11:06:06Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UCLU (University College London Union)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UCLU is the representative body for University College London students, founded in 1893.</mdui:Description>
+        <mdui:Logo height="80" width="206">https://uclu.org/shibboleth-sp/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UCLU (University College London Union)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UCLU is the representative body for University College London students, founded in 1893.</mdui:Description>
-          <mdui:Logo height="80" width="206">https://uclu.org/shibboleth-sp/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/zCCAeegAwIBAgIJAKwfQJ+dJ/UEMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHVjbHUub3JnMB4XDTEzMDMxNDE3MzEwOFoXDTIzMDMxMjE3MzEwOFowEzER
 						MA8GA1UEAxMIdWNsdS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -33,36 +33,36 @@
 						2PLYR/plUVOxRfiB4eEFjuiho3vanQCj1zhKtI3D0rxS2Nlbpu2mZbndxLfBrta3
 						AH0h
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uclu.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uclu.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uclu.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uclu.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uclu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UCLU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UCLU Website</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uclu.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UCLU Web Developer</md:GivenName>
-      <md:EmailAddress>mailto:UCLU-wd@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UCLU Web Developer</md:GivenName>
-      <md:EmailAddress>mailto:UCLU-wd@ucl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uclu.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uclu.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uclu.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uclu.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uclu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UCLU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UCLU Website</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uclu.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UCLU Web Developer</md:GivenName>
+    <md:EmailAddress>mailto:UCLU-wd@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UCLU Web Developer</md:GivenName>
+    <md:EmailAddress>mailto:UCLU-wd@ucl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml b/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
index abe1a191..2ed84d32 100644
--- a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
+++ b/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucopia-shib.ensta-bretagne.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T14:19:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T14:19:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://ucopia-shib.ensta-bretagne.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">ENSTA Bretagne - WiFi EduSpot</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://ucopia-shib.ensta-bretagne.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">ENSTA Bretagne - WiFi EduSpot</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDljCCAn4CCQCfU0WUIcNFIDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 RlIxETAPBgNVBAgMCEJyZXRhZ25lMQ4wDAYDVQQHDAVCcmVzdDEXMBUGA1UECgwO
 RU5TVEEgQnJldGFnbmUxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMSIw
@@ -46,13 +46,13 @@ aCK5iwx95AZ6qN5d0BzzC8PAcULgZjbgyOk/AF6PVZklHKs5u/vsyOFhlevj+YfM
 ca90uwRHWn/k67mBa29JYu6i+m0C9ivPTCHn9c4HaVGV023h2UvWXj2gFpUgesO/
 /1CfOyqCdiur4Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDljCCAn4CCQCfU0WUIcNFIDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
 RlIxETAPBgNVBAgMCEJyZXRhZ25lMQ4wDAYDVQQHDAVCcmVzdDEXMBUGA1UECgwO
 RU5TVEEgQnJldGFnbmUxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMSIw
@@ -74,13 +74,13 @@ aCK5iwx95AZ6qN5d0BzzC8PAcULgZjbgyOk/AF6PVZklHKs5u/vsyOFhlevj+YfM
 ca90uwRHWn/k67mBa29JYu6i+m0C9ivPTCHn9c4HaVGV023h2UvWXj2gFpUgesO/
 /1CfOyqCdiur4Q==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEYTCCA0mgAwIBAgIBATANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMCRlIx
 ETAPBgNVBAgMCEJSRVRBR05FMRcwFQYDVQQKDA5FTlNUQSBCUkVUQUdORTExMC8G
 A1UECwwoRUNPTEUgTkFUIFNVUCBJTkdFTiBFVFVERSBURUNITiBBUk1FTUVOVDEm
@@ -106,33 +106,31 @@ gBgI0bwtyCTjP0RVzJ4vWPpglXJPddfUvYh3rzDVM2wSzcVw36rl7s2oPgJy0CT9
 mrnJXRMvro3o5/2uT+4qCpJXj0mtWcAiOQDHISXFb7TpKZu8ra/XDpx1dVejo3e8
 fievTXxCFzLqApOjCWA8o5hbmgx1
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://controller.access.network/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://controller.access.network/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</md:ServiceName>
-        <md:ServiceName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">ENSTA Bretagne - WiFi EduSpot</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ENSTA Bretagne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ENSTA Bretagne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ensta-bretagne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Paul KIRKBRIDE</md:SurName>
-      <md:EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Pierrick VEILLON</md:SurName>
-      <md:EmailAddress>pierrick.veillon@ensta-bretagne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://controller.access.network/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://controller.access.network/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</md:ServiceName>
+      <md:ServiceName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">ENSTA Bretagne - WiFi EduSpot</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ENSTA Bretagne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ENSTA Bretagne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ensta-bretagne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Paul KIRKBRIDE</md:SurName>
+    <md:EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Pierrick VEILLON</md:SurName>
+    <md:EmailAddress>pierrick.veillon@ensta-bretagne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml
index 8899ce17..ba076738 100644
--- a/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucreative.idm.oclc.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-12T10:14:54Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-12T10:14:54Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID/DCCAuSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBhMSEwHwYDVQQDFBgqLnVj
 						cmVhdGl2ZS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xD
 						MSAwHgYJKoZIhvcNAQkBFhFha2tpbmVudkBvY2xjLm9yZzAeFw0xMzAzMDYyMzU0
@@ -31,27 +31,27 @@
 						WBSxxYRpDgUJ+Pz5QCZuAMkQGbPdhWSGfcURBUxYhiBK4fnOghJTXMXumg7GycfW
 						vVK8cWTrEwbTlG9q6mlD0Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Creative Arts Hosted Ezproxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Vasu</md:GivenName>
-      <md:SurName>Akkineni</md:SurName>
-      <md:EmailAddress>mailto:akkinenv@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vasu</md:GivenName>
-      <md:SurName>Akkineni</md:SurName>
-      <md:EmailAddress>mailto:akkinenv@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Creative Arts Hosted Ezproxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vasu</md:GivenName>
+    <md:SurName>Akkineni</md:SurName>
+    <md:EmailAddress>mailto:akkinenv@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vasu</md:GivenName>
+    <md:SurName>Akkineni</md:SurName>
+    <md:EmailAddress>mailto:akkinenv@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml
index 5bc6168b..19446561 100644
--- a/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucs.cirqahosting.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-29T11:03:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-29T11:03:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ucs.cirqahosting.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ucs.cirqahosting.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHjCCAgagAwIBAgIJAJgpdfh1+YmvMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHWNhbXN1Zi5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyNjIyNDIy
 						OVoXDTI1MDEyMzIyNDIyOVowKDEmMCQGA1UEAxMdY2Ftc3VmLmlzb3hmb3JkLWhv
@@ -47,51 +47,51 @@
 						flxTIg3hb5c3mlLYpLTboH9Nd5xwUba9OuWaS0mNfYBc5jjzHv3wc17LUR3+3c0y
 						PKzomY9nI7c5Kk93SmbYuuBY76D/kZE+baaoDSELEYNXtA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucs.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IS Oxford Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University Campus Suffolk Heritage Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.isoxford.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Orchard</md:SurName>
-      <md:EmailAddress>mailto:lee@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Oxford Support</md:GivenName>
-      <md:EmailAddress>mailto:support@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Salvesen</md:SurName>
-      <md:EmailAddress>mailto:david@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Oxford Support</md:GivenName>
-      <md:EmailAddress>mailto:support@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucs.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IS Oxford Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University Campus Suffolk Heritage Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.isoxford.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Orchard</md:SurName>
+    <md:EmailAddress>mailto:lee@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Oxford Support</md:GivenName>
+    <md:EmailAddress>mailto:support@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Salvesen</md:SurName>
+    <md:EmailAddress>mailto:david@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Oxford Support</md:GivenName>
+    <md:EmailAddress>mailto:support@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/udash-dev.data.alpha.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/udash-dev.data.alpha.jisc.ac.uk-shibboleth.xml
index 12439130..baf85170 100644
--- a/swamid-interfederations-2.0/udash-dev.data.alpha.jisc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/udash-dev.data.alpha.jisc.ac.uk-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://udash-dev.data.alpha.jisc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-15T14:36:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-15T14:36:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Unicon Dashboard (Development)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Access to the Development version of the Jisc Unicon Dashboard</mdui:Description>
+        <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Unicon Dashboard (Development)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Access to the Development version of the Jisc Unicon Dashboard</mdui:Description>
-          <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIJAMoOqszthd+3MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH3VkYXNoLWRldi5kYXRhLmFscGhhLmppc2MuYWMudWswHhcNMTYwMjExMTMw
 						OTUwWhcNMjYwMjA4MTMwOTUwWjAqMSgwJgYDVQQDEx91ZGFzaC1kZXYuZGF0YS5h
@@ -52,52 +52,52 @@
 						+NwsIoGehsa2hcJ7NeMhQKgTZKJMw3Aq/LltoqBe3qLe1RLgdR9Yr37KdCFknBlK
 						e1kOr58uk4NSlXwpnXzJm1qbO8wyNpg5BSS3J+AJmlYNDgPDah/zdg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Jisc Unicon Dashboard (Development)</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jisc Unicon Dashboard (Development)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.jisc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Baylis</md:SurName>
-      <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Baylis</md:SurName>
-      <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://udash-dev.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Jisc Unicon Dashboard (Development)</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jisc Unicon Dashboard (Development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.jisc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Baylis</md:SurName>
+    <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Baylis</md:SurName>
+    <md:EmailAddress>mailto:lee.baylis@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 9cea3c31..ebe790b1 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">LINDAT / CLARIN Dienste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</mdui:Description>
+        <mdui:Description xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</mdui:Description>
+        <mdui:Logo height="16" width="16">https://lindat.mff.cuni.cz/favicon.ico</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">LINDAT / CLARIN Dienste</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">LINDAT/CLARIN services</mdui:DisplayName>
-          <mdui:Description xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</mdui:Description>
-          <mdui:Description xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</mdui:Description>
-          <mdui:Logo height="16" width="16">https://lindat.mff.cuni.cz/favicon.ico</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>lindat.mff.cuni.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=lindat.mff.cuni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-            <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lindat.mff.cuni.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lindat.mff.cuni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzEyMTgwMDAwMDBaFw0xNjEyMTcyMzU5NTlaMEAxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGluZGF0Lm1m
@@ -58,60 +58,60 @@ EFw6XzWMKSgkB0QFX2WUCVuhWfejJ6OhUkH6S5Bh+p5WPKJ7bM4E6UrfaleieSr7
 mfwH8VeBwoL+rL1n6xqndwwqAnzWtFPAO/hBIuOwkucYl85fBqXT0de7g8fIw7bt
 iALZ/UygiLnb3oX/q0Q=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">LINDAT / CLARIN Dienste</md:ServiceName>
-        <md:ServiceName xml:lang="en">LINDAT/CLARIN services</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jozef</md:GivenName>
-      <md:SurName>Mišutka</md:SurName>
-      <md:EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jozef</md:GivenName>
-      <md:SurName>Mišutka</md:SurName>
-      <md:EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pavel</md:GivenName>
-      <md:SurName>Straňák</md:SurName>
-      <md:EmailAddress>mailto:stranak@ufal.mff.cuni.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">LINDAT / CLARIN Dienste</md:ServiceName>
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN services</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Mišutka</md:SurName>
+    <md:EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Mišutka</md:SurName>
+    <md:EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Straňák</md:SurName>
+    <md:EmailAddress>mailto:stranak@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ufit.onecampus.com.xml b/swamid-interfederations-2.0/ufit.onecampus.com.xml
index 7f9a1573..1d822453 100644
--- a/swamid-interfederations-2.0/ufit.onecampus.com.xml
+++ b/swamid-interfederations-2.0/ufit.onecampus.com.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufit.onecampus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Florida - IT</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Florida - IT</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFgjCCBGqgAwIBAgIIPonQRl6+sRswDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
 BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
 GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
@@ -51,21 +51,21 @@ DX/omW8DHrG3VYEfmGjnuwzL8Bm7Skh51w51SM18bKqKQ0n5egk8TKnIlYccY8dF
 nH5otsDvcIH8ufCvgtMEYHaCoJBsF6+sPdOInsbBz7CcJuQZEgt7uYD73peThM2D
 r5n4bRxg+vpuTaMcDvkx5GVQGSTsSA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cloud Ops Support</md:GivenName>
-      <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://services.it.ufl.edu/saml/SSO/alias/ufit" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cloud Ops Support</md:GivenName>
+    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uiowa.infoready4.com-shibboleth.xml b/swamid-interfederations-2.0/uiowa.infoready4.com-shibboleth.xml
index 44a93e4f..b3c4ad04 100644
--- a/swamid-interfederations-2.0/uiowa.infoready4.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/uiowa.infoready4.com-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uiowa.infoready4.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uiowa.infoready4.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InfoReady Review - University of Iowa</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uiowa.infoready4.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">InfoReady Review - University of Iowa</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6zCCAdOgAwIBAgIJAOO9wmxE2PCSMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGluZm9yZHl3aW4wMjAeFw0xMzEwMjkwNjE0NDlaFw0yMzEwMjcwNjE0NDla
 MBcxFTATBgNVBAMTDGluZm9yZHl3aW4wMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -36,31 +36,31 @@ zAs2xgBj3V5YWmzS7nk1wPPJBKpr+9W5xixEGfaKfrrQXayP/LVyN+u/3BjZCZfE
 bfqmalH+rjpJ7ZCck4CQFxCvnLhwl+L5DEuEFXmgTzk7EDb65no+rXaZQd3/IEre
 sazovBHNw8FPYGiOCi2757flvBsb6gW+FbN0SPmtSQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uiowa.infoready4.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uiowa.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uiowa.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">InfoReady Review - University of Iowa</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Testa</md:GivenName>
-      <md:EmailAddress>jtesta@infoready4.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uiowa.infoready4.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uiowa.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uiowa.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uiowa.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">InfoReady Review - University of Iowa</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Testa</md:GivenName>
+    <md:EmailAddress>jtesta@infoready4.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml
index 5163afa9..2496bc6f 100644
--- a/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uisshibb1.uis.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://uisshibb1.uis.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Illinois At Springfield</mdui:DisplayName>
+        <mdui:Description xml:lang="en">User Identification Service @ Illinois Springfield</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uis.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uis.edu/informationtechnologyservices/about/policies.html#acceptuse</mdui:PrivacyStatementURL>
+        <mdui:Logo height="183" width="131" xml:lang="en">https://uofi.box.com/shared/static/l5b0pac3r6fgffnybw4olbrs68dwwxar.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://uisshibb1.uis.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Illinois At Springfield</mdui:DisplayName>
-          <mdui:Description xml:lang="en">User Identification Service @ Illinois Springfield</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.uis.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.uis.edu/informationtechnologyservices/about/policies.html#acceptuse</mdui:PrivacyStatementURL>
-          <mdui:Logo height="183" width="131" xml:lang="en">https://uofi.box.com/shared/static/l5b0pac3r6fgffnybw4olbrs68dwwxar.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAKHOcYSjaC5wZJQOZRw+J1v3yp5iMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXVpc3NoaWJiMS51aXMuZWR1MB4XDTExMTEyMTIzMjQx
 M1oXDTMxMTEyMTIzMjQxM1owHDEaMBgGA1UEAxMRdWlzc2hpYmIxLnVpcy5lZHUw
@@ -45,24 +45,24 @@ VSeGSuGQh526tY5HlqaZ6pYmQ4EFj5Iu9fhAlpQy2fvR16UjPG+dV7HwmdK3isqk
 LWaYSk6XCWIh1fIli2rNF5GbETJGOGfypjDL6f1P60+Sc8rg39XRANxBhbjLipD7
 9FRlnA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://uisshibb1.uis.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://uisshibb1.uis.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVAKHOcYSjaC5wZJQOZRw+J1v3yp5iMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXVpc3NoaWJiMS51aXMuZWR1MB4XDTExMTEyMTIzMjQx
 M1oXDTMxMTEyMTIzMjQxM1owHDEaMBgGA1UEAxMRdWlzc2hpYmIxLnVpcy5lZHUw
@@ -82,26 +82,26 @@ VSeGSuGQh526tY5HlqaZ6pYmQ4EFj5Iu9fhAlpQy2fvR16UjPG+dV7HwmdK3isqk
 LWaYSk6XCWIh1fIli2rNF5GbETJGOGfypjDL6f1P60+Sc8rg39XRANxBhbjLipD7
 9FRlnA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Illinois At Springfield</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Illinois At Springfield</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tulio Llosa</md:GivenName>
-      <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tulio Llosa</md:GivenName>
-      <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tulio Llosa</md:GivenName>
-      <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Illinois At Springfield</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Illinois At Springfield</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tulio Llosa</md:GivenName>
+    <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tulio Llosa</md:GivenName>
+    <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tulio Llosa</md:GivenName>
+    <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml
index a2d0a181..4a57c504 100644
--- a/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uk-bris-shibboleth.moveon4.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-05T15:07:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-05T15:07:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
+        <mdui:Logo height="29" width="189">https://static.moveon4.com/sso/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
-          <mdui:Logo height="29" width="189">https://static.moveon4.com/sso/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFgTCCA2mgAwIBAgIJAPyfEjrHG6KuMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
 						BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCF1
 						ay1icmlzdG9sLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTQxMTA1MDY1MDM4
@@ -64,39 +64,39 @@
 						aZmnja4uIchgKipEXlNaG1+HACmzj0SIKGpaBtiryIcogwbZoeCaxKp69YgyaQEk
 						swIdKrlywppmFlZP04UczhynlNo3
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">QS unisolution GmbH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">qsu-unisolution</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kamran</md:GivenName>
-      <md:SurName>Tabassum</md:SurName>
-      <md:EmailAddress>mailto:kamran@zeptosystems.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zia</md:GivenName>
-      <md:SurName>Qazi</md:SurName>
-      <md:EmailAddress>mailto:ziaqazi@zeptosystems.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">QS unisolution GmbH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">qsu-unisolution</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kamran</md:GivenName>
+    <md:SurName>Tabassum</md:SurName>
+    <md:EmailAddress>mailto:kamran@zeptosystems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zia</md:GivenName>
+    <md:SurName>Qazi</md:SurName>
+    <md:EmailAddress>mailto:ziaqazi@zeptosystems.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml
index 647f8bd6..97278672 100644
--- a/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uk-coventry-shibboleth.moveon4.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T10:53:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T10:53:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFgzCCA2ugAwIBAgIJAJdEyesPxkXQMA0GCSqGSIb3DQEBCwUAMFgxCzAJBgNV
 						BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSswKQYDVQQDDCJ1
 						ay1jb3ZlbnRyeS1zaGliYm9sZXRoLm1vdmVvbjQuY29tMB4XDTE1MTAyODEyMDIw
@@ -63,39 +63,39 @@
 						bqjPiPhgc3heOqonB6c8fDLtu9JzNAl6TGHyw9j8Yb4etgH8HlmkPa9THXXtrewY
 						VBmw7O2i/F60fXVEf7AtB1a2KZfQ/Lw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">QS unisolution GmbH</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">qsu-unisolution</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kamran</md:GivenName>
-      <md:SurName>Tabassum</md:SurName>
-      <md:EmailAddress>mailto:kamran@zeptosystems.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mubashar</md:GivenName>
-      <md:SurName>Latif</md:SurName>
-      <md:EmailAddress>mailto:mubashar.latif@zeptosystems.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">QS unisolution GmbH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">qsu-unisolution</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kamran</md:GivenName>
+    <md:SurName>Tabassum</md:SurName>
+    <md:EmailAddress>mailto:kamran@zeptosystems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mubashar</md:GivenName>
+    <md:SurName>Latif</md:SurName>
+    <md:EmailAddress>mailto:mubashar.latif@zeptosystems.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk.ihs.com-entity.xml b/swamid-interfederations-2.0/uk.ihs.com-entity.xml
index 2fc8e408..0b00b94e 100644
--- a/swamid-interfederations-2.0/uk.ihs.com-entity.xml
+++ b/swamid-interfederations-2.0/uk.ihs.com-entity.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uk.ihs.com/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T10:05:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T10:05:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ihssso.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ihssso.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ihssso.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ihssso.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEGjCCAwKgAwIBAgIJANbtDttZCw1wMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDESMBAGA1UEBxMJQnJhY2tuZWxsMQww
 						CgYDVQQKEwNJSFMxCzAJBgNVBAsTAklUMRYwFAYDVQQDEw13d3cuaWhzdGkuY29t
@@ -53,42 +53,42 @@
 						DzE+93eMDZMqxG6X3jyYtfF9f551vCFvTDvOxkDd9dnSYPzb+++8BfTYtEnwpNiK
 						yKYcCFVxFCy1km7h2HBrOZMLUAbs0gGoTmSRAEByt0E3C8xzV1Ywu9htzRHmog==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ihssso.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihssso.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IHS (Global) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IHS (Global) Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://uk.ihs.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Support</md:GivenName>
-      <md:EmailAddress>mailto:customer.support@ihs.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Trevor</md:GivenName>
-      <md:SurName>Cooley</md:SurName>
-      <md:EmailAddress>mailto:trevor.cooley@ihs.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ihssso.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihssso.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IHS (Global) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IHS (Global) Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uk.ihs.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:customer.support@ihs.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Trevor</md:GivenName>
+    <md:SurName>Cooley</md:SurName>
+    <md:EmailAddress>mailto:trevor.cooley@ihs.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml b/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml
index cd76e296..33152560 100644
--- a/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml
+++ b/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uk.practicallaw.com/cs/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-07T09:24:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-07T09:24:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Practical Law</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A legal solution from Thomson Reuters providing practical know how (including practice notes, precedents and checklists) to help lawyers work smarter and more efficiently. Practical Law know how is created and maintained by a team of 300 lawyer-editors.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Practical Law</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A legal solution from Thomson Reuters providing practical know how (including practice notes, precedents and checklists) to help lawyers work smarter and more efficiently. Practical Law know how is created and maintained by a team of 300 lawyer-editors.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIEU1pN/TANBgkqhkiG9w0BAQUFADA2MRYwFAYDVQQKEw1Q
 						cmFjdGljYWwgTGF3MRwwGgYDVQQDExN1ay5wcmFjdGljYWxsYXcuY29tMB4XDTE0
 						MDQyNTExNTg1M1oXDTI0MDQyMjExNTg1M1owNjEWMBQGA1UEChMNUHJhY3RpY2Fs
@@ -33,13 +33,13 @@
 						f1v1bBVmrjy6E1aWTdH7G4cEhMIyfPeZRZvuThhKDGjBVRy1EjI+FSxWPxM1WnsD
 						y8wft8UJXsBOJlHjpkjdcaR+DS88edmhvJNRbQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIEU1pN/TANBgkqhkiG9w0BAQUFADA2MRYwFAYDVQQKEw1Q
 						cmFjdGljYWwgTGF3MRwwGgYDVQQDExN1ay5wcmFjdGljYWxsYXcuY29tMB4XDTE0
 						MDQyNTExNTg1M1oXDTI0MDQyMjExNTg1M1owNjEWMBQGA1UEChMNUHJhY3RpY2Fs
@@ -57,39 +57,39 @@
 						f1v1bBVmrjy6E1aWTdH7G4cEhMIyfPeZRZvuThhKDGjBVRy1EjI+FSxWPxM1WnsD
 						y8wft8UJXsBOJlHjpkjdcaR+DS88edmhvJNRbQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/shib/post" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/saml2/art" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://global.practicallaw.com/cs/oa/auth/rcv/shib/post" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://global.practicallaw.com/cs/oa/auth/rcv/shib/art" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://global.practicallaw.com/cs/oa/auth/rcv/saml2/post" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://global.practicallaw.com/cs/oa/auth/rcv/saml2/art" index="8"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Practical Law</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://uk.practicallaw.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christopher</md:GivenName>
-      <md:SurName>Parker</md:SurName>
-      <md:EmailAddress>mailto:Christopher.Parker@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Web Operations Group</md:GivenName>
-      <md:EmailAddress>mailto:lukiwebops@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alan</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:alan.wilson@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Web Operations Group</md:GivenName>
-      <md:EmailAddress>mailto:lukiwebops@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/shib/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://global.practicallaw.com/cs/oa/auth/rcv/shib/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://global.practicallaw.com/cs/oa/auth/rcv/shib/art" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://global.practicallaw.com/cs/oa/auth/rcv/saml2/post" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://global.practicallaw.com/cs/oa/auth/rcv/saml2/art" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Practical Law</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uk.practicallaw.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christopher</md:GivenName>
+    <md:SurName>Parker</md:SurName>
+    <md:EmailAddress>mailto:Christopher.Parker@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Web Operations Group</md:GivenName>
+    <md:EmailAddress>mailto:lukiwebops@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alan</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:alan.wilson@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Web Operations Group</md:GivenName>
+    <md:EmailAddress>mailto:lukiwebops@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml
index 231af8d9..8e69483e 100644
--- a/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukamf.belfastmet.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-16T11:02:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-16T11:02:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfastmet.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfastmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQDS2kVQVGZPUTANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGQW50cmltMRAwDgYDVQQHEwdCZWxmYXN0MSUwIwYDVQQKExxC
 						ZWxmYXN0IE1ldHJvcG9saXRhbiBDb2xsZWdlMR8wHQYDVQQDExZ1a2FtZi5iZWxm
@@ -33,26 +33,26 @@
 						c31IzqmKufqdF2tzXEe3rO8xUV7FsFPbPaXMJi/zLhWbT9vtQkhE4ZFLnvV4sHm8
 						BgVr2TuWFh2nO+9r+umLkg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukamf.belfastmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfastmet.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukamf.belfastmet.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfastmet.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbDCCAlQCCQDS2kVQVGZPUTANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGQW50cmltMRAwDgYDVQQHEwdCZWxmYXN0MSUwIwYDVQQKExxC
 						ZWxmYXN0IE1ldHJvcG9saXRhbiBDb2xsZWdlMR8wHQYDVQQDExZ1a2FtZi5iZWxm
@@ -73,27 +73,27 @@
 						c31IzqmKufqdF2tzXEe3rO8xUV7FsFPbPaXMJi/zLhWbT9vtQkhE4ZFLnvV4sHm8
 						BgVr2TuWFh2nO+9r+umLkg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Belfast Metropolitan College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Belfast Metropolitan College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.belfastmet.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Moran</md:SurName>
-      <md:EmailAddress>mailto:imoran@belfastmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>O'Reilly</md:SurName>
-      <md:EmailAddress>mailto:poreilly@belfastmet.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Belfast Metropolitan College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Belfast Metropolitan College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.belfastmet.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Moran</md:SurName>
+    <md:EmailAddress>mailto:imoran@belfastmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>O'Reilly</md:SurName>
+    <md:EmailAddress>mailto:poreilly@belfastmet.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml
index 7374bfc5..36732375 100644
--- a/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukdsdev01.ds.man.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T10:05:43Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T10:05:43Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAJQ6G0iUGwxqMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnVrZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTMwODI3MTExNDIwWhcNMjMw
 						ODI1MTExNDIwWjAhMR8wHQYDVQQDExZ1a2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
@@ -45,42 +45,42 @@
 						2l4Z2j1AtknzLhBHs0kVF8oFjRNb6DilqMa5avXU4QrNPMpVrJopPuEyJ8mJ/1F8
 						Rduyp41iuU+v6vWNtQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MIMAS: UK Data Service Development Server 01</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Susan</md:GivenName>
-      <md:SurName>Noble</md:SurName>
-      <md:EmailAddress>mailto:Susan.Noble@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS: UK Data Service Development Server 01</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Susan</md:GivenName>
+    <md:SurName>Noble</md:SurName>
+    <md:EmailAddress>mailto:Susan.Noble@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml
index 90b994ac..5af6fa13 100644
--- a/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukdsdev02.ds.man.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-10T10:29:41Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-10T10:29:41Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAIIDXwPwi+LyMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnVrZHNkZXYwMi5kcy5tYW4uYWMudWswHhcNMTMwNTA3MjIwNDQ5WhcNMjMw
 						NTA1MjIwNDQ5WjAhMR8wHQYDVQQDExZ1a2RzZGV2MDIuZHMubWFuLmFjLnVrMIIB
@@ -45,42 +45,42 @@
 						6ddjZbh92KxHLsDPbnY+Z3i90jxHsb1L1vclx7sa5sfiU/eLhMPHVCNglmZJ8VQy
 						Xc+mCSMo3CZsZHhC7w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MIMAS: UK Data Service Development Server 02</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Susan</md:GivenName>
-      <md:SurName>Noble</md:SurName>
-      <md:EmailAddress>mailto:Susan.Noble@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS: UK Data Service Development Server 02</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Susan</md:GivenName>
+    <md:SurName>Noble</md:SurName>
+    <md:EmailAddress>mailto:Susan.Noble@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
index 77e7121c..5cb15bb1 100644
--- a/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukf-cds-dev.edina.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-16T11:14:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-16T11:14:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
 						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
@@ -40,13 +40,13 @@
 						XcsYNzIwAw+Lhphm6Cl/dM4X6QyvJGHqf+D/ZhHB2ltd4faO+sDurmcmHLpZ+b7g
 						CIW6zaDitlDneg+4iWmQJ9ciDA+53VkCHt91
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -66,13 +66,13 @@
 						clLy0UggCGh3aK6o9Xh8a0uYEDwRoaqQYICkGyyr9ZpFhEQGLyoHdOjnytMWK0g6
 						fmmaemg0jVARvKleJCUu9vzFHDpUJAmXlB8X0w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -92,30 +92,30 @@
 						uZOnrbQ20spV0hJV0PgfrgGFHRK9eYTz1XlILKpG8fX+WhP4QOro5ywT8nMCUZ7f
 						Epl1SF0WLq/28i3NlTE1SQKjWVgTnSbQNe6Qpg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
 						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
 						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
@@ -135,13 +135,13 @@
 						XcsYNzIwAw+Lhphm6Cl/dM4X6QyvJGHqf+D/ZhHB2ltd4faO+sDurmcmHLpZ+b7g
 						CIW6zaDitlDneg+4iWmQJ9ciDA+53VkCHt91
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -161,13 +161,13 @@
 						clLy0UggCGh3aK6o9Xh8a0uYEDwRoaqQYICkGyyr9ZpFhEQGLyoHdOjnytMWK0g6
 						fmmaemg0jVARvKleJCUu9vzFHDpUJAmXlB8X0w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
 						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
 						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
@@ -187,25 +187,25 @@
 						uZOnrbQ20spV0hJV0PgfrgGFHRK9eYTz1XlILKpG8fX+WhP4QOro5ywT8nMCUZ7f
 						Epl1SF0WLq/28i3NlTE1SQKjWVgTnSbQNe6Qpg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sara</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sara</md:GivenName>
-      <md:SurName>Hopkins</md:SurName>
-      <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ukfederation.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sara</md:GivenName>
+    <md:SurName>Hopkins</md:SurName>
+    <md:EmailAddress>mailto:sara.hopkins@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed-sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ukfed-sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 406b693c..d5499c22 100644
--- a/swamid-interfederations-2.0/ukfed-sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/ukfed-sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-23T11:15:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-05-23T11:15:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal 1.2</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal 1.2</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
 						BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
 						BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
@@ -37,13 +37,13 @@
 						mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
 						/+zVfwU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
 						BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
 						BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
@@ -66,28 +66,28 @@
 						mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
 						/+zVfwU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aluminati Network Group Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal 1.2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aluminati.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Emily</md:GivenName>
-      <md:SurName>Grant</md:SurName>
-      <md:EmailAddress>mailto:help@aluminati.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roger</md:GivenName>
-      <md:SurName>Garner</md:SurName>
-      <md:EmailAddress>mailto:roger@aluminati.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed-sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aluminati Network Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal 1.2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aluminati.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Emily</md:GivenName>
+    <md:SurName>Grant</md:SurName>
+    <md:EmailAddress>mailto:help@aluminati.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Garner</md:SurName>
+    <md:EmailAddress>mailto:roger@aluminati.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml b/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml
index df96766b..0938e51e 100644
--- a/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml
+++ b/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukfed.one-test2.contrail.rl.ac.uk/portal/sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:24:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:24:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5DCCAsygAwIBAgIJALS9Y48v9modMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
 						BAYTAlVLMQ0wCwYDVQQIDARPeG9uMRAwDgYDVQQHDAdDaGlsdG9uMQ0wCwYDVQQK
 						DARTVEZDMQwwCgYDVQQLDANTQ0QxJjAkBgNVBAMMHSoub25lLXRlc3QyLmNvbnRy
@@ -32,13 +32,13 @@
 						zUl6YNvn0L7djY34CHGKVQVtiV0F8PMyrYRpAMmOBUR+DsW14y8isnBcQVBjSwvA
 						/kVnQYMEPEQjewc0WBDer1g4xo/Nulo66UwgSE1rJqLUSiU/TZznhA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID5DCCAsygAwIBAgIJALS9Y48v9modMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
 						BAYTAlVLMQ0wCwYDVQQIDARPeG9uMRAwDgYDVQQHDAdDaGlsdG9uMQ0wCwYDVQQK
 						DARTVEZDMQwwCgYDVQQLDANTQ0QxJjAkBgNVBAMMHSoub25lLXRlc3QyLmNvbnRy
@@ -61,37 +61,37 @@
 						zUl6YNvn0L7djY34CHGKVQVtiV0F8PMyrYRpAMmOBUR+DsW14y8isnBcQVBjSwvA
 						/kVnQYMEPEQjewc0WBDer1g4xo/Nulo66UwgSE1rJqLUSiU/TZznhA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/uk-federation"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/uk-federation" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/uk-federation" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/uk-federation" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/uk-federation/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">ukfed-connector</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Contrail project, STFC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://stfc.ac.uk/scd/default.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Cheney</md:GivenName>
-      <md:SurName>Ketley</md:SurName>
-      <md:EmailAddress>mailto:cheney.ketley@stfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cheney</md:GivenName>
-      <md:SurName>Ketley</md:SurName>
-      <md:EmailAddress>mailto:cheney.ketley@stfc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/uk-federation"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/uk-federation" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/uk-federation" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/uk-federation" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/uk-federation/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">ukfed-connector</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science and Technology Facilities Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Contrail project, STFC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://stfc.ac.uk/scd/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Cheney</md:GivenName>
+    <md:SurName>Ketley</md:SurName>
+    <md:EmailAddress>mailto:cheney.ketley@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cheney</md:GivenName>
+    <md:SurName>Ketley</md:SurName>
+    <md:EmailAddress>mailto:cheney.ketley@stfc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 6a1fc612..52038eff 100644
--- a/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T12:05:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T12:05:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Aluminati Engagement Portal</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
 						BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
 						BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
@@ -37,13 +37,13 @@
 						mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
 						/+zVfwU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
 						BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
 						BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
@@ -66,28 +66,28 @@
 						mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
 						/+zVfwU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Aluminati Network Group Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aluminati.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Emily</md:GivenName>
-      <md:SurName>Grant</md:SurName>
-      <md:EmailAddress>mailto:help@aluminati.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roger</md:GivenName>
-      <md:SurName>Garner</md:SurName>
-      <md:EmailAddress>mailto:roger@aluminati.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aluminati Network Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aluminati.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Emily</md:GivenName>
+    <md:SurName>Grant</md:SurName>
+    <md:EmailAddress>mailto:help@aluminati.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roger</md:GivenName>
+    <md:SurName>Garner</md:SurName>
+    <md:EmailAddress>mailto:roger@aluminati.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml b/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml
index e75cdba2..c56d189f 100644
--- a/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukfed.ukpressonline.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-27T16:32:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-27T16:32:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHjCCAgagAwIBAgIJAPiDlYs5S2Y2MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHWRpZ2ktd2ViLXN2ci5kaWdpdG9yaWFsLmNvLnVrMB4XDTE0MDcwMTExMTY0
 						NVoXDTM0MDYyNjExMTY0NVowKDEmMCQGA1UEAxMdZGlnaS13ZWItc3ZyLmRpZ2l0
@@ -31,37 +31,37 @@
 						aMNyvJmu5u9z7IUYGESPox+4a4B4epdkdwHcOFw7/01URXfb19HfTNtKhS/tHw42
 						C7xMZ7c4p7rZOnaeqwso9Zpf+yP9/7sNh9iKvS3kEvITAg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digitorial Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UKPressOnline</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ukpressonline.co.uk/ukpressonline/open/aboutus.jsp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Alasdair</md:GivenName>
-      <md:SurName>Mellis</md:SurName>
-      <md:EmailAddress>mailto:alasdair@digitorial.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dawn</md:GivenName>
-      <md:SurName>Raison</md:SurName>
-      <md:EmailAddress>mailto:dawn@digitorial.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digitorial Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UKPressOnline</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ukpressonline.co.uk/ukpressonline/open/aboutus.jsp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alasdair</md:GivenName>
+    <md:SurName>Mellis</md:SurName>
+    <md:EmailAddress>mailto:alasdair@digitorial.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dawn</md:GivenName>
+    <md:SurName>Raison</md:SurName>
+    <md:EmailAddress>mailto:dawn@digitorial.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml
index 77717492..a88beeab 100644
--- a/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukfederation.ecu.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-21T15:45:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-21T15:45:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Equality Challenge Unit</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Equality Challenge Unit</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVANMvXrP3yd50wehorJHIv4sqdsdqMA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFnVrZmVkZXJhdGlvbi5lY3UuYWMudWswHhcNMTMwOTI1
 						MTA0NDIzWhcNMzMwOTI1MTA0NDIzWjAhMR8wHQYDVQQDExZ1a2ZlZGVyYXRpb24u
@@ -35,26 +35,26 @@
 						jUKdc4Ab3/C4QO/9kzBuhuHHsuQCnCU6puPgy8n2IKlXwS+PhMsC+mnvqDil77xN
 						O7939VxLIqifIAdVAOq2xkneYhX/3sy4
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukfederation.ecu.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukfederation.ecu.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecu.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRDCCAiygAwIBAgIVANMvXrP3yd50wehorJHIv4sqdsdqMA0GCSqGSIb3DQEB
 						BQUAMCExHzAdBgNVBAMTFnVrZmVkZXJhdGlvbi5lY3UuYWMudWswHhcNMTMwOTI1
 						MTA0NDIzWhcNMzMwOTI1MTA0NDIzWjAhMR8wHQYDVQQDExZ1a2ZlZGVyYXRpb24u
@@ -74,27 +74,27 @@
 						jUKdc4Ab3/C4QO/9kzBuhuHHsuQCnCU6puPgy8n2IKlXwS+PhMsC+mnvqDil77xN
 						O7939VxLIqifIAdVAOq2xkneYhX/3sy4
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Equality Challenge Unit</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Equality Challenge Unit</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ecu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Hanno</md:GivenName>
-      <md:SurName>Gregory</md:SurName>
-      <md:EmailAddress>mailto:support@comistechnology.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hanno</md:GivenName>
-      <md:SurName>Gregory</md:SurName>
-      <md:EmailAddress>mailto:support@comistechnology.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Equality Challenge Unit</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Equality Challenge Unit</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ecu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hanno</md:GivenName>
+    <md:SurName>Gregory</md:SurName>
+    <md:EmailAddress>mailto:support@comistechnology.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hanno</md:GivenName>
+    <md:SurName>Gregory</md:SurName>
+    <md:EmailAddress>mailto:support@comistechnology.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml
index 8375a197..778941a1 100644
--- a/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukidp.uky.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uky.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Kentucky</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uky.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Kentucky</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSjCCAjICCQCbrmikPdHPmzANBgkqhkiG9w0BAQUFADBnMRYwFAYDVQQDEw11
 a2lkcC51a3kuZWR1MR8wHQYDVQQKExZVbml2ZXJzaXR5IG9mIEtlbnR1Y2t5MQsw
 CQYDVQQGEwJVUzELMAkGA1UECBMCS1kxEjAQBgNVBAcTCUxleGluZ3RvbjAeFw0x
@@ -38,13 +38,13 @@ AWXHsaU1qI+pSG4EN8MlJVkO93wRFhJGNpSVdRjit2C2S46V7Gg14HDXpLpp3k6d
 c2LrI/F/p1VjQqgbgZE7Y8hUuksnfEeeZqDRv8n7MntEMrynjbbmBRO6YfBIbZ5V
 upCqaFotaUmUrD4IbUB9DCJyhwZjpuU/YoCeYg7K
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDqDCCApACCQDtzdVegR7Y/zANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAktZMRIwEAYDVQQHDAlMZXhpbmd0b24xHzAdBgNVBAoMFlVu
 aXZlcnNpdHkgb2YgS2VudHVja3kxCzAJBgNVBAsMAklUMRYwFAYDVQQDDA11a2lk
@@ -66,24 +66,24 @@ sc9B+OMfUS9u0p7pTA73hpYmOHDk+VCPC3ZSYrvIvT9zm332VCNnoqDN4DrbQK/6
 Q4jR1hdvy5T77bf3frtxPzIJpQbjX5qhcybHEl3gaNVJdKSiQHLSF7EQLEp8CIHD
 Ybij4JvaKAm1MP0F8i+qaBH7yflJh6G8J297aw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukidp.uky.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukidp.uky.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukidp.uky.edu:443/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uky.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukidp.uky.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukidp.uky.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukidp.uky.edu:443/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uky.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSjCCAjICCQCbrmikPdHPmzANBgkqhkiG9w0BAQUFADBnMRYwFAYDVQQDEw11
 a2lkcC51a3kuZWR1MR8wHQYDVQQKExZVbml2ZXJzaXR5IG9mIEtlbnR1Y2t5MQsw
 CQYDVQQGEwJVUzELMAkGA1UECBMCS1kxEjAQBgNVBAcTCUxleGluZ3RvbjAeFw0x
@@ -103,13 +103,13 @@ AWXHsaU1qI+pSG4EN8MlJVkO93wRFhJGNpSVdRjit2C2S46V7Gg14HDXpLpp3k6d
 c2LrI/F/p1VjQqgbgZE7Y8hUuksnfEeeZqDRv8n7MntEMrynjbbmBRO6YfBIbZ5V
 upCqaFotaUmUrD4IbUB9DCJyhwZjpuU/YoCeYg7K
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDqDCCApACCQDtzdVegR7Y/zANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgMAktZMRIwEAYDVQQHDAlMZXhpbmd0b24xHzAdBgNVBAoMFlVu
 aXZlcnNpdHkgb2YgS2VudHVja3kxCzAJBgNVBAsMAklUMRYwFAYDVQQDDA11a2lk
@@ -131,27 +131,27 @@ sc9B+OMfUS9u0p7pTA73hpYmOHDk+VCPC3ZSYrvIvT9zm332VCNnoqDN4DrbQK/6
 Q4jR1hdvy5T77bf3frtxPzIJpQbjX5qhcybHEl3gaNVJdKSiQHLSF7EQLEp8CIHD
 Ybij4JvaKAm1MP0F8i+qaBH7yflJh6G8J297aw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukidp.uky.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukidp.uky.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kentucky</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Kentucky</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uky.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Walker</md:GivenName>
-      <md:EmailAddress>jawalk00@uky.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Wayne Beech</md:GivenName>
-      <md:EmailAddress>wayne@uky.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John Walker</md:GivenName>
-      <md:EmailAddress>jawalk00@uky.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukidp.uky.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukidp.uky.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kentucky</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Kentucky</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uky.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Walker</md:GivenName>
+    <md:EmailAddress>jawalk00@uky.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Wayne Beech</md:GivenName>
+    <md:EmailAddress>wayne@uky.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John Walker</md:GivenName>
+    <md:EmailAddress>jawalk00@uky.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml
index aa2bffd1..cfad71d2 100644
--- a/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml
@@ -1,22 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukmyms01-zone02.smg-uk.com/idp/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T10:29:39Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T10:29:39Z">
-		</mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomson.com</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomson.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcTCCAlmgAwIBAgIUHY8B0tLuriNFq39X7sA2Pna5FmwwDQYJKoZIhvcNAQEF
 						BQAwLDEqMCgGA1UEAxMhdWtteS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29t
 						MB4XDTE0MDIwNjE1MjcxOFoXDTM0MDIwNjE1MjcxOFowLDEqMCgGA1UEAxMhdWtt
@@ -37,29 +36,29 @@
 						veOmrduNCjLZY6Ve2poxgw+eIfGsnRLYkz7ak7h/7BYNhUYz48cGPnHOb2+B9J0M
 						MUfe/9b/hNW/YTMa9+4MQNOEkWHO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomson.com</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomson.com</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcTCCAlmgAwIBAgIUHY8B0tLuriNFq39X7sA2Pna5FmwwDQYJKoZIhvcNAQEF
 						BQAwLDEqMCgGA1UEAxMhdWtteS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29t
 						MB4XDTE0MDIwNjE1MjcxOFoXDTM0MDIwNjE1MjcxOFowLDEqMCgGA1UEAxMhdWtt
@@ -80,27 +79,27 @@
 						veOmrduNCjLZY6Ve2poxgw+eIfGsnRLYkz7ak7h/7BYNhUYz48cGPnHOb2+B9J0M
 						MUfe/9b/hNW/YTMa9+4MQNOEkWHO
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Westlaw UK Test IdP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.westlaw.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Doug</md:GivenName>
-      <md:SurName>Potts</md:SurName>
-      <md:EmailAddress>mailto:douglas.potts@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Halford</md:SurName>
-      <md:EmailAddress>mailto:andrew.halford@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Westlaw UK Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.westlaw.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Doug</md:GivenName>
+    <md:SurName>Potts</md:SurName>
+    <md:EmailAddress>mailto:douglas.potts@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Halford</md:SurName>
+    <md:EmailAddress>mailto:andrew.halford@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch-.xml b/swamid-interfederations-2.0/umbrella.psi.ch-.xml
index cbd67297..77dcd01b 100644
--- a/swamid-interfederations-2.0/umbrella.psi.ch-.xml
+++ b/swamid-interfederations-2.0/umbrella.psi.ch-.xml
@@ -1,31 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umbrella.psi.ch/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-18T09:41:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>psi.ch</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>others</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-18T09:41:16Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-				</saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>psi.ch</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>others</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Umbrella Test Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Umbrella Test Service Provider</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIJAPuvSPAzAC6mMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD3VtYnJlbGxhLnBzaS5jaDAeFw0xMzExMjgxMDQ2MjBaFw0xNjExMjcxMDQ2
 MjBaMBoxGDAWBgNVBAMTD3VtYnJlbGxhLnBzaS5jaDCCASIwDQYJKoZIhvcNAQEB
@@ -45,42 +44,42 @@ mB0SSH6Wh64W+Tkwp4HES9XCdEWbuSeJEO+0MEC8kBR13YlXLIsGU95Q5694eeun
 jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
 
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Umbrella Test Service Provider</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">psi.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.psi.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.psi.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Björn</md:GivenName>
-      <md:SurName>Abt</md:SurName>
-      <md:EmailAddress>mailto:bjoern.abt@psi.ch</md:EmailAddress>
-      <md:TelephoneNumber>+41563103509</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Björn</md:GivenName>
-      <md:SurName>Abt</md:SurName>
-      <md:EmailAddress>mailto:bjoern.abt@psi.ch</md:EmailAddress>
-      <md:TelephoneNumber>+41563103509</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Umbrella Test Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">psi.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.psi.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.psi.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Abt</md:SurName>
+    <md:EmailAddress>mailto:bjoern.abt@psi.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41563103509</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Abt</md:SurName>
+    <md:EmailAddress>mailto:bjoern.abt@psi.ch</md:EmailAddress>
+    <md:TelephoneNumber>+41563103509</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml
index 7951ec44..a72e2314 100644
--- a/swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umshibp.olemiss.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olemiss.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Mississippi</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://en.wikipedia.org/wiki/University_of_Mississippi</mdui:InformationURL>
+        <mdui:Logo height="100" width="400" xml:lang="en">https://secure1.olemiss.edu/irj/go/km/docs/documents/UMImages/UMLogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olemiss.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Mississippi</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://en.wikipedia.org/wiki/University_of_Mississippi</mdui:InformationURL>
-          <mdui:Logo height="100" width="400" xml:lang="en">https://secure1.olemiss.edu/irj/go/km/docs/documents/UMImages/UMLogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAJ02en1t5aWOCxE4dPI/WEGJxW7gMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3Vtc2hpYnAub2xlbWlzcy5lZHUwHhcNMTIwNzE3MTQy
 MDQyWhcNMzIwNzE3MTQyMDQyWjAeMRwwGgYDVQQDExN1bXNoaWJwLm9sZW1pc3Mu
@@ -40,23 +40,23 @@ kXK+zix7sCJdKO5v6bbmXuGSFT+KRQnHWEC/mDgfU/CwVtVcalFMLAamSa/Y8yzm
 7c2UaQVnu2J/dRQROe7fBs4XdIjF7/kaLlO0fQaNqrQ7PBJLgNbmGGn1vgVPrD47
 njcg/y96NdqwknJF
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://umshibp.olemiss.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umshibp.olemiss.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umshibp.olemiss.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olemiss.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://umshibp.olemiss.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umshibp.olemiss.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umshibp.olemiss.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olemiss.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAJ02en1t5aWOCxE4dPI/WEGJxW7gMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3Vtc2hpYnAub2xlbWlzcy5lZHUwHhcNMTIwNzE3MTQy
 MDQyWhcNMzIwNzE3MTQyMDQyWjAeMRwwGgYDVQQDExN1bXNoaWJwLm9sZW1pc3Mu
@@ -76,22 +76,22 @@ kXK+zix7sCJdKO5v6bbmXuGSFT+KRQnHWEC/mDgfU/CwVtVcalFMLAamSa/Y8yzm
 7c2UaQVnu2J/dRQROe7fBs4XdIjF7/kaLlO0fQaNqrQ7PBJLgNbmGGn1vgVPrD47
 njcg/y96NdqwknJF
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Mississippi</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Mississippi</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.olemiss.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Daksh Chauhan</md:GivenName>
-      <md:EmailAddress>daksh@olemiss.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daksh Chauhan</md:GivenName>
-      <md:EmailAddress>daksh@olemiss.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Mississippi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Mississippi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.olemiss.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Daksh Chauhan</md:GivenName>
+    <md:EmailAddress>daksh@olemiss.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daksh Chauhan</md:GivenName>
+    <md:EmailAddress>daksh@olemiss.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml
index 392741e0..ed977fbb 100644
--- a/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unicos.cirqahosting.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-27T13:52:11Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-27T13:52:11Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://unicos.cirqahosting.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://unicos.cirqahosting.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDHjCCAgagAwIBAgIJAI69JgucdSaEMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHXVuaWNvcy5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDcwODEzNTQz
 						MVoXDTI1MDcwNTEzNTQzMVowKDEmMCQGA1UEAxMddW5pY29zLmlzb3hmb3JkLWhv
@@ -47,43 +47,43 @@
 						5Fx8nzqsHxkDaZC+DVGajwkzDDgsz1saH15dOOIDoHcdW3snMD3jBWuT7Yq/Kj6B
 						RH7xD7LtoPdX1VlnCjvUQILdhc/mJ9MddLSOW6r9JubXgg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IS Oxford Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University College School</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.isoxford.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee</md:GivenName>
-      <md:SurName>Orchard</md:SurName>
-      <md:EmailAddress>mailto:lee@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Salvesen</md:SurName>
-      <md:EmailAddress>mailto:david@isoxford.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IS Oxford Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University College School</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.isoxford.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee</md:GivenName>
+    <md:SurName>Orchard</md:SurName>
+    <md:EmailAddress>mailto:lee@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Salvesen</md:SurName>
+    <md:EmailAddress>mailto:david@isoxford.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unigepass.unige.it-idp.xml b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
index 1396384c..a94c3d9c 100644
--- a/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
+++ b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unigepass.unige.it/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-31T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Genoa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Genova</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IDP for members of University of Genoa</mdui:Description>
+        <mdui:Description xml:lang="it">IDP per gli utenti dell'Università di Genova</mdui:Description>
+        <mdui:Keywords xml:lang="en">Genoa, unige.it, unige, Università degli Studi di Genova, UniGePASS</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">Genova, unige.it, unige, Università degli Studi di Genova, UniGePASS</mdui:Keywords>
+        <mdui:InformationURL xml:lang="it">https://unigepass.unige.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://unigepass.unige.it/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="72" width="72">https://unige.it/resources/img/favicons/apple-touch-icon-72x72.png</mdui:Logo>
+        <mdui:Logo height="57" width="57">https://unige.it/resources/img/favicons/apple-touch-icon.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMAUExURQAAACoqKiwsLC8vLzAwMDIyMjMzMzQ0NDk5OTs7O0JCQkVFRVFRUVxcXF1dXV9fX2BgYGlpaWpqamtra21tbW5ubnFxcXNzc3V1dXZ2dnh4eH5+foODg4+Pj5GRkZKSkpSUlJWVlZaWlpiYmJmZmZycnKCgoLGxsbOzs7i4uLq6uru7u7y8vL6+vsDAwMHBwcLCwsfHx8rKygAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAmBYAAAAEAdFJOU////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wBT9wclAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAGHRFWHRTb2Z0d2FyZQBwYWludC5uZXQgNC4wLjlsM35OAAAAlUlEQVQoUy2PhxLDMAhD3RE5TfdOVzrSvZv//zcVsLkDyQ+bw44h8jwax8p0ODZR8GhrpKnJW0CI3SEax2dHI8tMXgoAX2hvA+Au4Adc7TIvgM1AP5zJLnQG8RVfLKR8AvDarE1vUsUKWIub1VtSq5UB6tbNRMpcUsFJEvKcZQRclmc0tnv7nwEe/aCXhOUDICcjE/IPUa2k6vKP9s8AAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unige.it</mdui:DomainHint>
+        <mdui:IPHint>130.251.0.0/16</mdui:IPHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.it</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Genoa</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Università di Genova</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IDP for members of University of Genoa</mdui:Description>
-          <mdui:Description xml:lang="it">IDP per gli utenti dell'Università di Genova</mdui:Description>
-          <mdui:Keywords xml:lang="en">Genoa, unige.it, unige, Università degli Studi di Genova, UniGePASS</mdui:Keywords>
-          <mdui:Keywords xml:lang="it">Genova, unige.it, unige, Università degli Studi di Genova, UniGePASS</mdui:Keywords>
-          <mdui:InformationURL xml:lang="it">https://unigepass.unige.it/idem</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://unigepass.unige.it/idem</mdui:PrivacyStatementURL>
-          <mdui:Logo height="72" width="72">https://unige.it/resources/img/favicons/apple-touch-icon-72x72.png</mdui:Logo>
-          <mdui:Logo height="57" width="57">https://unige.it/resources/img/favicons/apple-touch-icon.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMAUExURQAAACoqKiwsLC8vLzAwMDIyMjMzMzQ0NDk5OTs7O0JCQkVFRVFRUVxcXF1dXV9fX2BgYGlpaWpqamtra21tbW5ubnFxcXNzc3V1dXZ2dnh4eH5+foODg4+Pj5GRkZKSkpSUlJWVlZaWlpiYmJmZmZycnKCgoLGxsbOzs7i4uLq6uru7u7y8vL6+vsDAwMHBwcLCwsfHx8rKygAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAmBYAAAAEAdFJOU////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wBT9wclAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAGHRFWHRTb2Z0d2FyZQBwYWludC5uZXQgNC4wLjlsM35OAAAAlUlEQVQoUy2PhxLDMAhD3RE5TfdOVzrSvZv//zcVsLkDyQ+bw44h8jwax8p0ODZR8GhrpKnJW0CI3SEax2dHI8tMXgoAX2hvA+Au4Adc7TIvgM1AP5zJLnQG8RVfLKR8AvDarE1vUsUKWIub1VtSq5UB6tbNRMpcUsFJEvKcZQRclmc0tnv7nwEe/aCXhOUDICcjE/IPUa2k6vKP9s8AAAAASUVORK5CYII=</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>unige.it</mdui:DomainHint>
-          <mdui:IPHint>130.251.0.0/16</mdui:IPHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEPDCCAySgAwIBAgIJAJUnUP5NQ2loMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNV
 BAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmExHjAc
 BgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEExDDAK
@@ -54,13 +54,13 @@ PcO/yMKtJrq43DyJiwNHHomTbyFOiQ2Vsn2/Hm05mJ9wkl4/d5j1I4PrsOYy4p5i
 levf5fRUC2nfXJvxcaNuDs40n2+oSGK7RT708GJcNWlgv6JJ9gD+GJfekj7qbx0l
 i0udBCaIfD5C2h/9Gk8PJUEofI93dBwVkAZhFtr/42M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEPDCCAySgAwIBAgIJAJUnUP5NQ2loMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNV
 BAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmExHjAc
 BgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEExDDAK
@@ -85,13 +85,13 @@ PcO/yMKtJrq43DyJiwNHHomTbyFOiQ2Vsn2/Hm05mJ9wkl4/d5j1I4PrsOYy4p5i
 levf5fRUC2nfXJvxcaNuDs40n2+oSGK7RT708GJcNWlgv6JJ9gD+GJfekj7qbx0l
 i0udBCaIfD5C2h/9Gk8PJUEofI93dBwVkAZhFtr/42M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWzCCAkOgAwIBAgIJAIAJ8UH68A6xMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
 BAYTAklUMR4wHAYDVQQKDBVVbml2ZXJzaXTDoCBkaSBHZW5vdmExFTATBgNVBAMM
 DGlkcC51bmlnZS5pdDAeFw0xNjAyMTAwOTAyMDlaFw0zNjAyMDkwOTAyMDlaMEQx
@@ -111,13 +111,13 @@ eIeWTTTGKnIVbCkEdyWQFKUamNjXWCrIWR7aAmef/U/fuxH4WAkmtJRCzUHbhlAq
 gDqpphhHlm9EjByOkvnLq2yeNBmE4W2iEBOKcqaTI1xDRMssrCAgudEoGukP97f0
 5ySVv5RNdC8OIsJj2xsMV2R/Y05cHormJs2VUYg7w3/cvULdgwLQkT93X82Ykps=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDXjCCAkYCCQDlqbNFoXLEhzANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJJ
 VDETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UEBwwGR2Vub3ZhMR4wHAYDVQQK
 DBVVbml2ZXJzaXRhJyBkaSBHZW5vdmExDjAMBgNVBAsMBUNTSVRBMQwwCgYDVQQD
@@ -138,23 +138,23 @@ fTuDqQReLM4InB+Xopz3QQjX4XAOyKJid3vzkOiI9cLLbqfneR9G9yy0/CxnMLsE
 G/skK6Zj0pBgXGLhQmeG12gljKMsEavax/AMstPzSDhVxKudrbC+7aMD65aLfJng
 +9c=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unigepass.unige.it/idp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unigepass.unige.it/idp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Genoa</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Università di Genova</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Genoa</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Università di Genova</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.unige.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Ferrante</md:SurName>
-      <md:EmailAddress>mailto:marco@csita.unige.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unigepass.unige.it/idp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unigepass.unige.it/idp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Genoa</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università di Genova</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Genoa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Genova</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.unige.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Ferrante</md:SurName>
+    <md:EmailAddress>mailto:marco@csita.unige.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/univet.hu-simplesaml.xml b/swamid-interfederations-2.0/univet.hu-simplesaml.xml
index e1eabdc6..d3ecf839 100644
--- a/swamid-interfederations-2.0/univet.hu-simplesaml.xml
+++ b/swamid-interfederations-2.0/univet.hu-simplesaml.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://univet.hu/simplesaml">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>szie</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>szie</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">ATE</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ATE</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Állatorvostudományi Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Állatorvostudományi Egyetem</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">http://univet.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://univet.hu</mdui:PrivacyStatementURL>
+        <mdui:Logo height="80" width="300">http://univet.hu/pics/aote-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">ATE</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">ATE</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Állatorvostudományi Egyetem</mdui:Description>
-          <mdui:Description xml:lang="en">Állatorvostudományi Egyetem</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">http://univet.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://univet.hu</mdui:PrivacyStatementURL>
-          <mdui:Logo height="80" width="300">http://univet.hu/pics/aote-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJAMgy3ruScwYCMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAkhVMQ0wCwYDVQQIDARQZXN0MREwDwYDVQQHDAhCdWRhcGVzdDEMMAoGA1UECgwDQVRFMRYwFAYDVQQDDA1pZHAudW5pdmV0Lmh1MSMwIQYJKoZIhvcNAQkBFhRob3N0bWFzdGVyQHVuaXZldC5odTAeFw0xNjA1MjYwOTQ5NDFaFw0yNjA1MjYwOTQ5NDFaMHoxCzAJBgNVBAYTAkhVMQ0wCwYDVQQIDARQZXN0MREwDwYDVQQHDAhCdWRhcGVzdDEMMAoGA1UECgwDQVRFMRYwFAYDVQQDDA1pZHAudW5pdmV0Lmh1MSMwIQYJKoZIhvcNAQkBFhRob3N0bWFzdGVyQHVuaXZldC5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFv/Nwz1EAJwEncjFJmj6+A+Zu5uGtZeTyH5jogBrCPX8kNP4BJ2JxzWIXJdjv7r77W8SULAPzB2vec3OJthVtKRgeQwPl94jDpEKZ1nP6rscmkg0oTnF5p8ntN9Zavf9QBNp78PogZp8824mQOS3PbYk2UoTOQApexqtDXElkNAH7OPsYoDyyFlNcT3+zO7INYLKw9DUZsnYhfpPSV3WdTo5Ou81GaDEcNb+UZkOwklXYu7mnTe2ixsadhx2qhiCRGwzZ/1k7erOTAR0ycov0dFT8YFgQ982u+l0uUd99r2BQ6zMgYvQWwEOMnqhpl9YFJws1M6+gmiGA42L0cgHUCAwEAAaNQME4wHQYDVR0OBBYEFIzY/5yZIl7N/mgoXHMv27KduTelMB8GA1UdIwQYMBaAFIzY/5yZIl7N/mgoXHMv27KduTelMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABfQgO6BUtabY/lpsiogNeaGZfXlSF8p7NV+8Om7CP4jeXasrwjUTnHvbClI3OY2QDlDFYOB5gfMciTJ2smtEMgiWi3O5Ie7yRlV8C5npKRXskFVstDSY5D4amM9o5Pds/NgFqy7zWaWSBez+080NpHuMeo9kKUQTqdMf+5SpujP9X2+VG4TTMkYVPLjiq/gMdrEaVx0O1e9heYlb51nMnMcfsa0KWNLbvs8DvGYu9dxCWcizFCmvA1UybDb+NyFEq87jEo5vjV60ujq2fH+ylF/HWwUB16aEdaci5GZuwpPC+Y+eYeRi4anITbd5Ts1joKL5zsOFOxpDQ0EZ0kyseo=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>idp.univet.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univet.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univet.hu/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univet.hu/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">Szent István Egyetem</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Szent István University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">Szent István Egyetem</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Szent István University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.szie.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.szie.hu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Vendel</md:SurName>
-      <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Vendel</md:SurName>
-      <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Vendel</md:SurName>
-      <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDxzCCAq+gAwIBAgIJAMgy3ruScwYCMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAkhVMQ0wCwYDVQQIDARQZXN0MREwDwYDVQQHDAhCdWRhcGVzdDEMMAoGA1UECgwDQVRFMRYwFAYDVQQDDA1pZHAudW5pdmV0Lmh1MSMwIQYJKoZIhvcNAQkBFhRob3N0bWFzdGVyQHVuaXZldC5odTAeFw0xNjA1MjYwOTQ5NDFaFw0yNjA1MjYwOTQ5NDFaMHoxCzAJBgNVBAYTAkhVMQ0wCwYDVQQIDARQZXN0MREwDwYDVQQHDAhCdWRhcGVzdDEMMAoGA1UECgwDQVRFMRYwFAYDVQQDDA1pZHAudW5pdmV0Lmh1MSMwIQYJKoZIhvcNAQkBFhRob3N0bWFzdGVyQHVuaXZldC5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFv/Nwz1EAJwEncjFJmj6+A+Zu5uGtZeTyH5jogBrCPX8kNP4BJ2JxzWIXJdjv7r77W8SULAPzB2vec3OJthVtKRgeQwPl94jDpEKZ1nP6rscmkg0oTnF5p8ntN9Zavf9QBNp78PogZp8824mQOS3PbYk2UoTOQApexqtDXElkNAH7OPsYoDyyFlNcT3+zO7INYLKw9DUZsnYhfpPSV3WdTo5Ou81GaDEcNb+UZkOwklXYu7mnTe2ixsadhx2qhiCRGwzZ/1k7erOTAR0ycov0dFT8YFgQ982u+l0uUd99r2BQ6zMgYvQWwEOMnqhpl9YFJws1M6+gmiGA42L0cgHUCAwEAAaNQME4wHQYDVR0OBBYEFIzY/5yZIl7N/mgoXHMv27KduTelMB8GA1UdIwQYMBaAFIzY/5yZIl7N/mgoXHMv27KduTelMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABfQgO6BUtabY/lpsiogNeaGZfXlSF8p7NV+8Om7CP4jeXasrwjUTnHvbClI3OY2QDlDFYOB5gfMciTJ2smtEMgiWi3O5Ie7yRlV8C5npKRXskFVstDSY5D4amM9o5Pds/NgFqy7zWaWSBez+080NpHuMeo9kKUQTqdMf+5SpujP9X2+VG4TTMkYVPLjiq/gMdrEaVx0O1e9heYlb51nMnMcfsa0KWNLbvs8DvGYu9dxCWcizFCmvA1UybDb+NyFEq87jEo5vjV60ujq2fH+ylF/HWwUB16aEdaci5GZuwpPC+Y+eYeRi4anITbd5Ts1joKL5zsOFOxpDQ0EZ0kyseo=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.univet.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univet.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univet.hu/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univet.hu/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">Szent István Egyetem</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Szent István University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">Szent István Egyetem</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Szent István University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.szie.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.szie.hu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Vendel</md:SurName>
+    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Vendel</md:SurName>
+    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Vendel</md:SurName>
+    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml
index c841fce0..f4d3feff 100644
--- a/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unmpidp.unm.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unm.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of New Mexico</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Primary IDP for the University of New Mexico</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unm.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of New Mexico</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Primary IDP for the University of New Mexico</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUHkqghRUEAkZxZ/0df+bxNNL7T9AwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MB4XDTEyMDExMTE4NTU1NloX
 DTMyMDExMTE4NTU1NlowGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MIIBIjAN
@@ -41,23 +41,23 @@ TMXYK7ycdYBfsqaH9w7lG7esXXThYRiktRq5mzCxQx93x7H5LCF4o+OFvSx0mCX2
 IoYdDX58vQSM0wh4b8pjNSWyPhyyt7Ogee4EVq17sJLMLlFzggjbJCE6YkBvwxce
 mtW4BfJL5R5xn6jGVmGkCJ/H3Qn4XW26dFRbTtpoKVeYnogS4bPdvoc4qQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://unmpidp.unm.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unmpidp.unm.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unmpidp.unm.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unm.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://unmpidp.unm.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unmpidp.unm.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unmpidp.unm.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unm.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUHkqghRUEAkZxZ/0df+bxNNL7T9AwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MB4XDTEyMDExMTE4NTU1NloX
 DTMyMDExMTE4NTU1NlowGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MIIBIjAN
@@ -76,30 +76,30 @@ TMXYK7ycdYBfsqaH9w7lG7esXXThYRiktRq5mzCxQx93x7H5LCF4o+OFvSx0mCX2
 IoYdDX58vQSM0wh4b8pjNSWyPhyyt7Ogee4EVq17sJLMLlFzggjbJCE6YkBvwxce
 mtW4BfJL5R5xn6jGVmGkCJ/H3Qn4XW26dFRbTtpoKVeYnogS4bPdvoc4qQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of New Mexico</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of New Mexico</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unm.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chuck Phillips</md:GivenName>
-      <md:EmailAddress>chuckp@unm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Libby Henry</md:GivenName>
-      <md:EmailAddress>ehenry@unm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jared Galbraith</md:GivenName>
-      <md:EmailAddress>jagalb@unm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jared Galbraith</md:GivenName>
-      <md:EmailAddress>jagalb@unm.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of New Mexico</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of New Mexico</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unm.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chuck Phillips</md:GivenName>
+    <md:EmailAddress>chuckp@unm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Libby Henry</md:GivenName>
+    <md:EmailAddress>ehenry@unm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jared Galbraith</md:GivenName>
+    <md:EmailAddress>jagalb@unm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jared Galbraith</md:GivenName>
+    <md:EmailAddress>jagalb@unm.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml
index 631a3076..cc81187c 100644
--- a/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uobhive.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T14:25:23Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T14:25:23Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="60" width="60">https://uob-hive.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="60" width="60">https://uob-hive.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -49,34 +49,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sisoshibboleth.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sisoshibboleth.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml
index 26a2e312..4ea4f93a 100644
--- a/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml
+++ b/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uoe-shib.hosted.exlibrisgroup.com/shib">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-12T13:57:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-12T13:57:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Edinburgh - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Edinburgh</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Edinburgh - Primo</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Edinburgh</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAIHsfkq6pSPaMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB2FpbzAwMjEwHhcNMTUwMjIwMjE1MzA1WhcNMjUwMjE3MjE1MzA1WjASMRAw
 						DgYDVQQDEwdhaW8wMDIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -45,38 +45,38 @@
 						tcaxY6g7Qf6hKDePS/E1Za597QsmpfLNMhllU3JjTATGBBwHP3Ke/TSicuDYU/cu
 						2uFODAwEKXXlTXol08EA3w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for the University of Edinburgh</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benoit</md:GivenName>
-      <md:SurName>Ginestet</md:SurName>
-      <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ex Libris (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for the University of Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://exlibrisgroup.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benoit</md:GivenName>
+    <md:SurName>Ginestet</md:SurName>
+    <md:EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml
index abae6041..84a9ffaa 100644
--- a/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml
+++ b/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uolics.sisoshibboleth.co.uk/entity">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T16:50:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T16:50:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</mdui:Description>
+        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</mdui:Description>
-          <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
 						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
 						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
@@ -51,34 +51,34 @@
 						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
 						firJubLNu96jbGctasqcpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steven</md:GivenName>
-      <md:SurName>Oates</md:SurName>
-      <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TechEthika Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.siso.uk.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steven</md:GivenName>
+    <md:SurName>Oates</md:SurName>
+    <md:EmailAddress>mailto:steve@siso.uk.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml b/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml
index 0d41d36d..a86174e1 100644
--- a/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://upkcontent.imparando.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T16:01:41Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T16:01:41Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://upkcontent.imparando.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://upkcontent.imparando.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSzCCAjOgAwIBAgIJAOd6oO6JdGfIMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 						BAMTHWltcC1jb250ZW50MDEtcC5pbXBhcmFuZG8uY29tMB4XDTEyMDUwODE1MjEw
 						MVoXDTIyMDUwNjE1MjEwMVowKDEmMCQGA1UEAxMdaW1wLWNvbnRlbnQwMS1wLmlt
@@ -30,32 +30,32 @@
 						A05LtZya40PZ6vdC56IE0Ch0Sqjn0kLbt6KnKT8sfqXfwdOCvXLdvs2ISzzQZMak
 						KbW8+5q5lNgkgzIwTRFYyp1vbDoPNm2tqPuMfJsOOA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkcontent.imparando.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Imparando (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Imparando: Oracle UPK Training Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imparando.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>upk-support</md:GivenName>
-      <md:EmailAddress>mailto:upk-support@imparando.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>technical</md:GivenName>
-      <md:EmailAddress>mailto:technical@imparando.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkcontent.imparando.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Imparando (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Imparando: Oracle UPK Training Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imparando.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>upk-support</md:GivenName>
+    <md:EmailAddress>mailto:upk-support@imparando.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>technical</md:GivenName>
+    <md:EmailAddress>mailto:technical@imparando.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml b/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml
index 061f9972..402a6e7a 100644
--- a/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://upki.yamagata-u.ac.jp/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2009-11-05T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2009-11-05T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yamagata-u.ac.jp</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="ja">山形大学</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Yamagata University</mdui:DisplayName>
+        <mdui:Keywords xml:lang="en">category:location:tohoku category:organizationType:university</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yamagata-u.ac.jp</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="ja">山形大学</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Yamagata University</mdui:DisplayName>
-          <mdui:Keywords xml:lang="en">category:location:tohoku category:organizationType:university</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIfK4/rh+AlMUwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIfK4/rh+AlMUwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
 BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
 dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
 IC0gRzQwHhcNMTUwNjI2MTExNzA0WhcNMTcwNzI2MTExNzA0WjCBjzELMAkGA1UE
@@ -45,23 +45,23 @@ r9gv2PuEqtibPXM8FFe0ARmBWUWo3/Fgh/1aTwSKzTeAoX/vMVjJZXZTCB6xmyls
 jHCqvp568dPYJo7bNRgDS5L8gcR79VDUQfvysZNgqgu4yBJN2QyloNfPbTEWI3BK
 F/SKL1HwtIO9yIFXUifLwqEx2U7H3WVQowe/avgAPVEHsCqAPAPv+OCEqJbjjtl5
 +u7BMTn7P17Ua/k7aQTIDQ9E9wMs7Fp4LBKUklinM9o=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://upki.yamagata-u.ac.jp/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upki.yamagata-u.ac.jp/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upki.yamagata-u.ac.jp/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yamagata-u.ac.jp</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIfK4/rh+AlMUwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://upki.yamagata-u.ac.jp/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upki.yamagata-u.ac.jp/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upki.yamagata-u.ac.jp/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yamagata-u.ac.jp</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIfK4/rh+AlMUwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
 BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
 dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
 IC0gRzQwHhcNMTUwNjI2MTExNzA0WhcNMTcwNzI2MTExNzA0WjCBjzELMAkGA1UE
@@ -88,23 +88,23 @@ r9gv2PuEqtibPXM8FFe0ARmBWUWo3/Fgh/1aTwSKzTeAoX/vMVjJZXZTCB6xmyls
 jHCqvp568dPYJo7bNRgDS5L8gcR79VDUQfvysZNgqgu4yBJN2QyloNfPbTEWI3BK
 F/SKL1HwtIO9yIFXUifLwqEx2U7H3WVQowe/avgAPVEHsCqAPAPv+OCEqJbjjtl5
 +u7BMTn7P17Ua/k7aQTIDQ9E9wMs7Fp4LBKUklinM9o=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://upki.yamagata-u.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upki.yamagata-u.ac.jp:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Yamagata University</md:OrganizationName>
-      <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Yamagata University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="ja">山形大学</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://kdwww.kj.yamagata-u.ac.jp/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Networking and Computing Service Center</md:SurName>
-      <md:EmailAddress>mailto:sinet-admin@cc.yamagata-u.ac.jp</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://upki.yamagata-u.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upki.yamagata-u.ac.jp:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Yamagata University</md:OrganizationName>
+    <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Yamagata University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ja">山形大学</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://kdwww.kj.yamagata-u.ac.jp/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Networking and Computing Service Center</md:SurName>
+    <md:EmailAddress>mailto:sinet-admin@cc.yamagata-u.ac.jp</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml
index e5d998f2..6c4622f4 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:dur.ac.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Durham</mdui:DisplayName>
+        <mdui:Logo height="101" width="90">https://shib.dur.ac.uk/idp/images/du90x101.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.dur.ac.uk/idp/images/du16x16.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Durham</mdui:DisplayName>
-          <mdui:Logo height="101" width="90">https://shib.dur.ac.uk/idp/images/du90x101.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib.dur.ac.uk/idp/images/du16x16.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
 						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
 						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
@@ -39,26 +39,26 @@
 						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
 						CDgIrJGVkQXCNg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dur.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
 						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
 						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
@@ -82,26 +82,26 @@
 						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
 						CDgIrJGVkQXCNg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Durham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Durham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dur.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@durham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:m.a.young@durham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Durham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Durham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dur.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@durham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:m.a.young@durham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml
index 951de878..35dd33d4 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shibboleth-i.sgul.ac.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">St George's, University of London</mdui:DisplayName>
+        <mdui:Logo height="150" width="200">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_standard.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_small.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://sgsa01.sgul.ac.uk/idp/images/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">St George's, University of London</mdui:DisplayName>
-          <mdui:Logo height="150" width="200">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_standard.png</mdui:Logo>
-          <mdui:Logo height="60" width="80">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_small.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://sgsa01.sgul.ac.uk/idp/images/favicon.ico</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
 						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
@@ -36,26 +36,26 @@
 						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
 						qCZw
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sgsa01.sgul.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sgsa01.sgul.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
 						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
 						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
@@ -75,27 +75,27 @@
 						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
 						qCZw
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">St George's Hospital Medical School</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St George's, University of London</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sgul.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Keith</md:GivenName>
-      <md:SurName>Carr</md:SurName>
-      <md:EmailAddress>mailto:kecarr@sgul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Keith</md:GivenName>
-      <md:SurName>Carr</md:SurName>
-      <md:EmailAddress>mailto:kecarr@sgul.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">St George's Hospital Medical School</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St George's, University of London</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sgul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Keith</md:GivenName>
+    <md:SurName>Carr</md:SurName>
+    <md:EmailAddress>mailto:kecarr@sgul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Keith</md:GivenName>
+    <md:SurName>Carr</md:SurName>
+    <md:EmailAddress>mailto:kecarr@sgul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
index 5d7264c3..040a0444 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:edina.ac.uk:statacc">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Statistical Accounts of Scotland</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Essential sources of the study of Scottish life in the 18th and 19th centuries</mdui:Description>
+        <mdui:Logo height="119" width="350">https://auth.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Statistical Accounts of Scotland</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Essential sources of the study of Scottish life in the 18th and 19th centuries</mdui:Description>
-          <mdui:Logo height="119" width="350">https://auth.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -41,35 +41,35 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/ECP" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA: Statistical Accounts of Scotland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/statacc/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA: Statistical Accounts of Scotland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
index f19e5ab8..105f4273 100644
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:service:target.sdss.ac.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">EDINA services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EDINA services for research and education</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="65" width="150">https://auth.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">EDINA services</mdui:DisplayName>
-          <mdui:Description xml:lang="en">EDINA services for research and education</mdui:Description>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -41,35 +41,35 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/ECP" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/POST" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA Test Target</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/ECP" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdev.edina.ac.uk/target/Shibboleth.sso/SAML2/POST-SimpleSign" index="21"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA Test Target</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/about/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
index cc61865b..6e75aa03 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:montpellier.iufm.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-08T18:22:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-08T18:22:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IUFM de Montpellier</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-montp2.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">IUFM de Montpellier</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IUFM de Montpellier</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-montp2.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">IUFM de Montpellier</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
 BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
 Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
@@ -38,13 +38,13 @@ k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
 UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
 R4xWKyqWIGnn4g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
 DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
 ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
@@ -70,23 +70,23 @@ O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
 7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
 ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.montpellier.iufm.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.montpellier.iufm.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
 BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
 Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
@@ -107,13 +107,13 @@ k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
 UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
 R4xWKyqWIGnn4g==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
 DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
 ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
@@ -139,19 +139,19 @@ O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
 7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
 ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IUFM de Montpellier</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IUFM de Montpellier</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-montp2.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@montpellier.iufm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IUFM de Montpellier</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IUFM de Montpellier</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-montp2.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@montpellier.iufm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
index 56b499cc..1a0ac0c9 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:uhb.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-23T13:48:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-23T13:48:41Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhb.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-haute-bretagne.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Rennes 2</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQoz1WST0iUURTFf/fNlzCpWSA0EQYSYgz9cRUWNut2QdG+drWR2rizqFW0KGaVyZAGQVCGChVEm8wpgiJiQhTCFlIEYWU2g86/d1q870u7m/d4vHPPPeceY9wAJDMTGIhwAjJMiLgMcBbfTQgv+eSDMEtJoR0IvEARwpA81DmU6euI2ufK8z9WlmkBNQNjT2tPJr0zZe7F95dwF25zcfZCXTUltVRZ2veglwKMpSjwcG4ivDOCo8H57LkbAzcjtqDATdfWrvnTCwd39OGbQM1XExk46lzrv56osqAsqHh9oohjQ3MA7O3s3ha1g/40VoeKQ8ce56YXpwy8fGuq9dXxIuv/ATgyfTjMd+b5WUbhDoxw+e0lSfJe0uDsYOF9YUODNxeQ2c4sDWhCmivvrk59nsQMyA/kD2T2b6K4hyTvvaSZbzOPFiYowDiM8rXyRZLXPzJxC0eF0s+PYc25TO5k7ylqmCBi92T3mtbD7s0Udu1oof/Z0dX6b9vknMxwjlp9z/1dlWbFsCQsOMzWquWOse3Db4afLj0p/SqRAmTyuNRydaVtrC3/Ib9Y/hTnhXEMk0QTPBgWIbPEfwc+NsNjaYuSEVFkIZ7EmTUkzIMjEpFMJnDCUBzsgFCcVwVbTd4ww0Kbv2lsB+BFv9iTAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.uhb.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Rennes 2</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhb.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-haute-bretagne.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Rennes 2</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQoz1WST0iUURTFf/fNlzCpWSA0EQYSYgz9cRUWNut2QdG+drWR2rizqFW0KGaVyZAGQVCGChVEm8wpgiJiQhTCFlIEYWU2g86/d1q870u7m/d4vHPPPeceY9wAJDMTGIhwAjJMiLgMcBbfTQgv+eSDMEtJoR0IvEARwpA81DmU6euI2ufK8z9WlmkBNQNjT2tPJr0zZe7F95dwF25zcfZCXTUltVRZ2veglwKMpSjwcG4ivDOCo8H57LkbAzcjtqDATdfWrvnTCwd39OGbQM1XExk46lzrv56osqAsqHh9oohjQ3MA7O3s3ha1g/40VoeKQ8ce56YXpwy8fGuq9dXxIuv/ATgyfTjMd+b5WUbhDoxw+e0lSfJe0uDsYOF9YUODNxeQ2c4sDWhCmivvrk59nsQMyA/kD2T2b6K4hyTvvaSZbzOPFiYowDiM8rXyRZLXPzJxC0eF0s+PYc25TO5k7ylqmCBi92T3mtbD7s0Udu1oof/Z0dX6b9vknMxwjlp9z/1dlWbFsCQsOMzWquWOse3Db4afLj0p/SqRAmTyuNRydaVtrC3/Ib9Y/hTnhXEMk0QTPBgWIbPEfwc+NsNjaYuSEVFkIZ7EmTUkzIMjEpFMJnDCUBzsgFCcVwVbTd4ww0Kbv2lsB+BFv9iTAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.uhb.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Rennes 2</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIUN1TTOPl4sgCyt2P8GnFSEqcJLsYwDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC51bml2LXJlbm5lczIuZnIwHhcNMTUx
 MjE2MTAwNjMwWhcNMzUxMjE2MTAwNjMwWjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
@@ -40,13 +40,13 @@ Fbiu42dnzjVPtsLiURycXoGWdN9eYdPkZT/x7b60utBFJ7Y1lCA2+6D0eMXJI/bu
 CQJuCqQLnHVwpjJ0xEHustvaFv2zyxP6P/af8iLUK+9UciOk7Cp4LjrdlBmMrf5Q
 QisFJWc/MGN0ISKidXg5cRqLoBnSgnw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIElDCCA3ygAwIBAgIQLdnpFQuu69xl9z7dAWPZhzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDQwMjAwMDAwMFoXDTE2MDQwMTIzNTk1OVowSDEhMB8GA1UE
@@ -73,21 +73,21 @@ fhb8GprtsM8qv0z2+6Fat+iIu0GfmOaDZ/gDsW++cOD9P6K25GrdmVk20rC3oyy1
 OABUhu/g7vs9SnH4R/DZfgZ3U2WrVo8n/P9zcmNwfefBBC267M8I7c73wxZza+fb
 /K7h56t2aaVkVbRdvi8tEncI1Fzw5lq5
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhb.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Rennes 2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Rennes 2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uhb.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>admin-unix@uhb.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhb.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Rennes 2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Rennes 2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uhb.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>admin-unix@uhb.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
index 77eb157b..2a02782c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unice.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-07T17:06:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-07T17:06:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nice Sophia Antipolis</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACcUlEQVQ4y3WSXUiTURjHf+fd2bst55wfmyxBGxXmTSliEQV9QEEGQaQEQRhBJdRlBCEEEfQFQRfdeJNEhIF11UUahWVXgUP70CQSXGQ2t7RMt7l373u6mL5uYufinMN5zvmd5/n/HwG4OX17gMXUNpSlAFC5pWAIewKhCVyeYe5f2iNouTiI6Wwkk4ToNCgLqgJgKZibp6G6knQmy+foTzCtHKA6CK4icBgRweHzBuiSmTm6O9rImCY3u55xpH4jTulkZCpGUNdpbNpKZSjAVGKW9ntPodgDKpOVKEw0JE7J2JcoVx/08uTaCd4MRPCGNrG9rgRdd3Ln8XNK/S6O7d0BugQFKExp15jN4va4CQb9TMRTfIkt0Pf2Jbh0mI7xousKB0/doKOtBRJ/oKoCFMh8nSwFtRU+Prwfo++XAcGS3E++MI96XhEKBxn6OA5et/1Gs3cKEBpFuoOMoYFQubOlYDKZpmF9GdLlBFOtARCgsHAIgULZjtkXhcCBQiEAaw3AkssO7f9tYClAiLzMCgACoSCLQK0mKLAQGKZCrAqtAKRGNmMQmZzB6/OAyqvBVJR7JfOLmcKOLAD8TdFUv4XYRJwzrfth6jv8nof4LCfDZezeVctQbAFhWaCtAKTd+5VlvPs0wvHmOo5e7uRueyuTaQvNMEhGv2JZDlKJBMlkMieUDRAIhIBkis011dSFN3BgZ5rR4VFM08BdXILp9XP9YT/dty7g1iX0vF4W0iFoPjuIO9CIkYJvMdA0EBAIlOLTJeOxGSj357L8Ec+5UBMC6YJ0PCKAdRw6148m67E1Vite5tsmlmtXAjM7TG/nvn9ZBuyGK8PBkwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0NyswMjowMJXV8kIAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDcrMDI6MDDkiEr+AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.unice.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Staff and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université Nice Sophia Antipolis</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels et étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nice Sophia Antipolis</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACcUlEQVQ4y3WSXUiTURjHf+fd2bst55wfmyxBGxXmTSliEQV9QEEGQaQEQRhBJdRlBCEEEfQFQRfdeJNEhIF11UUahWVXgUP70CQSXGQ2t7RMt7l373u6mL5uYufinMN5zvmd5/n/HwG4OX17gMXUNpSlAFC5pWAIewKhCVyeYe5f2iNouTiI6Wwkk4ToNCgLqgJgKZibp6G6knQmy+foTzCtHKA6CK4icBgRweHzBuiSmTm6O9rImCY3u55xpH4jTulkZCpGUNdpbNpKZSjAVGKW9ntPodgDKpOVKEw0JE7J2JcoVx/08uTaCd4MRPCGNrG9rgRdd3Ln8XNK/S6O7d0BugQFKExp15jN4va4CQb9TMRTfIkt0Pf2Jbh0mI7xousKB0/doKOtBRJ/oKoCFMh8nSwFtRU+Prwfo++XAcGS3E++MI96XhEKBxn6OA5et/1Gs3cKEBpFuoOMoYFQubOlYDKZpmF9GdLlBFOtARCgsHAIgULZjtkXhcCBQiEAaw3AkssO7f9tYClAiLzMCgACoSCLQK0mKLAQGKZCrAqtAKRGNmMQmZzB6/OAyqvBVJR7JfOLmcKOLAD8TdFUv4XYRJwzrfth6jv8nof4LCfDZezeVctQbAFhWaCtAKTd+5VlvPs0wvHmOo5e7uRueyuTaQvNMEhGv2JZDlKJBMlkMieUDRAIhIBkis011dSFN3BgZ5rR4VFM08BdXILp9XP9YT/dty7g1iX0vF4W0iFoPjuIO9CIkYJvMdA0EBAIlOLTJeOxGSj357L8Ec+5UBMC6YJ0PCKAdRw6148m67E1Vite5tsmlmtXAjM7TG/nvn9ZBuyGK8PBkwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0NyswMjowMJXV8kIAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDcrMDI6MDDkiEr+AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.unice.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Staff and students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université Nice Sophia Antipolis</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels et étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGjCCAgICCQDEc1geh13qYjANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJG
 UjEpMCcGA1UEChMgVW5pdmVyc2l0ZSBOaWNlIFNvcGhpYSBBbnRpcG9saXMxFTAT
 BgNVBAMTDGlkcC51bmljZS5mcjAeFw0xNTAzMzAxNDA2MzRaFw0yNTAzMzAxNDA2
@@ -39,13 +39,13 @@ XjLrB1uWCc0DIq8UadXJrQCK34zYwpx+V13pch1/GfiNibgXipIdL5pLnjf1HXwQ
 qmTeKX7MGcrmSXwqoRkufJvN96w5RsZwq+c82x8w3DA9o7S9BfCj7RqFUywuaS+G
 ocmAdFFE3FlU7n+j9x4StI4bTezYKVTQPa4Pcw18
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEkjCCA3qgAwIBAgIQfx/AsWyTjGxfLF7+a+MU3DANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -72,23 +72,23 @@ Y7hQVSNM+vGWd2dx0Ax7qlF9I00YAzKXSw94tvrL8XeXJ1W7nZ6K/DqSuWwpFE9L
 T41tULnrHJS9hPhwtG33O35uW3WpQLwsWJZDCXaQNf31PNsjaPhrV6qBsEz0/vwL
 XAU685+5ngtQMo1C+QYwfpEV9fZZVw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unice.fr/renater/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unice.fr/renater/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unice.fr/renater/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unice.fr/renater/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unice.fr/renater/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unice.fr/renater/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGjCCAgICCQDEc1geh13qYjANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJG
 UjEpMCcGA1UEChMgVW5pdmVyc2l0ZSBOaWNlIFNvcGhpYSBBbnRpcG9saXMxFTAT
 BgNVBAMTDGlkcC51bmljZS5mcjAeFw0xNTAzMzAxNDA2MzRaFw0yNTAzMzAxNDA2
@@ -107,13 +107,13 @@ XjLrB1uWCc0DIq8UadXJrQCK34zYwpx+V13pch1/GfiNibgXipIdL5pLnjf1HXwQ
 qmTeKX7MGcrmSXwqoRkufJvN96w5RsZwq+c82x8w3DA9o7S9BfCj7RqFUywuaS+G
 ocmAdFFE3FlU7n+j9x4StI4bTezYKVTQPa4Pcw18
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEkjCCA3qgAwIBAgIQfx/AsWyTjGxfLF7+a+MU3DANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -140,24 +140,24 @@ Y7hQVSNM+vGWd2dx0Ax7qlF9I00YAzKXSw94tvrL8XeXJ1W7nZ6K/DqSuWwpFE9L
 T41tULnrHJS9hPhwtG33O35uW3WpQLwsWJZDCXaQNf31PNsjaPhrV6qBsEz0/vwL
 XAU685+5ngtQMo1C+QYwfpEV9fZZVw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unice.fr:8443/renater/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Nice Sophia Antipolis</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Nice Sophia Antipolis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unice.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Charles GODIEN</md:SurName>
-      <md:EmailAddress>Jean-Charles.Godien@unice.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Richard Manas</md:SurName>
-      <md:EmailAddress>Richard.Manas@unice.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unice.fr:8443/renater/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Nice Sophia Antipolis</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Nice Sophia Antipolis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unice.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Charles GODIEN</md:SurName>
+    <md:EmailAddress>Jean-Charles.Godien@unice.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Richard Manas</md:SurName>
+    <md:EmailAddress>Richard.Manas@unice.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
index cc8a010f..1f692a0c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unilim.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-03T17:29:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-03T17:29:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilim.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Limoges</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACVElEQVQ4y42Tv4tUZxSGn/fcOzO6IBoRvYuQde8ipImCmpDGBTvdWVJYiCmClYVlQBBcUgRFbPwHFBvBQoyE6AyYCELSSYKRiHazCwtmrr9Ao+DO3HvPSTGjwRQbT3e+4j3ne97zqpPltxD7FKpYpYKQRJJQfb6/v3y3OznzWwSvUsGsUBIiWU1gjYyBx7f7i+W7nSz/O5XWOYEhqmD1MmAQ8bRd9E53svxew2xdHYEHL40PqEQiiAs3Nm87OmHJzipGkyEefpBAipjvLy7I7NQgfCwKjn74XwEBb6J+fWNTvn3Cki0+fhu4D4deXjOAhoQiyvexj3oBCj1SwrGKEa2mhEnftSxdMKGJsvZLgS6nEgCt0Z9PNsY9opLpE48xUPe/5vq9M4KvLcKvtB8vHhFR6N/1npdv/Ht7t0ysiYiNAKnEoKr2dLLps02zhrWLpcPXs6kDgY5VEYym6mJzbfqNAw5ImhY8mTBjEPXCwWfLfZOdKCOwbpb/kbjtapnWAwzdy3bROwEx6/HORoNIXnt1db6/dKY7OfP7yFowxM4w5Q60ZNTEV9c3T+9A2iBBgsZMuD3XXzzUzfLza2W7I2IEk6AUTJXuw5Xaj35ZLF1LE/s53H+pPV7UEX++HA4PzBdL58ZE9614/byGBwOvj6egCPh4vui1ALpZ/lNLtmVF8cVc0fvoraudLP8RmGoXve3v3Uk3m1lpmlrD8JsEW5tmnw4jSCVKj8cQ9wWzDbNmAJV7CboDkSA+U2cy/zXF9o4ji/8nREI4wdvAaQzOBKX7vX8AiVcUpd+HilcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.unilim.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Limoges</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilim.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Limoges</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACVElEQVQ4y42Tv4tUZxSGn/fcOzO6IBoRvYuQde8ipImCmpDGBTvdWVJYiCmClYVlQBBcUgRFbPwHFBvBQoyE6AyYCELSSYKRiHazCwtmrr9Ao+DO3HvPSTGjwRQbT3e+4j3ne97zqpPltxD7FKpYpYKQRJJQfb6/v3y3OznzWwSvUsGsUBIiWU1gjYyBx7f7i+W7nSz/O5XWOYEhqmD1MmAQ8bRd9E53svxew2xdHYEHL40PqEQiiAs3Nm87OmHJzipGkyEefpBAipjvLy7I7NQgfCwKjn74XwEBb6J+fWNTvn3Cki0+fhu4D4deXjOAhoQiyvexj3oBCj1SwrGKEa2mhEnftSxdMKGJsvZLgS6nEgCt0Z9PNsY9opLpE48xUPe/5vq9M4KvLcKvtB8vHhFR6N/1npdv/Ht7t0ysiYiNAKnEoKr2dLLps02zhrWLpcPXs6kDgY5VEYym6mJzbfqNAw5ImhY8mTBjEPXCwWfLfZOdKCOwbpb/kbjtapnWAwzdy3bROwEx6/HORoNIXnt1db6/dKY7OfP7yFowxM4w5Q60ZNTEV9c3T+9A2iBBgsZMuD3XXzzUzfLza2W7I2IEk6AUTJXuw5Xaj35ZLF1LE/s53H+pPV7UEX++HA4PzBdL58ZE9614/byGBwOvj6egCPh4vui1ALpZ/lNLtmVF8cVc0fvoraudLP8RmGoXve3v3Uk3m1lpmlrD8JsEW5tmnw4jSCVKj8cQ9wWzDbNmAJV7CboDkSA+U2cy/zXF9o4ji/8nREI4wdvAaQzOBKX7vX8AiVcUpd+HilcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.unilim.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Limoges</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDNzCCAh+gAwIBAgIUCJLJlFRsGEvjGAk03CmBdGzPqAswDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTaWRlbnQtbmV3LnVuaWxpbS5mcjAeFw0xMTA0MDgwOTU1
 NDRaFw0zMTA0MDgwOTU1NDRaMB4xHDAaBgNVBAMTE2lkZW50LW5ldy51bmlsaW0u
@@ -38,21 +38,21 @@ wixNzp6SP7pbBch2TajO9mKgGh15wzU/aO19dXpUO/bpAgNfcOlpd+LlRtQ6AaO+
 /rzAmJBWj5oXmNLIuWfDZDz9I6/SSJmsK3i8tTAKxKK3YslapJiwApPNPfAbH5Ac
 4dTyIRHkjWvItKk=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident2.unilim.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident2.unilim.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident2.unilim.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Limoges</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Limoges</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unilim.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@unilim.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident2.unilim.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident2.unilim.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident2.unilim.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Limoges</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Limoges</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unilim.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@unilim.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
index a0337e3c..f514b5f5 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-angers.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-23T11:48:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-23T11:48:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Angers</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC4klEQVQ4y32RS2xUdRTGf///vXPn3ULtI61ayyMGm06MaYvaVggxhiApiaIWjSS6MYakxp1p3LmwunABPhIT0IWFUBXaGAwg1BjAJkpsSRAoWkSYwhSnTqfTO9OZ3sdxQVtf1S85q3O+3zk5HywjcUqr7YG3ZWZvt4jIW/yPzP9quFdHKFy/SNqh7kRBhn2IlBlcWmWwp9rgJ63U78sCREQjXijveEzm53jkw/6dBdcDQCl1/9ry2I53ujoP+SI7tFKu/ifgskP3Y58ev/B1chLPFxbNC3B+zs7y9N7+7QfzfPS3C1xfqk8V2b+5/1hbKj3FRqsSASKmwQPVFUQDJpahGc/OMpbJ8cqBgeeSjpw2AHyR0IjDJ119g1smsrlALBhkNL6GI/Emetqb2XR3DV9dS1EVDvFaSyPDqSkm83M6kUg0aIBvS3xc7xY7n1/XQMwyGdy2gVfbW5k2ozSURTk8nuT8VJZjv96k3ArQXF2BiLDv6ImETrmy69m+L56xHXfZNF46+T1fXr0BwJzrUfJ8aiIhAFL5IuZ7yWz3DdvWAEHTIG4FMPWfv3V8n/sqyumoq6IyHKQ+HqHMCiykAvr9oyfXidwefqFxNZ893kHijhVLgNfXNzHQuYGgoRlK3mLkt+ml3l2xCDpbmgfgu8kpruVs5n2f0XSGKzM2VeEgPa2N7B4dY/e5ywzfTJObd25vB556dNN5syYS4lahyMtDZ9FKLdFLnkfENHF8Yc71EAGtFHWxML/M2ESDlrc5rt819hzobzly7sd7i57HX8tdMNqOy8O1lYykp8mW5lmzIk5tNETLqvqZJ2pXdilHZOuLQ2cPH7wwbrm+/CsFpRQBrXB9wRfBUIqNa++ZPbSlrW+loXYpANuT1s8L9L4xeLzteiYTXg4EELdMnmx/6MqbTfW9d5pq3+IvljThyvYfSjTv/+ZMz1gmR9HzAYgGTB6sqWBnx/reFosPglpNLHr+AODIRmnyfRqlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjU5KzAyOjAwCUCJgQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMHgdMT0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-angers.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Employees and students from the University of Angers</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université d'Angers</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les personnels et étudiants de l'Université d'Angers</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Angers</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC4klEQVQ4y32RS2xUdRTGf///vXPn3ULtI61ayyMGm06MaYvaVggxhiApiaIWjSS6MYakxp1p3LmwunABPhIT0IWFUBXaGAwg1BjAJkpsSRAoWkSYwhSnTqfTO9OZ3sdxQVtf1S85q3O+3zk5HywjcUqr7YG3ZWZvt4jIW/yPzP9quFdHKFy/SNqh7kRBhn2IlBlcWmWwp9rgJ63U78sCREQjXijveEzm53jkw/6dBdcDQCl1/9ry2I53ujoP+SI7tFKu/ifgskP3Y58ev/B1chLPFxbNC3B+zs7y9N7+7QfzfPS3C1xfqk8V2b+5/1hbKj3FRqsSASKmwQPVFUQDJpahGc/OMpbJ8cqBgeeSjpw2AHyR0IjDJ119g1smsrlALBhkNL6GI/Emetqb2XR3DV9dS1EVDvFaSyPDqSkm83M6kUg0aIBvS3xc7xY7n1/XQMwyGdy2gVfbW5k2ozSURTk8nuT8VJZjv96k3ArQXF2BiLDv6ImETrmy69m+L56xHXfZNF46+T1fXr0BwJzrUfJ8aiIhAFL5IuZ7yWz3DdvWAEHTIG4FMPWfv3V8n/sqyumoq6IyHKQ+HqHMCiykAvr9oyfXidwefqFxNZ893kHijhVLgNfXNzHQuYGgoRlK3mLkt+ml3l2xCDpbmgfgu8kpruVs5n2f0XSGKzM2VeEgPa2N7B4dY/e5ywzfTJObd25vB556dNN5syYS4lahyMtDZ9FKLdFLnkfENHF8Yc71EAGtFHWxML/M2ESDlrc5rt819hzobzly7sd7i57HX8tdMNqOy8O1lYykp8mW5lmzIk5tNETLqvqZJ2pXdilHZOuLQ2cPH7wwbrm+/CsFpRQBrXB9wRfBUIqNa++ZPbSlrW+loXYpANuT1s8L9L4xeLzteiYTXg4EELdMnmx/6MqbTfW9d5pq3+IvljThyvYfSjTv/+ZMz1gmR9HzAYgGTB6sqWBnx/reFosPglpNLHr+AODIRmnyfRqlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjU5KzAyOjAwCUCJgQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMHgdMT0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-angers.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Employees and students from the University of Angers</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université d'Angers</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Les personnels et étudiants de l'Université d'Angers</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
 BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
 NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -40,13 +40,13 @@ EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
 R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
 SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
 MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
@@ -66,23 +66,23 @@ e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
 85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
 +2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-angers.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-angers.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
 BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
 NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
@@ -102,13 +102,13 @@ EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
 R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
 SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
 MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
@@ -128,19 +128,19 @@ e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
 85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
 +2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université d'Angers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université d'Angers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-angers.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>ddn-ssr@listes.univ-angers.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université d'Angers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université d'Angers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-angers.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>ddn-ssr@listes.univ-angers.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
index d0ede87a..c97ed61c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lemans.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-16T12:04:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-16T12:04:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lemans.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université du Maine - Le Mans</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz2P8//8/AymAiSTVg1rDqVPvGBn3MDLuY2TcfenyR0bG3YyMh9CU3rv/9cuXP1ANT599V9biWr1GvaFJTk+Xv7ZO9sBBzZOn3sFVz5x1X1npxLLlj1l+/Phr43C6KE/ayZb38eMfDXXP2ViZ3r7942B/jYHh9///LgwMDGIyR18//cvAwCQtzcF44OCrhw+/Hzr84dHjX7t3fPPw5nr+6pcgP8uBPT/NrdkWzNXU1DjDwMCqpM6yZoWmoYEAk72d6PUbX27f/bHn6A8GBiZtLc6Ll/4d2PNz2gwZPl5mTY3zDAwsgSHct65aGBoIMDAwMP7//59L4vD394wMv/5ExHGvWPSTlZ/h9zcGhj//eYQZv7z5M2OmfHqaIiKU7t794mbNzcDK8P+/w44dvxgY/vi4cdZUCTP8//vlzc8LFwyQVTMwMDD8RwJfv/65e+8LhH3kyOsfP/7+xwCMgy/xAQBPx7tYVY6ZIgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMHw7c+8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDANZstTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lemans.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université du Maine - Le Mans</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lemans.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université du Maine - Le Mans</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz2P8//8/AymAiSTVg1rDqVPvGBn3MDLuY2TcfenyR0bG3YyMh9CU3rv/9cuXP1ANT599V9biWr1GvaFJTk+Xv7ZO9sBBzZOn3sFVz5x1X1npxLLlj1l+/Phr43C6KE/ayZb38eMfDXXP2ViZ3r7942B/jYHh9///LgwMDGIyR18//cvAwCQtzcF44OCrhw+/Hzr84dHjX7t3fPPw5nr+6pcgP8uBPT/NrdkWzNXU1DjDwMCqpM6yZoWmoYEAk72d6PUbX27f/bHn6A8GBiZtLc6Ll/4d2PNz2gwZPl5mTY3zDAwsgSHct65aGBoIMDAwMP7//59L4vD394wMv/5ExHGvWPSTlZ/h9zcGhj//eYQZv7z5M2OmfHqaIiKU7t794mbNzcDK8P+/w44dvxgY/vi4cdZUCTP8//vlzc8LFwyQVTMwMDD8RwJfv/65e+8LhH3kyOsfP/7+xwCMgy/xAQBPx7tYVY6ZIgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMHw7c+8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDANZstTAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lemans.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université du Maine - Le Mans</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEBzCCAu+gAwIBAgIJAPJkjMeKwz+TMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
 VQQGEwJmcjEUMBIGA1UECAwLdW5pdi1sZW1hbnMxEDAOBgNVBAcMB0xFIE1BTlMx
 HDAaBgNVBAoME1VOSVZFUlNJVEUgRFUgTUFJTkUxHDAaBgNVBAMME2lkcDIudW5p
@@ -42,13 +42,13 @@ VAgkzA5irhs1FL1lhLrN0VP0Zl41cckZtAamNcc4xJ+HXPk0jCRtEIRdoBCF+4fL
 0Kczl19r1JsQ1/qYuSzYFoSeMonfQMzNswe2JMhVtem/X76sSLk9sXf/DGLBdxO5
 psTKLRse8C18pocxxBm/KWroiZrNIExoq6GB
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAOfG5aIZ6Aohb63NMTtvPZ3HLBWfMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcDIudW5pdi1sZW1hbnMuZnIwHhcNMTAwNDEyMTE1
 ODExWhcNMzAwNDEyMTE1ODExWjAeMRwwGgYDVQQDExNpZHAyLnVuaXYtbGVtYW5z
@@ -68,21 +68,21 @@ lKgdL3SFqkTQMbBvs4ouAnxw++YMfvcqUtxZJZKIKF7QTPeDOPLHLwHEZl6yL/kl
 dkydWQ+SmHuq9+cAfmW7kzferGnkRoHvIPVNtgGNo7kvQieeLbnGrLYpRWeMFt3f
 4weH5Ji9r7v8/chk
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.univ-lemans.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université du Maine - Le Mans</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université du Maine - Le Mans</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lemans.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-tech@univ-lemans.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.univ-lemans.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université du Maine - Le Mans</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université du Maine - Le Mans</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lemans.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-tech@univ-lemans.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
index 4791c71a..994343c4 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lille1.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-20T17:10:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-20T17:10:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lille - Sciences et Technologies</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lille1.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">staff and students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Lille - Sciences et Technologies</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">personnels et étudiants</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lille - Sciences et Technologies</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lille1.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">staff and students</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Lille - Sciences et Technologies</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">personnels et étudiants</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
 NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
@@ -40,26 +40,26 @@ ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
 w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
 +HT9dOog
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
 NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
@@ -79,24 +79,24 @@ ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
 w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
 +HT9dOog
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille1.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lille - Sciences et Technologies</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lille - Sciences et Technologies</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>claude vieville</md:SurName>
-      <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ines wallon</md:SurName>
-      <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille1.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lille - Sciences et Technologies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lille - Sciences et Technologies</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>claude vieville</md:SurName>
+    <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ines wallon</md:SurName>
+    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
index aed6bb9f..7f67f6fc 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-littoral.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-15T17:26:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-15T17:26:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-littoral.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université du Littoral Côte d'Opale</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-littoral.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université du Littoral Côte d'Opale</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-littoral.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université du Littoral Côte d'Opale</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-littoral.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université du Littoral Côte d'Opale</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDOzCCAiOgAwIBAgIUckQ0nZQ3bw9/XmojqKebUBVcI+AwDQYJKoZIhvcNAQEF
 BQAwHzEdMBsGA1UEAwwUaWRwLnVuaXYtbGl0dG9yYWwuZnIwHhcNMTQwOTI0MTIz
 NzI3WhcNMzQwOTI0MTIzNzI3WjAfMR0wGwYDVQQDDBRpZHAudW5pdi1saXR0b3Jh
@@ -37,13 +37,13 @@ DBV+SqSgCIr5cYGH1jdWVcexJ2Mu2uuj5Gw04RBr5PkPLhgLYrxjfEE4abo33yPp
 s82vo0ov93xTva1Dvplep805AxG5l1XQZxmHrQawCUW7aQTf/oNqUQODbNXjr6Wn
 ANRboW9edeQmiV/cZeZ1
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhTCCA22gAwIBAgIQM3C+kyGnfSc/kTiiA9+naTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTIxMDAwMDAwMFoXDTE2MDEwNTIzNTk1OVowXDELMAkGA1UE
@@ -70,21 +70,21 @@ aWEV9NoSDZaqIJdSdKD9M5mWRV4z7RPQUTzW131WZUgTEjoWu7uLSf35wH1oAnxo
 we5qOyV4yEtVosxilJRh/BQNAwcQSAo/OMCjOPfzz0Vs8aUbukcnN122p23wbyPI
 HRSh/cWFEY7F
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-littoral.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université du Littoral Côte d'Opale</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université du Littoral Côte d'Opale</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-littoral.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-littoral.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-littoral.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université du Littoral Côte d'Opale</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université du Littoral Côte d'Opale</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-littoral.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-littoral.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
index 7a67ab2c..200c6459 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lyon1.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-26T16:20:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-26T16:20:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA7ElEQVQoz41SsW3DMBA8GS5+CBrgGgbi5jWFCw9CJKUFDxIgnoLfmEDWECDvkO+YghRtUSzEisDx7u/+2P39MA6MjWeSPQ5MH58b32vAro08RcOAp6yRfUPm3mMUAPoAuVihu7U2RoFlchGn61quJuj4C4DOHkDKpmHQMNSW9NbRxcPwa47h4g2AzvxMIBffI+p3X+7kot772pLeuoWz0zWrJGiUsvpV6ElgFz2Si7BcYsxrtVxs0MWn6Ivh82+YM5x90iB7hGEyrI+vRM48sySUJWbVMBTtqrtG03mO9U2oTXgV0iBMogFbzyT/VNdfIJ4V1XcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-lyon1.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA7ElEQVQoz41SsW3DMBA8GS5+CBrgGgbi5jWFCw9CJKUFDxIgnoLfmEDWECDvkO+YghRtUSzEisDx7u/+2P39MA6MjWeSPQ5MH58b32vAro08RcOAp6yRfUPm3mMUAPoAuVihu7U2RoFlchGn61quJuj4C4DOHkDKpmHQMNSW9NbRxcPwa47h4g2AzvxMIBffI+p3X+7kot772pLeuoWz0zWrJGiUsvpV6ElgFz2Si7BcYsxrtVxs0MWn6Ivh82+YM5x90iB7hGEyrI+vRM48sySUJWbVMBTtqrtG03mO9U2oTXgV0iBMogFbzyT/VNdfIJ4V1XcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-lyon1.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIE3zCCA8egAwIBAgIJAIz0IVyFIDO8MA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
 VQQGEwJGUjEPMA0GA1UECBMGRlJBTkNFMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUx
 KTAnBgNVBAoTIFVOSVZFUlNJVEUgQ0xBVURFIEJFUk5BUkQgTFlPTiAxMRowGAYD
@@ -47,21 +47,21 @@ c9cUTNP0EeRAYh7jQtNMJirphI8U43QDGdeOSytypmpQpe002c44CczDa9tkx+sT
 TFbUmmvfu3TPJmE3CXuFrt8C9wh19uNNm9uAhqU3jHjRa5n/OqQJVddhgZ8WkCsd
 dYpv
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon1.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Lyon 1 - Claude Bernard</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-lyon1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@univ-lyon1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon1.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Lyon 1 - Claude Bernard</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-lyon1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@univ-lyon1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
index 0912b624..76f0efef 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp1.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-02T12:01:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-02T12:01:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Montpellier 1</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABk0lEQVQ4y6WTu06CQRCFv1nUQhsT/VvBzkujEqzQ/DbGhMJLJCYkBB4BSiv1CYA3wBBtJEYLErURL5WGhMZLp9ZY0GhjcC2W8F9QY+I0szkz5+yeyazwTej1ZAYIgp4ygDyjuZDDUtHfK11EzRbCIN8q00TYkXIp3yWg15M5IMPfIi/lUhZAAei1ZNpDHg1CbMlpjy3BQL9bINPm0KPjiSk+yXn04ysQCcP9AwSDkE6ANQTFPbf5nI4n6godSHk8W5YhA8QWYSFqzvacf3qD6EBKgbY9hQVX48Q4TIzB27uxYM/7p2ortIQ8mB01hOI+9Ld9HxyZPDvt40tIeYDZMFjDUL2C6qW5tfEKlRO4fzTWLMut0FSIfnYEZky+uIbJcXO+qZl8ft1tUWgqtNQ9A3x7N0+PrxqscmZy9dLU7KjbQl2hWoUOcPdonr29CaERqJxCo+EQqlfOXABUqyDQ2f1cZ4kiYbitwdMLv0RWyqX8v1e5+zPh28ofbnbm6Au9vBGit28FdMpbkV0+VFGOd5tu9AudaICSH77WlwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-montp1.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Montpellier 1</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Montpellier 1</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABk0lEQVQ4y6WTu06CQRCFv1nUQhsT/VvBzkujEqzQ/DbGhMJLJCYkBB4BSiv1CYA3wBBtJEYLErURL5WGhMZLp9ZY0GhjcC2W8F9QY+I0szkz5+yeyazwTej1ZAYIgp4ygDyjuZDDUtHfK11EzRbCIN8q00TYkXIp3yWg15M5IMPfIi/lUhZAAei1ZNpDHg1CbMlpjy3BQL9bINPm0KPjiSk+yXn04ysQCcP9AwSDkE6ANQTFPbf5nI4n6godSHk8W5YhA8QWYSFqzvacf3qD6EBKgbY9hQVX48Q4TIzB27uxYM/7p2ortIQ8mB01hOI+9Ld9HxyZPDvt40tIeYDZMFjDUL2C6qW5tfEKlRO4fzTWLMut0FSIfnYEZky+uIbJcXO+qZl8ft1tUWgqtNQ9A3x7N0+PrxqscmZy9dLU7KjbQl2hWoUOcPdonr29CaERqJxCo+EQqlfOXABUqyDQ2f1cZ4kiYbitwdMLv0RWyqX8v1e5+zPh28ofbnbm6Au9vBGit28FdMpbkV0+VFGOd5tu9AudaICSH77WlwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-montp1.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Montpellier 1</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUDCCAjigAwIBAgIVAJOMiotpzQ96F7hbDILKKowOjLKeMA0GCSqGSIb3DQEB
 BQUAMCQxIjAgBgNVBAMMGWZlZGVyYXRpb24udW5pdi1tb250cDEuZnIwHhcNMTUw
 NzEzMDk0MjUzWhcNMzUwNzEzMDk0MjUzWjAkMSIwIAYDVQQDDBlmZWRlcmF0aW9u
@@ -38,13 +38,13 @@ uRhyMT0WXbmpEtEtL+3eLDN2YpysNtXB720WmgMJNot0N/od5t6HZ/qX73RqfDEp
 QG7nmiGC7F4dtqNbseQfiUXBJ3zyqnYp/Foxrj4CCXr7u7LphFwVD1S9P2XEAU7+
 jrnOFBPNFh4Y2Am2S7HRRZgtL0oPhJX8iPweocqY1nZy/RZs
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
@@ -71,23 +71,23 @@ sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
 UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
 tMVy28FqAhY=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUDCCAjigAwIBAgIVAJOMiotpzQ96F7hbDILKKowOjLKeMA0GCSqGSIb3DQEB
 BQUAMCQxIjAgBgNVBAMMGWZlZGVyYXRpb24udW5pdi1tb250cDEuZnIwHhcNMTUw
 NzEzMDk0MjUzWhcNMzUwNzEzMDk0MjUzWjAkMSIwIAYDVQQDDBlmZWRlcmF0aW9u
@@ -107,13 +107,13 @@ uRhyMT0WXbmpEtEtL+3eLDN2YpysNtXB720WmgMJNot0N/od5t6HZ/qX73RqfDEp
 QG7nmiGC7F4dtqNbseQfiUXBJ3zyqnYp/Foxrj4CCXr7u7LphFwVD1S9P2XEAU7+
 jrnOFBPNFh4Y2Am2S7HRRZgtL0oPhJX8iPweocqY1nZy/RZs
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
@@ -140,19 +140,19 @@ sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
 UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
 tMVy28FqAhY=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Montpellier 1</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-montp1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-montp1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Montpellier 1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-montp1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-montp1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
index 7026c3e9..217e68f8 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp3.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-23T15:18:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-23T15:18:07Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Montpellier 3</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACK0lEQVQoz2VSXUiTURh+vnO+99tczlQSXWu0NprV5lrZTBizkkXWQEkLL5LotggyiqQLb7rpoqCrCm+qiyDpDy8kSCqWF9rS7D+FZfa1UX3aXFNkkVtfF5uzbx1eOOc8h+d93ud9j6AoCoBzNx5d7RsGAAiA6nPbznQEBp5PXL47CABA50F/16GdAMTsHZyDJCytJl9N0Of6MpNcBjnP7jmCyrhKlD0LgrCl2gJgPBbPgypjGgI4V8Xc2/YNlkaPXZ5OXn/8Jg/mFXI8MAaRQASR9vudEvHewfedbT6doQhEIMKSAltOQASR3OvNJ1vqf6czt4Ymug74dnnsEAkigRUqcBBJRfrjQa/I2f1wpL3BWayXgnUOEFmqyr0Os8aDtap0s92kI97uqx77PNN9L3zYvxFAcKtNmUsd3e2Wv8c1CkcaNnW31isLi30vpvpfyxnGUxkVgLWiJCzHradv3hn9pCGs0FHrNtvUxY7yEoOprPhsizf0cTqWWABQa6tcFPh/prPNBsais+cfvjvW+2wkOtv/Ngag2WPlErHCti79ilMB54mAi4iI6MGHrwDq1q0ylRlZwaSvDU/uqVnbdCVkLjWMK0kiCcCQnJj/lTbqxb0uC2OqRkH+mbr9KnaprbbZvWalQU8SkURg/ElEAbDPuZoXlMQ47wnLL7/NXXg6OZ+GSJSNgcgPAI2OSp0kakoSOE8z3jMS5RL96yokJzJ/VKNO3GGvyCJ/AXntoub2TxErAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAw2EssoQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMKkWlB0AAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-montp3.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Montpellier 3</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Montpellier 3</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACK0lEQVQoz2VSXUiTURh+vnO+99tczlQSXWu0NprV5lrZTBizkkXWQEkLL5LotggyiqQLb7rpoqCrCm+qiyDpDy8kSCqWF9rS7D+FZfa1UX3aXFNkkVtfF5uzbx1eOOc8h+d93ud9j6AoCoBzNx5d7RsGAAiA6nPbznQEBp5PXL47CABA50F/16GdAMTsHZyDJCytJl9N0Of6MpNcBjnP7jmCyrhKlD0LgrCl2gJgPBbPgypjGgI4V8Xc2/YNlkaPXZ5OXn/8Jg/mFXI8MAaRQASR9vudEvHewfedbT6doQhEIMKSAltOQASR3OvNJ1vqf6czt4Ymug74dnnsEAkigRUqcBBJRfrjQa/I2f1wpL3BWayXgnUOEFmqyr0Os8aDtap0s92kI97uqx77PNN9L3zYvxFAcKtNmUsd3e2Wv8c1CkcaNnW31isLi30vpvpfyxnGUxkVgLWiJCzHradv3hn9pCGs0FHrNtvUxY7yEoOprPhsizf0cTqWWABQa6tcFPh/prPNBsais+cfvjvW+2wkOtv/Ngag2WPlErHCti79ilMB54mAi4iI6MGHrwDq1q0ylRlZwaSvDU/uqVnbdCVkLjWMK0kiCcCQnJj/lTbqxb0uC2OqRkH+mbr9KnaprbbZvWalQU8SkURg/ElEAbDPuZoXlMQ47wnLL7/NXXg6OZ+GSJSNgcgPAI2OSp0kakoSOE8z3jMS5RL96yokJzJ/VKNO3GGvyCJ/AXntoub2TxErAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAw2EssoQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMKkWlB0AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-montp3.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Montpellier 3</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKDCCAhCgAwIBAgIJAOUsRys+9vr2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0xNTEyMjExMzAzMjlaFw0xODEyMjAx
 MzAzMjlaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJKoZI
@@ -37,13 +37,13 @@ S2RyLxCNaG735iyf02pouXs/vGDaVj8q5Ime/lR/mpODOKQk5lJP9Z4U3xJamQd6
 zLXKMS8vUj2HIydQGDEuXNg0DT1j3c22b/tPPgfv0ZSDfLeHYTb7D+H3+sZdgeCv
 DanziiDRT48w7pw7CXw6+cSSmi8dtXnkK5kk1sS2DBFmroJ+IEFYvP7ZxmI=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
@@ -70,23 +70,23 @@ Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
 94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
 9m9urGFyfVe5MQM=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-montp3.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-montp3.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDKDCCAhCgAwIBAgIJAOUsRys+9vr2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0xNTEyMjExMzAzMjlaFw0xODEyMjAx
 MzAzMjlaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJKoZI
@@ -105,13 +105,13 @@ S2RyLxCNaG735iyf02pouXs/vGDaVj8q5Ime/lR/mpODOKQk5lJP9Z4U3xJamQd6
 zLXKMS8vUj2HIydQGDEuXNg0DT1j3c22b/tPPgfv0ZSDfLeHYTb7D+H3+sZdgeCv
 DanziiDRT48w7pw7CXw6+cSSmi8dtXnkK5kk1sS2DBFmroJ+IEFYvP7ZxmI=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
@@ -138,19 +138,19 @@ Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
 94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
 9m9urGFyfVe5MQM=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-montp3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Montpellier 3</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 3</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-montp3.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-montp3.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-montp3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Montpellier 3</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 3</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-montp3.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-montp3.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
index c9657822..49e6362c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-nantes.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-23T15:56:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-23T15:56:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nantes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nantes (FRANCE)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABC0lEQVQoz2PkkvRjIAUwkaSagYGBhZWDRUZKHMK5f+8pshwrBwsP17c/vxg/f2FFsaEg3W/lrFI0k+Rlv0qJfuTj/m1m+LY4/Yag0C+oht8//hw7eY2BgeHJs5fIZj97zf/wMffDx9x7D0tcuCbQWHKOlYMFxQ+/f/xBZiNzz10VEuD9JyX6kVhPf/nGxcDAoKLwGUUDxEYSghXZDURpwG/Dh89MCA2nLtxhYGCAxwZWIMD7D6HhybOXx8/eNDNQIcY2ZlZe9X9//t289zzU34afj/vbzz9yspKiwoIvX76FK5KV/Oxk/ZKZkfn6PV5G5MQHMRjT97w8vyGMH384UazGFVBIaekPyakVAEkXYeg1Yfc8AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-nantes.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students and staff belonging to University of Nantes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Nantes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et personnels de l'Université de Nantes</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nantes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Nantes (FRANCE)</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABC0lEQVQoz2PkkvRjIAUwkaSagYGBhZWDRUZKHMK5f+8pshwrBwsP17c/vxg/f2FFsaEg3W/lrFI0k+Rlv0qJfuTj/m1m+LY4/Yag0C+oht8//hw7eY2BgeHJs5fIZj97zf/wMffDx9x7D0tcuCbQWHKOlYMFxQ+/f/xBZiNzz10VEuD9JyX6kVhPf/nGxcDAoKLwGUUDxEYSghXZDURpwG/Dh89MCA2nLtxhYGCAxwZWIMD7D6HhybOXx8/eNDNQIcY2ZlZe9X9//t289zzU34afj/vbzz9yspKiwoIvX76FK5KV/Oxk/ZKZkfn6PV5G5MQHMRjT97w8vyGMH384UazGFVBIaekPyakVAEkXYeg1Yfc8AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-nantes.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students and staff belonging to University of Nantes</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Nantes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Etudiants et personnels de l'Université de Nantes</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUXhtC9sGfg8MZ1QOlWpmnARmmHMYwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZyMB4XDTA5MDMzMTA4MTA1
 OVoXDTI5MDMzMTA4MTA1OVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZy
@@ -40,21 +40,21 @@ pF1bmgLeWzeQlAtCz8sNNPwXDvAVbBLLHXnOUa8V9TzhaPlInHHhUs6DLNdGml/9
 fLM8XuyqV7zxR0P8IGEgoEuNDgaBilEU3IeExFo/eOojuKJbQkV9w18Q5cxIzGPR
 9yMUR1nBIg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-nantes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Nantes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Nantes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-nantes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>shibboleth@univ-nantes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-nantes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Nantes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Nantes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-nantes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>shibboleth@univ-nantes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
index 9a223a44..ee441558 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-paris1.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-30T20:41:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-30T20:41:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Paris 1 Panthéon-Sorbonne University</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQElEQVQ4y7WQvyuFYRzFP+dxvW8pKSXJ3WTgDxBJZkXpbiaTYrLKJLL68Q4mi4HNKllsXrcMUpSs10R2P+57DH5eupernOl5vuc8n87zhf/UySodxYR8rUyullkm7nnJ3Jf+BHBgAdMIHFTLhGpGmkRjoCFQf5pEhbobBMhwtmF0G8R93QDbzUglObvGtNQPIEwLDVuAfQrs/HoHx+tRt3D+A0Zbuhr1/AiwUboeL9i6gND1NpfUiXR2vBYv2+jzm4bPl5HWaE6EJUnfmkkKSEPXxYawuV8+fJ+/HYoJeTu+BDWBH4Fdw5EgwwwiCqDY9pPk3v7Zh6vKJWbxOOJO9gr4zlJBKHn9XGo8L9OCmJSZABYrABbnMtuGKRTav/QfEBpAvhFsGaXvVprk+kKWmzEeRZU7qaEM2JPKG7/MV9cz925uhXlAUDYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Students, faculty, staff and affiliate people from Paris 1 Panthéon-Sorbonne university</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels, enseignants, chercheurs, étudiants, hébergés et invités de l'université Paris 1 Panthéon-Sorbonne</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Paris 1 Panthéon-Sorbonne University</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQElEQVQ4y7WQvyuFYRzFP+dxvW8pKSXJ3WTgDxBJZkXpbiaTYrLKJLL68Q4mi4HNKllsXrcMUpSs10R2P+57DH5eupernOl5vuc8n87zhf/UySodxYR8rUyullkm7nnJ3Jf+BHBgAdMIHFTLhGpGmkRjoCFQf5pEhbobBMhwtmF0G8R93QDbzUglObvGtNQPIEwLDVuAfQrs/HoHx+tRt3D+A0Zbuhr1/AiwUboeL9i6gND1NpfUiXR2vBYv2+jzm4bPl5HWaE6EJUnfmkkKSEPXxYawuV8+fJ+/HYoJeTu+BDWBH4Fdw5EgwwwiCqDY9pPk3v7Zh6vKJWbxOOJO9gr4zlJBKHn9XGo8L9OCmJSZABYrABbnMtuGKRTav/QfEBpAvhFsGaXvVprk+kKWmzEeRZU7qaEM2JPKG7/MV9cz925uhXlAUDYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Students, faculty, staff and affiliate people from Paris 1 Panthéon-Sorbonne university</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnels, enseignants, chercheurs, étudiants, hébergés et invités de l'université Paris 1 Panthéon-Sorbonne</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
 OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
@@ -40,23 +40,23 @@ YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
 Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
 yutCRUw+eg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris1.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris1.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
 BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
 OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
@@ -76,19 +76,19 @@ YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
 Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
 yutCRUw+eg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris1.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-paris1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-paris1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris1.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-paris1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-paris1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
index 58ce773d..0bd4d58c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-poitiers.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-18T10:46:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-18T10:46:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-poitiers.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-poitiers.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Poitiers</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB50lEQVQ4y52ST0tUURjGf+/5c++YFGMxKZhWy2zhJmyTtIoiiPat2gQS2KJFBX2CAvETBBK0qqBFBEFNBEUMuDOKFgmFGdiMcXVGvePc87aYSb1KZL2bA+c8z+/9d+T+nRvXjMgE4NhliABKmsGYMSITIrJrM4AqiEhs0EkHOFVlPV0lZNkOsfURWasJunlnrMXHXYAUHMB6usr5y9cp9Q/SaqYoICL4KOZ95TVDJ04RQkYIAec81e9zPJuaxMcFdQDWRcy8K7O3uJ+RMxcBqCc/mS4/pTr/laS6wNDIKD2lPr7NfuLj9Bus9/B7cMZa5j9/YK2xxPGTp+neV2wLK2WiQje1+S/UkxpnL43x6uE9Qsiwrg0wW/uyPuqMGMQYrIs6p0ekLW2bN2du+MeQToL/BmyPHQD5o1T/DhAga7U2StUNk+J8DECrmebS5AHGkixWASge6KW52qDVTFlrLHP42DAr9aUdFeS+sPMRleePOHT1NqX+QS5cuUVSW6Cn1EfvwFHKj6dwUZxv+cHdm7q1u5C1dzw8eo6DA0dwPqaeLDLz9gU/5ma3A9ZcQNeNGK8djLGWEDKmXz5BQ4aqImKw3ufMxggadMVYkXFUV7buV0RwPsLHXUSFPfi4gDE2965BlzUw/gtzXK+1ooP+ugAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-poitiers.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Poitiers</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-poitiers.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-poitiers.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Poitiers</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB50lEQVQ4y52ST0tUURjGf+/5c++YFGMxKZhWy2zhJmyTtIoiiPat2gQS2KJFBX2CAvETBBK0qqBFBEFNBEUMuDOKFgmFGdiMcXVGvePc87aYSb1KZL2bA+c8z+/9d+T+nRvXjMgE4NhliABKmsGYMSITIrJrM4AqiEhs0EkHOFVlPV0lZNkOsfURWasJunlnrMXHXYAUHMB6usr5y9cp9Q/SaqYoICL4KOZ95TVDJ04RQkYIAec81e9zPJuaxMcFdQDWRcy8K7O3uJ+RMxcBqCc/mS4/pTr/laS6wNDIKD2lPr7NfuLj9Bus9/B7cMZa5j9/YK2xxPGTp+neV2wLK2WiQje1+S/UkxpnL43x6uE9Qsiwrg0wW/uyPuqMGMQYrIs6p0ekLW2bN2du+MeQToL/BmyPHQD5o1T/DhAga7U2StUNk+J8DECrmebS5AHGkixWASge6KW52qDVTFlrLHP42DAr9aUdFeS+sPMRleePOHT1NqX+QS5cuUVSW6Cn1EfvwFHKj6dwUZxv+cHdm7q1u5C1dzw8eo6DA0dwPqaeLDLz9gU/5ma3A9ZcQNeNGK8djLGWEDKmXz5BQ4aqImKw3ufMxggadMVYkXFUV7buV0RwPsLHXUSFPfi4gDE2965BlzUw/gtzXK+1ooP+ugAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-poitiers.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Poitiers</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEsDCCA5igAwIBAgIQUMcwKhTYAJRU4aUw5HaMrDANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -47,13 +47,13 @@ WxJcX4OyP3Ryyoc1e+ElHZdGRjKKpDd24hKUHiBtwaiio4jXRSzVw7dUUblKCMVN
 27h8pxrE4bUEWHkfxXKfWihDx6GPfk+exNY0mhn1Eunh288jAyt96C7uq2rXL9wg
 Yjdn9A==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDRzCCAi+gAwIBAgIUXgDtqsSuMG9ToiX/PwcpOmY+zGswDQYJKoZIhvcNAQEL
 BQAwIjEgMB4GA1UEAwwXc2hpYmJvLnVuaXYtcG9pdGllcnMuZnIwHhcNMTYwNTEx
 MDk0NjI4WhcNMzYwNTExMDk0NjI4WjAiMSAwHgYDVQQDDBdzaGliYm8udW5pdi1w
@@ -73,26 +73,26 @@ MhQQDq1GcOgSjbj39LIpy8QhkgZE2dZh1JxUyMPzhI8ks1jpaInjxd5/1fmKorKn
 lyH/XTi75Xk6NvLf+EZEXEyttrgK7QHpR7XeFUKbbExE4tdJFyBwpe9nKxS/OEMW
 uYwfqhCUk5GVdeGrYV0hfyp0JQelh7MjWoqw
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Poitiers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Poitiers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-poitiers.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Duthilleul Benjamin</md:SurName>
-      <md:EmailAddress>benjamin.duthilleul@univ-poitiers.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Lionel Lombardi</md:SurName>
-      <md:EmailAddress>lionel.lombardi@univ-poitiers.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-poitiers.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Poitiers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Poitiers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-poitiers.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Duthilleul Benjamin</md:SurName>
+    <md:EmailAddress>benjamin.duthilleul@univ-poitiers.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lionel Lombardi</md:SurName>
+    <md:EmailAddress>lionel.lombardi@univ-poitiers.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
index af694511..846c420a 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reims.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-27T15:31:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-27T15:31:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Reims Champagne-Ardenne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAcElEQVQY02NgoBloO5vaf8oPzl00b9f/6t3/56wqBvFcF/fe+7/3f82OP8f+b5kxlYFB+QeQu/t/5c5Pp3/u/H8EqCT8/4szj+617Dz2acf/J6IgTW73353au+fA4SNftvNCTY1ZtH7N2tWTLanlaAC+9DhgiXGMJgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-reims.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Reims Champagne-Ardenne</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Reims Champagne-Ardenne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAcElEQVQY02NgoBloO5vaf8oPzl00b9f/6t3/56wqBvFcF/fe+7/3f82OP8f+b5kxlYFB+QeQu/t/5c5Pp3/u/H8EqCT8/4szj+617Dz2acf/J6IgTW73353au+fA4SNftvNCTY1ZtH7N2tWTLanlaAC+9DhgiXGMJgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-reims.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Reims Champagne-Ardenne</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
 MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
@@ -38,23 +38,23 @@ L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
 /M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
 Eby/Nw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
 MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
@@ -74,24 +74,24 @@ L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
 /M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
 Eby/Nw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reims.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Reims Champagne-Ardenne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Reims Champagne-Ardenne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-reims.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Dere Kevin</md:SurName>
-      <md:EmailAddress>kevin.dere@univ-reims.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Canart Arnaud</md:SurName>
-      <md:EmailAddress>arnaud.canart@univ-reims.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reims.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Reims Champagne-Ardenne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Reims Champagne-Ardenne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-reims.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Dere Kevin</md:SurName>
+    <md:EmailAddress>kevin.dere@univ-reims.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Canart Arnaud</md:SurName>
+    <md:EmailAddress>arnaud.canart@univ-reims.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
index 4e4d6392..1461cc52 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rennes1.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-19T16:25:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-19T16:25:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Rennes 1</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQ4y92S3UtTcRjHv7+1ae0t6GVG/0Bd6cqmIrbONIw2KUpCiZWzSKGkRLwogi5CCCLDm4IuRjfSTWJBLikiLMvAGkl100VQXXXh2dlLZ7/tnG3fLnSmQlBBNz23z/N53r5f4P8KUgVJUGpr0uq3ejILSm0hZ2ZASjCXXMFYf8IEIKthpt7Baq1wrbdVnujuibYFQ5PMpcY6jnZNbqnyfKyv870nZVSIdQAAsdTA0NAabM9YLELm88ZmALA77G8OhIJD6Ux667PnL+smYuPdQBEo0CVs7gwAWBam59DeGblbKBScZVgIgaye3fXk6dT5/a375shS8NrVkZMAUYaXnUAUC6YXAKo8nqmNmzZ8amzwxaK3R8dVVW1IJucrYg/vbd/bEkq8jscV5jPHRKULSxsAJSj+psveHdX9brfz8ecvX70PYo/OOZ3ODyQxdGX4FkxT89XW9qrzarjndN8lUl+lgK6DzKOz48hIpCs8SiOJ+Ox0W0DxM6D4efHC4AClhpZmxTx86OBbUq5UQTgci8/Ub4JFHTaBnTU1E7ubGgemX8xcn3k1O3zqTP+2UqlkNU3D+LUXEolFScvySkSOh2+UN2kO7OH9sTvB5TW/YTAJmnLt2b7eQRrf7avN9AeNUn8H/tP4AX438DbsXuD8AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">University of Rennes 1</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Rennes 1</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Université de Rennes 1</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Rennes 1</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQ4y92S3UtTcRjHv7+1ae0t6GVG/0Bd6cqmIrbONIw2KUpCiZWzSKGkRLwogi5CCCLDm4IuRjfSTWJBLikiLMvAGkl100VQXXXh2dlLZ7/tnG3fLnSmQlBBNz23z/N53r5f4P8KUgVJUGpr0uq3ejILSm0hZ2ZASjCXXMFYf8IEIKthpt7Baq1wrbdVnujuibYFQ5PMpcY6jnZNbqnyfKyv870nZVSIdQAAsdTA0NAabM9YLELm88ZmALA77G8OhIJD6Ux667PnL+smYuPdQBEo0CVs7gwAWBam59DeGblbKBScZVgIgaye3fXk6dT5/a375shS8NrVkZMAUYaXnUAUC6YXAKo8nqmNmzZ8amzwxaK3R8dVVW1IJucrYg/vbd/bEkq8jscV5jPHRKULSxsAJSj+psveHdX9brfz8ecvX70PYo/OOZ3ODyQxdGX4FkxT89XW9qrzarjndN8lUl+lgK6DzKOz48hIpCs8SiOJ+Ox0W0DxM6D4efHC4AClhpZmxTx86OBbUq5UQTgci8/Ub4JFHTaBnTU1E7ubGgemX8xcn3k1O3zqTP+2UqlkNU3D+LUXEolFScvySkSOh2+UN2kO7OH9sTvB5TW/YTAJmnLt2b7eQRrf7avN9AeNUn8H/tP4AX438DbsXuD8AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">University of Rennes 1</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Université de Rennes 1</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Université de Rennes 1</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
 MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
@@ -40,23 +40,23 @@ SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
 +2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
 rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.univ-rennes1.fr/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.univ-rennes1.fr/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
 BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
 MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
@@ -76,19 +76,19 @@ SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
 +2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
 rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ident-shib.univ-rennes1.fr/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Rennes 1</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Rennes 1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ident-shib.univ-rennes1.fr/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Rennes 1</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Rennes 1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
index 11b4ce76..b27aab97 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reunion.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-10T15:52:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-10T15:52:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Reunion Island</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz22RS08TYRiF32/mm+mNTtuhtBTaQoFwEVtBAS0SlUgkYWMiG0xYuDGuu/QHuHBrXKBbFpq4MqAS1BgSUxCN2hKQS6BKoRd6ZabTTmc6My40hhie9XNyknNQaC5CIBhpbbjkZQ8OjpZ2MqsVw/x2AU6jmaExArjd5323sPLqxdFieIMrixf9rdNjN55G8v/ZjI70WXW4r8nKJ9LP33y2mYzBM205TohuH9os4YDnfDRd/md32w3trN6qJ4lBt+3D6paTZUYHuiau+Ad6WjqbHR+/bk8HGgCAJlHQY757wem10GaarMgKZvV4L56ZGh8kCaKrwxXsb+v0OT+txyZ7WEaPk7wUjnNcVWH0uCDWoqkSBoTC0d3DZHF0oNPf1dThNLffCja7bJmStJmtuBk64DStHpbcDBXe5zTQcPy4Ikpylit924yPttTJ2V3c6y/wQpGvpUoSJ9bsJooi0LO1HADU0Qgv7+cXZ0KcUJkMzfw61zhkd4CmNTrYHIm8Ft38Vn4jUzm5Fd7LCz7WNBFoe3R/any4l9JqAmV4sJZ+u5s89QoUmosAQHu9acjD5ivaZrby5Etqv1ilSKSomqoBjQmniYoVRIpERkz8DfwhxhHDXitJQEaQE7x01mHMCjUjTSR4KZoqX2+zvN7O4ZN1sYLIVQuSoqYFudtu+JEpZ4RaVVFpEgmysnLAl2UVA4BvJ6ITBQB4KXVodtbN0KoGwx4mVhQ77YZeh3E3L97s1s1GMoe8hAFgbGHWlYoBwHL/nXip1WXVK1x1LUFRJCqrWloDTKIdSTFU1caGFgwApK+dvnYZSPKxUAI1qv5MIr0BGeqV71Fq5KpWFpDZrB4f147iD4fuYQBQ8zl5fRU1ujShDIqiCSXCaoNUQjtKy0vvgSCAIKFaVUURAH4DUkdAsE8XlkoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-reunion.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de la Réunion</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Reunion Island</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz22RS08TYRiF32/mm+mNTtuhtBTaQoFwEVtBAS0SlUgkYWMiG0xYuDGuu/QHuHBrXKBbFpq4MqAS1BgSUxCN2hKQS6BKoRd6ZabTTmc6My40hhie9XNyknNQaC5CIBhpbbjkZQ8OjpZ2MqsVw/x2AU6jmaExArjd5323sPLqxdFieIMrixf9rdNjN55G8v/ZjI70WXW4r8nKJ9LP33y2mYzBM205TohuH9os4YDnfDRd/md32w3trN6qJ4lBt+3D6paTZUYHuiau+Ad6WjqbHR+/bk8HGgCAJlHQY757wem10GaarMgKZvV4L56ZGh8kCaKrwxXsb+v0OT+txyZ7WEaPk7wUjnNcVWH0uCDWoqkSBoTC0d3DZHF0oNPf1dThNLffCja7bJmStJmtuBk64DStHpbcDBXe5zTQcPy4Ikpylit924yPttTJ2V3c6y/wQpGvpUoSJ9bsJooi0LO1HADU0Qgv7+cXZ0KcUJkMzfw61zhkd4CmNTrYHIm8Ft38Vn4jUzm5Fd7LCz7WNBFoe3R/any4l9JqAmV4sJZ+u5s89QoUmosAQHu9acjD5ivaZrby5Etqv1ilSKSomqoBjQmniYoVRIpERkz8DfwhxhHDXitJQEaQE7x01mHMCjUjTSR4KZoqX2+zvN7O4ZN1sYLIVQuSoqYFudtu+JEpZ4RaVVFpEgmysnLAl2UVA4BvJ6ITBQB4KXVodtbN0KoGwx4mVhQ77YZeh3E3L97s1s1GMoe8hAFgbGHWlYoBwHL/nXip1WXVK1x1LUFRJCqrWloDTKIdSTFU1caGFgwApK+dvnYZSPKxUAI1qv5MIr0BGeqV71Fq5KpWFpDZrB4f147iD4fuYQBQ8zl5fRU1ujShDIqiCSXCaoNUQjtKy0vvgSCAIKFaVUURAH4DUkdAsE8XlkoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-reunion.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de la Réunion</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
 OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
@@ -38,23 +38,23 @@ hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
 gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
 FChXMMiPA+POOLIC
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reunion.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reunion.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
 OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
@@ -74,19 +74,19 @@ hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
 gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
 FChXMMiPA+POOLIC
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de la Réunion</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de la Réunion</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-reunion.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>dsi-si@listes.univ-reunion.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de la Réunion</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de la Réunion</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-reunion.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>dsi-si@listes.univ-reunion.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
index 51202471..9f2ef8c4 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rouen.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-20T15:48:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-20T15:48:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Rouen</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAADfSURBVCjPhdHBKoRhFMbxn7eRRlJjQSlkY2+lWbkFG9aWcgGuQCkLxQXIxk5cwqxcABbExo5mYmH0NZPGsZivb3w0PGdxek//97xPz8uuc1XsCyG8WMaqTGg7SHZMCQPFt9OE7WTUXxpL/lHl1yR8gsy9dwuVIRebtjR0zA4D7tyChwEwUvSEMGfTjJsB0Mp7V4ZJR9bQI1ybxopnIZypou4tD07oWEey4dieRYokcyBcWvphsgD6HuounGhoqpp3pVkOpl89rx49aamXN2TGQVJTQ7v01EdyKBv6EV2nX1OIUOUJ197xAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-rouen.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Rouen</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Rouen</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAADfSURBVCjPhdHBKoRhFMbxn7eRRlJjQSlkY2+lWbkFG9aWcgGuQCkLxQXIxk5cwqxcABbExo5mYmH0NZPGsZivb3w0PGdxek//97xPz8uuc1XsCyG8WMaqTGg7SHZMCQPFt9OE7WTUXxpL/lHl1yR8gsy9dwuVIRebtjR0zA4D7tyChwEwUvSEMGfTjJsB0Mp7V4ZJR9bQI1ybxopnIZypou4tD07oWEey4dieRYokcyBcWvphsgD6HuounGhoqpp3pVkOpl89rx49aamXN2TGQVJTQ7v01EdyKBv6EV2nX1OIUOUJ197xAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-rouen.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Rouen</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
 WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
@@ -38,23 +38,23 @@ XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
 yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
 jf6+
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-rouen.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-rouen.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
 BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
 WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
@@ -74,19 +74,19 @@ XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
 yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
 jf6+
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Rouen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Rouen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-rouen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>systeme@univ-rouen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Rouen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Rouen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-rouen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>systeme@univ-rouen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
index 45dce69a..c46b568c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-st-etienne.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T14:19:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T14:19:31Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-st-etienne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABvUlEQVQoz7VSvY4SYRS9d2Y+vmGGAcRFFxZConELoxs1FsbWysLCF7DWV/B9fAwbbSxM1JjVQHRXZEFgFxCGme935lqYkFUrCm937z0n5yTnIBHBNuNshQYAj4gQ8dyFlM4SZZS2RMQ8N/QLRe5tMJjn+e8ly/PTn0l/smAeRkXuc4YIxuarVAppr7XqF8sBAHiAAADLRPZOTkWq7uy3SyH/18n7LydS2b16GYnys2XaG0wDZA7iMlaD0WKnFl7f3201quc5b7uDg6tNRyjbny6YcTzXHU1Wt2/s3T1ohwEfT1d/iexUAiENHo1mmbHzmRiOV48f3ty8X77uHg8WvOCuU/PsyX0A+Px90rl0wYulNCvbblY5L4J+AQyePi93GsVWs+Jzz5hMCA0AJsvWQhc580q+zwIY/lhGkf+ue28Zi0cPnE6retyfo4vMc5mLZ/N1bzy7daWBiCC1efOpbzJLRFpnQhqpDBElqZbKKmU+fh2++nCUCk1ERIQ55VLZw28TXnDqlVIUcuY6UttYqEWcxonuXK7t1iLH2QRHOQISUJLqeSziVNks58yLAl4p8dAv/NkDwP9evq0JvwB5p+5AaVPc7QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNiswMjowMIpzAwYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDYrMDI6MDD7Lru6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-st-etienne.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-st-etienne.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABvUlEQVQoz7VSvY4SYRS9d2Y+vmGGAcRFFxZConELoxs1FsbWysLCF7DWV/B9fAwbbSxM1JjVQHRXZEFgFxCGme935lqYkFUrCm937z0n5yTnIBHBNuNshQYAj4gQ8dyFlM4SZZS2RMQ8N/QLRe5tMJjn+e8ly/PTn0l/smAeRkXuc4YIxuarVAppr7XqF8sBAHiAAADLRPZOTkWq7uy3SyH/18n7LydS2b16GYnys2XaG0wDZA7iMlaD0WKnFl7f3201quc5b7uDg6tNRyjbny6YcTzXHU1Wt2/s3T1ohwEfT1d/iexUAiENHo1mmbHzmRiOV48f3ty8X77uHg8WvOCuU/PsyX0A+Px90rl0wYulNCvbblY5L4J+AQyePi93GsVWs+Jzz5hMCA0AJsvWQhc580q+zwIY/lhGkf+ue28Zi0cPnE6retyfo4vMc5mLZ/N1bzy7daWBiCC1efOpbzJLRFpnQhqpDBElqZbKKmU+fh2++nCUCk1ERIQ55VLZw28TXnDqlVIUcuY6UttYqEWcxonuXK7t1iLH2QRHOQISUJLqeSziVNks58yLAl4p8dAv/NkDwP9evq0JvwB5p+5AaVPc7QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNiswMjowMIpzAwYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDYrMDI6MDD7Lru6AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-st-etienne.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDODCCAiCgAwIBAgIJAKRhyHl9TUy1MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMTFmlkcC51bml2LXN0LWV0aWVubmUuZnIwHhcNMTQxMjExMDkwODE5WhcNMTcx
 MjEwMDkwODE5WjAhMR8wHQYDVQQDExZpZHAudW5pdi1zdC1ldGllbm5lLmZyMIIB
@@ -38,13 +38,13 @@ y+sDX87f4KU2fKpVjS1OOZv1a9f+U9wRnOXjuTVVr50lj4YdjzVq5g9TGxF3n8Qk
 3My8dpA9BiKR9vHvNPiGJPfruPZnK6WpjX+Q35KHrKNCquj5L09GW3OviRgRkUlu
 8CBvzFGfIhN9GDZ3
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDWDCCAkCgAwIBAgIVAM60eJPNg42CHzM+jgGiPUF8XxVEMA0GCSqGSIb3DQEB
 BQUAMCYxJDAiBgNVBAMTG2lwZC10ZXN0LnVuaXYtc3QtZXRpZW5uZS5mcjAeFw0x
 MDAxMjcxMzMzMTNaFw0zMDAxMjcxMzMzMTNaMCYxJDAiBgNVBAMTG2lwZC10ZXN0
@@ -64,26 +64,26 @@ XzRKyPJ2OmxEL3ly8pKUd0a3fXJZTOikICLLYezOdV2V/QLheIvMfZlhZ1uUhVGB
 J/tcRGvcPSvO9TGVGz+0YVsDmcGrfiHcokztEZ6Z7ADLep/iXMTpS331wYizQ7Oc
 I5j1CmAlzfvcYGPy6fOMCjINmd75Sez4RvGbVAQE/tRIM+6ButzQ6Lymrk4=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-st-etienne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Saint-Etienne - Jean Monnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-st-etienne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Murgue Thierry</md:SurName>
-      <md:EmailAddress>thierry.murgue@univ-st-etienne.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Valeille Jean-François</md:SurName>
-      <md:EmailAddress>jean.francois.valeille@univ-st-etienne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-st-etienne.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Saint-Etienne - Jean Monnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-st-etienne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Murgue Thierry</md:SurName>
+    <md:EmailAddress>thierry.murgue@univ-st-etienne.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Valeille Jean-François</md:SurName>
+    <md:EmailAddress>jean.francois.valeille@univ-st-etienne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
index c4e585bb..67786d60 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-tln.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-28T11:55:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-28T11:55:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tln.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université du Sud Toulon Var</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJElEQVQoz32STUiUURSG33vPvfPN3zeW8SWOyZAomFrTBGFJC0NN0kJKiKBW1j5atCmDBoooWwYJLUKoRcZAJJn0A1ExtShRQUT8gagpLEPImnF+7r0tpszJ6nAWB877HN5zOOz83eH6qvVNNWXRe6PSaEEc/4iM0q21QdH9ZBIPJiqDgUsdW2/Hp/tHEnAR2N+ItAoVeThJIp+cXkh29j5LKX1oZwUswSWRJJIEAwA/a0nEmcjDxBm8cmBmHtqU2O65ZIYYVEb1tNdlcurMwwmSlFcWOCbOSPC8GgByujUSag6XI6eXNWK1Vfq1AHnllnMDYCCP/B+gTAHzR5cXSo1SutRvKbNqijaA+Q0YQGVUuNjfVhP8uLhEDCsZZdBeVYKcySrNASildTIb3VtbFwwMjr0XxJVB0HavZO5Pf755vKElEuIqmd1dXvz0VEv/67e3ht9VO/5QkQdp1VblQOsVpszR3uevpubEnWMNTpGn8cpjCFbt2PWVTl989nC4bOF7enmxinX27PxXuGUqleZTnxYbLz+Ciwd81tl9m/tezEDpE3tqY2MfeP6vNCKOb2PAA2MYGD89NA6/C0LETzYfufESFlVvWON1EbTJ35aIxUYT0f1hJLMABIjDsC8XOnZcHIJgSKurndvi4wkQU8v+GXLJpQPby5XS3Odzfes52B17M7WYst2y2LGbNpVeG0lYPtdaS+QzYFtdgxPXu3blGPsB3tjPFvOp0QsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-tln.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université du Sud Toulon Var</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tln.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université du Sud Toulon Var</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJElEQVQoz32STUiUURSG33vPvfPN3zeW8SWOyZAomFrTBGFJC0NN0kJKiKBW1j5atCmDBoooWwYJLUKoRcZAJJn0A1ExtShRQUT8gagpLEPImnF+7r0tpszJ6nAWB877HN5zOOz83eH6qvVNNWXRe6PSaEEc/4iM0q21QdH9ZBIPJiqDgUsdW2/Hp/tHEnAR2N+ItAoVeThJIp+cXkh29j5LKX1oZwUswSWRJJIEAwA/a0nEmcjDxBm8cmBmHtqU2O65ZIYYVEb1tNdlcurMwwmSlFcWOCbOSPC8GgByujUSag6XI6eXNWK1Vfq1AHnllnMDYCCP/B+gTAHzR5cXSo1SutRvKbNqijaA+Q0YQGVUuNjfVhP8uLhEDCsZZdBeVYKcySrNASildTIb3VtbFwwMjr0XxJVB0HavZO5Pf755vKElEuIqmd1dXvz0VEv/67e3ht9VO/5QkQdp1VblQOsVpszR3uevpubEnWMNTpGn8cpjCFbt2PWVTl989nC4bOF7enmxinX27PxXuGUqleZTnxYbLz+Ciwd81tl9m/tezEDpE3tqY2MfeP6vNCKOb2PAA2MYGD89NA6/C0LETzYfufESFlVvWON1EbTJ35aIxUYT0f1hJLMABIjDsC8XOnZcHIJgSKurndvi4wkQU8v+GXLJpQPby5XS3Odzfes52B17M7WYst2y2LGbNpVeG0lYPtdaS+QzYFtdgxPXu3blGPsB3tjPFvOp0QsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-tln.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université du Sud Toulon Var</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDQzCCAiugAwIBAgIURrZcRMW1GJitmEg2t0KC308pj88wDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWZmVkZXJhdGlvbi51bml2LXRsbi5mcjAeFw0wOTA5MDYx
 OTIyNDFaFw0yOTA5MDYxOTIyNDFaMCExHzAdBgNVBAMTFmZlZGVyYXRpb24udW5p
@@ -38,21 +38,21 @@ eHcjM5wZ+FrykOxUsv663wJowcCE0aRkAUnyg1rUfYy4sRJh3EP/MXQpb4/ePTCg
 lAu3e0usivWcDm0/WX2N6oA9cp0sUsegYtoBY7tmPtml4yMRODG7ZSDqUmLlB3PZ
 FIrOgN1sOW6bInYYilkc/7jjHW5T6AQ=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-tln.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-tln.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-tln.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université du Sud Toulon Var</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université du Sud Toulon Var</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-tln.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>federation@univ-tln.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-tln.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-tln.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-tln.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université du Sud Toulon Var</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université du Sud Toulon Var</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-tln.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation@univ-tln.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
index 88edc495..bda0d047 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-ubs.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-09T16:11:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-09T16:11:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ubs.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Bretagne Sud</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC00lEQVQozy3BT2wUVRgA8O97b2bezra7s7O7/bPL7qxaNSJNJmDVRLMpMfSER2svguGi3nognrh6qIkB0hAPLSSGUiWhGuMJL4IGEQ+CbOTQIimNiW3JLDvsdHamu++9z4u/HzbfahJSL0qAaQIADf9DICAkRABkPCMEsxhoMAAhSfYvfHkhYwsCAgAEBAAiymQySZowxuI4vrh86eHf68LMGsDIYGYUd8+cWbAsC5H1env9/kCYwi25pmm2220AUFIzzrVWBgBwzrb/3d15ssM5HymNHj/+rn/Y9zyv+6x75/c7ly+vuE7RcYafhiExbQCB1rpQyJ/68JR/xB8tjd64+fPKVyuIrFqrKqkqY+Pl8khueLjueZuPNxkoUFJ79cbQUG55afnEByeFsE5/enp27v3JVw+ZpmHbthCWsIWTz7tuAZtvN4FRN4wIaG5ububYzPUfr3//3Q+vTR2emprqhJ1ra9fcvGuZVtSLlFQGIACgk3MkycebW/Pz8wW38MXZz3N5p3W/9eCvB5r0sygEhVxwJMRmsymV7PcGpmU+/8Jzvu9/9MnHq1e+Xvhs4YBXeeP1NyuVqtYqSdKnnSDuxXDwlYOz782uXllt3W+FnVBKeeOnm8femVlaWtpY30iTVClFREQU78VhGGIv7gHC9vb2o4eP1r5du/XLLf+Iv7i4GEV7v/16++o3V7e2/tFSuyWnWqsU3BKeP3d+fWO9da+Vpn1ugsHMglt86eWJu3/8GcXdbMZWpBgyBswwzf1+yoMg2NndqVZqwjbHyuNpuu+4uYbXqNXrQRCAhunpo0KIsBNpkJxxZmdtzvn42EjRLdbrNUPwfN7JDmXLJbdULiIyreTEixONhqdBA4IBAAzZbvBk8tBkRmSSJEmSJI7jwWAgpdqXSdBuZ3NDzGBAwDjH6eZRAJByQJqQcUQCAIMbWmsiINCGYZAmKSXjjCH/DwooS6x9sQOOAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAxKzAyOjAwT9Q9iAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowMD6JhTQAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-ubs.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Bretagne Sud</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ubs.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Bretagne Sud</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC00lEQVQozy3BT2wUVRgA8O97b2bezra7s7O7/bPL7qxaNSJNJmDVRLMpMfSER2svguGi3nognrh6qIkB0hAPLSSGUiWhGuMJL4IGEQ+CbOTQIimNiW3JLDvsdHamu++9z4u/HzbfahJSL0qAaQIADf9DICAkRABkPCMEsxhoMAAhSfYvfHkhYwsCAgAEBAAiymQySZowxuI4vrh86eHf68LMGsDIYGYUd8+cWbAsC5H1env9/kCYwi25pmm2220AUFIzzrVWBgBwzrb/3d15ssM5HymNHj/+rn/Y9zyv+6x75/c7ly+vuE7RcYafhiExbQCB1rpQyJ/68JR/xB8tjd64+fPKVyuIrFqrKqkqY+Pl8khueLjueZuPNxkoUFJ79cbQUG55afnEByeFsE5/enp27v3JVw+ZpmHbthCWsIWTz7tuAZtvN4FRN4wIaG5ububYzPUfr3//3Q+vTR2emprqhJ1ra9fcvGuZVtSLlFQGIACgk3MkycebW/Pz8wW38MXZz3N5p3W/9eCvB5r0sygEhVxwJMRmsymV7PcGpmU+/8Jzvu9/9MnHq1e+Xvhs4YBXeeP1NyuVqtYqSdKnnSDuxXDwlYOz782uXllt3W+FnVBKeeOnm8femVlaWtpY30iTVClFREQU78VhGGIv7gHC9vb2o4eP1r5du/XLLf+Iv7i4GEV7v/16++o3V7e2/tFSuyWnWqsU3BKeP3d+fWO9da+Vpn1ugsHMglt86eWJu3/8GcXdbMZWpBgyBswwzf1+yoMg2NndqVZqwjbHyuNpuu+4uYbXqNXrQRCAhunpo0KIsBNpkJxxZmdtzvn42EjRLdbrNUPwfN7JDmXLJbdULiIyreTEixONhqdBA4IBAAzZbvBk8tBkRmSSJEmSJI7jwWAgpdqXSdBuZ3NDzGBAwDjH6eZRAJByQJqQcUQCAIMbWmsiINCGYZAmKSXjjCH/DwooS6x9sQOOAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAxKzAyOjAwT9Q9iAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowMD6JhTQAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-ubs.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Bretagne Sud</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUQf+bgYI+pflZTXe6Sw+Ijq7sDuwwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMB4XDTA5MDMyNjA5MzUxM1oX
 DTI5MDMyNjA4MzUxM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMIIBIjAN
@@ -37,21 +37,21 @@ tuagpJOU3yH1CJ1aV9Za1cvobQJryWlwGgvw2Z2ALFs5/BT435lBJbMjuNAR9mC8
 GKrzVJxuCZuaFkCNIGIA2lPmHA755Vf5rKi2/4A+qBzN9XJc1RBzTlg9PF1WQzb3
 KsqVsaQhhLja8zwz5NlpcXN89WMIL/Bg6T3t5KN4ajbKbWxX/7uMAVsEUw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ubs.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Bretagne Sud</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Bretagne Sud</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-ubs.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-ubs.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ubs.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Bretagne Sud</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Bretagne Sud</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-ubs.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-ubs.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
index 3a25a1b5..aa7319c2 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-valenciennes.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-17T13:52:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-17T13:52:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Valenciennes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB2ElEQVQoz5VSS2+SURCdmXs/nqXlsyWA1NDWqhF1oy6Mj61JdeEf8L+xd68rFyY1JuJjIbGYGINWKBLQRguF8t07xwUNQU1MOsuTmXNm5hwGQCcpS0QAmHkenSIgMPEM8XAE4pkCAECJWVjmWRTq1QUmNm1jANOZmYhXLyzMrFBVb01ARJEe9Q72oGAAChUWr957Z8QaY1QVBBFhYq/ucDLoDnb39pvqYGd7R27S6jUVfq1wPjAx750R43TS6L5+13peypy7uX7fWLaq6rzzGhkJEkHqaeNR83vj9oWtdCLz7eDLi+aT9o+PaRvmiquxeOz4hvn/fOrXtxuPC9nyqcWVD/3a6HB0uXBjbbkSpnPxIAmAO51Ou91OJpJK2u10y6sbn3/V6z+f9SetUmZzq/JwfaXyhw8va7WdnfeLmUUmefP2VeXKpbt37o3z++lB5lbpQTm86DRS9YGJMzMArlarYRgCGI/HTAzC2Y1Nk1QjQbi0TNYVc2cCE6iqiBCRDbNZY4xzjphTqXQ2u/S1tTsaj62Y4unitetXrVhVnbnEvV4viiIiUkCYksnUcDicREcKXUgt5POFv7LD/w8foER8vD0zEVnv/XzgmFlVpywiYow5mcK/9Rvn6g+oQ1JefgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.univ-valenciennes.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Valenciennes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Valenciennes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB2ElEQVQoz5VSS2+SURCdmXs/nqXlsyWA1NDWqhF1oy6Mj61JdeEf8L+xd68rFyY1JuJjIbGYGINWKBLQRguF8t07xwUNQU1MOsuTmXNm5hwGQCcpS0QAmHkenSIgMPEM8XAE4pkCAECJWVjmWRTq1QUmNm1jANOZmYhXLyzMrFBVb01ARJEe9Q72oGAAChUWr957Z8QaY1QVBBFhYq/ucDLoDnb39pvqYGd7R27S6jUVfq1wPjAx750R43TS6L5+13peypy7uX7fWLaq6rzzGhkJEkHqaeNR83vj9oWtdCLz7eDLi+aT9o+PaRvmiquxeOz4hvn/fOrXtxuPC9nyqcWVD/3a6HB0uXBjbbkSpnPxIAmAO51Ou91OJpJK2u10y6sbn3/V6z+f9SetUmZzq/JwfaXyhw8va7WdnfeLmUUmefP2VeXKpbt37o3z++lB5lbpQTm86DRS9YGJMzMArlarYRgCGI/HTAzC2Y1Nk1QjQbi0TNYVc2cCE6iqiBCRDbNZY4xzjphTqXQ2u/S1tTsaj62Y4unitetXrVhVnbnEvV4viiIiUkCYksnUcDicREcKXUgt5POFv7LD/w8foER8vD0zEVnv/XzgmFlVpywiYow5mcK/9Rvn6g+oQ1JefgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.univ-valenciennes.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Valenciennes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAJ08QHO7V9BoMbcBRHL2N0BzYGEIMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMMGGlkcC51bml2LXZhbGVuY2llbm5lcy5mcjAeFw0xNTA4
 MjcxMzU4MDFaFw0zNTA4MjcxMzU4MDFaMCMxITAfBgNVBAMMGGlkcC51bml2LXZh
@@ -38,13 +38,13 @@ UHvcFYBCZoeO/ZoeNfA5Q6rs59yf6CGddF1CT0LdSCa3W2tQ1ksz5+/rWoCYXfp2
 KHJkTmG701axl/BxOJwyOYz7dscQr3dvK6BnFxAEAFx3xDvB9xEJnXnsnh0g9xK6
 xSnpvawSYkjwVqPeJcD49c5+suFyql7UIF18xWjCk+c=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
 MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
@@ -64,23 +64,23 @@ VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
 sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
 lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-valenciennes.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-valenciennes.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAJ08QHO7V9BoMbcBRHL2N0BzYGEIMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMMGGlkcC51bml2LXZhbGVuY2llbm5lcy5mcjAeFw0xNTA4
 MjcxMzU4MDFaFw0zNTA4MjcxMzU4MDFaMCMxITAfBgNVBAMMGGlkcC51bml2LXZh
@@ -100,13 +100,13 @@ UHvcFYBCZoeO/ZoeNfA5Q6rs59yf6CGddF1CT0LdSCa3W2tQ1ksz5+/rWoCYXfp2
 KHJkTmG701axl/BxOJwyOYz7dscQr3dvK6BnFxAEAFx3xDvB9xEJnXnsnh0g9xK6
 xSnpvawSYkjwVqPeJcD49c5+suFyql7UIF18xWjCk+c=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
 MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
@@ -126,19 +126,19 @@ VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
 sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
 lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Valenciennes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Valenciennes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.univ-valenciennes.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>fed-admin@univ-valenciennes.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Valenciennes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Valenciennes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univ-valenciennes.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>fed-admin@univ-valenciennes.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
index 69f90540..7b8d204d 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utc.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-04T14:19:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-04T14:19:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAw0lEQVQ4y8WRsQ3CMBBF/51CTcIawAzsQcsOzBAphB2oEVtQUUI6RqAAiQ4lPorYjkMIskWRL1my5Pvv/p2BoUXmUp0nQiTeRp7fCQCiBiX1CVQUUlzjKze4M8IlaY2ghEFcIt8vcXuONYGsQwBs8pQily8ADscFTtcpgAqkq0V3yrYpfaaygPVuBZaRjqVsuCxvTK8iFmPg2aO9RGN24wFAWSTC6F8u9T2oIv75JZ0EZokCsbP7iLuR/M1fAaH6GzC83sSiOspjegsMAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwx+3d5QAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMLawZVkAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.utc.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Université de Technologie de Compiègne (UTC)'s staff and students identity provider.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Identités fournies pour le personnel et les étudiants de l'Université de Technologie de Compiègne (UTC)</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAw0lEQVQ4y8WRsQ3CMBBF/51CTcIawAzsQcsOzBAphB2oEVtQUUI6RqAAiQ4lPorYjkMIskWRL1my5Pvv/p2BoUXmUp0nQiTeRp7fCQCiBiX1CVQUUlzjKze4M8IlaY2ghEFcIt8vcXuONYGsQwBs8pQily8ADscFTtcpgAqkq0V3yrYpfaaygPVuBZaRjqVsuCxvTK8iFmPg2aO9RGN24wFAWSTC6F8u9T2oIv75JZ0EZokCsbP7iLuR/M1fAaH6GzC83sSiOspjegsMAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwx+3d5QAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMLawZVkAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.utc.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Université de Technologie de Compiègne (UTC)'s staff and students identity provider.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Identités fournies pour le personnel et les étudiants de l'Université de Technologie de Compiègne (UTC)</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFDCCAfygAwIBAgIVALKUNv/nTVKQIuB1xMzl8BSvmMIvMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMMCmlkcC51dGMuZnIwHhcNMTUwNzEwMjIyODExWhcNMzUw
 NzEwMjIyODExWjAVMRMwEQYDVQQDDAppZHAudXRjLmZyMIIBIjANBgkqhkiG9w0B
@@ -39,13 +39,13 @@ tURWo1OcTcNS0KQcSRrxhNOl8+C3M1Enx9peJSSE25MgFZbeERzBm22PweFQNqr+
 lTMGjfitokokh3z4Mr+YgnPTSH/PLm2XuEbFIZLiWL60VrYyxBsMuBIJvk/xgMpU
 XaUj+MhAJNdwwHHIGwKjoAotbCEk+rTR
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDGDCCAgCgAwIBAgIVAJniTskfMWtBbgn1nDzPa0dObhFfMA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMMC2lkcDIudXRjLmZyMB4XDTE0MDkwOTE3MTgwN1oXDTM0
 MDkwOTE3MTgwN1owFjEUMBIGA1UEAwwLaWRwMi51dGMuZnIwggEiMA0GCSqGSIb3
@@ -64,24 +64,24 @@ SmGHT2g4R8Ll446Jd2vkrMR0FXiYEoFM1DUB+b/tLARw4NQuIfooXBGzsVcLJucM
 v+C1uEftjADboIz5BDy5wIZITGG/yELlCVoLyBri2ozPaUFpEetbzKdmfcG6wk+z
 3zuwoSLKhPoHFPCoVMaxjYpXmPobZG6PumciJg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utc.fr:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utc.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UTC - Université de Technologie de Compiègne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utc.fr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>federation-id@utc.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utc.fr:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utc.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UTC - Université de Technologie de Compiègne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utc.fr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>federation-id@utc.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
index 7238a589..fd5efc0c 100644
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utt.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-14T19:52:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-14T19:52:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université de Technologie de Troyes</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACa0lEQVQoz2WS3UuTcRTHv7/ffs+zZz5jijOZpU5FNzN7dQbGAgmCusgoulIo/Qvypotuom56uQvyoouKCiKDkG6ilIoQlQ1DFHyfrs1ymrPNzb0827Pn93Shma5zdT7n8D3nwPkStN0FQLEdfFe+hdhbYbthp7cj20ZdB9eh6+A6yxu5R8Y5chq4Dmaok6X9slQgMJZ3CQeg61Bz0HGoSG6psp06WnXYeaCq0mqxmAwGymjeyGzOWiBdrK9obaqtr7MlkhlFURUla7GYRJEB+LuBc6iao1C+1FLtarTHYql+7/ztt0P+dAaqBs5HH3S6TlQDYBxARi01GdtdjsYa24QvdOPll8BmCpSCUegAcOd887EjdgCKmmbIqB0N9gvug9F4enz2R8+EHyBGScxwjmyuVJbud7R2tbsBhJPhj6PT5PHzr4ySqcXVezcvM4G6O3s8a1HogCR2H6/t7jpjt1sVNTG2FHjaN/Fs8DszGYVrT/pPl5f09nnfDc14fkUbisxXXI6OtmaH06ZpqW+B2TcDk/3DS3Ymvbp6lly/1fto3F/BDGWS6HaWn3M3NLtqLBYxpmx45wIfRvy++UhTma31ZJ1sNn4emSM65+FwQhAMlkITpTyZTUwthcZ9KzMLkWJqcpaVVleWzAfW3g9Pv/avQsmShdVlQvhGMr0WjQVD8c2Yuk82FwqmInNBMBTxTgY/+ZZ9sSQogcAoIeThiwFrsSxLRpEwopHfkeTqenxsIeT5uR7YTIEQCAZK/7mHDXqCZknI5LRIUvHHU4vJNDS+9QQqif+5DKwvsAJdBwgoASVgBggsz+G78Q8yZwpdy1AnGwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.utt.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université de Technologie de Troyes</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université de Technologie de Troyes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACa0lEQVQoz2WS3UuTcRTHv7/ffs+zZz5jijOZpU5FNzN7dQbGAgmCusgoulIo/Qvypotuom56uQvyoouKCiKDkG6ilIoQlQ1DFHyfrs1ymrPNzb0827Pn93Shma5zdT7n8D3nwPkStN0FQLEdfFe+hdhbYbthp7cj20ZdB9eh6+A6yxu5R8Y5chq4Dmaok6X9slQgMJZ3CQeg61Bz0HGoSG6psp06WnXYeaCq0mqxmAwGymjeyGzOWiBdrK9obaqtr7MlkhlFURUla7GYRJEB+LuBc6iao1C+1FLtarTHYql+7/ztt0P+dAaqBs5HH3S6TlQDYBxARi01GdtdjsYa24QvdOPll8BmCpSCUegAcOd887EjdgCKmmbIqB0N9gvug9F4enz2R8+EHyBGScxwjmyuVJbud7R2tbsBhJPhj6PT5PHzr4ySqcXVezcvM4G6O3s8a1HogCR2H6/t7jpjt1sVNTG2FHjaN/Fs8DszGYVrT/pPl5f09nnfDc14fkUbisxXXI6OtmaH06ZpqW+B2TcDk/3DS3Ymvbp6lly/1fto3F/BDGWS6HaWn3M3NLtqLBYxpmx45wIfRvy++UhTma31ZJ1sNn4emSM65+FwQhAMlkITpTyZTUwthcZ9KzMLkWJqcpaVVleWzAfW3g9Pv/avQsmShdVlQvhGMr0WjQVD8c2Yuk82FwqmInNBMBTxTgY/+ZZ9sSQogcAoIeThiwFrsSxLRpEwopHfkeTqenxsIeT5uR7YTIEQCAZK/7mHDXqCZknI5LRIUvHHU4vJNDS+9QQqif+5DKwvsAJdBwgoASVgBggsz+G78Q8yZwpdy1AnGwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.utt.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université de Technologie de Troyes</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
 BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
 HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
@@ -35,23 +35,23 @@ fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
 Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
 BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utt.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utt.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utt.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utt.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utt.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utt.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
 BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
 HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
@@ -68,19 +68,19 @@ fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
 Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
 BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utt.fr:8443/shibboleth-idp/AA"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université de Technologie de Troyes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université de Technologie de Troyes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utt.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>cri@utt.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utt.fr:8443/shibboleth-idp/AA"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université de Technologie de Troyes</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université de Technologie de Troyes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utt.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cri@utt.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml
index 7a5a13a8..eb8c6c15 100644
--- a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml
+++ b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:eduserv.org.uk:athens:provider:liv.ac.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-09T16:53:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-09T16:53:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
 						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
@@ -32,29 +32,29 @@
 						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
 						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth3.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth3.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liv.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
 						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
 						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
@@ -74,27 +74,27 @@
 						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
 						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Liverpool</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Gilbertson</md:SurName>
-      <md:EmailAddress>mailto:webmaster@liv.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Pretlove</md:SurName>
-      <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Liverpool</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Liverpool</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.liv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Gilbertson</md:SurName>
+    <md:EmailAddress>mailto:webmaster@liv.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Pretlove</md:SurName>
+    <md:EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
index 97dd84b4..5e1f68e0 100644
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2014-07-29T14:36:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2014-07-29T14:36:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
           centralized repository of a wide range of language technology tools, all installed on a high-performance
           computing cluster.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
@@ -42,13 +42,13 @@ XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
 58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
 Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
 agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
 BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
@@ -72,37 +72,37 @@ XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
 58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
 Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
 agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.hpc.uio.no/user/logout_feide_user"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.hpc.uio.no/user/feide_auth" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Language Analysis Portal (LAP)</md:ServiceName>
-        <md:ServiceName xml:lang="no">Språkanalyseportalen (LAP)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.hpc.uio.no/user/logout_feide_user"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.hpc.uio.no/user/feide_auth" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Language Analysis Portal (LAP)</md:ServiceName>
+      <md:ServiceName xml:lang="no">Språkanalyseportalen (LAP)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
         centralized repository of a wide range of language technology tools, all installed on a high-performance
         computing cluster.</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
-      <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nikolay</md:GivenName>
-      <md:SurName>Vazov</md:SurName>
-      <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nikolay</md:GivenName>
+    <md:SurName>Vazov</md:SurName>
+    <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml
index 42b7ecf5..e28d64ba 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:alaska.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.alaska.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alaska.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Alaska Statewide System</mdui:DisplayName>
+        <mdui:Description xml:lang="en">InCommon federated IdP (identity provider) for all students, faculty, &amp; staff at all campuses of the University of Alaska.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://iam.alaska.edu/trac/wiki/UAInCPOP.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://iam.alaska.edu/trac/wiki/IamUaArp</mdui:PrivacyStatementURL>
+        <mdui:Logo height="632" width="860" xml:lang="en">https://www.alaska.edu/files/opa/color.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.alaska.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alaska.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Alaska Statewide System</mdui:DisplayName>
-          <mdui:Description xml:lang="en">InCommon federated IdP (identity provider) for all students, faculty, &amp; staff at all campuses of the University of Alaska.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://iam.alaska.edu/trac/wiki/UAInCPOP.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://iam.alaska.edu/trac/wiki/IamUaArp</mdui:PrivacyStatementURL>
-          <mdui:Logo height="632" width="860" xml:lang="en">https://www.alaska.edu/files/opa/color.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFDDCCA/SgAwIBAgIJALS9LfC6aZcBMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
 VQQGEwJVUzEPMA0GA1UECBMGQWxhc2thMRIwEAYDVQQHEwlGYWlyYmFua3MxHTAb
 BgNVBAoTFFVuaXZlcnNpdHkgb2YgQWxhc2thMSkwJwYDVQQLEyBPZmZpY2Ugb2Yg
@@ -54,13 +54,13 @@ U7cIkWqnMdrGhal5MNzrYypOUvZhKOrf/E10e6ZuuB6+5liGus8YZbfu18Ur3k9f
 Q3gISQ3vKG1Z8ACyVD2peCbpoN2QEtjIrAsU1WHgDrviAd5k5slFHue5g6Ujen4T
 B89QgPCsFr20bV2LDmEEnxNO47F6pFVlHYnrdxQCsf9ETU/7gzgn2g5OX1wkmETL
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMN6E6Kx9SACb2AMDLfMzBz7UbvtMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5hbGFza2EuZWR1MB4XDTE0MDYxMzIxNTkyMFoX
 DTM0MDYxMzIxNTkyMFowGTEXMBUGA1UEAxMOaWRwLmFsYXNrYS5lZHUwggEiMA0G
@@ -79,24 +79,24 @@ pp25mLVA1KlcLQOGhdnxa1EkHR5zekUukapNGaQGOSTHdwvi+xxDpVfZ1xj9jjt+
 Qc8E7z0BxqW2QRaU1D7Jqc4QQbOD+wDnIWHtj2LzdyJknBeG+i9L0IKogsUgDDJr
 qkYa6vIOo4URe5e3Z1bGmENzaoHt2usblOWLGu2AV+CNwkbX65c9wg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.alaska.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.alaska.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.alaska.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.alaska.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.alaska.edu/idp/profile/SAML2/POST-SimipleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.alaska.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alaska.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.alaska.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.alaska.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.alaska.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.alaska.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.alaska.edu/idp/profile/SAML2/POST-SimipleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.alaska.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alaska.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFDDCCA/SgAwIBAgIJALS9LfC6aZcBMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
 VQQGEwJVUzEPMA0GA1UECBMGQWxhc2thMRIwEAYDVQQHEwlGYWlyYmFua3MxHTAb
 BgNVBAoTFFVuaXZlcnNpdHkgb2YgQWxhc2thMSkwJwYDVQQLEyBPZmZpY2Ugb2Yg
@@ -125,13 +125,13 @@ U7cIkWqnMdrGhal5MNzrYypOUvZhKOrf/E10e6ZuuB6+5liGus8YZbfu18Ur3k9f
 Q3gISQ3vKG1Z8ACyVD2peCbpoN2QEtjIrAsU1WHgDrviAd5k5slFHue5g6Ujen4T
 B89QgPCsFr20bV2LDmEEnxNO47F6pFVlHYnrdxQCsf9ETU/7gzgn2g5OX1wkmETL
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAMN6E6Kx9SACb2AMDLfMzBz7UbvtMA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDmlkcC5hbGFza2EuZWR1MB4XDTE0MDYxMzIxNTkyMFoX
 DTM0MDYxMzIxNTkyMFowGTEXMBUGA1UEAxMOaWRwLmFsYXNrYS5lZHUwggEiMA0G
@@ -150,27 +150,27 @@ pp25mLVA1KlcLQOGhdnxa1EkHR5zekUukapNGaQGOSTHdwvi+xxDpVfZ1xj9jjt+
 Qc8E7z0BxqW2QRaU1D7Jqc4QQbOD+wDnIWHtj2LzdyJknBeG+i9L0IKogsUgDDJr
 qkYa6vIOo4URe5e3Z1bGmENzaoHt2usblOWLGu2AV+CNwkbX65c9wg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.alaska.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.alaska.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Alaska Statewide System</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Alaska Statewide System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.alaska.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Bantz</md:GivenName>
-      <md:EmailAddress>Q@Alaska.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Center</md:GivenName>
-      <md:EmailAddress>helpdesk@alaska.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Identity &amp; Access Management</md:GivenName>
-      <md:EmailAddress>IAM@Alaska.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.alaska.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.alaska.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Alaska Statewide System</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Alaska Statewide System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.alaska.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Bantz</md:GivenName>
+    <md:EmailAddress>Q@Alaska.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Center</md:GivenName>
+    <md:EmailAddress>helpdesk@alaska.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Identity &amp; Access Management</md:GivenName>
+    <md:EmailAddress>IAM@Alaska.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml
index a13bd384..2150a3c5 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:arizona.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arizona.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Arizona</mdui:DisplayName>
+        <mdui:Logo height="150" width="633" xml:lang="en">https://shibboleth.arizona.edu/images/ua_horiz.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arizona.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The University of Arizona</mdui:DisplayName>
-          <mdui:Logo height="150" width="633" xml:lang="en">https://shibboleth.arizona.edu/images/ua_horiz.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEejCCA2KgAwIBAgIJAKeNAZjK8MQiMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEPMA0GA1UEBxMGVHVjc29uMSIwIAYD
 VQQKExlUaGUgVW5pdmVyc2l0eSBvZiBBcml6b25hMQ0wCwYDVQQLEwRVSVRTMR8w
@@ -48,23 +48,23 @@ X50BUKB63iIpnnyKIrGLA7UM++0ybZkOv4kPJRy7nKhypqSyzshaaw+GoiirWHdW
 IZIpATHnb/kCgn0zItoFv1USDzPmVUrw568eK/TK5/7tf4M9F3dU47hLDixo4522
 fEjKSM/7WyBx25FQJQ7IePI1kfVA8BNRI5atCm8DJd5lqFlQK/rmZiZWYrADVQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.arizona.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.arizona.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.arizona.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arizona.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.arizona.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.arizona.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.arizona.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arizona.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEejCCA2KgAwIBAgIJAKeNAZjK8MQiMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEPMA0GA1UEBxMGVHVjc29uMSIwIAYD
 VQQKExlUaGUgVW5pdmVyc2l0eSBvZiBBcml6b25hMQ0wCwYDVQQLEwRVSVRTMR8w
@@ -90,27 +90,27 @@ X50BUKB63iIpnnyKIrGLA7UM++0ybZkOv4kPJRy7nKhypqSyzshaaw+GoiirWHdW
 IZIpATHnb/kCgn0zItoFv1USDzPmVUrw568eK/TK5/7tf4M9F3dU47hLDixo4522
 fEjKSM/7WyBx25FQJQ7IePI1kfVA8BNRI5atCm8DJd5lqFlQK/rmZiZWYrADVQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Arizona</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Arizona</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.arizona.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Gary Windham</md:GivenName>
-      <md:EmailAddress>gary.windham@arizona.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UITS 24/7 IT Support Center</md:GivenName>
-      <md:EmailAddress>support@email.arizona.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UITS Systems Integration &amp; Architecture</md:GivenName>
-      <md:EmailAddress>uits-sia@list.arizona.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Arizona</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Arizona</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.arizona.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gary Windham</md:GivenName>
+    <md:EmailAddress>gary.windham@arizona.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UITS 24/7 IT Support Center</md:GivenName>
+    <md:EmailAddress>support@email.arizona.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UITS Systems Integration &amp; Architecture</md:GivenName>
+    <md:EmailAddress>uits-sia@list.arizona.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml
index a15f88c0..0853afec 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:asu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Arizona State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Arizona State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAIEaja/L6bBgSu+JKg1QGKs5jXFJMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgyLmFzdS5lZHUwHhcNMTIxMjA2MDA1
 ODU4WhcNMzIxMjA2MDA1ODU4WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoMi5hc3Uu
@@ -41,31 +41,31 @@ E2VLaHwxQUzc7qxfLLwl8J+W7dd+LaTndoFtkpW7QLQUandHQWLzGt4lt7ahfbvz
 /InkWSyJ1jS/ihPrRrjyu7A3iTXITNxMow2gC1/u0Ho6FqzunXlgC4bcdGPcQiDK
 CatfNOBqeNRAh5p0
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.asu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.asu.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Arizona State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Arizona State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UTO EDNA Team</md:GivenName>
-      <md:EmailAddress>ednateam@asu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UTO EDNA Team</md:GivenName>
-      <md:EmailAddress>ednateam@asu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jack Hsu</md:GivenName>
-      <md:EmailAddress>Jack.Hsu@asu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Certificate Support</md:GivenName>
-      <md:EmailAddress>ops.ss.certificates@mainex1.asu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.asu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.asu.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Arizona State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Arizona State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UTO EDNA Team</md:GivenName>
+    <md:EmailAddress>ednateam@asu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UTO EDNA Team</md:GivenName>
+    <md:EmailAddress>ednateam@asu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jack Hsu</md:GivenName>
+    <md:EmailAddress>Jack.Hsu@asu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Certificate Support</md:GivenName>
+    <md:EmailAddress>ops.ss.certificates@mainex1.asu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml
index cbe0746f..fa45d263 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:berkeley.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berkeley.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California, Berkeley</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berkeley.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California, Berkeley</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE9DCCA9ygAwIBAgIJAPg8VmRSQ3pCMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
 FDASBgNVBAoTC1VDIEJlcmtlbGV5MRMwEQYDVQQLEwpJU1QtQ2FsbmV0MRowGAYD
@@ -47,24 +47,24 @@ j+OKY/1E48QNYKEnxTdKbe5HEzm5Qzh9CwDpnWEEPTYVGXkcZr834c5rfCC9eJFW
 DwHJO2iXtfD8CCpYzg2Qm85yQo3LKavIRnDiPFC0SUliC9pyGGrf9Apsxfisx0Um
 qL/5vv0Vxy0Ba8FeI9WOTs3mSavQNGQ/
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.berkeley.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.berkeley.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.berkeley.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.berkeley.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.berkeley.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.berkeley.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berkeley.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.berkeley.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.berkeley.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.berkeley.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.berkeley.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.berkeley.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.berkeley.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berkeley.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE9DCCA9ygAwIBAgIJAPg8VmRSQ3pCMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
 FDASBgNVBAoTC1VDIEJlcmtlbGV5MRMwEQYDVQQLEwpJU1QtQ2FsbmV0MRowGAYD
@@ -93,23 +93,23 @@ j+OKY/1E48QNYKEnxTdKbe5HEzm5Qzh9CwDpnWEEPTYVGXkcZr834c5rfCC9eJFW
 DwHJO2iXtfD8CCpYzg2Qm85yQo3LKavIRnDiPFC0SUliC9pyGGrf9Apsxfisx0Um
 qL/5vv0Vxy0Ba8FeI9WOTs3mSavQNGQ/
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.berkeley.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.berkeley.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California, Berkeley</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California, Berkeley</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.berkeley.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeff McCullough</md:GivenName>
-      <md:EmailAddress>jeffmc@berkeley.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Karl Grose</md:GivenName>
-      <md:EmailAddress>karlgrose@berkeley.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.berkeley.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.berkeley.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California, Berkeley</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California, Berkeley</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.berkeley.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeff McCullough</md:GivenName>
+    <md:EmailAddress>jeffmc@berkeley.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Karl Grose</md:GivenName>
+    <md:EmailAddress>karlgrose@berkeley.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml
index ff5fd545..480097dd 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:carleton.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.carleton.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carleton.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Carleton College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Carleton College</mdui:Description>
+        <mdui:Logo height="53" width="321" xml:lang="en">https://www.carleton.edu/departments/ITS/Images/CarletonLogoSmall.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.carleton.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carleton.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Carleton College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Carleton College</mdui:Description>
-          <mdui:Logo height="53" width="321" xml:lang="en">https://www.carleton.edu/departments/ITS/Images/CarletonLogoSmall.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIjCCAgqgAwIBAgICBDswDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECwwDU1NP
 MRswGQYDVQQDDBJsb2dpbi5jYXJsZXRvbi5lZHUwHhcNMTQwNDExMDI0MjAxWhcN
 MjQwNDA4MDI0MjAxWjArMQwwCgYDVQQLDANTU08xGzAZBgNVBAMMEmxvZ2luLmNh
@@ -42,13 +42,13 @@ RL8eo9ATYSSwl5JJM0D89XovPl534kPjGcp/l3PRp8tEiP6pNBrPWI+KgV0ksqkZ
 bllJv8s7/Np5XwEEQ1KkqCNLI/cvW9u7OIhII7/F0QoKyAvNtdut8e61oQJyyAJq
 Edda89AEn3ZZeCBK6d2ALE01aEjJmH2MElHQbR/a387IpYbztYM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDujCCAqICCQCPaJ8ioTbhuDANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
 VVMxEjAQBgNVBAgTCU1pbm5lc290YTETMBEGA1UEBxMKTm9ydGhmaWVsZDEZMBcG
 A1UEChMQQ2FybGV0b24gQ29sbGVnZTEMMAoGA1UECxMDSVRTMRswGQYDVQQDExJs
@@ -70,29 +70,29 @@ DGbJW/HYJ07x+5V7hONXUmEvh8SZo+JXmTO37hLOBGSyteXbWJv7VptIm/fD6411
 cYLejujXijfbVj38Ijcucjrel7dJ2Zl8nnmkn3VlRFdEuRScuWudI+7rS6Ux+Dwc
 25Ls34lI9+W9mXyA7ix0qDjNmpRccdkzLcvfTgYC7q5VGzyToU4S2u7AZvcxeA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.carleton.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.carleton.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.carleton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.carleton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Carleton College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Carleton College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.carleton.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Candyce Lelm</md:GivenName>
-      <md:EmailAddress>clelm@carleton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rich Graves</md:GivenName>
-      <md:EmailAddress>rgraves@carleton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Les LaCroix</md:GivenName>
-      <md:EmailAddress>llacroix@carleton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.carleton.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.carleton.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.carleton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.carleton.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Carleton College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Carleton College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.carleton.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Candyce Lelm</md:GivenName>
+    <md:EmailAddress>clelm@carleton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rich Graves</md:GivenName>
+    <md:EmailAddress>rgraves@carleton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Les LaCroix</md:GivenName>
+    <md:EmailAddress>llacroix@carleton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml
index e298586c..c0fb862e 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:case.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Case Western Reserve University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Case Western Reserve University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUZg+QtZy18Ty8wtEmZfdNYUEbjU0wDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmIuY2FzZS5lZHUwHhcNMTAwODA4MjE1MTU5WhcN
 MzAwODA4MjE1MTU5WjAZMRcwFQYDVQQDEw5zaGliYi5jYXNlLmVkdTCCASIwDQYJ
@@ -37,24 +37,24 @@ nCTiiHM5pMiVpysHXIDJ4eglE1Ox84oqFfe7gnh+wnwAx9Lyi5g1MxhkEhPEjTFK
 Y95Vc7ddQcRmKwiMkEKCRCPyRqAVV0Cs6LidPlinGMeQgA2H/zyxmZ5qM63sxpPe
 LRP0OmLbglzlhEOSOKp7/3fIWR/s1QjG/8i4VkCv2koLyPWqhs3I
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.case.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.case.edu/shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.case.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.case.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.case.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.case.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.case.edu/shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.case.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.case.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.case.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUZg+QtZy18Ty8wtEmZfdNYUEbjU0wDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOc2hpYmIuY2FzZS5lZHUwHhcNMTAwODA4MjE1MTU5WhcN
 MzAwODA4MjE1MTU5WjAZMRcwFQYDVQQDEw5zaGliYi5jYXNlLmVkdTCCASIwDQYJ
@@ -73,27 +73,27 @@ nCTiiHM5pMiVpysHXIDJ4eglE1Ox84oqFfe7gnh+wnwAx9Lyi5g1MxhkEhPEjTFK
 Y95Vc7ddQcRmKwiMkEKCRCPyRqAVV0Cs6LidPlinGMeQgA2H/zyxmZ5qM63sxpPe
 LRP0OmLbglzlhEOSOKp7/3fIWR/s1QjG/8i4VkCv2koLyPWqhs3I
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.case.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Case Western Reserve University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Case Western Reserve University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cwru.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy Smith</md:GivenName>
-      <md:EmailAddress>jeremy.smith@case.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Kovacic</md:GivenName>
-      <md:EmailAddress>david.kovacic@case.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Authentication Support</md:GivenName>
-      <md:EmailAddress>sso-admin@case.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.case.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Case Western Reserve University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Case Western Reserve University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cwru.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy Smith</md:GivenName>
+    <md:EmailAddress>jeremy.smith@case.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Kovacic</md:GivenName>
+    <md:EmailAddress>david.kovacic@case.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>sso-admin@case.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml
index 0e305a65..e6c28366 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:clemson.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clemson.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Clemson University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider for Clemson University</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.clemson.edu/ccit/help_support/safe_computing/resources/best_practices.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.clemson.edu/ccit/about/policies/index.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="130" width="449" xml:lang="en">https://www.clemson.edu/administration/public-affairs/toolbox/downloads/logos/logos/wordmark.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clemson.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Clemson University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider for Clemson University</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.clemson.edu/ccit/help_support/safe_computing/resources/best_practices.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.clemson.edu/ccit/about/policies/index.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="130" width="449" xml:lang="en">https://www.clemson.edu/administration/public-affairs/toolbox/downloads/logos/logos/wordmark.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIJAIWTbV26VuPeMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xNDAxMjIxOTI0NTBaFw0yNDAxMjAxOTI0
 NTBaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -45,13 +45,13 @@ EGUdMHmqx12yrMmweKwJ2thh2DOEebiJeJ8DBvj44kmSGMoEWw7HCC3wQOUsTrjv
 KmFS8uC55wmP9wsWXa8g5S7eim10poro2UW5dSOGYhET3GVG7rywL//9eP9bH6nG
 gf9X1kGw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIJAPsDZoExwhElMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xMTAxMjQxOTMyMzdaFw0xNDAxMjMxOTMy
 MzdaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -71,24 +71,24 @@ NNUqqKY9PkPijGeGztwogiwosxr6SCiwsQWc2OzcGslAVPCFkpQTlIlYN1xm19R/
 cRa+GNX9yfCwaDszTvIkvAfks4q+/J8F5Pu/OiWT1CQTL//bvVf0c38c9SLY9uVI
 W9jOpMFc
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clemson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clemson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.clemson.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.clemson.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.clemson.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.clemson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clemson.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clemson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clemson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.clemson.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.clemson.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.clemson.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.clemson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clemson.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIJAIWTbV26VuPeMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xNDAxMjIxOTI0NTBaFw0yNDAxMjAxOTI0
 NTBaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -108,13 +108,13 @@ EGUdMHmqx12yrMmweKwJ2thh2DOEebiJeJ8DBvj44kmSGMoEWw7HCC3wQOUsTrjv
 KmFS8uC55wmP9wsWXa8g5S7eim10poro2UW5dSOGYhET3GVG7rywL//9eP9bH6nG
 gf9X1kGw
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMjCCAhqgAwIBAgIJAPsDZoExwhElMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xMTAxMjQxOTMyMzdaFw0xNDAxMjMxOTMy
 MzdaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
@@ -134,31 +134,31 @@ NNUqqKY9PkPijGeGztwogiwosxr6SCiwsQWc2OzcGslAVPCFkpQTlIlYN1xm19R/
 cRa+GNX9yfCwaDszTvIkvAfks4q+/J8F5Pu/OiWT1CQTL//bvVf0c38c9SLY9uVI
 W9jOpMFc
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clemson.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clemson.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Clemson University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Clemson University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.clemson.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Barry Johnson</md:GivenName>
-      <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barry Johnson</md:GivenName>
-      <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kathy E. Wright</md:GivenName>
-      <md:EmailAddress>kewrig@clemson.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CCIT Web Authentication</md:GivenName>
-      <md:EmailAddress>SHIBBOLETHOPS@lists.clemson.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clemson.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clemson.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Clemson University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Clemson University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.clemson.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Barry Johnson</md:GivenName>
+    <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barry Johnson</md:GivenName>
+    <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kathy E. Wright</md:GivenName>
+    <md:EmailAddress>kewrig@clemson.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CCIT Web Authentication</md:GivenName>
+    <md:EmailAddress>SHIBBOLETHOPS@lists.clemson.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml
index 277c5311..79d8f0a4 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:columbia.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">columbia.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Columbia University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">columbia.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Columbia University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRzCCAi+gAwIBAgIUAb+rsLUvjwiVA2iVgiHAFGrtCPgwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUwHhcNMTMwODIy
 MTQ1MzUzWhcNMzMwODIyMTQ1MzUzWjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmNv
@@ -41,13 +41,13 @@ VlkYQLauLDhGVRNVuInSvii9B7T/8FJq90WHNfsuaBozqBIdifRq/2EB9JtiKUU9
 KS2JbAGCjAxg8D/IO5Y3JhdpMYx0fuyf1oLPc3weclFDj96Zc8VgGAmbbd+nFPh1
 O/X2TpwWYqPATAUn9yoZrNWjN34vmdHWTTGD
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIJAIl0siricUkMMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF3NoaWJib2xldGguY29sdW1iaWEuZWR1MB4XDTEwMTExMTE1MzA0NFoXDTEz
 MTExMDE1MzA0NFowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUw
@@ -67,24 +67,24 @@ LaD7Et+qJksnCwzDP8flxnOh7pfQEBnWiZqrlnejs+k7nMabsU5jXFPAsjJBR0Wu
 vZeuP/5/wZLYQT2FOsNGSiS26AAWU7AboFTQEOr9f9bCXOz+tboQ2ILl4RCVhtid
 0LjfAWgeogSSTJKUYSArP+vkEsNza15mXrRWKfRcl0o=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.columbia.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">columbia.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.columbia.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">columbia.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRzCCAi+gAwIBAgIUAb+rsLUvjwiVA2iVgiHAFGrtCPgwDQYJKoZIhvcNAQEF
 BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUwHhcNMTMwODIy
 MTQ1MzUzWhcNMzMwODIyMTQ1MzUzWjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmNv
@@ -104,13 +104,13 @@ VlkYQLauLDhGVRNVuInSvii9B7T/8FJq90WHNfsuaBozqBIdifRq/2EB9JtiKUU9
 KS2JbAGCjAxg8D/IO5Y3JhdpMYx0fuyf1oLPc3weclFDj96Zc8VgGAmbbd+nFPh1
 O/X2TpwWYqPATAUn9yoZrNWjN34vmdHWTTGD
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTDCCAjSgAwIBAgIJAIl0siricUkMMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 BAMTF3NoaWJib2xldGguY29sdW1iaWEuZWR1MB4XDTEwMTExMTE1MzA0NFoXDTEz
 MTExMDE1MzA0NFowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUw
@@ -130,23 +130,23 @@ LaD7Et+qJksnCwzDP8flxnOh7pfQEBnWiZqrlnejs+k7nMabsU5jXFPAsjJBR0Wu
 vZeuP/5/wZLYQT2FOsNGSiS26AAWU7AboFTQEOr9f9bCXOz+tboQ2ILl4RCVhtid
 0LjfAWgeogSSTJKUYSArP+vkEsNza15mXrRWKfRcl0o=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Columbia University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Columbia University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.columbia.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew Johnston</md:GivenName>
-      <md:EmailAddress>andrew@columbia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Identity and Access Management Group</md:GivenName>
-      <md:EmailAddress>iam-group@columbia.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Columbia University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Columbia University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.columbia.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew Johnston</md:GivenName>
+    <md:EmailAddress>andrew@columbia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Identity and Access Management Group</md:GivenName>
+    <md:EmailAddress>iam-group@columbia.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml
index b1cd6021..8a4ee119 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:csun.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csun.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, Northridge</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csun.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, Northridge</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUY2uSdWZf8iUsvSq94OJMJ4nik78wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MB4XDTA5MDczMDE2MTE1MFoX
 DTI5MDczMDE2MTE1MFowGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MIIBIjAN
@@ -37,13 +37,13 @@ ECBgb3NgBX2PFRZeC29gH20w5H0eTU9uORUTuINxASL42C48GIOScGawhoQsuoF9
 /OV1ae3LnYM8uqGzgYcC7I4KTxND5pPWdIQxlwoiX7ltroxhFVK74fFW65Hb9vdV
 gQxt3E011CLn6QqiHbbvGZoTTd9MJ1kPsejqryDgepMfD9VX2z+ieVsdgw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFmzCCBIOgAwIBAgIRAJo9a0/2NuQ/0LhXpZXousEwDQYJKoZIhvcNAQELBQAw
 djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
 EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
@@ -75,24 +75,24 @@ BAmuBKvZ3/7MvTjfx2FkVxMGBT1qmhOHjvolCAVMMGQIAiSsooD6oI28fjprU5VH
 8Okjj9vd1FWidEfxvNmfBLHaTeuEuZTPFKDPYcflZ+z7TYn5C2FqigZ7Bhfdmq8d
 8XdzO4Qjp5GshUVPkDwnH1BoEGJJqA/5dVeSlkvWiwdTvuS1bTalOVKPaG75oRk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csun.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csun.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csun.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csun.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csun.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csun.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csun.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csun.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csun.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csun.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUY2uSdWZf8iUsvSq94OJMJ4nik78wDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MB4XDTA5MDczMDE2MTE1MFoX
 DTI5MDczMDE2MTE1MFowGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MIIBIjAN
@@ -111,13 +111,13 @@ ECBgb3NgBX2PFRZeC29gH20w5H0eTU9uORUTuINxASL42C48GIOScGawhoQsuoF9
 /OV1ae3LnYM8uqGzgYcC7I4KTxND5pPWdIQxlwoiX7ltroxhFVK74fFW65Hb9vdV
 gQxt3E011CLn6QqiHbbvGZoTTd9MJ1kPsejqryDgepMfD9VX2z+ieVsdgw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFmzCCBIOgAwIBAgIRAJo9a0/2NuQ/0LhXpZXousEwDQYJKoZIhvcNAQELBQAw
 djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
 EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
@@ -149,23 +149,23 @@ BAmuBKvZ3/7MvTjfx2FkVxMGBT1qmhOHjvolCAVMMGQIAiSsooD6oI28fjprU5VH
 8Okjj9vd1FWidEfxvNmfBLHaTeuEuZTPFKDPYcflZ+z7TYn5C2FqigZ7Bhfdmq8d
 8XdzO4Qjp5GshUVPkDwnH1BoEGJJqA/5dVeSlkvWiwdTvuS1bTalOVKPaG75oRk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, Northridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, Northridge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csun.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin Krzewinski</md:GivenName>
-      <md:EmailAddress>kevin.krzewinski@csun.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Kevin Krzewinski</md:GivenName>
-      <md:EmailAddress>kevin.krzewinski@csun.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, Northridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, Northridge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csun.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin Krzewinski</md:GivenName>
+    <md:EmailAddress>kevin.krzewinski@csun.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Kevin Krzewinski</md:GivenName>
+    <md:EmailAddress>kevin.krzewinski@csun.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml
index 59ebdc49..445fe2f9 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:dartmouth.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://login.dartmouth.edu/shibboleth/error.shtml" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dartmouth College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://login.dartmouth.edu/shibboleth/error.shtml" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Dartmouth College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDfjCCAmYCCQD5v/lLik8sFjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
 VVMxFjAUBgNVBAgTDU5ldyBIYW1wc2hpcmUxEDAOBgNVBAcTB0hhbm92ZXIxGjAY
 BgNVBAoTEURhcnRtb3V0aCBDb2xsZWdlMQ0wCwYDVQQLEwRQS0NTMRwwGgYDVQQD
@@ -39,22 +39,22 @@ i3q0skAI/2nPGfA76XiIw88sfuT5bpqqpBfiVKIl/Fi7IV2Mvt8vraULJX/tkot7
 Szxwr2BKS9O9++4J7vv3tfqtPAwKNcyLYAKLnvjWrvVRcZGMarMWKNQsSdWYgdu6
 YCFCMPMXjTEu05ACdSRLThQAnSO5Ml+byI7hpfl0E69FVw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dartmouth.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dartmouth.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dartmouth.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dartmouth.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dartmouth.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dartmouth.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dartmouth.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dartmouth.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDfjCCAmYCCQD5v/lLik8sFjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
 VVMxFjAUBgNVBAgTDU5ldyBIYW1wc2hpcmUxEDAOBgNVBAcTB0hhbm92ZXIxGjAY
 BgNVBAoTEURhcnRtb3V0aCBDb2xsZWdlMQ0wCwYDVQQLEwRQS0NTMRwwGgYDVQQD
@@ -75,30 +75,30 @@ i3q0skAI/2nPGfA76XiIw88sfuT5bpqqpBfiVKIl/Fi7IV2Mvt8vraULJX/tkot7
 Szxwr2BKS9O9++4J7vv3tfqtPAwKNcyLYAKLnvjWrvVRcZGMarMWKNQsSdWYgdu6
 YCFCMPMXjTEu05ACdSRLThQAnSO5Ml+byI7hpfl0E69FVw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dartmouth.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dartmouth College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dartmouth College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dartmouth.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Sean McNamara</md:GivenName>
-      <md:EmailAddress>Sean.R.McNamara@dartmouth.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dartmouth Helpdesk</md:GivenName>
-      <md:EmailAddress>help@dartmouth.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dartmouth Helpdesk</md:GivenName>
-      <md:EmailAddress>help@dartmouth.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jonathan Crossett</md:GivenName>
-      <md:EmailAddress>Jonathan.Crossett@dartmouth.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dartmouth.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dartmouth College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dartmouth College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dartmouth.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Sean McNamara</md:GivenName>
+    <md:EmailAddress>Sean.R.McNamara@dartmouth.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dartmouth Helpdesk</md:GivenName>
+    <md:EmailAddress>help@dartmouth.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dartmouth Helpdesk</md:GivenName>
+    <md:EmailAddress>help@dartmouth.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jonathan Crossett</md:GivenName>
+    <md:EmailAddress>Jonathan.Crossett@dartmouth.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml
index 566f1608..12855a1c 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:duke.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duke.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Duke University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duke.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Duke University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWjCCA0KgAwIBAgIJAP1rB/FjRgy6MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
 BAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEPMA0GA1UEBxMGRHVyaGFt
 MRgwFgYDVQQKEw9EdWtlIFVuaXZlcnNpdHkxDDAKBgNVBAsTA09JVDEaMBgGA1UE
@@ -47,22 +47,22 @@ XNiLURrHhsK5pZUPLuhzJFgZuJT62TtnrjJXlrRhJ389VSkh6R64C6ncjNkg6/Cu
 tA6SX0infqNRyPRNJK+bnQd1yOP4++tjD/lAPE+5tiD/waI3fArt43ZE/qp7pYMS
 9TEfyQ5QpfRYAUFWXBc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.oit.duke.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.oit.duke.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.oit.duke.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.oit.duke.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duke.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.oit.duke.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.oit.duke.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.oit.duke.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.oit.duke.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">duke.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWjCCA0KgAwIBAgIJAP1rB/FjRgy6MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
 BAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEPMA0GA1UEBxMGRHVyaGFt
 MRgwFgYDVQQKEw9EdWtlIFVuaXZlcnNpdHkxDDAKBgNVBAsTA09JVDEaMBgGA1UE
@@ -88,23 +88,23 @@ XNiLURrHhsK5pZUPLuhzJFgZuJT62TtnrjJXlrRhJ389VSkh6R64C6ncjNkg6/Cu
 tA6SX0infqNRyPRNJK+bnQd1yOP4++tjD/lAPE+5tiD/waI3fArt43ZE/qp7pYMS
 9TEfyQ5QpfRYAUFWXBc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oit.duke.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oit.duke.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Duke University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Duke University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.duke.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shilen Patel</md:GivenName>
-      <md:EmailAddress>idmstech@duke.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shilen Patel</md:GivenName>
-      <md:EmailAddress>idmstech@duke.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oit.duke.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oit.duke.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Duke University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Duke University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.duke.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shilen Patel</md:GivenName>
+    <md:EmailAddress>idmstech@duke.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shilen Patel</md:GivenName>
+    <md:EmailAddress>idmstech@duke.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml
index 89f9face..796a5053 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:humboldt.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">humboldt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Humboldt State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">humboldt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Humboldt State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkTCCBHmgAwIBAgICAiUwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDUyOTE4NDY0OFoXDTExMDUz
@@ -50,13 +50,13 @@ Eo7yhlY9Nd2oOVWCLV6+hNqrR56gio6b0SWf97B1LAlkPTW0iLaldmLui1dW6EV0
 8pWQYq0T+m/F/Hzj730ntKD9AYN+VBCYxIPKXNPqBsKkBqNO8622mYNPcS5rbfUj
 MA1WuRhoHwRbAV7L/wak8BuONBWFl1zr3+/hOj3F1/Xpeomhag==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDyjCCArICCQDSIlwe73ERBTANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
 VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAcTBkFyY2F0YTEiMCAGA1UE
 ChMZSHVtYm9sZHQgU3RhdGUgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMRkwFwYD
@@ -79,23 +79,23 @@ JfaZDtwYHOUR9XrHbx+czHTqGcEo1Jpfg8p/KiuacKMb8n99HG9p2bUggLQOangC
 KU/1My9HTkHF8T8QLLSlqA4jb0eXnz9lxfJl2i2Y+imP77X7sWoPoL32jcoAWYoZ
 AR85Z5Jw0RxR+tbYexg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.humboldt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.humboldt.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.humboldt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.humboldt.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.humboldt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">humboldt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.humboldt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.humboldt.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.humboldt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.humboldt.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.humboldt.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">humboldt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkTCCBHmgAwIBAgICAiUwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDUyOTE4NDY0OFoXDTExMDUz
@@ -127,13 +127,13 @@ Eo7yhlY9Nd2oOVWCLV6+hNqrR56gio6b0SWf97B1LAlkPTW0iLaldmLui1dW6EV0
 8pWQYq0T+m/F/Hzj730ntKD9AYN+VBCYxIPKXNPqBsKkBqNO8622mYNPcS5rbfUj
 MA1WuRhoHwRbAV7L/wak8BuONBWFl1zr3+/hOj3F1/Xpeomhag==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDyjCCArICCQDSIlwe73ERBTANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
 VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAcTBkFyY2F0YTEiMCAGA1UE
 ChMZSHVtYm9sZHQgU3RhdGUgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMRkwFwYD
@@ -156,35 +156,35 @@ JfaZDtwYHOUR9XrHbx+czHTqGcEo1Jpfg8p/KiuacKMb8n99HG9p2bUggLQOangC
 KU/1My9HTkHF8T8QLLSlqA4jb0eXnz9lxfJl2i2Y+imP77X7sWoPoL32jcoAWYoZ
 AR85Z5Jw0RxR+tbYexg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.humboldt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.humboldt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Humboldt State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Humboldt State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.humboldt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark Hendricks</md:GivenName>
-      <md:EmailAddress>mark.hendricks@humboldt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Peter Johnson</md:GivenName>
-      <md:EmailAddress>peter.johnson@humboldt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Systems Group</md:GivenName>
-      <md:EmailAddress>sysadmin@humboldt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Josh Callahan</md:GivenName>
-      <md:EmailAddress>josh.callahan@humboldt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Troy Butolph</md:GivenName>
-      <md:EmailAddress>troy.butolph@humboldt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.humboldt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.humboldt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Humboldt State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Humboldt State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.humboldt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark Hendricks</md:GivenName>
+    <md:EmailAddress>mark.hendricks@humboldt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter Johnson</md:GivenName>
+    <md:EmailAddress>peter.johnson@humboldt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Systems Group</md:GivenName>
+    <md:EmailAddress>sysadmin@humboldt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Josh Callahan</md:GivenName>
+    <md:EmailAddress>josh.callahan@humboldt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Troy Butolph</md:GivenName>
+    <md:EmailAddress>troy.butolph@humboldt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml b/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml
index be0e1c9b..865d9cbb 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:idp.protectnetwork.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ProtectNetwork</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ProtectNetwork</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEDDCCAvSgAwIBAgIJAP9PRji2zBSeMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
 BAYTAlVTMScwJQYDVQQDEx5pbmNvbW1vbi1hYS5wcm90ZWN0bmV0d29yay5vcmcx
 KTAnBgkqhkiG9w0BCQEWGnN1cHBvcnRAcHJvdGVjdG5ldHdvcmsub3JnMB4XDTEw
@@ -42,22 +42,22 @@ knRMT+foHB/UYirm7EnD+mbOe7oYbwrdFTkNLTrRXCI/rhGcK7oS92iJnUeW4d9R
 s3oKMUqqjByzNELDOpWXy8pXCRoZtPViWEu2IlKVxv+ro+APJQU2IZDiVA9Ulv8B
 eff7ExscZJRD66zyJdXwxkUfazgWoo5e+ayZF4/q570=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon-aa.protectnetwork.org/protectnetwork-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon-aa.protectnetwork.org/protectnetwork-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEDDCCAvSgAwIBAgIJAP9PRji2zBSeMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
 BAYTAlVTMScwJQYDVQQDEx5pbmNvbW1vbi1hYS5wcm90ZWN0bmV0d29yay5vcmcx
 KTAnBgkqhkiG9w0BCQEWGnN1cHBvcnRAcHJvdGVjdG5ldHdvcmsub3JnMB4XDTEw
@@ -81,26 +81,26 @@ knRMT+foHB/UYirm7EnD+mbOe7oYbwrdFTkNLTrRXCI/rhGcK7oS92iJnUeW4d9R
 s3oKMUqqjByzNELDOpWXy8pXCRoZtPViWEu2IlKVxv+ro+APJQU2IZDiVA9Ulv8B
 eff7ExscZJRD66zyJdXwxkUfazgWoo5e+ayZF4/q570=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon-aa.protectnetwork.org/protectnetwork-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">9Star Research Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ProtectNetwork</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.protectnetwork.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tech Support</md:GivenName>
-      <md:EmailAddress>incommon@protectnetwork.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kaustav Ghoshal</md:GivenName>
-      <md:EmailAddress>kaustav@9starresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon Lee</md:GivenName>
-      <md:EmailAddress>simon.lee@9starresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon-aa.protectnetwork.org/protectnetwork-idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">9Star Research Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ProtectNetwork</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.protectnetwork.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tech Support</md:GivenName>
+    <md:EmailAddress>incommon@protectnetwork.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kaustav Ghoshal</md:GivenName>
+    <md:EmailAddress>kaustav@9starresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon Lee</md:GivenName>
+    <md:EmailAddress>simon.lee@9starresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml
index f6bf4f48..6f43f4fd 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:internet2.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Internet2</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.internet2.edu/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="200" width="200" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/10/15/internet2_logo_200pxtrans.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Internet2</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.internet2.edu/about/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="200" width="200" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/10/15/internet2_logo_200pxtrans.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDpTCCAo2gAwIBAgIJAIFOoKy0fzFNMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRvcmlnaW4uaW50ZXJuZXQyLmVk
@@ -46,29 +46,29 @@ hDtzphzWaOjXdfU904A3QuaeQq2LYOsYkG+GmFLSvzJ1UbvQ/NUTFeTpIVgsaUOb
 FaaEtp/LBAgwDJl9hoToLsRJHZdXevqmqKokP5I6LjXianwSgYDzku3sOwt/YwZM
 O5DEpKOPF/GsgEfq0uuXyFwYqiJLJFuEbw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://origin.internet2.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://origin.internet2.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://origin.internet2.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://origin.internet2.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://origin.internet2.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://origin.internet2.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://origin.internet2.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://origin.internet2.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml
index 7b669ffe..4fef6ae2 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:iu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://kb.iu.edu/data/abxl.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Indiana University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider for Indiana University.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://kb.iu.edu/data/bdbk.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://protect.iu.edu/privacy/policies</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://idp.iu.edu/shibboleth-idp/images/iu-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://kb.iu.edu/data/abxl.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Indiana University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider for Indiana University.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://kb.iu.edu/data/bdbk.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://protect.iu.edu/privacy/policies</mdui:PrivacyStatementURL>
-          <mdui:Logo height="64" width="350" xml:lang="en">https://idp.iu.edu/shibboleth-idp/images/iu-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEnjCCA4agAwIBAgIJALK5W6TnLzRkMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEUMBIGA1UEBxMLQmxvb21pbmd0b24x
 GzAZBgNVBAoTEkluZGlhbmEgVW5pdmVyc2l0eTEnMCUGA1UECxMeVW5pdmVyc2l0
@@ -52,24 +52,24 @@ fF9p7VWBrd4zmIOhtltgrn5bQKkvd/C6IuDERcGUVm3H4bMVX0R310+623kBaTLs
 ajy5DWB1nPufiuuDMvC4u5V5MFLuih4WNcHQDvlLKDYmTwwzMuMUT66RYRu3TZsD
 L2LuGuOyTnT5YZXTUl4ADM7Oqe2rOQeUdCTNomTlqhpZlA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iu.edu:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iu.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iu.edu:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iu.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEnjCCA4agAwIBAgIJALK5W6TnLzRkMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEUMBIGA1UEBxMLQmxvb21pbmd0b24x
 GzAZBgNVBAoTEkluZGlhbmEgVW5pdmVyc2l0eTEnMCUGA1UECxMeVW5pdmVyc2l0
@@ -96,27 +96,27 @@ fF9p7VWBrd4zmIOhtltgrn5bQKkvd/C6IuDERcGUVm3H4bMVX0R310+623kBaTLs
 ajy5DWB1nPufiuuDMvC4u5V5MFLuih4WNcHQDvlLKDYmTwwzMuMUT66RYRu3TZsD
 L2LuGuOyTnT5YZXTUl4ADM7Oqe2rOQeUdCTNomTlqhpZlA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iu.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Indiana University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Indiana University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.indiana.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Center</md:GivenName>
-      <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support Center</md:GivenName>
-      <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Support Center</md:GivenName>
-      <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iu.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Indiana University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Indiana University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.indiana.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Center</md:GivenName>
+    <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support Center</md:GivenName>
+    <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Support Center</md:GivenName>
+    <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml
index 6d69b2c8..a09d6d73 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:jmu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://itfederation.jmu.edu/shiberror.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jmu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">James Madison University</mdui:DisplayName>
+        <mdui:Logo height="125" width="230" xml:lang="en">https://itfederation.jmu.edu/idp/images/James_Madison_logo_black.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://itfederation.jmu.edu/shiberror.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jmu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">James Madison University</mdui:DisplayName>
-          <mdui:Logo height="125" width="230" xml:lang="en">https://itfederation.jmu.edu/idp/images/James_Madison_logo_black.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEvTCCA6WgAwIBAgIJAMwnlWaj6tOPMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVy
 ZzEhMB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJ
@@ -47,24 +47,24 @@ MsH+FBVwtyV/jxAkRpw/MRczHruwPObYT6mKoVMdOaP0NvAEtqQRFBuJQh760wpz
 QzYSjyLb8gehpoRs8nWw73l8FgKhXa/hz06Vp9hibCfxxSWb8bktOu8MruAM4zVe
 ItgUieNNRzPjqrr/K8B4rWo=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itfederation.jmu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itfederation.jmu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itfederation.jmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">James Madison University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">James Madison University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jmu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@jmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Unix/Linux Group</md:GivenName>
-      <md:EmailAddress>linuxteam@jmu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itfederation.jmu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itfederation.jmu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itfederation.jmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">James Madison University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">James Madison University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jmu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@jmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Unix/Linux Group</md:GivenName>
+    <md:EmailAddress>linuxteam@jmu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml
index c71da9a4..75190f9a 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:johnshopkins.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">johnshopkins.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Johns Hopkins</mdui:DisplayName>
+        <mdui:Logo height="52" width="266" xml:lang="en">https://login.johnshopkins.edu/login/images/jhlogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">johnshopkins.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Johns Hopkins</mdui:DisplayName>
-          <mdui:Logo height="52" width="266" xml:lang="en">https://login.johnshopkins.edu/login/images/jhlogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTzCCAjegAwIBAgIUB/OyD4uWMP6wD8bB45UeirMblPAwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZaW5jb21tb24uam9obnNob3BraW5zLmVkdTAeFw0xMDA1
 MTAxODQ1NTlaFw0zMDA1MTAxODQ1NTlaMCQxIjAgBgNVBAMTGWluY29tbW9uLmpv
@@ -42,24 +42,24 @@ GnAWzBvbr5GNrOnCQ8k35KVK6d+xwr3f+3H346CWcklxTNAYEn5+N3vR0F+uw0wP
 96QOFedHSLC7JwfG66uSWijmLy+QhtTiNEA1b8rn5Wq4AZnqwcjXoilz1yjSS1tT
 WYVvBm6n6IU0hHNWwnYCQT6WSHABz7vlkqM0c7A0oqltFPQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon.johnshopkins.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">johnshopkins.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon.johnshopkins.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">johnshopkins.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTzCCAjegAwIBAgIUB/OyD4uWMP6wD8bB45UeirMblPAwDQYJKoZIhvcNAQEF
 BQAwJDEiMCAGA1UEAxMZaW5jb21tb24uam9obnNob3BraW5zLmVkdTAeFw0xMDA1
 MTAxODQ1NTlaFw0zMDA1MTAxODQ1NTlaMCQxIjAgBgNVBAMTGWluY29tbW9uLmpv
@@ -79,27 +79,27 @@ GnAWzBvbr5GNrOnCQ8k35KVK6d+xwr3f+3H346CWcklxTNAYEn5+N3vR0F+uw0wP
 96QOFedHSLC7JwfG66uSWijmLy+QhtTiNEA1b8rn5Wq4AZnqwcjXoilz1yjSS1tT
 WYVvBm6n6IU0hHNWwnYCQT6WSHABz7vlkqM0c7A0oqltFPQ=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Johns Hopkins University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Johns Hopkins</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jhu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Andrew Baldwin</md:GivenName>
-      <md:EmailAddress>andrew.baldwin@jhu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Enterprise Authenticaion Team</md:GivenName>
-      <md:EmailAddress>enterpriseauth@jhmi.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Etan Weintraub</md:GivenName>
-      <md:EmailAddress>eweintra@jhmi.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Johns Hopkins University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Johns Hopkins</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jhu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andrew Baldwin</md:GivenName>
+    <md:EmailAddress>andrew.baldwin@jhu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Enterprise Authenticaion Team</md:GivenName>
+    <md:EmailAddress>enterpriseauth@jhmi.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Etan Weintraub</md:GivenName>
+    <md:EmailAddress>eweintra@jhmi.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml
index 7b6b58d3..45abc16c 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:lafayette.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lafayette.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lafayette College</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://its.lafayette.edu/policies/accounts/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://its.lafayette.edu/policies/shibboleth/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lafayette.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lafayette College</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://its.lafayette.edu/policies/accounts/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://its.lafayette.edu/policies/shibboleth/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAJYxoS4g0HtVGMnXI6lqUky18fzdMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVkdTAeFw0xMDA0MTkxNjA3
 NDhaFw0zMDA0MTkxNjA3NDhaMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVk
@@ -40,24 +40,24 @@ L95JVYfApoA4H6a/w1cxF9lMl2Bs+dlFOP4C9kvZNekgpOYWC1EmA5L4SLglywSw
 IxZ8wXmYPwB3rJluzCbFDPImBSY51mZTzT2AZnTjUPTY/7VhVFpk5jcBhxMVK/3z
 kmYrzZJG/UM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.lafayette.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.lafayette.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.lafayette.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.lafayette.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lafayette.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.lafayette.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.lafayette.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.lafayette.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.lafayette.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lafayette.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAJYxoS4g0HtVGMnXI6lqUky18fzdMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVkdTAeFw0xMDA0MTkxNjA3
 NDhaFw0zMDA0MTkxNjA3NDhaMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVk
@@ -77,27 +77,27 @@ L95JVYfApoA4H6a/w1cxF9lMl2Bs+dlFOP4C9kvZNekgpOYWC1EmA5L4SLglywSw
 IxZ8wXmYPwB3rJluzCbFDPImBSY51mZTzT2AZnTjUPTY/7VhVFpk5jcBhxMVK/3z
 kmYrzZJG/UM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lafayette College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lafayette College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lafayette.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janemarie Duh</md:GivenName>
-      <md:EmailAddress>berryj@lafayette.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>John O'Keefe</md:GivenName>
-      <md:EmailAddress>okeefej@lafayette.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Accounts</md:GivenName>
-      <md:EmailAddress>accounts@lafayette.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lafayette College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lafayette College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lafayette.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janemarie Duh</md:GivenName>
+    <md:EmailAddress>berryj@lafayette.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>John O'Keefe</md:GivenName>
+    <md:EmailAddress>okeefej@lafayette.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Accounts</md:GivenName>
+    <md:EmailAddress>accounts@lafayette.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml b/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml
index 20abe4f1..5f9b516e 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:lbl.gov">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lbl.gov</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lawrence Berkeley National Laboratory</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/display/IDMgmt/Web+Single+Sign+On+at+LBNL</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/Disclaimers.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="111" width="130" xml:lang="en">https://commons.lbl.gov/download/attachments/58393603/lbl-logo-scaled.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lbl.gov</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lawrence Berkeley National Laboratory</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/display/IDMgmt/Web+Single+Sign+On+at+LBNL</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/Disclaimers.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="111" width="130" xml:lang="en">https://commons.lbl.gov/download/attachments/58393603/lbl-logo-scaled.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUWaUNclZjoQfm4ab+ttJmW3Oqs7swDQYJKoZIhvcNAQEF
 BQAwGDEWMBQGA1UEAxMNbG9naW4ubGJsLmdvdjAeFw0wODEwMzEyMzM2MjVaFw0y
 ODEwMzEyMzM2MjVaMBgxFjAUBgNVBAMTDWxvZ2luLmxibC5nb3YwggEiMA0GCSqG
@@ -43,33 +43,33 @@ kFST/Q3Jtsg3anxCfqaP/R2vcad8H722vFDZwGflImbZg3DNhF6Mj/pt3CuGpnIg
 jMIMRq4HkXJG3HRnSAxxmy5CPoslaIvJEXvV1WGUe/1jSqCKfdVSf1SeN2KqfQyj
 XHl1TMy82/4cFm7JOZXiJx32LIlICdpcBIGU7dFwHmiVYJc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lbl.gov/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lbl.gov/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.lbl.gov/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lbl.gov/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg Haverkamp</md:GivenName>
-      <md:EmailAddress>gahaverkamp@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Identity Management Team</md:GivenName>
-      <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Help Desk</md:GivenName>
-      <md:EmailAddress>help@lb.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LBL Cybersecurity</md:GivenName>
-      <md:EmailAddress>security@lbl.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lbl.gov/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lbl.gov/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.lbl.gov/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lbl.gov/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg Haverkamp</md:GivenName>
+    <md:EmailAddress>gahaverkamp@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Identity Management Team</md:GivenName>
+    <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>help@lb.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LBL Cybersecurity</md:GivenName>
+    <md:EmailAddress>security@lbl.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml b/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
index 25761108..ea186007 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:mcnc.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnc.org</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MCNC</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnc.org</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MCNC</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAKPDo3j6X66pMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTMxMjEzMTU0ODE4WhcNMzMxMjEzMTU0ODE4
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -37,13 +37,13 @@ KJsQKCUT/4ZZoYJVFCBDShlu4igbXjNuBdL1gCsnlL8VWEbWbNJVMqzknZs4QWNw
 EUWUdnmWZjKjlk0102QEkIUvLU7en3kNqsmuPjw92IY2YhQPIH3J2RTas/FQjIL8
 nN1kNG2Jp9SMNpbgU3AYpY0oEFwoZ5QaEk0kYGPfE06xkiSOH0axJzPUWQ0yg1K+
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAPKCnaTdOvUTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTAxMjIyMTgzMzMwWhcNMTMxMjIxMTgzMzMw
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -62,24 +62,24 @@ iNSnodKcEBwA2xzg/5JBoN8+c2lfA3RErnNE6H1krRSdFUIf6qqvjAsAC4tiaNoX
 qpDN0kQQPXRDoNTOQwq3dsk8Ln3Xath+S+qGl7S4hvAx4uSwRBvq9NC8nbpPOePy
 yON7kOgCmBkorVBXljwXBx36Q7X8jMYI/CQtHFcH2M05Ld8oOU31/m8xiOGruasK
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnc.org/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnc.org/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnc.org/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mcnc.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnc.org</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnc.org/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnc.org/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnc.org/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mcnc.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnc.org</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAKPDo3j6X66pMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTMxMjEzMTU0ODE4WhcNMzMxMjEzMTU0ODE4
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -98,13 +98,13 @@ KJsQKCUT/4ZZoYJVFCBDShlu4igbXjNuBdL1gCsnlL8VWEbWbNJVMqzknZs4QWNw
 EUWUdnmWZjKjlk0102QEkIUvLU7en3kNqsmuPjw92IY2YhQPIH3J2RTas/FQjIL8
 nN1kNG2Jp9SMNpbgU3AYpY0oEFwoZ5QaEk0kYGPfE06xkiSOH0axJzPUWQ0yg1K+
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIJAPKCnaTdOvUTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubWNuYy5vcmcwHhcNMTAxMjIyMTgzMzMwWhcNMTMxMjIxMTgzMzMw
 WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -123,27 +123,27 @@ iNSnodKcEBwA2xzg/5JBoN8+c2lfA3RErnNE6H1krRSdFUIf6qqvjAsAC4tiaNoX
 qpDN0kQQPXRDoNTOQwq3dsk8Ln3Xath+S+qGl7S4hvAx4uSwRBvq9NC8nbpPOePy
 yON7kOgCmBkorVBXljwXBx36Q7X8jMYI/CQtHFcH2M05Ld8oOU31/m8xiOGruasK
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MCNC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MCNC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mcnc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve Thorpe</md:GivenName>
-      <md:EmailAddress>thorpe@mcnc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Keith Venters</md:GivenName>
-      <md:EmailAddress>kventers@mcnc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>MCNC Help Desk</md:GivenName>
-      <md:EmailAddress>support@mcnc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MCNC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MCNC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mcnc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve Thorpe</md:GivenName>
+    <md:EmailAddress>thorpe@mcnc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Keith Venters</md:GivenName>
+    <md:EmailAddress>kventers@mcnc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>MCNC Help Desk</md:GivenName>
+    <md:EmailAddress>support@mcnc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml
index 49979075..105d32fb 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:mit.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.mit.edu/help.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mit.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Massachusetts Institute of Technology</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.mit.edu/help.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mit.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Massachusetts Institute of Technology</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6DCCAdCgAwIBAgIJAOOuZYuBUH2jMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC5taXQuZWR1MB4XDTEzMTAyMTE5NDczNloXDTMzMTAxNjE5NDczNlow
 FjEUMBIGA1UEAxMLaWRwLm1pdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -39,21 +39,21 @@ CsVjcBbQw+YbSkmf30ebRTSzIYMhaGETQuf75xD/Ww0mM3njm79Ophg5Y7I9Ryud
 MdDQwsxAS7ECH7vLyu8V/HIfaPkOWYzKKKW5d4E1/X67J2XmTICT7PdxSd5ZKoB5
 jdqBxPVYM+C1V02QZFDb7TkTDEICzUnr/VBZ+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mit.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mit.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mit.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mit.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mit.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mit.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mit.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mit.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6DCCAdCgAwIBAgIJAOOuZYuBUH2jMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC5taXQuZWR1MB4XDTEzMTAyMTE5NDczNloXDTMzMTAxNjE5NDczNlow
 FjEUMBIGA1UEAxMLaWRwLm1pdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -71,19 +71,19 @@ CsVjcBbQw+YbSkmf30ebRTSzIYMhaGETQuf75xD/Ww0mM3njm79Ophg5Y7I9Ryud
 MdDQwsxAS7ECH7vLyu8V/HIfaPkOWYzKKKW5d4E1/X67J2XmTICT7PdxSd5ZKoB5
 jdqBxPVYM+C1V02QZFDb7TkTDEICzUnr/VBZ+A==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mit.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mit.edu:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Massachusetts Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Massachusetts Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://web.mit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Touchstone Support</md:GivenName>
-      <md:EmailAddress>touchstone-support@mit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mit.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mit.edu:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Massachusetts Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Massachusetts Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://web.mit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Touchstone Support</md:GivenName>
+    <md:EmailAddress>touchstone-support@mit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml
index 6ed7eb7f..721238f8 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:mlml.calstate.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlml.calstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moss Landing Marine Laboratories</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlml.calstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Moss Landing Marine Laboratories</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFZDCCBEygAwIBAgIJANHtJiw8sqZ3MA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMTW9zcyBMYW5k
 aW5nMSQwIgYDVQQKExtDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkxKTAnBgNV
@@ -49,24 +49,24 @@ iL54lUeZs8ADRZYipvzdsJ0E7E6LxC4JOsFREigFafDwk1lSBKSJ+JsEhmuNzEhz
 0PKULq364ZYjX+pa5f2au9lPWj1nwmV9lc9envcbiU7hg6LXZeh5fD5dzsad5YCn
 rDOZv9+tMo8RM/TCwSdro/wDgMKNegtJQb3Wny5phuSnRENGn+sr4w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-mlml.calstate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlml.calstate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-mlml.calstate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mlml.calstate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFZDCCBEygAwIBAgIJANHtJiw8sqZ3MA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMTW9zcyBMYW5k
 aW5nMSQwIgYDVQQKExtDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkxKTAnBgNV
@@ -97,31 +97,31 @@ iL54lUeZs8ADRZYipvzdsJ0E7E6LxC4JOsFREigFafDwk1lSBKSJ+JsEhmuNzEhz
 0PKULq364ZYjX+pa5f2au9lPWj1nwmV9lc9envcbiU7hg6LXZeh5fD5dzsad5YCn
 rDOZv9+tMo8RM/TCwSdro/wDgMKNegtJQb3Wny5phuSnRENGn+sr4w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Moss Landing Marine Laboratories</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Moss Landing Marine Laboratories</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mlml.calstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marcus M. Mizushima</md:GivenName>
-      <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul Klepac</md:GivenName>
-      <md:EmailAddress>pklepac@mlml.calstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jeff Arlt</md:GivenName>
-      <md:EmailAddress>jarlt@mlml.calstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eli Pham</md:GivenName>
-      <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Moss Landing Marine Laboratories</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moss Landing Marine Laboratories</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mlml.calstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marcus M. Mizushima</md:GivenName>
+    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul Klepac</md:GivenName>
+    <md:EmailAddress>pklepac@mlml.calstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jeff Arlt</md:GivenName>
+    <md:EmailAddress>jarlt@mlml.calstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eli Pham</md:GivenName>
+    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml
index 7ad49937..43060ed4 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:msu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Michigan State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Michigan State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUeJxFbzo6QUFQBwO2YCaJYbi4LNAwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MB4XDTEwMDgyMzE4NDYwNFoX
 DTMwMDgyMzE4NDYwNFowGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MIIBIjAN
@@ -37,22 +37,22 @@ QiEsqE+9onXd3TKwKPh5pLkYPM4+5bGDCIeeZGfFNcps6rRSP+bkoMJ39hmDUmqC
 bfkNIuyhSG8qzEKSdLYdg4PocBa2BrNetkjLwsBG1AGb7DxtDZw0wFZ/JjItlOqr
 IWSXrZlHRA8K/3KR3Augqn/TSQCTmWuhM+gxc/ooYDV3CGCC3Kn9OgMkXQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.idm.msu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.idm.msu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.idm.msu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.idm.msu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.idm.msu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.idm.msu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.idm.msu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.idm.msu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUeJxFbzo6QUFQBwO2YCaJYbi4LNAwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MB4XDTEwMDgyMzE4NDYwNFoX
 DTMwMDgyMzE4NDYwNFowGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MIIBIjAN
@@ -71,27 +71,27 @@ QiEsqE+9onXd3TKwKPh5pLkYPM4+5bGDCIeeZGfFNcps6rRSP+bkoMJ39hmDUmqC
 bfkNIuyhSG8qzEKSdLYdg4PocBa2BrNetkjLwsBG1AGb7DxtDZw0wFZ/JjItlOqr
 IWSXrZlHRA8K/3KR3Augqn/TSQCTmWuhM+gxc/ooYDV3CGCC3Kn9OgMkXQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.idm.msu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.idm.msu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Michigan State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Michigan State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.msu.edu/home/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Callaghan</md:GivenName>
-      <md:EmailAddress>jpc@msu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jim Green</md:GivenName>
-      <md:EmailAddress>jfgreen@msu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mike Bosko</md:GivenName>
-      <md:EmailAddress>mdb@msu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.idm.msu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.idm.msu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Michigan State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Michigan State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.msu.edu/home/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Callaghan</md:GivenName>
+    <md:EmailAddress>jpc@msu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jim Green</md:GivenName>
+    <md:EmailAddress>jfgreen@msu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mike Bosko</md:GivenName>
+    <md:EmailAddress>mdb@msu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml
index 183eb778..89f5ca02 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:muohio.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shib-idp.muohio.edu/shibboleth/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muohio.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Miami University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shib-idp.muohio.edu/shibboleth/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muohio.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Miami University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAKw5joclkRM7v8BoI/l7FWUAWuZmMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEG11aWRwLm11b2hpby5lZHUwHhcNMTEwOTA2MTgxNzM3
 WhcNMzEwOTA2MTgxNzM3WjAbMRkwFwYDVQQDExBtdWlkcC5tdW9oaW8uZWR1MIIB
@@ -38,25 +38,25 @@ PjkOhl1Xv1kTYkhNlUe+lD76xgvaizZqxQNOZSohGB6JKWVgpVmNKXrG70bPFoVD
 W9zHQ1QMn4zgrcdIXAh35hfJ3V11hYNAxbEJR+a6JcLx6w8sYF4hKcNMez89uunC
 YYDYqK0Q9zukmasDWzcclzuqiJdWWMieNGYFgQOru5/17okAMls3dl2RmjoQgEsN
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://muidp.miamioh.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://muidp.miamioh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muidp.miamioh.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muidp.miamioh.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muohio.edu</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://muidp.miamioh.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://muidp.miamioh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muidp.miamioh.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muidp.miamioh.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muohio.edu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAKw5joclkRM7v8BoI/l7FWUAWuZmMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEG11aWRwLm11b2hpby5lZHUwHhcNMTEwOTA2MTgxNzM3
 WhcNMzEwOTA2MTgxNzM3WjAbMRkwFwYDVQQDExBtdWlkcC5tdW9oaW8uZWR1MIIB
@@ -75,27 +75,27 @@ PjkOhl1Xv1kTYkhNlUe+lD76xgvaizZqxQNOZSohGB6JKWVgpVmNKXrG70bPFoVD
 W9zHQ1QMn4zgrcdIXAh35hfJ3V11hYNAxbEJR+a6JcLx6w8sYF4hKcNMez89uunC
 YYDYqK0Q9zukmasDWzcclzuqiJdWWMieNGYFgQOru5/17okAMls3dl2RmjoQgEsN
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Miami University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Miami University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.muohio.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dirk Tepe</md:GivenName>
-      <md:EmailAddress>tepeds@muohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Don Kidd</md:GivenName>
-      <md:EmailAddress>kidddw@muohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael Beck</md:GivenName>
-      <md:EmailAddress>beckmd@muohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Miami University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Miami University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.muohio.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dirk Tepe</md:GivenName>
+    <md:EmailAddress>tepeds@muohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Don Kidd</md:GivenName>
+    <md:EmailAddress>kidddw@muohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael Beck</md:GivenName>
+    <md:EmailAddress>beckmd@muohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml
index 99191621..a2466645 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:nau.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nau.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Northern Arizona University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nau.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Northern Arizona University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWTCCA0GgAwIBAgIJAJPypRDQcZpwMA0GCSqGSIb3DQEBBQUAMIHCMQswCQYD
 VQQGEwJVUzEQMA4GA1UECAwHQXJpem9uYTESMBAGA1UEBwwJRmxhZ3N0YWZmMSQw
 IgYDVQQKDBtOb3J0aGVybiBBcml6b25hIFVuaXZlcnNpdHkxKDAmBgNVBAsMH0lu
@@ -44,23 +44,23 @@ dwliFh/kektdknGal5jbyXZccRssfnGhW2eL1MXDzEY/YSKa95T2LTDq3ek9Wgyf
 c0MKBkAQOLaPFkY0E3sM7Hk/tWmbFyp584N4XZYHU2hcnWfuUBY1571m0ysP3n2y
 Sjgw6oOYg18rdX4w3w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nau.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nau.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nau.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nau.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nau.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nau.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nau.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nau.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEWTCCA0GgAwIBAgIJAJPypRDQcZpwMA0GCSqGSIb3DQEBBQUAMIHCMQswCQYD
 VQQGEwJVUzEQMA4GA1UECAwHQXJpem9uYTESMBAGA1UEBwwJRmxhZ3N0YWZmMSQw
 IgYDVQQKDBtOb3J0aGVybiBBcml6b25hIFVuaXZlcnNpdHkxKDAmBgNVBAsMH0lu
@@ -86,27 +86,27 @@ dwliFh/kektdknGal5jbyXZccRssfnGhW2eL1MXDzEY/YSKa95T2LTDq3ek9Wgyf
 c0MKBkAQOLaPFkY0E3sM7Hk/tWmbFyp584N4XZYHU2hcnWfuUBY1571m0ysP3n2y
 Sjgw6oOYg18rdX4w3w==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northern Arizona University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northern Arizona University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://home.nau.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christopher Michels</md:GivenName>
-      <md:EmailAddress>christopher.michels@nau.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Summer Steddom</md:GivenName>
-      <md:EmailAddress>Summer.steddom@nau.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mathew Eis</md:GivenName>
-      <md:EmailAddress>Mathew.Eis@nau.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northern Arizona University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northern Arizona University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://home.nau.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher Michels</md:GivenName>
+    <md:EmailAddress>christopher.michels@nau.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Summer Steddom</md:GivenName>
+    <md:EmailAddress>Summer.steddom@nau.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mathew Eis</md:GivenName>
+    <md:EmailAddress>Mathew.Eis@nau.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml
index 675d7890..74ff4558 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ncsu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">North Carolina State University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Sign in with your NC State UnityID credentials</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://oit.ncsu.edu/campus-it/identity-management/shibboleth/</mdui:InformationURL>
+        <mdui:Logo height="33" width="195" xml:lang="en">https://docs.shib.ncsu.edu/inc/fed_logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">North Carolina State University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Sign in with your NC State UnityID credentials</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://oit.ncsu.edu/campus-it/identity-management/shibboleth/</mdui:InformationURL>
-          <mdui:Logo height="33" width="195" xml:lang="en">https://docs.shib.ncsu.edu/inc/fed_logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIJAKcwwnWxi6ZCMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubmNzdS5lZHUwHhcNMTQwNDI1MTUxNDUyWhcNMTkwNDI1MTUxNDUy
 WjAYMRYwFAYDVQQDEw1zaGliLm5jc3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -43,24 +43,24 @@ lt5/Noa2Z0beNonPwErtEVMHY5ozKVsDAj71VpJYVno9Rh4sJA40M9X90Z8VumZF
 sTmYvvoBIotU2pYCM8LJKGaV14EeDOvKUinr7NwLJtRvrpYhdJLtdoweOC/CriGE
 QG14KYZRu8ILWwLE2Vtr8Zl9dQOZvVuq
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ncsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ncsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ncsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ncsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ncsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ncsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ncsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ncsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ncsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ncsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIJAKcwwnWxi6ZCMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXNoaWIubmNzdS5lZHUwHhcNMTQwNDI1MTUxNDUyWhcNMTkwNDI1MTUxNDUy
 WjAYMRYwFAYDVQQDEw1zaGliLm5jc3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -79,31 +79,31 @@ lt5/Noa2Z0beNonPwErtEVMHY5ozKVsDAj71VpJYVno9Rh4sJA40M9X90Z8VumZF
 sTmYvvoBIotU2pYCM8LJKGaV14EeDOvKUinr7NwLJtRvrpYhdJLtdoweOC/CriGE
 QG14KYZRu8ILWwLE2Vtr8Zl9dQOZvVuq
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ncsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">North Carolina State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North Carolina State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NC State Shibboleth Support Team</md:GivenName>
-      <md:EmailAddress>shibboleth-help@ncsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NC State Shibboleth Support Team</md:GivenName>
-      <md:EmailAddress>shibboleth-help@ncsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>NC State Help Desk</md:GivenName>
-      <md:EmailAddress>help@ncsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>NC State Security Team</md:GivenName>
-      <md:EmailAddress>security@ncsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ncsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">North Carolina State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North Carolina State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NC State Shibboleth Support Team</md:GivenName>
+    <md:EmailAddress>shibboleth-help@ncsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NC State Shibboleth Support Team</md:GivenName>
+    <md:EmailAddress>shibboleth-help@ncsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NC State Help Desk</md:GivenName>
+    <md:EmailAddress>help@ncsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>NC State Security Team</md:GivenName>
+    <md:EmailAddress>security@ncsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml b/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml
index 5cf2c49c..46f153d8 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:nih.gov">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.gov</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Institutes of Health</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.gov</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">National Institutes of Health</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFyTCCBLGgAwIBAgIEUS3McTANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
 UzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNISFMxIjAgBgNV
 BAsTGUNlcnRpZmljYXRpb24gQXV0aG9yaXRpZXMxJDAiBgNVBAMTG0hIUy1GUEtJ
@@ -51,27 +51,27 @@ kE2fjMauvXZQTI266pqnYFlwkFD48llB6wrbjKO9SDBSyeq2gAnxp3BIny7gBU/R
 WGRgzl5q5RbOcAjE63Jx7upsjb2L3QFpKrftvc4c9PApGKXKf7DYj1P4OPgOfDlC
 py4JyFjQZIDX97DqBhQa41A9M/NKJ+UtBAbHXNhyYWgCbMvH8jMRLbhOGPhO
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itrusteauth.nih.gov/affwebservices/public/saml2sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://citdecadssoweb.cit.nih.gov/affwebservices/public/saml2sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIH Login Team</md:GivenName>
-      <md:EmailAddress>CITIAMNIHLoginTeam@mail.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>NIH Login Support</md:GivenName>
-      <md:EmailAddress>NIHLoginSupport@mail.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>NIH Federation Request</md:GivenName>
-      <md:EmailAddress>NIHFederationRequest@mail.nih.gov</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itrusteauth.nih.gov/affwebservices/public/saml2sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://citdecadssoweb.cit.nih.gov/affwebservices/public/saml2sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIH Login Team</md:GivenName>
+    <md:EmailAddress>CITIAMNIHLoginTeam@mail.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>NIH Login Support</md:GivenName>
+    <md:EmailAddress>NIHLoginSupport@mail.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NIH Federation Request</md:GivenName>
+    <md:EmailAddress>NIHFederationRequest@mail.nih.gov</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml
index 41f4c2dd..89848e6f 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:northwestern.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northwestern.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Northwestern University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northwestern.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Northwestern University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDojCCAooCCQC5DFeN8E0XhTANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgTAklMMREwDwYDVQQHEwhFdmFuc3RvbjEgMB4GA1UEChMXTm9y
 dGh3ZXN0ZXJuIFVuaXZlcnNpdHkxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hu
@@ -43,21 +43,21 @@ xH100oQ2pDktlENbgaqSkf5Na4iSXCikSWlHXWrvLOitRUdMNatq5SBPNTg2KAH7
 d+Bjxku5FEnS07bFaN5TluB5dXvXjO974EsTgE0IERVG3Ctt627NQRWsgoliqsck
 nC6JxENe05T4sdut9pYxad/9deFNAQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northwestern.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northwestern.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDojCCAooCCQC5DFeN8E0XhTANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgTAklMMREwDwYDVQQHEwhFdmFuc3RvbjEgMB4GA1UEChMXTm9y
 dGh3ZXN0ZXJuIFVuaXZlcnNpdHkxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hu
@@ -79,22 +79,22 @@ xH100oQ2pDktlENbgaqSkf5Na4iSXCikSWlHXWrvLOitRUdMNatq5SBPNTg2KAH7
 d+Bjxku5FEnS07bFaN5TluB5dXvXjO974EsTgE0IERVG3Ctt627NQRWsgoliqsck
 nC6JxENe05T4sdut9pYxad/9deFNAQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Northwestern University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northwestern University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.northwestern.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Xiaoxia Dong</md:GivenName>
-      <md:EmailAddress>x-dong@northwestern.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil Tracy</md:GivenName>
-      <md:EmailAddress>ptracy@northwestern.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Northwestern University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northwestern University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.northwestern.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Xiaoxia Dong</md:GivenName>
+    <md:EmailAddress>x-dong@northwestern.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil Tracy</md:GivenName>
+    <md:EmailAddress>ptracy@northwestern.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml
index 1406065f..4862b4ba 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:nyu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nyu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">New York University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nyu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">New York University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE6DCCA9CgAwIBAgIJAI2V7DmlgLQ1MA0GCSqGSIb3DQEBBQUAMIGoMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRww
 GgYDVQQKExNOZXcgWW9yayBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxIjAgBgNV
@@ -50,27 +50,27 @@ iB30XNuA1VE0HlWs4l4DV1G/24Jc1Hr7iUyiZMfZlZkEuju7POrmxtU0RZ00Dyis
 tzuHg2kl7HlTBftOs8FDxM3sqityZScutQmvMe6NCy/3nSFyHCQFPfu66bycssYG
 R+4YvtjCZRUas5kS
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nyu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New York University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New York University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nyu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tracy Edappara</md:GivenName>
-      <md:EmailAddress>tte3@nyu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Gary Chapman</md:GivenName>
-      <md:EmailAddress>gwc1@nyu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Yavor Yanakiev</md:GivenName>
-      <md:EmailAddress>yy27@nyu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nyu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New York University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New York University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nyu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tracy Edappara</md:GivenName>
+    <md:EmailAddress>tte3@nyu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gary Chapman</md:GivenName>
+    <md:EmailAddress>gwc1@nyu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Yavor Yanakiev</md:GivenName>
+    <md:EmailAddress>yy27@nyu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml
index 8372109b..9fdcc956 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:odu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://shibboleth.odu.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Old Dominion University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Old Dominion University Shibboleth IDP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://shibboleth.odu.edu</mdui:InformationURL>
+        <mdui:Logo height="48" width="128" xml:lang="en">https://shibboleth.odu.edu/images/mkwl-logo-sm.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://shibboleth.odu.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Old Dominion University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Old Dominion University Shibboleth IDP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://shibboleth.odu.edu</mdui:InformationURL>
-          <mdui:Logo height="48" width="128" xml:lang="en">https://shibboleth.odu.edu/images/mkwl-logo-sm.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE0zCCA7ugAwIBAgIJAM0WUqwWTWK5MA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNVBAcTB05vcmZvbGsxIDAe
 BgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0wCwYDVQQLEwRPQ0NTMRsw
@@ -49,24 +49,24 @@ uhXaH0Ebso7KDEhBvZvDRmfR01SvUzpeftTsPRKnaWJTla1YUPgFszmjUkTJ1Qpa
 cnfTbgwJ96hKnHxmpK5uUsjV+V7EbuIPtI8tz5eL00nP8L/bXsgS3op6kHUk5+NS
 oQUCVhY/uxrC4/QdhUjx1/LfsyW84/+U6K9xavH1VPQaRyzB7MlM
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.odu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.odu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.odu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.odu.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.odu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.odu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.odu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.odu.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE0zCCA7ugAwIBAgIJAM0WUqwWTWK5MA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
 VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNVBAcTB05vcmZvbGsxIDAe
 BgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0wCwYDVQQLEwRPQ0NTMRsw
@@ -94,27 +94,27 @@ uhXaH0Ebso7KDEhBvZvDRmfR01SvUzpeftTsPRKnaWJTla1YUPgFszmjUkTJ1Qpa
 cnfTbgwJ96hKnHxmpK5uUsjV+V7EbuIPtI8tz5eL00nP8L/bXsgS3op6kHUk5+NS
 oQUCVhY/uxrC4/QdhUjx1/LfsyW84/+U6K9xavH1VPQaRyzB7MlM
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Old Dominion University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Old Dominion University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://web.odu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Todd Dergenski</md:GivenName>
-      <md:EmailAddress>tdergens@odu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Todd Dergenski</md:GivenName>
-      <md:EmailAddress>tdergens@odu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support Center</md:GivenName>
-      <md:EmailAddress>itshelp@odu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Old Dominion University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Old Dominion University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://web.odu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Todd Dergenski</md:GivenName>
+    <md:EmailAddress>tdergens@odu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Todd Dergenski</md:GivenName>
+    <md:EmailAddress>tdergens@odu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support Center</md:GivenName>
+    <md:EmailAddress>itshelp@odu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml
index d393f7a5..2e4245de 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ohio.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.ohio.edu/oit/help/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ohio University Main Campus</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.ohio.edu/oit/help/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ohio University Main Campus</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRjCCAi4CCQCgfWHrvKuIZTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
 UzENMAsGA1UECAwET2hpbzEPMA0GA1UEBwwGQXRoZW5zMRgwFgYDVQQKDA9PaGlv
 IFVuaXZlcnNpdHkxHDAaBgNVBAMME3NoaWJib2xldGgub2hpby5lZHUwHhcNMTMw
@@ -38,33 +38,33 @@ RcmWQqfefV/iEmk3TGbIXF7uJn+Pske66sFmJWDDrY/XyIk5/iMyZiYAgzXwHqYH
 DjvqccpUQMfjj63LtaJ/7651xVpno2blVL7KWjDs5mNTWMTz/b6pPYZyOhoEZe6E
 zogcZq8NtZ20nYx1Wx1u1vhCdNdZvXcpvOM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SSOService.php" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ohio.edu/simplesaml/shib13/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ohio University Main Campus</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ohio University Main Campus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ohiou.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mikio Olin</md:GivenName>
-      <md:EmailAddress>olin@ohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Allen Gattis</md:GivenName>
-      <md:EmailAddress>gattis@ohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Hayes</md:GivenName>
-      <md:EmailAddress>hayesc@ohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Renee Perry</md:GivenName>
-      <md:EmailAddress>perryr1@ohio.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SSOService.php" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ohio.edu/simplesaml/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ohio University Main Campus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ohio University Main Campus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ohiou.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mikio Olin</md:GivenName>
+    <md:EmailAddress>olin@ohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Allen Gattis</md:GivenName>
+    <md:EmailAddress>gattis@ohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Hayes</md:GivenName>
+    <md:EmailAddress>hayesc@ohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Renee Perry</md:GivenName>
+    <md:EmailAddress>perryr1@ohio.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml
index 4ae87ef3..98210229 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ohiolink.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://authdb.ohiolink.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohiolink.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">OhioLink</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Federated login server for OhioLINK staff</mdui:Description>
+        <mdui:Logo height="36" width="425" xml:lang="en">https://authdb.ohiolink.edu/images/full_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://authdb.ohiolink.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohiolink.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">OhioLink</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Federated login server for OhioLINK staff</mdui:Description>
-          <mdui:Logo height="36" width="425" xml:lang="en">https://authdb.ohiolink.edu/images/full_logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUW+nOjI+p8Qg0FhPqSEXtfdOSrxAwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTYXV0aGRiLm9oaW9saW5rLmVkdTAeFw0xMzAyMDExNzQz
 MzNaFw0zMzAyMDExNzQzMzNaMB4xHDAaBgNVBAMTE2F1dGhkYi5vaGlvbGluay5l
@@ -40,24 +40,24 @@ kZ6c3xnkawkitHG/YXhYX18xEymAS5xgYg6wCYVPAERq7WLwKq6nnogcRsE3QB6y
 vccB/Z9qVR6nWhC+fVb7TLjX1WqbnHrtcjheEicHD3RVLjTM1cOqZaSPTEyu95TE
 /sNN3IpfanDJlq8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authdb.ohiolink.edu/shibboleth/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohiolink.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authdb.ohiolink.edu/shibboleth/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohiolink.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUW+nOjI+p8Qg0FhPqSEXtfdOSrxAwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTYXV0aGRiLm9oaW9saW5rLmVkdTAeFw0xMzAyMDExNzQz
 MzNaFw0zMzAyMDExNzQzMzNaMB4xHDAaBgNVBAMTE2F1dGhkYi5vaGlvbGluay5l
@@ -77,31 +77,31 @@ kZ6c3xnkawkitHG/YXhYX18xEymAS5xgYg6wCYVPAERq7WLwKq6nnogcRsE3QB6y
 vccB/Z9qVR6nWhC+fVb7TLjX1WqbnHrtcjheEicHD3RVLjTM1cOqZaSPTEyu95TE
 /sNN3IpfanDJlq8=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OhioLink</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OhioLink</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ohiolink.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OhioLINK Support</md:GivenName>
-      <md:EmailAddress>support@ohiolink.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alan Edmonds</md:GivenName>
-      <md:EmailAddress>edmonds@oar.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark Beadles</md:GivenName>
-      <md:EmailAddress>mbeadles@oar.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew Soter</md:GivenName>
-      <md:EmailAddress>msoter@oh-tech.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OhioLink</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OhioLink</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ohiolink.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OhioLINK Support</md:GivenName>
+    <md:EmailAddress>support@ohiolink.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alan Edmonds</md:GivenName>
+    <md:EmailAddress>edmonds@oar.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark Beadles</md:GivenName>
+    <md:EmailAddress>mbeadles@oar.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew Soter</md:GivenName>
+    <md:EmailAddress>msoter@oh-tech.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml
index 12477492..46f70d92 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:osu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.service.ohio-state.edu/support.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ohio State University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://webauth.service.ohio-state.edu/info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://ocio.osu.edu/policy/policies</mdui:PrivacyStatementURL>
+        <mdui:Logo height="83" width="83" xml:lang="en">https://webauth.service.ohio-state.edu/images/osu_mdui.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.service.ohio-state.edu/support.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ohio State University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://webauth.service.ohio-state.edu/info.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://ocio.osu.edu/policy/policies</mdui:PrivacyStatementURL>
-          <mdui:Logo height="83" width="83" xml:lang="en">https://webauth.service.ohio-state.edu/images/osu_mdui.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDITCCAgmgAwIBAgIJAKu+jRod+TYIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 BAMTHndlYmF1dGguc2VydmljZS5vaGlvLXN0YXRlLmVkdTAeFw0xMDAyMDkyMDA3
 MzdaFw0zMDAyMDQyMDA3MzdaMCkxJzAlBgNVBAMTHndlYmF1dGguc2VydmljZS5v
@@ -43,23 +43,23 @@ zsEeAbjNqw1V/AJN7E4paw8aYg8TXEXAdOvNL5h7KRQw8Ui0kCw2DeTTIXExSxZd
 bqw6ldfQD2fVYnLxDGTFqITCi1a9TidA4xCXD95F7uQaEao3O8ArZcyag62uiMtv
 i24RvCRvD/vsnUhI82pV/DK+2icz6UDtiiKrFNAmIiR14TanfA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.service.ohio-state.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.service.ohio-state.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDITCCAgmgAwIBAgIJAKu+jRod+TYIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 BAMTHndlYmF1dGguc2VydmljZS5vaGlvLXN0YXRlLmVkdTAeFw0xMDAyMDkyMDA3
 MzdaFw0zMDAyMDQyMDA3MzdaMCkxJzAlBgNVBAMTHndlYmF1dGguc2VydmljZS5v
@@ -78,30 +78,30 @@ zsEeAbjNqw1V/AJN7E4paw8aYg8TXEXAdOvNL5h7KRQw8Ui0kCw2DeTTIXExSxZd
 bqw6ldfQD2fVYnLxDGTFqITCi1a9TidA4xCXD95F7uQaEao3O8ArZcyag62uiMtv
 i24RvCRvD/vsnUhI82pV/DK+2icz6UDtiiKrFNAmIiR14TanfA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Ohio State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ohio State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.osu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>8help@osu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Authentication Support</md:GivenName>
-      <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Authentication Support</md:GivenName>
-      <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security Response Team</md:GivenName>
-      <md:EmailAddress>security@osu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Ohio State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ohio State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.osu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>8help@osu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security Response Team</md:GivenName>
+    <md:EmailAddress>security@osu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml
index fc8c5128..3ee02905 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:psu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Penn State</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.psu.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.psu.edu/web-privacy-statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="70" width="130" xml:lang="en">https://www.dept.psu.edu/ids/public/psulogoforincommon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Penn State</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.psu.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.psu.edu/web-privacy-statement</mdui:PrivacyStatementURL>
-          <mdui:Logo height="70" width="130" xml:lang="en">https://www.dept.psu.edu/ids/public/psulogoforincommon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE+jCCA+KgAwIBAgIJAL8NZFMAw3T+MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRgwFgYDVQQHEw9Vbml2ZXJz
 aXR5IFBhcmsxKjAoBgNVBAoTIVRoZSBQZW5uc3lsdmFuaWEgU3RhdGUgVW5pdmVy
@@ -53,25 +53,25 @@ sBGSEC21XV/796AI8JQ4rb8ASWaLSjoGGwlZjsDogIzUJAuMdBPuG/CkbTJDjsii
 u9cF1oLJGzUEXx6B1ugWfWxVeUumOE0PGX3uPijrOd3Ak1gRevg//iyMw+zvL9xL
 4e+XA3Dtyu/I5Riwwv3AF7MFfNpiFhs0ay1ARC8y
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://as1.fim.psu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.fim.psu.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.fim.psu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://as1.fim.psu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://as1.fim.psu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.fim.psu.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.fim.psu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://as1.fim.psu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE+jCCA+KgAwIBAgIJAL8NZFMAw3T+MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
 VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRgwFgYDVQQHEw9Vbml2ZXJz
 aXR5IFBhcmsxKjAoBgNVBAoTIVRoZSBQZW5uc3lsdmFuaWEgU3RhdGUgVW5pdmVy
@@ -100,31 +100,31 @@ sBGSEC21XV/796AI8JQ4rb8ASWaLSjoGGwlZjsDogIzUJAuMdBPuG/CkbTJDjsii
 u9cF1oLJGzUEXx6B1ugWfWxVeUumOE0PGX3uPijrOd3Ak1gRevg//iyMw+zvL9xL
 4e+XA3Dtyu/I5Riwwv3AF7MFfNpiFhs0ay1ARC8y
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Pennsylvania State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Penn State</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.psu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark Miller</md:GivenName>
-      <md:EmailAddress>max@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Penn State Identity Services</md:GivenName>
-      <md:EmailAddress>identity@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Andrea Harrington</md:GivenName>
-      <md:EmailAddress>avh3@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Michael Gettes</md:GivenName>
-      <md:EmailAddress>mrg30@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Pennsylvania State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Penn State</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.psu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark Miller</md:GivenName>
+    <md:EmailAddress>max@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Penn State Identity Services</md:GivenName>
+    <md:EmailAddress>identity@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andrea Harrington</md:GivenName>
+    <md:EmailAddress>avh3@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Michael Gettes</md:GivenName>
+    <md:EmailAddress>mrg30@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml
index eb02d7eb..fd0d3495 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ramapo.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://idp.ramapo.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ramapo.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ramapo College of New Jersey</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ramapo.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ramapo.edu/statements-policies</mdui:PrivacyStatementURL>
+        <mdui:Logo height="73" width="180" xml:lang="en">https://www.ramapo.edu/wp-content/uploads/2016/02/ramapo-logo-180.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://idp.ramapo.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ramapo.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ramapo College of New Jersey</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ramapo.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ramapo.edu/statements-policies</mdui:PrivacyStatementURL>
-          <mdui:Logo height="73" width="180" xml:lang="en">https://www.ramapo.edu/wp-content/uploads/2016/02/ramapo-logo-180.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUMraID/Je8wXM0Yl6BJKCTTWX6RIwDQYJKoZIhvcNAQEF
 BQAwGTEXMBUGA1UEAxMOaWRwLnJhbWFwby5lZHUwHhcNMDkwMTMxMDQxODA0WhcN
 MjkwMTMxMDQxODA0WjAZMRcwFQYDVQQDEw5pZHAucmFtYXBvLmVkdTCCASIwDQYJ
@@ -40,29 +40,29 @@ lG4+EyUAEvTnN14Oe4Y8YQWwuVJEZfHlFp5gpop46fv0Q7q2CZ2SYtjrCmpVk4YE
 dX99H6mqvnkySdP2U5oat1ACQ5IfAV49eRR1JFzJaas+TsxGLIcQkx/GgLHP+3ef
 1FEZK3OCX+xZSA820MZxY7/F+3YdKb794sY4ku+x3ZszkcZ4FJL1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ramapo.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ramapo.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ramapo.edu/idp/profile/SAML2/SOAP/ECP"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ramapo.edu/idp/profile/SAML2/POST/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ramapo College of New Jersey</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ramapo College of New Jersey</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ramapo.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Richard Then</md:GivenName>
-      <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support Admin</md:GivenName>
-      <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Support Admin</md:GivenName>
-      <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ramapo.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ramapo.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ramapo.edu/idp/profile/SAML2/SOAP/ECP"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ramapo.edu/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ramapo College of New Jersey</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ramapo College of New Jersey</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ramapo.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Richard Then</md:GivenName>
+    <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support Admin</md:GivenName>
+    <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support Admin</md:GivenName>
+    <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml
index 11c3b97a..8303ca87 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:richmond.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richmond.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Richmond</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richmond.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Richmond</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIICsjCCAZoCCQCBYXtqVeqXXTANBgkqhkiG9w0BAQUFADAbMRkwFwYDVQQDExBp
 ZHAucmljaG1vbmQuZWR1MB4XDTEwMTExOTE4NDUyNloXDTMwMTExNDE4NDUyNlow
 GzEZMBcGA1UEAxMQaWRwLnJpY2htb25kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
@@ -35,21 +35,21 @@ x56haExHiHdwJbDguNL2w3j6eKVNmnRDzBBhMDVnLGETHnY5XxQdrZ/BWSWvvbTR
 l+rZWtKVWKLKaigDqCiM9g/1B946PVG3jmnxel/RP5ICm363RzyALz8dxG/2ujZU
 M48hMJgWkMldrREsBWB/ZJm1BA0sAw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richmond.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richmond.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richmond.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richmond.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richmond.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richmond.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richmond.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richmond.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIICsjCCAZoCCQCBYXtqVeqXXTANBgkqhkiG9w0BAQUFADAbMRkwFwYDVQQDExBp
 ZHAucmljaG1vbmQuZWR1MB4XDTEwMTExOTE4NDUyNloXDTMwMTExNDE4NDUyNlow
 GzEZMBcGA1UEAxMQaWRwLnJpY2htb25kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
@@ -66,22 +66,22 @@ x56haExHiHdwJbDguNL2w3j6eKVNmnRDzBBhMDVnLGETHnY5XxQdrZ/BWSWvvbTR
 l+rZWtKVWKLKaigDqCiM9g/1B946PVG3jmnxel/RP5ICm363RzyALz8dxG/2ujZU
 M48hMJgWkMldrREsBWB/ZJm1BA0sAw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richmond.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Richmond</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Richmond</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.richmond.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Greg Miller</md:GivenName>
-      <md:EmailAddress>gmiller@richmond.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve Zinski</md:GivenName>
-      <md:EmailAddress>szinski@richmond.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richmond.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Richmond</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Richmond</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.richmond.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Greg Miller</md:GivenName>
+    <md:EmailAddress>gmiller@richmond.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve Zinski</md:GivenName>
+    <md:EmailAddress>szinski@richmond.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml b/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml
index 24bccbab..9756d4fb 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:rock.k12.nc.us">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rock.k12.nc.us</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rockingham County Schools</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rock.k12.nc.us</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rockingham County Schools</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJAPmR55t2JpqLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTMxMjE4MTcxMzAxWhcNMzQwMTA4
 MTcxMzAxWjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
@@ -38,13 +38,13 @@ rUL38YTy5o779bOJWt7b7V3V/u4/Ckc5xIYHTgZWBo9o1GWpgNkszitRBBiQryZf
 8b7euuy4mlqaPv6zyudJOcHupn8GhHdekfNicDem60M4vl96TpHurp9ifSH2NGEb
 j0Gw0iewVqKmJYc2NtrfKI3T
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJANtc2N1zb53NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTEwNDA3MTQxMDU3WhcNMTQwNDA2
 MTQxMDU3WjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
@@ -64,24 +64,24 @@ agNbI0Gj1/d2JrAMlId3wZu1Z/tbZHndIypnUTW/PToLtkUjlrH8naMXYx3oTuP6
 OzXh12tNCnBxCY6icNDRtdN30nH0uDt11VfENHv5C5mKxr7w2uDTLdBjEL0HPh0m
 r1ynZK4DSpncepmCHNLOHwCG
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rock.k12.nc.us/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rock.k12.nc.us</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rock.k12.nc.us/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rock.k12.nc.us</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJAPmR55t2JpqLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTMxMjE4MTcxMzAxWhcNMzQwMTA4
 MTcxMzAxWjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
@@ -101,13 +101,13 @@ rUL38YTy5o779bOJWt7b7V3V/u4/Ckc5xIYHTgZWBo9o1GWpgNkszitRBBiQryZf
 8b7euuy4mlqaPv6zyudJOcHupn8GhHdekfNicDem60M4vl96TpHurp9ifSH2NGEb
 j0Gw0iewVqKmJYc2NtrfKI3T
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPjCCAiagAwIBAgIJANtc2N1zb53NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTEwNDA3MTQxMDU3WhcNMTQwNDA2
 MTQxMDU3WjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
@@ -127,23 +127,23 @@ agNbI0Gj1/d2JrAMlId3wZu1Z/tbZHndIypnUTW/PToLtkUjlrH8naMXYx3oTuP6
 OzXh12tNCnBxCY6icNDRtdN30nH0uDt11VfENHv5C5mKxr7w2uDTLdBjEL0HPh0m
 r1ynZK4DSpncepmCHNLOHwCG
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rockingham County Schools</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rockingham County Schools</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rock.k12.nc.us/rockingham/site/default.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kacey Sensenich</md:GivenName>
-      <md:EmailAddress>ksensenich@rock.k12.nc.us</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Wanda Goins</md:GivenName>
-      <md:EmailAddress>wgoins@rock.k12.nc.us</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rockingham County Schools</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rockingham County Schools</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rock.k12.nc.us/rockingham/site/default.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kacey Sensenich</md:GivenName>
+    <md:EmailAddress>ksensenich@rock.k12.nc.us</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Wanda Goins</md:GivenName>
+    <md:EmailAddress>wgoins@rock.k12.nc.us</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml
index 53272e9a..d0ab5fd7 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:rutgers.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rutgers.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Rutgers, The State University of New Jersey</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rutgers.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Rutgers, The State University of New Jersey</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAOTYftoWG9W/AvT7rTrVdDCpXO4RMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMzA5MTEy
 MDIwMjRaFw0zMzA5MTEyMDIwMjRaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRn
@@ -41,13 +41,13 @@ Pt4R1i6XhTrkL6noEiUY0wfVtA7JFe+beGB3jgmtAo8tV/uFO703ZHotLq+F2tx9
 79bLcfGy+NHx/95l7BNs6olcWipRkoQaSxmorqt2gShsvP8uNYSWOzgsAwtDU7J0
 hIzMRisvrfUsWonX0n1qZzmLU64=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRTCCAi2gAwIBAgIJAKL5nzW/yD3hMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMDA5MjcyMTIyNDlaFw0xMzA5
 MjYyMTIyNDlaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTCCASIw
@@ -67,24 +67,24 @@ o0k7iWRN5QzdkASXGDT6/4T4FzWGliv7obqfzG/MLstwFnR7haHgsWVNFX9X761+
 0cyUtC/ut8Rl3SifbyOoM91MVIg6hGOh2I4qcZO2OZWIui+7DXV8Jb88OtKmOxgT
 YnlJ2VP4+HqggzFa+Vth0GCTBBCFs16HRQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.oirt.rutgers.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rutgers.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.oirt.rutgers.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rutgers.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAOTYftoWG9W/AvT7rTrVdDCpXO4RMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMzA5MTEy
 MDIwMjRaFw0zMzA5MTEyMDIwMjRaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRn
@@ -104,13 +104,13 @@ Pt4R1i6XhTrkL6noEiUY0wfVtA7JFe+beGB3jgmtAo8tV/uFO703ZHotLq+F2tx9
 79bLcfGy+NHx/95l7BNs6olcWipRkoQaSxmorqt2gShsvP8uNYSWOzgsAwtDU7J0
 hIzMRisvrfUsWonX0n1qZzmLU64=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRTCCAi2gAwIBAgIJAKL5nzW/yD3hMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMDA5MjcyMTIyNDlaFw0xMzA5
 MjYyMTIyNDlaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTCCASIw
@@ -130,23 +130,23 @@ o0k7iWRN5QzdkASXGDT6/4T4FzWGliv7obqfzG/MLstwFnR7haHgsWVNFX9X761+
 0cyUtC/ut8Rl3SifbyOoM91MVIg6hGOh2I4qcZO2OZWIui+7DXV8Jb88OtKmOxgT
 YnlJ2VP4+HqggzFa+Vth0GCTBBCFs16HRQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Rutgers, The State University of New Jersey</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Rutgers, The State University of New Jersey</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rutgers.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Charles Hedrick</md:GivenName>
-      <md:EmailAddress>hedrick@rutgers.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Charles Hedrick</md:GivenName>
-      <md:EmailAddress>hedrick@rutgers.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rutgers, The State University of New Jersey</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Rutgers, The State University of New Jersey</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rutgers.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Charles Hedrick</md:GivenName>
+    <md:EmailAddress>hedrick@rutgers.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Charles Hedrick</md:GivenName>
+    <md:EmailAddress>hedrick@rutgers.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml
index b351a3b9..6d7a3045 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:sc.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.uts.sc.edu/authentication/shibboleth/shibberror.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of South Carolina</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.uts.sc.edu/authentication/shibboleth/shibberror.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of South Carolina</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkzCCBHugAwIBAgICAdAwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MTExMDIwMDM0NVoXDTEwMTEx
@@ -50,13 +50,13 @@ xOS/mVf+I4m+E+sGc2hqOKERUKa9I3OIZRyt4fcayHKUoSq2lr3+WH6TCNOI3ftI
 JeFdpFAEsVRCf6G0y15/NE2ZrZxIa40eMQyFiQBJZ3rg7QTxNHyRxrT1RzcJiqGW
 /BZ+1dTx9GUEp9N5c398vGG3GdxwYl6E0T7Cbv26YYi4i7HFU1VF
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIJAJVbAf35kTA3MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXNoaWJib2xldGguc2MuZWR1MB4XDTEwMTAyODIxMDgzMloXDTIwMTAyNzIx
 MDgzMlowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHUwggEiMA0GCSqGSIb3
@@ -76,13 +76,13 @@ k9dHmQcQ28srHTDzLtA3MtCbEj0I4cBb6OP1RsNyet+QmHPwI51XPAZrovgxX/bv
 eJzvMs2mf7f1nUhVPDL3vwNR3GUIh9aOiyh1NJALeZfj2LHYXN1o1c1lpzNB5RTe
 RYNn+o/milfR/UPS
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEHDCCAwSgAwIBAgIJAKYJJKVlWeB2MA0GCSqGSIb3DQEBCwUAMIGOMRowGAYD
 VQQDDBFzaGliYm9sZXRoLnNjLmVkdTEQMA4GA1UECwwHb3JnVW5pdDElMCMGA1UE
 CgwcVW5pdmVyc2l0eSBvZiBTb3V0aCBDYXJvbGluYTERMA8GA1UEBwwIQ29sdW1i
@@ -106,27 +106,27 @@ Pa3rylDBJm37f1xBDP3gwudphvavVg5jZKxEeBv0ldQiCnCJWJkXESsK+tReyJhf
 jtmAlQ2hQ5B3RJv5ww8emQP9J8Iy/d+UC4GPBLlQ53Hcys+3Z6atMd525BvEGY/8
 7wqr+RADyO5bm+dCz6TpBul7OJhNQ/jB2oBrNqA7Kob0YW1dtLxL38v+jcSQCsxC
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sc.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sc.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFkzCCBHugAwIBAgICAdAwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MTExMDIwMDM0NVoXDTEwMTEx
@@ -158,13 +158,13 @@ xOS/mVf+I4m+E+sGc2hqOKERUKa9I3OIZRyt4fcayHKUoSq2lr3+WH6TCNOI3ftI
 JeFdpFAEsVRCf6G0y15/NE2ZrZxIa40eMQyFiQBJZ3rg7QTxNHyRxrT1RzcJiqGW
 /BZ+1dTx9GUEp9N5c398vGG3GdxwYl6E0T7Cbv26YYi4i7HFU1VF
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIJAJVbAf35kTA3MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXNoaWJib2xldGguc2MuZWR1MB4XDTEwMTAyODIxMDgzMloXDTIwMTAyNzIx
 MDgzMlowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHUwggEiMA0GCSqGSIb3
@@ -184,13 +184,13 @@ k9dHmQcQ28srHTDzLtA3MtCbEj0I4cBb6OP1RsNyet+QmHPwI51XPAZrovgxX/bv
 eJzvMs2mf7f1nUhVPDL3vwNR3GUIh9aOiyh1NJALeZfj2LHYXN1o1c1lpzNB5RTe
 RYNn+o/milfR/UPS
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEHDCCAwSgAwIBAgIJAKYJJKVlWeB2MA0GCSqGSIb3DQEBCwUAMIGOMRowGAYD
 VQQDDBFzaGliYm9sZXRoLnNjLmVkdTEQMA4GA1UECwwHb3JnVW5pdDElMCMGA1UE
 CgwcVW5pdmVyc2l0eSBvZiBTb3V0aCBDYXJvbGluYTERMA8GA1UEBwwIQ29sdW1i
@@ -214,27 +214,27 @@ Pa3rylDBJm37f1xBDP3gwudphvavVg5jZKxEeBv0ldQiCnCJWJkXESsK+tReyJhf
 jtmAlQ2hQ5B3RJv5ww8emQP9J8Iy/d+UC4GPBLlQ53Hcys+3Z6atMd525BvEGY/8
 7wqr+RADyO5bm+dCz6TpBul7OJhNQ/jB2oBrNqA7Kob0YW1dtLxL38v+jcSQCsxC
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of South Carolina</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of South Carolina</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Bill Crayton</md:GivenName>
-      <md:EmailAddress>bcrayton@sc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bill Crayton</md:GivenName>
-      <md:EmailAddress>bcrayton@sc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Payne Seal</md:GivenName>
-      <md:EmailAddress>seale@mailbox.sc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of South Carolina</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of South Carolina</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Bill Crayton</md:GivenName>
+    <md:EmailAddress>bcrayton@sc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bill Crayton</md:GivenName>
+    <md:EmailAddress>bcrayton@sc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Payne Seal</md:GivenName>
+    <md:EmailAddress>seale@mailbox.sc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml
index f32a04e9..1724bac0 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:stanford.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanford.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stanford University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Stanford University's identity provider uses Stanford WebAuth to provide single sign-on functionality</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://shibboleth.stanford.edu/</mdui:InformationURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.stanford.edu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanford.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stanford University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Stanford University's identity provider uses Stanford WebAuth to provide single sign-on functionality</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://shibboleth.stanford.edu/</mdui:InformationURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://idp.stanford.edu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtTCCAp2gAwIBAgIJAPmWpLuXBmD6MA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEf
 MB0GA1UECgwWQWRtaW5pc3RyYXRpdmUgU3lzdGVtczEZMBcGA1UEAwwQaWRwLnN0
@@ -43,13 +43,13 @@ pFlfFNxtxYugIhRIcDyUdLUTMoWXmhKgVHbjNtUL9BGfJHkIIAtWSZZ4bsheOGUY
 IbtwXER+ihBU48YYjdAVC9bxdbR0GAJY5uLqG6k0FgEV/7vVHqFMqp31qJme3/ps
 SFqKGJNZvMvXzp89VM70lI2VewL/GVdm6c31p7PVmCfPJXdHmCOVVsY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDnzCCAoegAwIBAgIJAJl9YtyaxKsZMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEU
 MBIGA1UECgwLSVQgU2VydmljZXMxGTAXBgNVBAMMEGlkcC5zdGFuZm9yZC5lZHUw
@@ -71,24 +71,24 @@ T0yV3tYEonL3hXMzSqZxWirwsyZ0TnhWJsgEnqqG9tCFAcFu2p+glwXn1WL2GCRv
 BfuJMPzg7ZB419AEoeYnLktqAWiU+ISnVfbwFOJ+OM/O7VQOeHDm2AeYcwo12CAc
 4GC9KWTs3QtS3GREPKYDlHRNxQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stanford.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stanford.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stanford.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stanford.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stanford.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stanford.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanford.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stanford.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stanford.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stanford.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stanford.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stanford.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stanford.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanford.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDtTCCAp2gAwIBAgIJAPmWpLuXBmD6MA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEf
 MB0GA1UECgwWQWRtaW5pc3RyYXRpdmUgU3lzdGVtczEZMBcGA1UEAwwQaWRwLnN0
@@ -110,13 +110,13 @@ pFlfFNxtxYugIhRIcDyUdLUTMoWXmhKgVHbjNtUL9BGfJHkIIAtWSZZ4bsheOGUY
 IbtwXER+ihBU48YYjdAVC9bxdbR0GAJY5uLqG6k0FgEV/7vVHqFMqp31qJme3/ps
 SFqKGJNZvMvXzp89VM70lI2VewL/GVdm6c31p7PVmCfPJXdHmCOVVsY=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDnzCCAoegAwIBAgIJAJl9YtyaxKsZMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEU
 MBIGA1UECgwLSVQgU2VydmljZXMxGTAXBgNVBAMMEGlkcC5zdGFuZm9yZC5lZHUw
@@ -138,19 +138,19 @@ T0yV3tYEonL3hXMzSqZxWirwsyZ0TnhWJsgEnqqG9tCFAcFu2p+glwXn1WL2GCRv
 BfuJMPzg7ZB419AEoeYnLktqAWiU+ISnVfbwFOJ+OM/O7VQOeHDm2AeYcwo12CAc
 4GC9KWTs3QtS3GREPKYDlHRNxQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stanford.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stanford.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stanford University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stanford University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stanford.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Support</md:GivenName>
-      <md:EmailAddress>shibboleth-team@lists.stanford.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stanford.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stanford.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stanford University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stanford University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stanford.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Support</md:GivenName>
+    <md:EmailAddress>shibboleth-team@lists.stanford.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml
index 537df5a2..5904c807 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:starkstate.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">starkstate.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stark State College of Technology</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">starkstate.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stark State College of Technology</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAMa41Sm2Z43/pbQY6PVnKuY6ZBFCMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFndlYmF1dGguc3RhcmtzdGF0ZS5lZHUwHhcNMTIwMjA3
 MTUxMzE0WhcNMzIwMjA3MTUxMzE0WjAhMR8wHQYDVQQDExZ3ZWJhdXRoLnN0YXJr
@@ -38,24 +38,24 @@ jipaqfMXAqPK6HA/IHoB5k/PNDgV/hnpYiGYc/coYTL3s4mO80/NCrUHb2WP2Ku0
 /WRmBjNm2r5KIYuUl40A8wEjcR7l/fXJccahiypmtB4BBYlK2v2ktc6sb2+riXk2
 vKC1XL9IeVtw8IvrnaNTZnuW87F6XdEo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.starkstate.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.starkstate.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.starkstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.starkstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">starkstate.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.starkstate.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.starkstate.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.starkstate.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.starkstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">starkstate.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAMa41Sm2Z43/pbQY6PVnKuY6ZBFCMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFndlYmF1dGguc3RhcmtzdGF0ZS5lZHUwHhcNMTIwMjA3
 MTUxMzE0WhcNMzIwMjA3MTUxMzE0WjAhMR8wHQYDVQQDExZ3ZWJhdXRoLnN0YXJr
@@ -75,23 +75,23 @@ jipaqfMXAqPK6HA/IHoB5k/PNDgV/hnpYiGYc/coYTL3s4mO80/NCrUHb2WP2Ku0
 /WRmBjNm2r5KIYuUl40A8wEjcR7l/fXJccahiypmtB4BBYlK2v2ktc6sb2+riXk2
 vKC1XL9IeVtw8IvrnaNTZnuW87F6XdEo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stark State College of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stark State College of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.starkstate.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Geoff Starnes</md:GivenName>
-      <md:EmailAddress>gstarnes@starkstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Geoff Starnes</md:GivenName>
-      <md:EmailAddress>gstarnes@starkstate.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stark State College of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stark State College of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.starkstate.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Geoff Starnes</md:GivenName>
+    <md:EmailAddress>gstarnes@starkstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Geoff Starnes</md:GivenName>
+    <md:EmailAddress>gstarnes@starkstate.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml
index 9787d3bf..4b41cd9a 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:stevens.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stevens.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stevens Institute of Technology</mdui:DisplayName>
+        <mdui:Logo height="213" width="500" xml:lang="en">https://www.stevens.edu/sit/sites/sit/themes/sit_default/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stevens.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stevens Institute of Technology</mdui:DisplayName>
-          <mdui:Logo height="213" width="500" xml:lang="en">https://www.stevens.edu/sit/sites/sit/themes/sit_default/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE0DCCA7igAwIBAgIJAKUJTVvF9jMzMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEQMA4GA1UEBxMHSG9ib2tlbjEo
 MCYGA1UEChMfU3RldmVucyBJbnN0aXR1dGUgb2YgVGVjaG5vbG9neTEfMB0GA1UE
@@ -50,24 +50,24 @@ sP2lUMDInk7ed7EtMwAZ3yzzZeErQlCTzcp2FEDqELvFaWs+72fQLLUAhaOyvQX/
 eFcCdQ1M6aBTDHy7CrsFeIr+U90g9lwRLVfenOpRH9Hwhp3ADlPIFQWZCggwzPty
 vNxpYC0Zha2JoUI0lWpc6TWmQprKU5HaC/LZj6UdCQ11HM04
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stevens.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stevens.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stevens.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stevens.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE0DCCA7igAwIBAgIJAKUJTVvF9jMzMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEQMA4GA1UEBxMHSG9ib2tlbjEo
 MCYGA1UEChMfU3RldmVucyBJbnN0aXR1dGUgb2YgVGVjaG5vbG9neTEfMB0GA1UE
@@ -95,23 +95,23 @@ sP2lUMDInk7ed7EtMwAZ3yzzZeErQlCTzcp2FEDqELvFaWs+72fQLLUAhaOyvQX/
 eFcCdQ1M6aBTDHy7CrsFeIr+U90g9lwRLVfenOpRH9Hwhp3ADlPIFQWZCggwzPty
 vNxpYC0Zha2JoUI0lWpc6TWmQprKU5HaC/LZj6UdCQ11HM04
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stevens Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stevens Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stevens.edu/sit/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Stevens InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommonadmin@stevens.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stevens InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommonadmin@stevens.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stevens Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stevens Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stevens.edu/sit/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Stevens InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommonadmin@stevens.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stevens InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommonadmin@stevens.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml
index 02af3ed6..cb4f6579 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:stonybrook.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sso.cc.stonybrook.edu/idp/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stonybrook.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Stony Brook University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sso.cc.stonybrook.edu/idp/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stonybrook.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Stony Brook University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAM6zo1Tg/Cni0U1ZiS9qUjHwTb0qMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFXNzby5jYy5zdG9ueWJyb29rLmVkdTAeFw0xMjAzMzAy
 MTI4MTBaFw0zMjAzMzAyMTI4MTBaMCAxHjAcBgNVBAMTFXNzby5jYy5zdG9ueWJy
@@ -41,25 +41,25 @@ beoZeLMhDf4M7wf971qx6tV+qVQqqSdDbQOPx+IKKXGuHCwKXwi1V1KjmYFqnOm6
 vjLJq/ZYknekwIgXDYdL99d5kwqV6W7vHm5V7j2fv0o+mNu46sL9Y+TVZPAnyw8b
 P5kJpNl6SkvUOjZ4nvr9i9FgmHc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.cc.stonybrook.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Stony Brook University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stony Brook University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sunysb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sanjay Kapur</md:GivenName>
-      <md:EmailAddress>Sanjay.Kapur@stonybrook.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian Heller</md:GivenName>
-      <md:EmailAddress>Brian.Heller@stonybrook.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.cc.stonybrook.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stony Brook University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stony Brook University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sunysb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sanjay Kapur</md:GivenName>
+    <md:EmailAddress>Sanjay.Kapur@stonybrook.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian Heller</md:GivenName>
+    <md:EmailAddress>Brian.Heller@stonybrook.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml
index 77813954..a7d6358c 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:tamu.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Texas A &amp; M University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://infrastructure.tamu.edu/</mdui:InformationURL>
+        <mdui:Logo height="400" width="350" xml:lang="en">https://infrastructure.tamu.edu/images/TAM-PrimaryMarkA.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Texas A &amp; M University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://infrastructure.tamu.edu/</mdui:InformationURL>
-          <mdui:Logo height="400" width="350" xml:lang="en">https://infrastructure.tamu.edu/images/TAM-PrimaryMarkA.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFHzCCBAegAwIBAgICAM0wDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAMTJ1Rl
 eGFzIEEgYW5kIE0gVW5pdmVyc2l0eSBPcGVuU3lzdGVtcyBDQTELMAkGA1UEBhMC
 VVMxDjAMBgNVBAgTBVRleGFzMRgwFgYDVQQHEw9Db2xsZWdlIFN0YXRpb24xITAf
@@ -53,23 +53,23 @@ n6ynZa0trJl8dOzuRr7KcJYA77fYlce8yxQpeStvuGECneHFLwOdzm4ijqJOKhn6
 /T7yIyJS/3kH2Abpfri1MULpvY+Y+GxJj6tgG5akFDw1WLvG2lWViEsACWBVZGw5
 HEC94c/SIH+rUVVS/RftJxbjFQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tamu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tamu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tamu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tamu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tamu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tamu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFHzCCBAegAwIBAgICAM0wDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAMTJ1Rl
 eGFzIEEgYW5kIE0gVW5pdmVyc2l0eSBPcGVuU3lzdGVtcyBDQTELMAkGA1UEBhMC
 VVMxDjAMBgNVBAgTBVRleGFzMRgwFgYDVQQHEw9Db2xsZWdlIFN0YXRpb24xITAf
@@ -99,31 +99,31 @@ n6ynZa0trJl8dOzuRr7KcJYA77fYlce8yxQpeStvuGECneHFLwOdzm4ijqJOKhn6
 /T7yIyJS/3kH2Abpfri1MULpvY+Y+GxJj6tgG5akFDw1WLvG2lWViEsACWBVZGw5
 HEC94c/SIH+rUVVS/RftJxbjFQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Texas A &amp; M University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Texas A &amp; M University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tamu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Xavier Chapa</md:GivenName>
-      <md:EmailAddress>unix-admin@tamu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Xavier Chapa</md:GivenName>
-      <md:EmailAddress>unix-admin@tamu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas Golson</md:GivenName>
-      <md:EmailAddress>tgolson@tamu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Thomas Golson</md:GivenName>
-      <md:EmailAddress>tgolson@tamu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Texas A &amp; M University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Texas A &amp; M University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tamu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Xavier Chapa</md:GivenName>
+    <md:EmailAddress>unix-admin@tamu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Xavier Chapa</md:GivenName>
+    <md:EmailAddress>unix-admin@tamu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas Golson</md:GivenName>
+    <md:EmailAddress>tgolson@tamu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Thomas Golson</md:GivenName>
+    <md:EmailAddress>tgolson@tamu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml
index cfe58e05..b30e3b01 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:uab.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uab.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Alabama at Birmingham</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uab.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Alabama at Birmingham</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNTCCAh2gAwIBAgIJAKhbYAyHDVilMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEHNoaWIuZHBvLnVhYi5lZHUwHhcNMTMwNTA3MTczMzQ4WhcNMjMwNTE1MTcz
 MzQ4WjAbMRkwFwYDVQQDExBzaGliLmRwby51YWIuZWR1MIIBIjANBgkqhkiG9w0B
@@ -41,24 +41,24 @@ qsnFmVVeDfVtegKUOtE/p/hZZ0rAqilBeCz0jyqEG7cjW4Zwd3ULfb32F1sv00Zp
 +ap/RFh5amo3UF0raAflMUYKy64pgOBlsW4cqYsZ+ou8aqrcJVfPPTlWIQtdPFXS
 FFBTvHwNAQ9P
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dpo.uab.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uab.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dpo.uab.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uab.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNTCCAh2gAwIBAgIJAKhbYAyHDVilMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEHNoaWIuZHBvLnVhYi5lZHUwHhcNMTMwNTA3MTczMzQ4WhcNMjMwNTE1MTcz
 MzQ4WjAbMRkwFwYDVQQDExBzaGliLmRwby51YWIuZWR1MIIBIjANBgkqhkiG9w0B
@@ -78,27 +78,27 @@ qsnFmVVeDfVtegKUOtE/p/hZZ0rAqilBeCz0jyqEG7cjW4Zwd3ULfb32F1sv00Zp
 +ap/RFh5amo3UF0raAflMUYKy64pgOBlsW4cqYsZ+ou8aqrcJVfPPTlWIQtdPFXS
 FFBTvHwNAQ9P
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Alabama at Birmingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Alabama at Birmingham</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uab.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Landy Manderson</md:GivenName>
-      <md:EmailAddress>landy@uab.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UABIT User Services</md:GivenName>
-      <md:EmailAddress>UserServices@uab.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Robert Cloud</md:GivenName>
-      <md:EmailAddress>recloud@uab.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Alabama at Birmingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Alabama at Birmingham</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uab.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Landy Manderson</md:GivenName>
+    <md:EmailAddress>landy@uab.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UABIT User Services</md:GivenName>
+    <md:EmailAddress>UserServices@uab.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Robert Cloud</md:GivenName>
+    <md:EmailAddress>recloud@uab.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml
index 092f6375..94f826c6 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucdavis.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdavis.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California, Davis</mdui:DisplayName>
+        <mdui:Logo height="101" width="396" xml:lang="en">https://shibboleth.ucdavis.edu/icons/ucd_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdavis.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California, Davis</mdui:DisplayName>
-          <mdui:Logo height="101" width="396" xml:lang="en">https://shibboleth.ucdavis.edu/icons/ucd_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFTCCAf2gAwIBAgIJAPPcLMuZiVH8MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMMFnNoaWJib2xldGgudWNkYXZpcy5lZHUwHhcNMTMwNDAzMjAxNDE2WhcNMzMw
 NTAzMjAxNDE2WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLnVjZGF2aXMuZWR1MIIB
@@ -41,22 +41,22 @@ wNQMjfSwPtyOLPTF/1jGkQcTao1ZdejLuVbwTykBVFPeFQ8kAU6wsQpXeG3atpQl
 zxm9ugFEeQnBFLCckELT9sAV/5yzXtAdSexhyi4+wJ4peM57Kncf/SfdKeMKiyWt
 EyhVP7yaI/7vtaqct2bie69yO4PiaRMyaQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucdavis.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdavis.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucdavis.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdavis.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFTCCAf2gAwIBAgIJAPPcLMuZiVH8MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 BAMMFnNoaWJib2xldGgudWNkYXZpcy5lZHUwHhcNMTMwNDAzMjAxNDE2WhcNMzMw
 NTAzMjAxNDE2WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLnVjZGF2aXMuZWR1MIIB
@@ -75,26 +75,26 @@ wNQMjfSwPtyOLPTF/1jGkQcTao1ZdejLuVbwTykBVFPeFQ8kAU6wsQpXeG3atpQl
 zxm9ugFEeQnBFLCckELT9sAV/5yzXtAdSexhyi4+wJ4peM57Kncf/SfdKeMKiyWt
 EyhVP7yaI/7vtaqct2bie69yO4PiaRMyaQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucdavis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California, Davis</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California, Davis</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucdavis.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Infrastructure Systems Management</md:GivenName>
-      <md:EmailAddress>sysadmin@ucdavis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>EAIS Shibboleth Group</md:GivenName>
-      <md:EmailAddress>shibadmin@ucdavis.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>EAIS Shibboleth Group</md:GivenName>
-      <md:EmailAddress>shibadmin@ucdavis.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucdavis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California, Davis</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California, Davis</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucdavis.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Infrastructure Systems Management</md:GivenName>
+    <md:EmailAddress>sysadmin@ucdavis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>EAIS Shibboleth Group</md:GivenName>
+    <md:EmailAddress>shibadmin@ucdavis.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>EAIS Shibboleth Group</md:GivenName>
+    <md:EmailAddress>shibadmin@ucdavis.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml
index 01fde762..df89ddf4 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:uchicago.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shibboleth2.uchicago.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchicago.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Chicago</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Chicago Web Single Sign-On servce</mdui:Description>
+        <mdui:Logo height="83" width="350" xml:lang="en">https://shibboleth2.uchicago.edu/idp/shib_img/idplogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shibboleth2.uchicago.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchicago.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Chicago</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Chicago Web Single Sign-On servce</mdui:Description>
-          <mdui:Logo height="83" width="350" xml:lang="en">https://shibboleth2.uchicago.edu/idp/shib_img/idplogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTzCCAjegAwIBAgIJAI+nt27ZTDHAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVkdTAeFw0xMTA2MTYxNDQ2MjVaFw0y
 MTA2MTMxNDQ2MjVaMCMxITAfBgNVBAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVk
@@ -43,25 +43,25 @@ d8iaAs/IsHE0DdjJFUFyzrwy4UUPJvosDHP9eUx9aZ/dsAYLNeQwP9T/Tw/F1mLc
 ZzsMP2VdmhyWrqGNHdkGJCW9yEPTiGlhOZf2VM5wURpR6B1fUfpitGFJeRR72O96
 Q68ZpyIEX7vpdyRPeGehpyHiMbVGIBKmkXxHIH4zvacNhoc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.uchicago.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchicago.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.uchicago.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchicago.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDTzCCAjegAwIBAgIJAI+nt27ZTDHAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVkdTAeFw0xMTA2MTYxNDQ2MjVaFw0y
 MTA2MTMxNDQ2MjVaMCMxITAfBgNVBAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVk
@@ -81,35 +81,35 @@ d8iaAs/IsHE0DdjJFUFyzrwy4UUPJvosDHP9eUx9aZ/dsAYLNeQwP9T/Tw/F1mLc
 ZzsMP2VdmhyWrqGNHdkGJCW9yEPTiGlhOZf2VM5wURpR6B1fUfpitGFJeRR72O96
 Q68ZpyIEX7vpdyRPeGehpyHiMbVGIBKmkXxHIH4zvacNhoc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Chicago</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Chicago</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uchicago.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tom Barton</md:GivenName>
-      <md:EmailAddress>tbarton@uchicago.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David Langenberg</md:GivenName>
-      <md:EmailAddress>davel@uchicago.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Services Support</md:GivenName>
-      <md:EmailAddress>support@uchicago.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Daniel Yu</md:GivenName>
-      <md:EmailAddress>danielyu@uchicago.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>IT Security</md:GivenName>
-      <md:EmailAddress>security@uchicago.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Chicago</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Chicago</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uchicago.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tom Barton</md:GivenName>
+    <md:EmailAddress>tbarton@uchicago.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David Langenberg</md:GivenName>
+    <md:EmailAddress>davel@uchicago.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services Support</md:GivenName>
+    <md:EmailAddress>support@uchicago.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel Yu</md:GivenName>
+    <md:EmailAddress>danielyu@uchicago.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>IT Security</md:GivenName>
+    <md:EmailAddress>security@uchicago.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml
index 3fb3b674..52cb6d47 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:uci.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://shib.nacs.uci.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California-Irvine</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://shib.nacs.uci.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California-Irvine</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIJAO1Yk17FZKi5MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXNoaWIubmFjcy51Y2kuZWR1MB4XDTEzMDcyNDA3NTYxOVoXDTE2MDcyMzA3
 NTYxOVowHDEaMBgGA1UEAxMRc2hpYi5uYWNzLnVjaS5lZHUwggEiMA0GCSqGSIb3
@@ -41,24 +41,24 @@ hsP7gGcE2xwe7Mis8qEzSytn6kbkfT7w0ctddiL8J87/rIrsedREN8TFhuhlg8fZ
 v9aJmWKZeZ+2/K2ANetQpVHeZWel58B1y52d0VKhRA1D3IPmtlVETakAsNeTJ1UH
 SQUxnEmjRWv0mN8R
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nacs.uci.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nacs.uci.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIJAO1Yk17FZKi5MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXNoaWIubmFjcy51Y2kuZWR1MB4XDTEzMDcyNDA3NTYxOVoXDTE2MDcyMzA3
 NTYxOVowHDEaMBgGA1UEAxMRc2hpYi5uYWNzLnVjaS5lZHUwggEiMA0GCSqGSIb3
@@ -78,31 +78,31 @@ hsP7gGcE2xwe7Mis8qEzSytn6kbkfT7w0ctddiL8J87/rIrsedREN8TFhuhlg8fZ
 v9aJmWKZeZ+2/K2ANetQpVHeZWel58B1y52d0VKhRA1D3IPmtlVETakAsNeTJ1UH
 SQUxnEmjRWv0mN8R
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California-Irvine</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California-Irvine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uci.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brian Roode</md:GivenName>
-      <md:EmailAddress>bgroode@uci.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris Peters</md:GivenName>
-      <md:EmailAddress>cjpeters@uci.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OIT Response Center</md:GivenName>
-      <md:EmailAddress>oit@uci.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cliff Chuang</md:GivenName>
-      <md:EmailAddress>lchuang1@uci.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California-Irvine</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California-Irvine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uci.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brian Roode</md:GivenName>
+    <md:EmailAddress>bgroode@uci.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris Peters</md:GivenName>
+    <md:EmailAddress>cjpeters@uci.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OIT Response Center</md:GivenName>
+    <md:EmailAddress>oit@uci.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cliff Chuang</md:GivenName>
+    <md:EmailAddress>lchuang1@uci.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml
index 548c7205..544aee48 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucla.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shb.ais.ucla.edu/shibboleth-idp/WAYFerror" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California-Los Angeles</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shb.ais.ucla.edu/shibboleth-idp/WAYFerror" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California-Los Angeles</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEUTCCAzmgAwIBAgIJAIJtSzeAEQM6MA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtMb3MgQW5nZWxl
 czENMAsGA1UEChMEVUNMQTEUMBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMT
@@ -47,22 +47,22 @@ o1SyIYAshw5aijVaLg5wcZfwSnXxTByVhBa8m886tGrXrcsePeZv7/mrmfs+gJUS
 dlAgNuktzNxcWzokLWe0ynwTAPsWPUaPvUjhanK418P+F5WzsgLpU8LTzWcr5ixK
 E0JFJsE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/Artifact" index="1"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/Artifact" index="1"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEUTCCAzmgAwIBAgIJAIJtSzeAEQM6MA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtMb3MgQW5nZWxl
 czENMAsGA1UEChMEVUNMQTEUMBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMT
@@ -88,27 +88,27 @@ o1SyIYAshw5aijVaLg5wcZfwSnXxTByVhBa8m886tGrXrcsePeZv7/mrmfs+gJUS
 dlAgNuktzNxcWzokLWe0ynwTAPsWPUaPvUjhanK418P+F5WzsgLpU8LTzWcr5ixK
 E0JFJsE=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California-Los Angeles</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California-Los Angeles</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucla.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Albert Wu</md:GivenName>
-      <md:EmailAddress>albertwu@ucla.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Warren Leung</md:GivenName>
-      <md:EmailAddress>wleung@it.ucla.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Client Support</md:GivenName>
-      <md:EmailAddress>clientsupport@it.ucla.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California-Los Angeles</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California-Los Angeles</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucla.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Albert Wu</md:GivenName>
+    <md:EmailAddress>albertwu@ucla.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Warren Leung</md:GivenName>
+    <md:EmailAddress>wleung@it.ucla.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Client Support</md:GivenName>
+    <md:EmailAddress>clientsupport@it.ucla.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml
index b872affa..5cf929ff 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucmerced.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucmerced.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California, Merced</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucmerced.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California, Merced</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEjDCCA3SgAwIBAgIJAOupCdJ2sSXbMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEpMCcGA1UEChMgVW5pdmVyc2l0
 eSBvZiBDYWxpZm9ybmlhLCBNZXJjZWQxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRl
@@ -45,24 +45,24 @@ ff2dPd5C7gboKQO4y76D1uEgwR+XEexamlmpLvREfaZMyN3dbpXCjYmvSayBGUgM
 I/HsbnejDezNN+Za/qaXjv+9wsXOGgmF3QQlQsbKXcLHb0eHYqaB604kQ6I+6y5X
 kFhAPTrlZdh9/KLkKhq9QA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ucmerced.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ucmerced.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ucmerced.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ucmerced.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucmerced.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ucmerced.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ucmerced.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ucmerced.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ucmerced.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucmerced.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEjDCCA3SgAwIBAgIJAOupCdJ2sSXbMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEpMCcGA1UEChMgVW5pdmVyc2l0
 eSBvZiBDYWxpZm9ybmlhLCBNZXJjZWQxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRl
@@ -89,27 +89,27 @@ ff2dPd5C7gboKQO4y76D1uEgwR+XEexamlmpLvREfaZMyN3dbpXCjYmvSayBGUgM
 I/HsbnejDezNN+Za/qaXjv+9wsXOGgmF3QQlQsbKXcLHb0eHYqaB604kQ6I+6y5X
 kFhAPTrlZdh9/KLkKhq9QA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California, Merced</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California, Merced</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucmerced.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Greg Fellin</md:GivenName>
-      <md:EmailAddress>gfellin@ucmerced.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Faust Gorham</md:GivenName>
-      <md:EmailAddress>fgorham@ucmerced.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Kamminga</md:GivenName>
-      <md:EmailAddress>jkamminga@ucmerced.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California, Merced</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California, Merced</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucmerced.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Greg Fellin</md:GivenName>
+    <md:EmailAddress>gfellin@ucmerced.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Faust Gorham</md:GivenName>
+    <md:EmailAddress>fgorham@ucmerced.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Kamminga</md:GivenName>
+    <md:EmailAddress>jkamminga@ucmerced.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml
index ce17ae1c..cca6cf40 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucop.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucop.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California - Office of the President</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucop.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California - Office of the President</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMQjUagrFAAc3mU/MM8Y89753FJsMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHVjb3BpZHAudWNvcC5lZHUwHhcNMTEwNDE1MjE0NDQy
 WhcNMzEwNDE1MjE0NDQyWjAbMRkwFwYDVQQDExB1Y29waWRwLnVjb3AuZWR1MIIB
@@ -37,24 +37,24 @@ vEMn/hMWxQb10qaOsGyzp3uXz2aYJgZoEv2qAdVtKpuDSOcPt11A7rwZE4XhVwhb
 hdYDgZJ0gVCbr3oNhiccN7cf790QxrUdTjDq2qSl47S/SpOOLSLH0vflygsdASlb
 r5yHRx2chce62RYQtpM9sBEJjMZ9seBMN3J+y29vdvayfD1mo9Ma56VSHLitFJ9N
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ucopidp.ucop.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ucopidp.ucop.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucop.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ucopidp.ucop.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ucopidp.ucop.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucop.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMQjUagrFAAc3mU/MM8Y89753FJsMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEHVjb3BpZHAudWNvcC5lZHUwHhcNMTEwNDE1MjE0NDQy
 WhcNMzEwNDE1MjE0NDQyWjAbMRkwFwYDVQQDExB1Y29waWRwLnVjb3AuZWR1MIIB
@@ -73,27 +73,27 @@ vEMn/hMWxQb10qaOsGyzp3uXz2aYJgZoEv2qAdVtKpuDSOcPt11A7rwZE4XhVwhb
 hdYDgZJ0gVCbr3oNhiccN7cf790QxrUdTjDq2qSl47S/SpOOLSLH0vflygsdASlb
 r5yHRx2chce62RYQtpM9sBEJjMZ9seBMN3J+y29vdvayfD1mo9Ma56VSHLitFJ9N
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California - Office of the President</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UCOP DataCenter HelpDesk</md:GivenName>
-      <md:EmailAddress>ucopdatacenter.helpdesk@ucop.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Munish Malik</md:GivenName>
-      <md:EmailAddress>aig@ucop.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Paul Weiss</md:GivenName>
-      <md:EmailAddress>Paul.Weiss@ucop.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California - Office of the President</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UCOP DataCenter HelpDesk</md:GivenName>
+    <md:EmailAddress>ucopdatacenter.helpdesk@ucop.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Munish Malik</md:GivenName>
+    <md:EmailAddress>aig@ucop.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Paul Weiss</md:GivenName>
+    <md:EmailAddress>Paul.Weiss@ucop.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml
index ba29fe33..e53c72d2 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucr.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucr.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California, Riverside</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucr.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California, Riverside</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEZTCCA02gAwIBAgIJALzIMRTIUwPtMA0GCSqGSIb3DQEBCwUAMIHIMQswCQYD
 VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUml2ZXJzaWRl
 MSswKQYDVQQKDCJVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEtUml2ZXJzaWRlMSUw
@@ -44,23 +44,23 @@ gSmXzPs40Kgi//xz7NdpzOqeAOTs93bc1t4POxMIW3RhOV4laPo1D8gfnPU++x8P
 0pZ4Ba363uq9XWfUjRFlaixqMfE1b2jfjut1FbPLfzLvJ4EblJTkcGNw3DSdLB6w
 //p7tc4jkdSFr1zQgNUxNgjR4gh6fruSSg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucr.edu:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucr.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucr.edu:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucr.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEZTCCA02gAwIBAgIJALzIMRTIUwPtMA0GCSqGSIb3DQEBCwUAMIHIMQswCQYD
 VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUml2ZXJzaWRl
 MSswKQYDVQQKDCJVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEtUml2ZXJzaWRlMSUw
@@ -86,26 +86,26 @@ gSmXzPs40Kgi//xz7NdpzOqeAOTs93bc1t4POxMIW3RhOV4laPo1D8gfnPU++x8P
 0pZ4Ba363uq9XWfUjRFlaixqMfE1b2jfjut1FbPLfzLvJ4EblJTkcGNw3DSdLB6w
 //p7tc4jkdSFr1zQgNUxNgjR4gh6fruSSg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucr.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California, Riverside</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California, Riverside</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucr.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>UCR Shibboleth Administrators</md:GivenName>
-      <md:EmailAddress>shibboleth@ucr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UCR Shibboleth Administrators</md:GivenName>
-      <md:EmailAddress>shibboleth@ucr.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UCR Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@ucr.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucr.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California, Riverside</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California, Riverside</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucr.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>UCR Shibboleth Administrators</md:GivenName>
+    <md:EmailAddress>shibboleth@ucr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UCR Shibboleth Administrators</md:GivenName>
+    <md:EmailAddress>shibboleth@ucr.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UCR Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@ucr.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml
index 517e6833..10d2ea0a 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucsb.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California-Santa Barbara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UCSB is a public research university within the University of California system. It is located on the California coast about 100 miles northwest of Los Angeles.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ucsb.edu/campus/index.shtml</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ucsb.edu/policies/index.shtml</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California-Santa Barbara</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UCSB is a public research university within the University of California system. It is located on the California coast about 100 miles northwest of Los Angeles.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ucsb.edu/campus/index.shtml</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ucsb.edu/policies/index.shtml</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEwzCCA6ugAwIBAgIJALXsPc8MIWgFMA0GCSqGSIb3DQEBBQUAMIHlMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FudGEgQmFy
 YmFyYTEwMC4GA1UEChMnVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBC
@@ -49,24 +49,24 @@ WfybDi2fQ7QNKkIkh4yGi58Ole9wS7V8p1tchlKFCGiApnyeYj7Cy0MjuSC64FUj
 Ls6JGZp/+BoiS9inWJItj8ZjPY7cGaN1TD5hzeNxfThwJAenGSJS0nr3B4wh+5kb
 KFf7dOk/JbGUoqizayuf7Ucaf5A5MzI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport.identity.ucsb.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport.identity.ucsb.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEwzCCA6ugAwIBAgIJALXsPc8MIWgFMA0GCSqGSIb3DQEBBQUAMIHlMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FudGEgQmFy
 YmFyYTEwMC4GA1UEChMnVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBC
@@ -94,27 +94,27 @@ WfybDi2fQ7QNKkIkh4yGi58Ole9wS7V8p1tchlKFCGiApnyeYj7Cy0MjuSC64FUj
 Ls6JGZp/+BoiS9inWJItj8ZjPY7cGaN1TD5hzeNxfThwJAenGSJS0nr3B4wh+5kb
 KFf7dOk/JbGUoqizayuf7Ucaf5A5MzI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California-Santa Barbara</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California-Santa Barbara</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucsb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Matthew Dunham</md:GivenName>
-      <md:EmailAddress>matthew.dunham@ucsb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Identity Services Operations</md:GivenName>
-      <md:EmailAddress>sysadmin@identity.ucsb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Service Support</md:GivenName>
-      <md:EmailAddress>help@identity.ucsb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California-Santa Barbara</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California-Santa Barbara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucsb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Matthew Dunham</md:GivenName>
+    <md:EmailAddress>matthew.dunham@ucsb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Identity Services Operations</md:GivenName>
+    <md:EmailAddress>sysadmin@identity.ucsb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Service Support</md:GivenName>
+    <md:EmailAddress>help@identity.ucsb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml
index 9017c57a..8bf524c0 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucsc.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California, Santa Cruz</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ucsc.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://policy.ucsc.edu</mdui:PrivacyStatementURL>
+        <mdui:Logo height="129" width="400" xml:lang="en">https://www2.ucsc.edu/shibboleth-sp/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California, Santa Cruz</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.ucsc.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://policy.ucsc.edu</mdui:PrivacyStatementURL>
-          <mdui:Logo height="129" width="400" xml:lang="en">https://www2.ucsc.edu/shibboleth-sp/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQDLTquv7ZdiLTANBgkqhkiG9w0BAQsFADCBjTELMAkGA1UEBhMC
 VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEzARBgNVBAcMClNhbnRhIENydXoxLTAr
 BgNVBAoMJFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYSwgU2FudGEgQ3J1ejEMMAoG
@@ -46,22 +46,22 @@ aai0jp7M5se6pgnauX2g28ZyFORa5H0DO8Ku0SY8l9lTKRgXgsEOk8b2jJwuYnHu
 2dafiqrLOkdpKFPczD6ZGIx6eofqKmMeT4x+rZSvIZsq1j1wRw04gzQTHWCuEb+a
 N4x9ogtc8tHKC0O7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ucsc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ucsc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ucsc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucsc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ucsc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ucsc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ucsc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucsc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDmDCCAoACCQDLTquv7ZdiLTANBgkqhkiG9w0BAQsFADCBjTELMAkGA1UEBhMC
 VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEzARBgNVBAcMClNhbnRhIENydXoxLTAr
 BgNVBAoMJFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYSwgU2FudGEgQ3J1ejEMMAoG
@@ -83,31 +83,31 @@ aai0jp7M5se6pgnauX2g28ZyFORa5H0DO8Ku0SY8l9lTKRgXgsEOk8b2jJwuYnHu
 2dafiqrLOkdpKFPczD6ZGIx6eofqKmMeT4x+rZSvIZsq1j1wRw04gzQTHWCuEb+a
 N4x9ogtc8tHKC0O7
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ucsc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ucsc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California, Santa Cruz</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California, Santa Cruz</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucsc.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeffrey Crawford</md:GivenName>
-      <md:EmailAddress>jeffreyc@ucsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UCSC Support Center</md:GivenName>
-      <md:EmailAddress>help@ucsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security and Compliance</md:GivenName>
-      <md:EmailAddress>abuse@ucsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kari Robertson</md:GivenName>
-      <md:EmailAddress>kari@ucsc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ucsc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ucsc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California, Santa Cruz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California, Santa Cruz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucsc.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeffrey Crawford</md:GivenName>
+    <md:EmailAddress>jeffreyc@ucsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UCSC Support Center</md:GivenName>
+    <md:EmailAddress>help@ucsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security and Compliance</md:GivenName>
+    <md:EmailAddress>abuse@ucsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kari Robertson</md:GivenName>
+    <md:EmailAddress>kari@ucsc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml
index 2699abc0..8b0674aa 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucsd.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California-San Diego</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California-San Diego</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFjzCCBHegAwIBAgICAQwwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MDIyODIxMTg0NFoXDTEwMDIy
@@ -50,13 +50,13 @@ gKCmAXAl9I6SOrnEy98RJ7yWL51qXHaWE5xXl9dTCh43JONZWlsah0smeDYkYhZq
 7g+zU6RW3i/LigqVYW84V0+WH30htKco5uwr0SGoL9u8PGbYPgrRtCJIo5r8eE7N
 R1kv+lykb9hrz1KUyDvLTDhWQ7l4bXDaP7/dIpaTrtd0zC4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJjCCAg6gAwIBAgIJAPn3wXbFGjOZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2E0LnVjc2QuZWR1MB4XDTEwMDQwODIyNDcwOVoXDTIwMDQwNTIyNDcwOVow
 FjEUMBIGA1UEAxMLYTQudWNzZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -75,21 +75,21 @@ CcsFrrllX1SrpIz5yuwHRZcj1WDDvAzqanvjXGT+2BxmjYS7E25XG+eMC0JlzxLV
 ua34fsQvpcou9ufs1WPqLRTD6AVU1ZrGFdFFAOFY8mG6BEDEplp0Jpn8knxtc2Cg
 Y8R3vksytTmgdqrqYKEpA/CP8EUxyRB3IGOdZ3cJgxabq5X2FBWEFU8y
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://a4.ucsd.edu/tritON/HS"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://a4.ucsd.edu/tritON/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://a4.ucsd.edu/tritON/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://a4.ucsd.edu/tritON/HS"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://a4.ucsd.edu/tritON/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://a4.ucsd.edu/tritON/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFjzCCBHegAwIBAgICAQwwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
 HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
 IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MDIyODIxMTg0NFoXDTEwMDIy
@@ -121,13 +121,13 @@ gKCmAXAl9I6SOrnEy98RJ7yWL51qXHaWE5xXl9dTCh43JONZWlsah0smeDYkYhZq
 7g+zU6RW3i/LigqVYW84V0+WH30htKco5uwr0SGoL9u8PGbYPgrRtCJIo5r8eE7N
 R1kv+lykb9hrz1KUyDvLTDhWQ7l4bXDaP7/dIpaTrtd0zC4=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJjCCAg6gAwIBAgIJAPn3wXbFGjOZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2E0LnVjc2QuZWR1MB4XDTEwMDQwODIyNDcwOVoXDTIwMDQwNTIyNDcwOVow
 FjEUMBIGA1UEAxMLYTQudWNzZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -146,23 +146,23 @@ CcsFrrllX1SrpIz5yuwHRZcj1WDDvAzqanvjXGT+2BxmjYS7E25XG+eMC0JlzxLV
 ua34fsQvpcou9ufs1WPqLRTD6AVU1ZrGFdFFAOFY8mG6BEDEplp0Jpn8knxtc2Cg
 Y8R3vksytTmgdqrqYKEpA/CP8EUxyRB3IGOdZ3cJgxabq5X2FBWEFU8y
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://a4.ucsd.edu:8443/tritON/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://a4.ucsd.edu:8443/tritON/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California-San Diego</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California-San Diego</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucsd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ACT Help Desk</md:GivenName>
-      <md:EmailAddress>acthelp@ucsd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth/IDM Support</md:GivenName>
-      <md:EmailAddress>shibsupport@ucsd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://a4.ucsd.edu:8443/tritON/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://a4.ucsd.edu:8443/tritON/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California-San Diego</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California-San Diego</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucsd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ACT Help Desk</md:GivenName>
+    <md:EmailAddress>acthelp@ucsd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth/IDM Support</md:GivenName>
+    <md:EmailAddress>shibsupport@ucsd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml
index ec692e4e..36961780 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:ucsf.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://dp.ucsf.edu/idp/profile/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsf.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of California, San Francisco</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://dp.ucsf.edu/idp/profile/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsf.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of California, San Francisco</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUW2hLRYSTq6yflHpRZ5ZBXty14rYwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLZHAudWNzZi5lZHUwHhcNMDkwODI5MDQwMzU5WhcNMjkw
 ODI5MDQwMzU5WjAWMRQwEgYDVQQDEwtkcC51Y3NmLmVkdTCCASIwDQYJKoZIhvcN
@@ -40,24 +40,24 @@ LpFOenH8vd5TF7DjrozFivFC4+l/mTTW4hfl+RaR34zgrzBAv+fUNrq7cNrid11w
 jktgJp4o+Ld8xiH8Q5oLQ/qNG0hx9IRMaum9h0HCnxwHKsrxcJW2/A/CVhaVlj4J
 p/B3Zs13i2Wc6VGZGK1rfVetLqSnvfVPnT+h
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dp.ucsf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dp.ucsf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dp.ucsf.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dp.ucsf.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dp.ucsf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dp.ucsf.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsf.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dp.ucsf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dp.ucsf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dp.ucsf.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dp.ucsf.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dp.ucsf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dp.ucsf.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsf.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUW2hLRYSTq6yflHpRZ5ZBXty14rYwDQYJKoZIhvcNAQEF
 BQAwFjEUMBIGA1UEAxMLZHAudWNzZi5lZHUwHhcNMDkwODI5MDQwMzU5WhcNMjkw
 ODI5MDQwMzU5WjAWMRQwEgYDVQQDEwtkcC51Y3NmLmVkdTCCASIwDQYJKoZIhvcN
@@ -76,30 +76,30 @@ LpFOenH8vd5TF7DjrozFivFC4+l/mTTW4hfl+RaR34zgrzBAv+fUNrq7cNrid11w
 jktgJp4o+Ld8xiH8Q5oLQ/qNG0hx9IRMaum9h0HCnxwHKsrxcJW2/A/CVhaVlj4J
 p/B3Zs13i2Wc6VGZGK1rfVetLqSnvfVPnT+h
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dp.ucsf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of California, San Francisco</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of California, San Francisco</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ucsf.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kevin Dale</md:GivenName>
-      <md:EmailAddress>kevin.dale@ucsf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Susil Rayamajhi</md:GivenName>
-      <md:EmailAddress>susil.rayamajhi@ucsf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nathan Sheldon</md:GivenName>
-      <md:EmailAddress>nathan.sheldon@ucsf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mukesh Yadav</md:GivenName>
-      <md:EmailAddress>mukesh.yadav@ucsf.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dp.ucsf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of California, San Francisco</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of California, San Francisco</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ucsf.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kevin Dale</md:GivenName>
+    <md:EmailAddress>kevin.dale@ucsf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Susil Rayamajhi</md:GivenName>
+    <md:EmailAddress>susil.rayamajhi@ucsf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nathan Sheldon</md:GivenName>
+    <md:EmailAddress>nathan.sheldon@ucsf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mukesh Yadav</md:GivenName>
+    <md:EmailAddress>mukesh.yadav@ucsf.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml
index f222cc18..f6ab7ebc 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:udayton.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.udayton.edu/udit/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udayton.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Dayton</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Dayton Shibboleth IdP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.udayton.edu/udit/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.udayton.edu/udit/service_level_resources/policies/index.php</mdui:PrivacyStatementURL>
+        <mdui:Logo height="288" width="290" xml:lang="en">https://www-secure.udayton.edu/_udayton/images/logo/redbluep1.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.udayton.edu/udit/" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udayton.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Dayton</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Dayton Shibboleth IdP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.udayton.edu/udit/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.udayton.edu/udit/service_level_resources/policies/index.php</mdui:PrivacyStatementURL>
-          <mdui:Logo height="288" width="290" xml:lang="en">https://www-secure.udayton.edu/_udayton/images/logo/redbluep1.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUM/VS7xvn6O7+NovKwSxpIjkhzhkwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51ZGF5dG9uLmVkdTAeFw0xMzA5MTAxOTE1
 NTlaFw0zMzA5MTAxOTE1NTlaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWRheXRvbi5l
@@ -45,13 +45,13 @@ WHxpQxkAhiunKbvp6PYT1xuRJShnCfDdOaN6ZPEYN3xdt7BGnEQFLSld6vVPuA9P
 Q7nJdbEtqUixvYf8kOt5p7yu0hN1P9Il6KGK4accYZcZwz5iraHYwL/rakWeSrWe
 txASPQkR5yOUfss=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDbjCCAlYCCQCKKt3UaF/nmjANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
 UzENMAsGA1UECBMET2hpbzEPMA0GA1UEBxMGRGF5dG9uMR0wGwYDVQQKExRVbml2
 ZXJzaXR5IG9mIERheXRvbjENMAsGA1UECxMEVURpdDEcMBoGA1UEAxMTc2hpYmlk
@@ -72,24 +72,24 @@ MjJUYy7Ehrs3mBO0IBMCUL/HJ7SpoOEO17naZM8tk47nJDD6it3y6ZL3VFpOWAB5
 VMdHiRS3spxAs7ucmCKjy6zIxBvHjkTYHqaU0BpA2CBCPaBEJURAVlsWxpR30rwa
 d9zo8/mEfl59OrJ1rbki2xP1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.udayton.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.udayton.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.udayton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.udayton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udayton.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.udayton.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.udayton.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.udayton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.udayton.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udayton.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNzCCAh+gAwIBAgIUM/VS7xvn6O7+NovKwSxpIjkhzhkwDQYJKoZIhvcNAQEF
 BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51ZGF5dG9uLmVkdTAeFw0xMzA5MTAxOTE1
 NTlaFw0zMzA5MTAxOTE1NTlaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWRheXRvbi5l
@@ -109,13 +109,13 @@ WHxpQxkAhiunKbvp6PYT1xuRJShnCfDdOaN6ZPEYN3xdt7BGnEQFLSld6vVPuA9P
 Q7nJdbEtqUixvYf8kOt5p7yu0hN1P9Il6KGK4accYZcZwz5iraHYwL/rakWeSrWe
 txASPQkR5yOUfss=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDbjCCAlYCCQCKKt3UaF/nmjANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
 UzENMAsGA1UECBMET2hpbzEPMA0GA1UEBxMGRGF5dG9uMR0wGwYDVQQKExRVbml2
 ZXJzaXR5IG9mIERheXRvbjENMAsGA1UECxMEVURpdDEcMBoGA1UEAxMTc2hpYmlk
@@ -136,30 +136,30 @@ MjJUYy7Ehrs3mBO0IBMCUL/HJ7SpoOEO17naZM8tk47nJDD6it3y6ZL3VFpOWAB5
 VMdHiRS3spxAs7ucmCKjy6zIxBvHjkTYHqaU0BpA2CBCPaBEJURAVlsWxpR30rwa
 d9zo8/mEfl59OrJ1rbki2xP1
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Dayton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Dayton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.udayton.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth IdP Support</md:GivenName>
-      <md:EmailAddress>shibadmin@udayton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shibboleth IdP Support</md:GivenName>
-      <md:EmailAddress>shibadmin@udayton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UDit Help Desk</md:GivenName>
-      <md:EmailAddress>helpdesk@udayton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>IT Risk Management Officer</md:GivenName>
-      <md:EmailAddress>itriskmgmt@udayton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Dayton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Dayton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udayton.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth IdP Support</md:GivenName>
+    <md:EmailAddress>shibadmin@udayton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth IdP Support</md:GivenName>
+    <md:EmailAddress>shibadmin@udayton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UDit Help Desk</md:GivenName>
+    <md:EmailAddress>helpdesk@udayton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>IT Risk Management Officer</md:GivenName>
+    <md:EmailAddress>itriskmgmt@udayton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml
index 9ea53484..0321ba64 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:uiowa.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://its.uiowa.edu/support/article/61" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uiowa.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Iowa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Iowa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://its.uiowa.edu/shibboleth</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://opsmanual.uiowa.edu/community-policies/acceptable-use-information-technology-resources#19.3</mdui:PrivacyStatementURL>
+        <mdui:Logo height="262" width="286" xml:lang="en">https://idp.uiowa.edu/static/ui-incommon-metadata-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://its.uiowa.edu/support/article/61" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uiowa.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Iowa</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Iowa</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://its.uiowa.edu/shibboleth</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://opsmanual.uiowa.edu/community-policies/acceptable-use-information-technology-resources#19.3</mdui:PrivacyStatementURL>
-          <mdui:Logo height="262" width="286" xml:lang="en">https://idp.uiowa.edu/static/ui-incommon-metadata-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVANC3p2UisM0yO/80OL67JqcqNiLJMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDWlkcC51aW93YS5lZHUwHhcNMTMwNjIxMTY0NjQyWhcN
 MzMwNjIxMTY0NjQyWjAYMRYwFAYDVQQDEw1pZHAudWlvd2EuZWR1MIIBIjANBgkq
@@ -44,35 +44,35 @@ rUBp5wLmFF+K71cm0XJzlD/faYgGo1d6COT2vbklzPnOziQZVh3RUeYqmbltOFY/
 6qD50/b9pCOR30EbZxLv/oxhpKXKv2nVZBcG4IhEhXdXH1rd0JPug4nhrslRdx4N
 fU6A4c+0Aj/vLEIjWne+wPdi+1bIhUAtEMg/CPBZSrokX2N0
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uiowa.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uiowa.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uiowa.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Iowa</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Iowa</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uiowa.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>ITS DNA Identity Services</md:GivenName>
-      <md:EmailAddress>its-dna-identity-services@uiowa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>University of Iowa Federation Requests</md:GivenName>
-      <md:EmailAddress>iowa-federation-requests@uiowa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Iowa Federation Requests</md:GivenName>
-      <md:EmailAddress>iowa-federation-requests@uiowa.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Information Security and Policy Office</md:GivenName>
-      <md:EmailAddress>security@uiowa.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uiowa.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uiowa.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uiowa.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Iowa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Iowa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uiowa.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>ITS DNA Identity Services</md:GivenName>
+    <md:EmailAddress>its-dna-identity-services@uiowa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>University of Iowa Federation Requests</md:GivenName>
+    <md:EmailAddress>iowa-federation-requests@uiowa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Iowa Federation Requests</md:GivenName>
+    <md:EmailAddress>iowa-federation-requests@uiowa.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Information Security and Policy Office</md:GivenName>
+    <md:EmailAddress>security@uiowa.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
index 868b7499..1cad2c94 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:uiuc.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://answers.uillinois.edu/illinois/shibboleth-error-message" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">illinois.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Illinois at Urbana-Champaign</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://answers.uillinois.edu/illinois/shibboleth-error-message" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">illinois.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Illinois at Urbana-Champaign</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEBjCCAu4CCQD/Lyp8FiC7FTANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMC
 VVMxETAPBgNVBAgMCElsbGlub2lzMQ8wDQYDVQQHDAZVcmJhbmExMzAxBgNVBAoM
 KlVuaXZlcnNpdHkgb2YgSWxsaW5vaXMgYXQgVXJiYW5hLUNoYW1wYWlnbjEOMAwG
@@ -45,35 +45,35 @@ qP191AZWeabC+lN/TOc1NMNc5jXyqseMSpsDfMvrlTKGlInPm/baTBE0Lm/mTB9q
 wiiA8CqRlW/oeEwFvk49dE9Ruu5XTbbjFKeWAH+P2PKVAE9Hlavctmq77sB/qUFt
 jUX3lekoVG8DHflvYu+KkI/zV5xbuO0O9Lc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.illinois.edu/idp/profile/Logout"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.illinois.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Illinois at Urbana-Champaign</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Illinois at Urbana-Champaign</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uiuc.edu/index.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
-      <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
-      <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
-      <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security Office</md:GivenName>
-      <md:EmailAddress>security@illinois.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.illinois.edu/idp/profile/Logout"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.illinois.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Illinois at Urbana-Champaign</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Illinois at Urbana-Champaign</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uiuc.edu/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
+    <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
+    <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
+    <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security Office</md:GivenName>
+    <md:EmailAddress>security@illinois.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml
index 9b0d8369..4a99268c 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:umbc.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.umbc.edu:443/shib_error_page.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.umbc.edu:443/shib_error_page.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umbc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Maryland Baltimore County</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Maryland Baltimore County IdP enables standards-based federation for the UMBC community.
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umbc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Maryland Baltimore County</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Maryland Baltimore County IdP enables standards-based federation for the UMBC community.
 </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.umbc.edu/display/MW/Shibboleth+Identity+Provider</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.umbc.edu/policies/pdfs/x-1.00.06%20web%20site%20privacy%20statement.pdf</mdui:PrivacyStatementURL>
-          <mdui:Logo height="133" width="345" xml:lang="en">https://webauth.umbc.edu/umbclogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:InformationURL xml:lang="en">https://wiki.umbc.edu/display/MW/Shibboleth+Identity+Provider</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.umbc.edu/policies/pdfs/x-1.00.06%20web%20site%20privacy%20statement.pdf</mdui:PrivacyStatementURL>
+        <mdui:Logo height="133" width="345" xml:lang="en">https://webauth.umbc.edu/umbclogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNTCCAh2gAwIBAgIJAMBfbssnE/opMA0GCSqGSIb3DQEBBAUAMBsxGTAXBgNV
 BAMTEHdlYmF1dGgudW1iYy5lZHUwHhcNMTExMTIxMjEwOTAyWhcNMjExMTE4MjEw
 OTAyWjAbMRkwFwYDVQQDExB3ZWJhdXRoLnVtYmMuZWR1MIIBIjANBgkqhkiG9w0B
@@ -49,24 +49,24 @@ utTwI71lUwiib56EZek95qUHDvAA9IbReMn+/El6OrtT2uvp2XrqMCyw+2mSEt5E
 ZtXClyNP5VtdFaH5a+ghepre+P3T66MP8VoDKAdFlAQ8ZvLWLKd4kqzUy0i76tSW
 TyINBRx/UZdk
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umbc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umbc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umbc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umbc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umbc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.umbc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umbc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umbc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umbc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umbc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umbc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umbc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.umbc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umbc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNTCCAh2gAwIBAgIJAMBfbssnE/opMA0GCSqGSIb3DQEBBAUAMBsxGTAXBgNV
 BAMTEHdlYmF1dGgudW1iYy5lZHUwHhcNMTExMTIxMjEwOTAyWhcNMjExMTE4MjEw
 OTAyWjAbMRkwFwYDVQQDExB3ZWJhdXRoLnVtYmMuZWR1MIIBIjANBgkqhkiG9w0B
@@ -86,31 +86,31 @@ utTwI71lUwiib56EZek95qUHDvAA9IbReMn+/El6OrtT2uvp2XrqMCyw+2mSEt5E
 ZtXClyNP5VtdFaH5a+ghepre+P3T66MP8VoDKAdFlAQ8ZvLWLKd4kqzUy0i76tSW
 TyINBRx/UZdk
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umbc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umbc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jason Griego</md:GivenName>
-      <md:EmailAddress>jcgriego@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul Riddle</md:GivenName>
-      <md:EmailAddress>paulr@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Paul Riddle</md:GivenName>
-      <md:EmailAddress>paulr@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technology Support Center</md:GivenName>
-      <md:EmailAddress>incommon-help@umbc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umbc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umbc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jason Griego</md:GivenName>
+    <md:EmailAddress>jcgriego@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul Riddle</md:GivenName>
+    <md:EmailAddress>paulr@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Paul Riddle</md:GivenName>
+    <md:EmailAddress>paulr@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technology Support Center</md:GivenName>
+    <md:EmailAddress>incommon-help@umbc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
index d1929ba3..5b72139d 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:umd.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Maryland College Park</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Maryland, College Park is a public research university, the flagship campus of the University System of Maryland, and the original 1862 land-grant institution in the State.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.umd.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.nethics.umd.edu/aup/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="115" width="115" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobelg.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Maryland College Park</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Maryland, College Park is a public research university, the flagship campus of the University System of Maryland, and the original 1862 land-grant institution in the State.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.umd.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.nethics.umd.edu/aup/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="115" width="115" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobelg.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDxjCCAq4CCQCYTHuI1qWbdjANBgkqhkiG9w0BAQUFADCBpDELMAkGA1UEBhMC
 VVMxETAPBgNVBAgTCE1hcnlsYW5kMRUwEwYDVQQHEwxDb2xsZWdlIFBhcmsxHzAd
 BgNVBAoTFlVuaXZlcnNpdHkgb2YgTWFyeWxhbmQxDDAKBgNVBAsTA09JVDEZMBcG
@@ -48,22 +48,22 @@ LhNGpiofYzOzHz4kYWLs/xl+0NN0yURVrE9dxunk35P07PwyNtZ68h3Qzr6g5CZ/
 ILOzZbPBHBTjCBjCX+eq7CAvF3GJJD5VvXcGtZFcOEhgXSi/D6/SRSO133UoRYNT
 corVUSTEZlJJNA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDxjCCAq4CCQCYTHuI1qWbdjANBgkqhkiG9w0BAQUFADCBpDELMAkGA1UEBhMC
 VVMxETAPBgNVBAgTCE1hcnlsYW5kMRUwEwYDVQQHEwxDb2xsZWdlIFBhcmsxHzAd
 BgNVBAoTFlVuaXZlcnNpdHkgb2YgTWFyeWxhbmQxDDAKBgNVBAsTA09JVDEZMBcG
@@ -86,31 +86,31 @@ LhNGpiofYzOzHz4kYWLs/xl+0NN0yURVrE9dxunk35P07PwyNtZ68h3Qzr6g5CZ/
 ILOzZbPBHBTjCBjCX+eq7CAvF3GJJD5VvXcGtZFcOEhgXSi/D6/SRSO133UoRYNT
 corVUSTEZlJJNA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.idm.umd.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.idm.umd.edu:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Maryland College Park</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Maryland College Park</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Barks</md:GivenName>
-      <md:EmailAddress>dbarks@umd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Pfeifer</md:GivenName>
-      <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jyoti Sawhney</md:GivenName>
-      <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth Team</md:GivenName>
-      <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.idm.umd.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.idm.umd.edu:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Maryland College Park</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Maryland College Park</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Barks</md:GivenName>
+    <md:EmailAddress>dbarks@umd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Pfeifer</md:GivenName>
+    <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jyoti Sawhney</md:GivenName>
+    <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth Team</md:GivenName>
+    <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml
index 561365d4..05b4bed5 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:umn.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umn.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Minnesota</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Minnesota, All Campuses</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://it.umn.edu/about-university-identity-provider</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://privacy.umn.edu</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umn.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Minnesota</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Minnesota, All Campuses</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://it.umn.edu/about-university-identity-provider</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://privacy.umn.edu</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVALDP0Qlersp1DxNStIJY8Ek/vHjCMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcDIuc2hpYi51bW4uZWR1MB4XDTA5MDQxNjIyMDcx
 N1oXDTI5MDQxNjIyMDcxN1owHDEaMBgGA1UEAxMRaWRwMi5zaGliLnVtbi5lZHUw
@@ -44,22 +44,22 @@ r4SsABgM19W3/8Lj4C/5X94q3Pm5BrDKjzm2V99B5Mk85cn/P/ASCqQ75oPKCbxZ
 fXmKgZVht6jxjIlzQcV6eLsME5F2Y7FTFBRHlQTGojwOuP6ZXbu5bram8AqXhWuW
 ufJdoQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.shib.umn.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umn.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.shib.umn.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umn.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIVALDP0Qlersp1DxNStIJY8Ek/vHjCMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEWlkcDIuc2hpYi51bW4uZWR1MB4XDTA5MDQxNjIyMDcx
 N1oXDTI5MDQxNjIyMDcxN1owHDEaMBgGA1UEAxMRaWRwMi5zaGliLnVtbi5lZHUw
@@ -79,35 +79,35 @@ r4SsABgM19W3/8Lj4C/5X94q3Pm5BrDKjzm2V99B5Mk85cn/P/ASCqQ75oPKCbxZ
 fXmKgZVht6jxjIlzQcV6eLsME5F2Y7FTFBRHlQTGojwOuP6ZXbu5bram8AqXhWuW
 ufJdoQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.shib.umn.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.shib.umn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Minnesota</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Minnesota</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www1.umn.edu/twincities/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Kevin O'Rourke</md:GivenName>
-      <md:EmailAddress>kor@umn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>University of Minnesota Identity Management</md:GivenName>
-      <md:EmailAddress>idm@umn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Christopher Bongaarts</md:GivenName>
-      <md:EmailAddress>cab@umn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University of Minnesota IT Helpdesk (1-HELP)</md:GivenName>
-      <md:EmailAddress>help@umn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>University of Minnesota IT Security</md:GivenName>
-      <md:EmailAddress>abuse@umn.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.shib.umn.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.shib.umn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Minnesota</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Minnesota</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www1.umn.edu/twincities/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kevin O'Rourke</md:GivenName>
+    <md:EmailAddress>kor@umn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>University of Minnesota Identity Management</md:GivenName>
+    <md:EmailAddress>idm@umn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Christopher Bongaarts</md:GivenName>
+    <md:EmailAddress>cab@umn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University of Minnesota IT Helpdesk (1-HELP)</md:GivenName>
+    <md:EmailAddress>help@umn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>University of Minnesota IT Security</md:GivenName>
+    <md:EmailAddress>abuse@umn.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml
index 27d2a566..ac308030 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:unc.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://sso.unc.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of North Carolina at Chapel Hill</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of North Carolina at Chapel Hill</mdui:Description>
+        <mdui:Logo height="73" width="265" xml:lang="en">https://its.unc.edu/wp-content/themes/unc-sites-base-theme/images/logo_unc_main.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://sso.unc.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of North Carolina at Chapel Hill</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of North Carolina at Chapel Hill</mdui:Description>
-          <mdui:Logo height="73" width="265" xml:lang="en">https://its.unc.edu/wp-content/themes/unc-sites-base-theme/images/logo_unc_main.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIHGTCCBgGgAwIBAgIRAKyOdrs0hcQ6LwrLegYuWrgwDQYJKoZIhvcNAQEFBQAw
 gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
@@ -63,24 +63,24 @@ ZmPr2MT4nwfEa114RWvjKhYAIjZl4SLiKjpIQlES/Rq2sVNYGhsC4vwiPKAbO0+g
 NrKpJaan1fZVEdmV6Qg881VQH/M0k00cFuK8ri7vqN2LUVtbHFK4g6M0n7yuywhv
 3UoSgjFz/cNvq9QpYmM1XYYnuqhu86ZHiod2vrvSq2u35uzx/MhIn8fT9IlV
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.unc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.unc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.unc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.unc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.unc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.unc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.unc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.unc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.unc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.unc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.unc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.unc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIHGTCCBgGgAwIBAgIRAKyOdrs0hcQ6LwrLegYuWrgwDQYJKoZIhvcNAQEFBQAw
 gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
@@ -120,23 +120,23 @@ ZmPr2MT4nwfEa114RWvjKhYAIjZl4SLiKjpIQlES/Rq2sVNYGhsC4vwiPKAbO0+g
 NrKpJaan1fZVEdmV6Qg881VQH/M0k00cFuK8ri7vqN2LUVtbHFK4g6M0n7yuywhv
 3UoSgjFz/cNvq9QpYmM1XYYnuqhu86ZHiod2vrvSq2u35uzx/MhIn8fT9IlV
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.unc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.unc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of North Carolina at Chapel Hill</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Chapel Hill</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UNC ITRC</md:GivenName>
-      <md:EmailAddress>help@unc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>UNC Identity Management</md:GivenName>
-      <md:EmailAddress>idman@unc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.unc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.unc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of North Carolina at Chapel Hill</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Chapel Hill</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UNC ITRC</md:GivenName>
+    <md:EmailAddress>help@unc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>UNC Identity Management</md:GivenName>
+    <md:EmailAddress>idman@unc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml
index 0a510264..92ea51f2 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:unoh.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.unoh.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoh.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Northwestern Ohio</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.unoh.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoh.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Northwestern Ohio</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIULy08BQkcpOnmTH92+QGu+JKU2UMwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQd2ViYXV0aC51bm9oLmVkdTAeFw0xMjAyMjgwNDE5MDda
 Fw0zMjAyMjgwNDE5MDdaMBsxGTAXBgNVBAMTEHdlYmF1dGgudW5vaC5lZHUwggEi
@@ -37,22 +37,22 @@ hAOnSgGr4+3CaQiYG2uD/usYib6kkAdG9kUtaNvSgA+kqXEgDew6K7gQRAgGgD9+
 Tj0jVc553XRlzq170MaFkOWMrL/FaIRfj2OdSD/0W0B+ry2Fg1+8S3AJNPuFNMF0
 OfmbJ3v2CPAigA44FKZBy9+77vXYadvgl9q2bnhvQE6qMf+lUj6VmKa+fyuEPvk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.unoh.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.unoh.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.unoh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.unoh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoh.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.unoh.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.unoh.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.unoh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.unoh.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoh.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIULy08BQkcpOnmTH92+QGu+JKU2UMwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQd2ViYXV0aC51bm9oLmVkdTAeFw0xMjAyMjgwNDE5MDda
 Fw0zMjAyMjgwNDE5MDdaMBsxGTAXBgNVBAMTEHdlYmF1dGgudW5vaC5lZHUwggEi
@@ -71,18 +71,18 @@ hAOnSgGr4+3CaQiYG2uD/usYib6kkAdG9kUtaNvSgA+kqXEgDew6K7gQRAgGgD9+
 Tj0jVc553XRlzq170MaFkOWMrL/FaIRfj2OdSD/0W0B+ry2Fg1+8S3AJNPuFNMF0
 OfmbJ3v2CPAigA44FKZBy9+77vXYadvgl9q2bnhvQE6qMf+lUj6VmKa+fyuEPvk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.unoh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Northwestern Ohio</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Northwestern Ohio</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://unoh.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy Brinkman</md:GivenName>
-      <md:EmailAddress>jbrinkman@unoh.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.unoh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Northwestern Ohio</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Northwestern Ohio</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://unoh.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy Brinkman</md:GivenName>
+    <md:EmailAddress>jbrinkman@unoh.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml
index 1008f615..d453f881 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:usc.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Southern California</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Southern California</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIJAIO8BJMy8v25MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudXNjLmVkdTAeFw0xMzA3MTUxODM0MTVaFw0yMzA3MTMx
 ODM0MTVaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXNjLmVkdTCCASIwDQYJKoZI
@@ -40,24 +40,24 @@ z5Bx1PefOz4/mE6zQrYUwbn1wSlbPnG8VvFHCkPWFYq0fUtt2GFa9/Va4MfzMJO8
 zh419vf+P3WE28wIM1uzuNJnnN1ugTINM0tdncgJnoXGwXPXpDvIDUWBHqHhqiqf
 8bMYQw/J8MvmwVw++cbBCgAi6bEcrOpcge9r1g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.usc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.usc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIJAIO8BJMy8v25MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 BAMTEnNoaWJib2xldGgudXNjLmVkdTAeFw0xMzA3MTUxODM0MTVaFw0yMzA3MTMx
 ODM0MTVaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXNjLmVkdTCCASIwDQYJKoZI
@@ -76,27 +76,27 @@ z5Bx1PefOz4/mE6zQrYUwbn1wSlbPnG8VvFHCkPWFYq0fUtt2GFa9/Va4MfzMJO8
 zh419vf+P3WE28wIM1uzuNJnnN1ugTINM0tdncgJnoXGwXPXpDvIDUWBHqHhqiqf
 8bMYQw/J8MvmwVw++cbBCgAi6bEcrOpcge9r1g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Southern California</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Southern California</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.usc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Asbed Bedrossian</md:GivenName>
-      <md:EmailAddress>asbed@usc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>shib-admin-l@usc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>ITS Security</md:GivenName>
-      <md:EmailAddress>security@usc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Southern California</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Southern California</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.usc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Asbed Bedrossian</md:GivenName>
+    <md:EmailAddress>asbed@usc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>shib-admin-l@usc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>ITS Security</md:GivenName>
+    <md:EmailAddress>security@usc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml
index 2f4b5c11..f51e0873 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:usf.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usf.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of South Florida</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is the Shibboleth Identity Provider for the University of South Florida</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.usf.edu</mdui:InformationURL>
+        <mdui:Logo height="47" width="316" xml:lang="en">https://cdn.usf.edu/themes/sun-globe/global/1.0.0/images/header/banner/banner-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usf.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of South Florida</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This is the Shibboleth Identity Provider for the University of South Florida</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.usf.edu</mdui:InformationURL>
-          <mdui:Logo height="47" width="316" xml:lang="en">https://cdn.usf.edu/themes/sun-globe/global/1.0.0/images/header/banner/banner-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFLTCCBBWgAwIBAgIJANCZEr8p39EUMA0GCSqGSIb3DQEBBQUAMIG/MQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEOMAwGA1UEBxMFVGFtcGExJDAiBgNV
 BAoTG1VuaXZlcnNpdHkgb2YgU291dGggRmxvcmlkYTEfMB0GA1UECxMWSW5mb3Jt
@@ -54,32 +54,32 @@ aynShAHxIbud5Uy/4h6MNDtc56sScEqBUb4D7Xm14Kg15keCBxUvumoUxdD/ykrg
 ccGf3bUq48WwGSuikV1OjN+buvlSmWlZYDKzuU2Azdvezk5BK/mEEHxZJIdTWbpd
 wHRSBfdWykar3yfWl3v3l4C3ARmBsVmmqD2lXRtpfZtO
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usf.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usf.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usf.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of South Florida</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of South Florida</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.usf.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eric Pierce</md:GivenName>
-      <md:EmailAddress>epierce@usf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Randy Smith</md:GivenName>
-      <md:EmailAddress>rwsmith@usf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>USF IT HelpDesk</md:GivenName>
-      <md:EmailAddress>help@usf.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Office of Information Security</md:GivenName>
-      <md:EmailAddress>security@usf.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usf.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usf.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usf.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of South Florida</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of South Florida</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.usf.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric Pierce</md:GivenName>
+    <md:EmailAddress>epierce@usf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Randy Smith</md:GivenName>
+    <md:EmailAddress>rwsmith@usf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>USF IT HelpDesk</md:GivenName>
+    <md:EmailAddress>help@usf.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Office of Information Security</md:GivenName>
+    <md:EmailAddress>security@usf.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml
index d88bd0fc..3d3a5557 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:utah.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utah.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Utah</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utah.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Utah</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIUNKGu8wOF9BnZeWHZWXe1e0FzhbswDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaW5jb21tb24yLnNzby51dGFoLmVkdTAeFw0xMjAyMjIx
 NDE2MjBaFw0zMjAyMjIxNDE2MjBaMCExHzAdBgNVBAMTFmluY29tbW9uMi5zc28u
@@ -41,24 +41,24 @@ QEB914XUZYgkzwpmOwWd8UHe0yekCp1hh9+nNDFk8igygIgCK3S3GI92a8nPk+q5
 h0/pbgjQw2DUQBBatGw8zWsm3JzHUhIsZiiVP2ssUblwHzK4HcNHX1Y3xrTINpgW
 chyV0g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon2.sso.utah.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utah.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon2.sso.utah.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utah.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDMDCCAhigAwIBAgIUNKGu8wOF9BnZeWHZWXe1e0FzhbswDQYJKoZIhvcNAQEF
 BQAwITEfMB0GA1UEAxMWaW5jb21tb24yLnNzby51dGFoLmVkdTAeFw0xMjAyMjIx
 NDE2MjBaFw0zMjAyMjIxNDE2MjBaMCExHzAdBgNVBAMTFmluY29tbW9uMi5zc28u
@@ -78,31 +78,31 @@ QEB914XUZYgkzwpmOwWd8UHe0yekCp1hh9+nNDFk8igygIgCK3S3GI92a8nPk+q5
 h0/pbgjQw2DUQBBatGw8zWsm3JzHUhIsZiiVP2ssUblwHzK4HcNHX1Y3xrTINpgW
 chyV0g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Utah</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Utah</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utah.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Caprice Post</md:GivenName>
-      <md:EmailAddress>Caprice.Post@Utah.Edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert Roll</md:GivenName>
-      <md:EmailAddress>Robert.Roll@Utah.Edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bryan Wooten</md:GivenName>
-      <md:EmailAddress>bryan.wooten@utah.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tim Richardson</md:GivenName>
-      <md:EmailAddress>tim.richardson@utah.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Utah</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Utah</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utah.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Caprice Post</md:GivenName>
+    <md:EmailAddress>Caprice.Post@Utah.Edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert Roll</md:GivenName>
+    <md:EmailAddress>Robert.Roll@Utah.Edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bryan Wooten</md:GivenName>
+    <md:EmailAddress>bryan.wooten@utah.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tim Richardson</md:GivenName>
+    <md:EmailAddress>tim.richardson@utah.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml
index c34382f9..3e8fd3b4 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:uww.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uww.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin - Whitewater</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uww.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin - Whitewater</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDbjCCAlagAwIBAgIJANHauNynrVx7MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC51d3cuZWR1MB4XDTExMDUzMTE1MjIwNloXDTMxMDUzMTE1MjIwNlow
 FjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -39,13 +39,13 @@ UYl2uzijiLLNRlQhNEIoLEECagEzX04SjpVwL3rgQf3hVj6bCWmx8uBbjGqlecDs
 QsXWzT9ZZmUIsQSvfFn5YihMdCKhtdoo2sLOaNbSY9XoOnwR+j3+k7/4kGCHcrPT
 D4gMA01lwUQDurauD6wSvYXJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPtxOslOmXc+9xoiMxwmqTfiBqf4MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC51d3cuZWR1MB4XDTA5MDUyOTE2MzUwNVoXDTI5
 MDUyOTE2MzUwNVowFjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3
@@ -64,23 +64,23 @@ wu6siLxqVUBVBZXa5r3LlvLXnAiUWDcubYdF02bU9ygd36+/RJLPO4pA37QwMFHp
 l1iTzZIgt6BGrGtlACPEioKYqDkitjjLHpobISS8cUMV3oeIuOvJt88PryDSlQPH
 Lb3/4DTRLmlBb5hpWKEnDWEtB0NdnRXBOgpkoQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uww.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uww.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uww.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uww.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uww.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uww.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uww.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uww.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uww.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uww.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uww.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uww.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDbjCCAlagAwIBAgIJANHauNynrVx7MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 BAMTC2lkcC51d3cuZWR1MB4XDTExMDUzMTE1MjIwNloXDTMxMDUzMTE1MjIwNlow
 FjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -101,13 +101,13 @@ UYl2uzijiLLNRlQhNEIoLEECagEzX04SjpVwL3rgQf3hVj6bCWmx8uBbjGqlecDs
 QsXWzT9ZZmUIsQSvfFn5YihMdCKhtdoo2sLOaNbSY9XoOnwR+j3+k7/4kGCHcrPT
 D4gMA01lwUQDurauD6wSvYXJ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGDCCAgCgAwIBAgIVAPtxOslOmXc+9xoiMxwmqTfiBqf4MA0GCSqGSIb3DQEB
 BQUAMBYxFDASBgNVBAMTC2lkcC51d3cuZWR1MB4XDTA5MDUyOTE2MzUwNVoXDTI5
 MDUyOTE2MzUwNVowFjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3
@@ -126,26 +126,26 @@ wu6siLxqVUBVBZXa5r3LlvLXnAiUWDcubYdF02bU9ygd36+/RJLPO4pA37QwMFHp
 l1iTzZIgt6BGrGtlACPEioKYqDkitjjLHpobISS8cUMV3oeIuOvJt88PryDSlQPH
 Lb3/4DTRLmlBb5hpWKEnDWEtB0NdnRXBOgpkoQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uww.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin - Whitewater</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Whitewater</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uww.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nicholas A Ciesinski</md:GivenName>
-      <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nicholas A Ciesinski</md:GivenName>
-      <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Nicholas A Ciesinski</md:GivenName>
-      <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uww.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin - Whitewater</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Whitewater</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uww.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nicholas A Ciesinski</md:GivenName>
+    <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nicholas A Ciesinski</md:GivenName>
+    <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Nicholas A Ciesinski</md:GivenName>
+    <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml
index 94a2170f..eac36751 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:virginia.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://shibidp.its.virginia.edu/shiberror.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">virginia.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Virginia</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://shibidp.its.virginia.edu/shiberror.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">virginia.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Virginia</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIVALIs8V8u06NEcoiPKqBdTWQ5F3WdMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRzLnZpcmdpbmlhLmVkdTAeFw0xMjAz
 MDIxNTI2MDNaFw0zMjAzMDIxNTI2MDNaMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRz
@@ -41,24 +41,24 @@ l3CESXZORAXC50pPjoacANRdAl729CszcW65zUhoKBV37plZq5uRc7FTtjJujEOL
 3FljH7rKPo43+7MT2XZGS2J+PcALgUfSxewXei0RQNXWXN3l0qXupwsWM8kO6mSA
 zZQUr9YEODP0DFBKKGSo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.its.virginia.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">virginia.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.its.virginia.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">virginia.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDOzCCAiOgAwIBAgIVALIs8V8u06NEcoiPKqBdTWQ5F3WdMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRzLnZpcmdpbmlhLmVkdTAeFw0xMjAz
 MDIxNTI2MDNaFw0zMjAzMDIxNTI2MDNaMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRz
@@ -78,31 +78,31 @@ l3CESXZORAXC50pPjoacANRdAl729CszcW65zUhoKBV37plZq5uRc7FTtjJujEOL
 3FljH7rKPo43+7MT2XZGS2J+PcALgUfSxewXei0RQNXWXN3l0qXupwsWM8kO6mSA
 zZQUr9YEODP0DFBKKGSo
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Virginia</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Virginia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.virginia.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hamp Carruth</md:GivenName>
-      <md:EmailAddress>ehc@Virginia.EDU</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ITC Unix Systems</md:GivenName>
-      <md:EmailAddress>systems@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Systems Support</md:GivenName>
-      <md:EmailAddress>systems@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>UVa InCommon Admin</md:GivenName>
-      <md:EmailAddress>incommon-admin@virginia.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Virginia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Virginia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.virginia.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hamp Carruth</md:GivenName>
+    <md:EmailAddress>ehc@Virginia.EDU</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ITC Unix Systems</md:GivenName>
+    <md:EmailAddress>systems@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Systems Support</md:GivenName>
+    <md:EmailAddress>systems@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>UVa InCommon Admin</md:GivenName>
+    <md:EmailAddress>incommon-admin@virginia.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
index 8e0900a6..7d8c8509 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:vt.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/assurance/silver</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://login.vt.edu/support.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/assurance/silver</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Virginia Polytechnic Institute and State University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.vt.edu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.vt.edu/about/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="28" width="160" xml:lang="en">https://www.assets.cms.vt.edu/images/vt_notag_onwhite160.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://login.vt.edu/support.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Virginia Polytechnic Institute and State University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.vt.edu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.vt.edu/about/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="28" width="160" xml:lang="en">https://www.assets.cms.vt.edu/images/vt_notag_onwhite160.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEETCCAvmgAwIBAgIJANFfZSukyEO/MA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
 PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
@@ -52,28 +52,28 @@ eTd7/azVGGJNAVKLfNaHHm1K1MVWtTK1Jt5QuG0iy2PZnKQOJ4c7RUrAHOqfg8TE
 6Cq66ObNkIKPmivcU0uUy27IT9eM9Y/WyNfYY3isQqvLareyEiHQTeZniIwlq734
 QYvy/+Jxoro0d/n+VkiOjSlrLIrprl9zVmvWjjPvpth13a2m1Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.vt.edu:10443/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.vt.edu/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vt.edu/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.vt.edu/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vt.edu/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.vt.edu/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.vt.edu/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.vt.edu:10443/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.vt.edu/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vt.edu/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.vt.edu/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vt.edu/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.vt.edu/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.vt.edu/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEETCCAvmgAwIBAgIJALq5f54rrOCOMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
 VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
 PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
@@ -97,34 +97,34 @@ rDvxTL8YHBDra9btpkTgpLg4FbjfBUCBOwR4ufHMFxqvPhCf4Bd4PaG2z+cYufj2
 Nx4mXDispAMSseaMORrEqkmePOfKS2dKO0CsEtfKtELhQ7FrXTVW8O5nm7+9ej+F
 +jZpcemMJOiPy8U9eb3yq+vRduFXh4Ddw6yyhWUWPuyVdZcrGw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.vt.edu:10443/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marvin Addison</md:GivenName>
-      <md:EmailAddress>shib-admin@vt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mary Dunker</md:GivenName>
-      <md:EmailAddress>dunker@vt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marvin Addison</md:GivenName>
-      <md:EmailAddress>shib-admin@vt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>4Help</md:GivenName>
-      <md:EmailAddress>4help@vt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>IT Security Office</md:GivenName>
-      <md:EmailAddress>itso@vt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.vt.edu:10443/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marvin Addison</md:GivenName>
+    <md:EmailAddress>shib-admin@vt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mary Dunker</md:GivenName>
+    <md:EmailAddress>dunker@vt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marvin Addison</md:GivenName>
+    <md:EmailAddress>shib-admin@vt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>4Help</md:GivenName>
+    <md:EmailAddress>4help@vt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>IT Security Office</md:GivenName>
+    <md:EmailAddress>itso@vt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml
index 9e0c9c43..89e7d606 100644
--- a/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml
+++ b/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:incommon:washington.edu">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Washington</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Washington IdP enables standards-based federation for the UW community.
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Washington</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Washington IdP enables standards-based federation for the UW community.
 </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.cac.washington.edu/x/fiOD</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.washington.edu/online/privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="79" width="160" xml:lang="en">https://wiki.cac.washington.edu/download/attachments/69729985/uw-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:InformationURL xml:lang="en">https://wiki.cac.washington.edu/x/fiOD</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.washington.edu/online/privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="79" width="160" xml:lang="en">https://wiki.cac.washington.edu/download/attachments/69729985/uw-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID/TCCAuWgAwIBAgIJAMoYJbDt9lKKMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJXQTEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBXYXNo
 aW5ndG9uMR0wGwYDVQQDExRpZHAudS53YXNoaW5ndG9uLmVkdTAeFw0xMTA0MjYx
@@ -50,29 +50,29 @@ yFJkkJX3qSExXrl053uxTOQVPms4ypkYv1A/FBZWgSC8eNoYnBnv1Mhy4m8bfeEN
 HJZeOLUIBvJu15GzcexuDDXe0kg7sHD6PbK0xzEF/QeXP/hXzMxR9kQXB/IR/b2k
 4ien+EM3eY/ueBcTZ95dgVM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u.washington.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u.washington.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u.washington.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.u.washington.edu/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Washington</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Washington</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.washington.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IAM Technical Support</md:GivenName>
-      <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IAM Administrative Support</md:GivenName>
-      <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IAM Support</md:GivenName>
-      <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u.washington.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u.washington.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u.washington.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.u.washington.edu/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Washington</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Washington</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.washington.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IAM Technical Support</md:GivenName>
+    <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IAM Administrative Support</md:GivenName>
+    <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IAM Support</md:GivenName>
+    <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
index a36e7e25..ed5f1ffe 100644
--- a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
+++ b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:kuleuven.be:kulassoc:khleuven.be">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">associatie.kuleuven.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KHLeuven</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Katholieke Hogeschool Leuven</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">associatie.kuleuven.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">KHLeuven</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Katholieke Hogeschool Leuven</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.khleuven.be</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.khleuven.be</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
 	MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
 	BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
 	Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
@@ -37,28 +37,28 @@
 	XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
 	5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=	
 				    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.khleuven.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.khleuven.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.khleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.khleuven.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">associatie.kuleuven.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>idp.khleuven.be</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.khleuven.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.khleuven.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.khleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.khleuven.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">associatie.kuleuven.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.khleuven.be</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
 	MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
 	BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
 	Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
@@ -77,21 +77,21 @@
 	XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
 	5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=			    
 				    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Katholieke Hogeschool Leuven</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KHLeuven</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.khleuven.be/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Technical Support</md:SurName>
-      <md:EmailAddress>support@khleuven.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Katholieke Hogeschool Leuven</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KHLeuven</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.khleuven.be/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>support@khleuven.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
index 25a8b008..d3624c1e 100644
--- a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
+++ b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuleuven.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groept.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hubkaho.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odisee.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucll.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vives.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luca-arts.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khlim.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomasmore.be</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
+        <mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
+        <mdui:Description xml:lang="nl">KU Leuven en de geassocieerde hogescholen</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kuleuven.be</mdui:DomainHint>
+        <mdui:IPHint>134.58.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.190.168.0/23</mdui:IPHint>
+        <mdui:IPHint>193.190.176.0/22</mdui:IPHint>
+        <mdui:IPHint>193.190.180.0/23</mdui:IPHint>
+        <mdui:IPHint>193.190.253.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.146.160/27</mdui:IPHint>
+        <mdui:IPHint>193.190.57.0/26</mdui:IPHint>
+        <mdui:IPHint>193.190.57.192/27</mdui:IPHint>
+        <mdui:IPHint>193.190.57.224/27</mdui:IPHint>
+        <mdui:IPHint>193.190.58.0/26</mdui:IPHint>
+        <mdui:IPHint>193.190.59.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.255.0/25</mdui:IPHint>
+        <mdui:IPHint>193.190.138.0/24</mdui:IPHint>
+        <mdui:IPHint>193.191.187.0/25</mdui:IPHint>
+        <mdui:IPHint>193.190.77.0/26</mdui:IPHint>
+        <mdui:IPHint>193.190.224.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.225.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.130.128/26</mdui:IPHint>
+        <mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
+        <mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuleuven.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groept.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hubkaho.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odisee.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucll.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vives.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luca-arts.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khlim.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomasmore.be</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
-          <mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
-          <mdui:Description xml:lang="nl">KU Leuven en de geassocieerde hogescholen</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
-          <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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</mdui:Logo>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>kuleuven.be</mdui:DomainHint>
-          <mdui:IPHint>134.58.0.0/16</mdui:IPHint>
-          <mdui:IPHint>193.190.168.0/23</mdui:IPHint>
-          <mdui:IPHint>193.190.176.0/22</mdui:IPHint>
-          <mdui:IPHint>193.190.180.0/23</mdui:IPHint>
-          <mdui:IPHint>193.190.253.0/24</mdui:IPHint>
-          <mdui:IPHint>193.190.146.160/27</mdui:IPHint>
-          <mdui:IPHint>193.190.57.0/26</mdui:IPHint>
-          <mdui:IPHint>193.190.57.192/27</mdui:IPHint>
-          <mdui:IPHint>193.190.57.224/27</mdui:IPHint>
-          <mdui:IPHint>193.190.58.0/26</mdui:IPHint>
-          <mdui:IPHint>193.190.59.0/24</mdui:IPHint>
-          <mdui:IPHint>193.190.255.0/25</mdui:IPHint>
-          <mdui:IPHint>193.190.138.0/24</mdui:IPHint>
-          <mdui:IPHint>193.191.187.0/25</mdui:IPHint>
-          <mdui:IPHint>193.190.77.0/26</mdui:IPHint>
-          <mdui:IPHint>193.190.224.0/24</mdui:IPHint>
-          <mdui:IPHint>193.190.225.0/24</mdui:IPHint>
-          <mdui:IPHint>193.190.130.128/26</mdui:IPHint>
-          <mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
-          <mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
 DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
@@ -94,35 +94,35 @@ vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
 +yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
 yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
 5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kuleuven.be/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuleuven.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groept.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hubkaho.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odisee.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucll.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vives.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luca-arts.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khlim.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomasmore.be</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kuleuven.be/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuleuven.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groept.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hubkaho.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odisee.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucll.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vives.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luca-arts.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khlim.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomasmore.be</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
 DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
@@ -139,28 +139,28 @@ vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
 +yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
 yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
 5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">KU Leuven / Associatie KU Leuven</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">KU Leuven / KU Leuven Association</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">KU Leuven / KU Leuven Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.kuleuven.be</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.kuleuven.be</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>AAI team</md:GivenName>
-      <md:EmailAddress>shib@kuleuven.be</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ICTS Servicepunt</md:GivenName>
-      <md:EmailAddress>servicepunt@icts.kuleuven.be</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">KU Leuven / Associatie KU Leuven</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">KU Leuven / KU Leuven Association</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KU Leuven / KU Leuven Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.kuleuven.be</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kuleuven.be</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>AAI team</md:GivenName>
+    <md:EmailAddress>shib@kuleuven.be</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICTS Servicepunt</md:GivenName>
+    <md:EmailAddress>servicepunt@icts.kuleuven.be</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
index 8938039f..e802b1ca 100644
--- a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:urkund:shibboleth:sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
+        <mdui:Description xml:lang="en">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.urkund.com/se/om-urkund</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.urkund.com/en/about-urkund</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://static.urkund.com/documents/URKUND_SP_privacy.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
-          <mdui:Description xml:lang="en">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.urkund.com/se/om-urkund</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.urkund.com/en/about-urkund</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://static.urkund.com/documents/URKUND_SP_privacy.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>urkundweb.urkund.se</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=urkundweb.urkund.se</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAL61GoCfz8heMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>urkundweb.urkund.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=urkundweb.urkund.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAL61GoCfz8heMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3Vya3VuZHdlYi51cmt1bmQuc2UwHhcNMDkwMzAzMTU1NjQyWhcNMTkwMzAx
 MTU1NjQyWjAeMRwwGgYDVQQDExN1cmt1bmR3ZWIudXJrdW5kLnNlMIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RwMFJu304/B3qtfLT8r2vKBOugNcfyZ
@@ -48,15 +48,15 @@ YcF3FDUEnWCpXVoOF3bB84M9zlrggkBlhid47DpJZ54EcMl8qrMQmOJDcw4/1Jc1
 idGXqKfeI6/eA5cV6Kvyy63eSji0hOvD1CKIhufI3w6R1+DU0pSVsv+t7ND9KWBl
 gEln3A==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>urkundweb.urkund.se</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=urkundweb.urkund.se</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAL61GoCfz8heMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>urkundweb.urkund.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=urkundweb.urkund.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAL61GoCfz8heMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 BAMTE3Vya3VuZHdlYi51cmt1bmQuc2UwHhcNMDkwMzAzMTU1NjQyWhcNMTkwMzAx
 MTU1NjQyWjAeMRwwGgYDVQQDExN1cmt1bmR3ZWIudXJrdW5kLnNlMIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RwMFJu304/B3qtfLT8r2vKBOugNcfyZ
@@ -74,38 +74,38 @@ YcF3FDUEnWCpXVoOF3bB84M9zlrggkBlhid47DpJZ54EcMl8qrMQmOJDcw4/1Jc1
 idGXqKfeI6/eA5cV6Kvyy63eSji0hOvD1CKIhufI3w6R1+DU0pSVsv+t7ND9KWBl
 gEln3A==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Peter</md:GivenName>
-      <md:SurName>Witasp</md:SurName>
-      <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Samuel</md:GivenName>
-      <md:SurName>Otter</md:SurName>
-      <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Witasp</md:SurName>
+    <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Samuel</md:GivenName>
+    <md:SurName>Otter</md:SurName>
+    <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml b/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
index 25af7fc2..16400b19 100644
--- a/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
+++ b/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
@@ -1,31 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://urz-cf9dev.urz.unibas.ch/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-29T14:44:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>unibas.ch</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-29T14:44:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-				</saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>unibas.ch</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:DisplayName>
+        <mdui:Description xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:DisplayName>
-          <mdui:Description xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIJAM7GrNjzVwKBMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGHVyei1jZjlkZXYudXJ6LnVuaWJhcy5jaDAeFw0xNTAzMDIxMjQ4NTFaFw0x
 ODAzMDExMjQ4NTFaMCMxITAfBgNVBAMTGHVyei1jZjlkZXYudXJ6LnVuaWJhcy5j
@@ -45,59 +44,59 @@ gVBOKbQBqFA4kFy2pmi1P2WJ6ZlWQhYsw85FmLaLdZYxL5uau0iXLz03fSaJoQ2T
 IrXMRU8/Na6KDEGsbSSUGDeWYrFB3dgyL1f6/rsr4pWFmGz4yzN1Ay3YCaZSTFpF
 aSLed9e+X5BTJyKEWbheQg==
 						</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Basel</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Basel</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="fr">Université de Bâle</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ITS</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:support-its@unibas.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ITS</md:GivenName>
-      <md:SurName>WApp</md:SurName>
-      <md:EmailAddress>mailto:wapp-its@unibas.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>ITS</md:GivenName>
-      <md:SurName>WSyM</md:SurName>
-      <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Basel</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Basel</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="fr">Université de Bâle</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ITS</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support-its@unibas.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ITS</md:GivenName>
+    <md:SurName>WApp</md:SurName>
+    <md:EmailAddress>mailto:wapp-its@unibas.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ITS</md:GivenName>
+    <md:SurName>WSyM</md:SurName>
+    <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml b/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml
index b5053e8f..4171a508 100644
--- a/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/us.ready.kuali.co-shibboleth-sp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://us.ready.kuali.co/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kuali Ready</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Kuali Ready: Continuity Planning Tool</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kuali.co</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kuali.co/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Kuali Ready</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Kuali Ready: Continuity Planning Tool</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.kuali.co</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.kuali.co/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFWDCCBECgAwIBAgIQdSD51D2J/H68GiKuV9R+VzANBgkqhkiG9w0BAQsFADCB
 kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
@@ -51,32 +51,32 @@ BjeBl4P1r17InaZSLCwRPJkpU26qFUctBqe+eRBkiHcP8yA5SQe1pxJzmuvSIQxF
 gPmXUWIVQJomabMJXajnaW+N9aUgq2pkUFOWc/cyrPu4hCZ+3t1mYI53TCHZuT9j
 igrISDU4NE+WRFXYNimd2m6klDtRE3PVtwaPcQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Kuali Ready</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Kuali Ready: Continuity Planning Tool</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Kuali, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Kuali, Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.kuali.co/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kuali Ready Technical Support</md:GivenName>
-      <md:EmailAddress>ready-help@kuali.co</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://us.ready.kuali.co/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Kuali Ready</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Kuali Ready: Continuity Planning Tool</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kuali, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kuali, Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kuali.co/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kuali Ready Technical Support</md:GivenName>
+    <md:EmailAddress>ready-help@kuali.co</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/usertest.sciquest.com.xml b/swamid-interfederations-2.0/usertest.sciquest.com.xml
index b211387c..816ab747 100644
--- a/swamid-interfederations-2.0/usertest.sciquest.com.xml
+++ b/swamid-interfederations-2.0/usertest.sciquest.com.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://usertest.sciquest.com">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-13T16:37:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-13T16:37:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAl2gAwIBAgIITH47WRLwirIwDQYJKoZIhvcNAQEEBQAwXzELMAkGA1UEBhMCVVMxETAP
 						BgNVBAoTCFNjaVF1ZXN0MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEnMCUGA1UEAxMeU2NpUXVlc3Qg
 						Q2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEzMDkwOTIwMjkzMVoXDTMzMDMzMTIwMjkzMVowYDEV
@@ -25,26 +25,26 @@
 						UJxYoO9+3wRbtkiHnfP2W8SP7GoxvZhaJyblGX5PS+xLtCBhwfVbUQC9dNGy/yTOggYvF6oQIXn2
 						U7mXMJZfSVNp1vexAK1dV+TJVQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usertest.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Edinburgh" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usertest.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Warwick" index="1"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SciQuest Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SciQuest, Inc. (test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sciquest.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Monroe</md:SurName>
-      <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Monroe</md:SurName>
-      <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usertest.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Edinburgh" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usertest.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Warwick" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SciQuest Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SciQuest, Inc. (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sciquest.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Monroe</md:SurName>
+    <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Monroe</md:SurName>
+    <md:EmailAddress>mailto:MMonroe@SciQuest.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uthscsa.infoready4.com-shibboleth.xml b/swamid-interfederations-2.0/uthscsa.infoready4.com-shibboleth.xml
index 95b0be6e..00848087 100644
--- a/swamid-interfederations-2.0/uthscsa.infoready4.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/uthscsa.infoready4.com-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uthscsa.infoready4.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uthscsa.infoready4.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">InfoReady Review - UTHSCSA</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uthscsa.infoready4.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">InfoReady Review - UTHSCSA</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6zCCAdOgAwIBAgIJAOO9wmxE2PCSMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDGluZm9yZHl3aW4wMjAeFw0xMzEwMjkwNjE0NDlaFw0yMzEwMjcwNjE0NDla
 MBcxFTATBgNVBAMTDGluZm9yZHl3aW4wMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -36,31 +36,31 @@ zAs2xgBj3V5YWmzS7nk1wPPJBKpr+9W5xixEGfaKfrrQXayP/LVyN+u/3BjZCZfE
 bfqmalH+rjpJ7ZCck4CQFxCvnLhwl+L5DEuEFXmgTzk7EDb65no+rXaZQd3/IEre
 sazovBHNw8FPYGiOCi2757flvBsb6gW+FbN0SPmtSQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">InfoReady Review - UTHSCSA</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John Testa</md:GivenName>
-      <md:EmailAddress>jtesta@infoready4.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uthscsa.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">InfoReady Review - UTHSCSA</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John Testa</md:GivenName>
+    <md:EmailAddress>jtesta@infoready4.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/utwente.nl-.xml b/swamid-interfederations-2.0/utwente.nl-.xml
index 4083223a..62afab8b 100644
--- a/swamid-interfederations-2.0/utwente.nl-.xml
+++ b/swamid-interfederations-2.0/utwente.nl-.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://utwente.nl/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-09T08:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-09T08:40:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit Twente</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Twente</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit Twente</mdui:Description>
+        <mdui:Description xml:lang="en">Universiteit Twente</mdui:Description>
+        <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/utwente.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Universiteit Twente</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Twente</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Universiteit Twente</mdui:Description>
-          <mdui:Description xml:lang="en">Universiteit Twente</mdui:Description>
-          <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/utwente.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/771fcfef97ddd691af69d7a52b7d2457"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Universiteit Twente</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Universiteit Twente</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.utwente.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/771fcfef97ddd691af69d7a52b7d2457"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universiteit Twente</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit Twente</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utwente.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uwgb.edu-idp.xml b/swamid-interfederations-2.0/uwgb.edu-idp.xml
index c1d075d0..0aae7b51 100644
--- a/swamid-interfederations-2.0/uwgb.edu-idp.xml
+++ b/swamid-interfederations-2.0/uwgb.edu-idp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uwgb.edu/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwgb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Wisconsin - Green Bay</mdui:DisplayName>
+        <mdui:Logo height="364" width="447" xml:lang="en">https://shibidp-1.uwgb.edu/UWGB_Logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwgb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Wisconsin - Green Bay</mdui:DisplayName>
-          <mdui:Logo height="364" width="447" xml:lang="en">https://shibidp-1.uwgb.edu/UWGB_Logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFHTCCBAWgAwIBAgIRAIu7XEh83akQ2Pq8cCMVoKUwDQYJKoZIhvcNAQEFBQAw
 UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
 b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xNDA0MzAwMDAw
@@ -49,32 +49,32 @@ l2TErMlmpmMxrm6PXAskJMXfwdAOiCTrcgddGbZ4ZtmVSM5FBhIZzJ1IyHypGjy6
 GrQwWjQqXBKeNFNo7SFl6YqjJ6QPG9CwYR9LOKGSOnsL13UW6gODtGnf4gb9F9xa
 MmJAfqdYwZ9xDXBIkSE7gHk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Wisconsin - Green Bay</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Green Bay</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uwgb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>David Kieper</md:GivenName>
-      <md:EmailAddress>kieperd@uwgb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>David Kieper</md:GivenName>
-      <md:EmailAddress>kieperd@uwgb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Patrick Goggins</md:GivenName>
-      <md:EmailAddress>gogginsp@uwgb.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Patrick Goggins</md:GivenName>
-      <md:EmailAddress>gogginsp@uwgb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Wisconsin - Green Bay</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Green Bay</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwgb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David Kieper</md:GivenName>
+    <md:EmailAddress>kieperd@uwgb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>David Kieper</md:GivenName>
+    <md:EmailAddress>kieperd@uwgb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Patrick Goggins</md:GivenName>
+    <md:EmailAddress>gogginsp@uwgb.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Patrick Goggins</md:GivenName>
+    <md:EmailAddress>gogginsp@uwgb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml
index a65df32b..86b4a1e6 100644
--- a/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://v-shibboleth.cant-col.ac.uk/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-17T17:42:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-17T17:42:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIUX0CFs7nNWuXu2lCNNauASex5B5wwDQYJKoZIhvcNAQEF
 						BQAwJjEkMCIGA1UEAxMbdi1zaGliYm9sZXRoLmNhbnQtY29sLmFjLnVrMB4XDTEz
 						MDkxNzEwMTg0MloXDTMzMDkxNzEwMTg0MlowJjEkMCIGA1UEAxMbdi1zaGliYm9s
@@ -32,26 +32,26 @@
 						KcSh5MvzBEYhufI4n/tZbwb52gvZV2LJuKk+NaE/OS9yYYgLkCOc4UIxs8/GnNtT
 						buTISGMXC6sfecQTotCodG6BJlwQwhLVCngEfJgWskoRwgfenuneoCxCSw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cant-col.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIUX0CFs7nNWuXu2lCNNauASex5B5wwDQYJKoZIhvcNAQEF
 						BQAwJjEkMCIGA1UEAxMbdi1zaGliYm9sZXRoLmNhbnQtY29sLmFjLnVrMB4XDTEz
 						MDkxNzEwMTg0MloXDTMzMDkxNzEwMTg0MlowJjEkMCIGA1UEAxMbdi1zaGliYm9s
@@ -71,26 +71,26 @@
 						KcSh5MvzBEYhufI4n/tZbwb52gvZV2LJuKk+NaE/OS9yYYgLkCOc4UIxs8/GnNtT
 						buTISGMXC6sfecQTotCodG6BJlwQwhLVCngEfJgWskoRwgfenuneoCxCSw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Canterbury College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Canterbury College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@canterburycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Nathan</md:GivenName>
-      <md:SurName>Friend</md:SurName>
-      <md:EmailAddress>mailto:n.friend@canterburycollege.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Canterbury College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Canterbury College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@canterburycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nathan</md:GivenName>
+    <md:SurName>Friend</md:SurName>
+    <md:EmailAddress>mailto:n.friend@canterburycollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/va-idp.lanet.lv.xml b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
index b2d812b5..cc60978e 100644
--- a/swamid-interfederations-2.0/va-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://va-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vidzeme University of Applied Sciences</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Vidzeme University of Applied Sciences</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - VA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Vidzeme University of Applied Sciences - VA IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.va.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - VA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vidzeme University of Applied Sciences - VA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.va.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
index 9e87fbd6..59d0137d 100644
--- a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
+++ b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vea-idp.lanet.lv">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Ventspils University College</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-        <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ventspils University College</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LAIFE - VEA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ventspils University College - VEA IDP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="lv">http://www.venta.lv/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>ITserviss</md:SurName>
-      <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LAIFE - VEA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ventspils University College - VEA IDP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lv">http://www.venta.lv/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml
index 912190e1..280c3e6b 100644
--- a/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.cranfield.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:12:30Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:12:30Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
 						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
@@ -29,34 +29,34 @@
 						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
 						JXxZbc0L9R3Upa90FjFH8QnxXg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digitary</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digitary DARE Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.digitary.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Xiang</md:GivenName>
-      <md:SurName>Chen</md:SurName>
-      <md:EmailAddress>mailto:xiang.chen@digitary.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Troy</md:SurName>
-      <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digitary</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digitary DARE Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.digitary.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Xiang</md:GivenName>
+    <md:SurName>Chen</md:SurName>
+    <md:EmailAddress>mailto:xiang.chen@digitary.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Troy</md:SurName>
+    <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml
index 50198993..f91be2a4 100644
--- a/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.dmu.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-13T10:28:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-13T10:28:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.dmu.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.dmu.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
 						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
@@ -31,34 +31,34 @@
 						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
 						JXxZbc0L9R3Upa90FjFH8QnxXg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.dmu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digitary</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DARE service for De Montfort University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.digitary.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Troy</md:SurName>
-      <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Troy</md:SurName>
-      <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.dmu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digitary</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DARE service for De Montfort University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.digitary.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Troy</md:SurName>
+    <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Troy</md:SurName>
+    <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml
index b68d1185..2339c7d6 100644
--- a/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.sheffield.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-11T16:20:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-11T16:20:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
 						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
@@ -31,34 +31,34 @@
 						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
 						JXxZbc0L9R3Upa90FjFH8QnxXg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digitary</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digitary DARE Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.digitary.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Xiang</md:GivenName>
-      <md:SurName>Chen</md:SurName>
-      <md:EmailAddress>mailto:xiang.chen@digitary.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin</md:GivenName>
-      <md:SurName>Troy</md:SurName>
-      <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digitary</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digitary DARE Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.digitary.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Xiang</md:GivenName>
+    <md:SurName>Chen</md:SurName>
+    <md:EmailAddress>mailto:xiang.chen@digitary.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin</md:GivenName>
+    <md:SurName>Troy</md:SurName>
+    <md:EmailAddress>mailto:kevin.troy@digitary.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
index 6dc439be..57aa3cf3 100644
--- a/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.studentbeans.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T12:07:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T12:07:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.studentbeans.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://verify.studentbeans.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Beans</mdui:DisplayName>
+        <mdui:Logo height="78" width="348">https://cdn.ymaservices.com/student-verification/ukfederation/studentbeans-id-logo-348x78.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Free digital student card - Access 1000's of student exclusive discounts with Student Beans iD.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify.studentbeans.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://verify.studentbeans.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Student Beans</mdui:DisplayName>
-          <mdui:Logo height="78" width="348">https://cdn.ymaservices.com/student-verification/ukfederation/studentbeans-id-logo-348x78.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Free digital student card - Access 1000's of student exclusive discounts with Student Beans iD.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEODCCAyCgAwIBAgIJANJg6RwX4lGaMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
 						VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
 						BAoME1RoZSBCZWFucyBHcm91cCBMdGQxIDAeBgNVBAMMF3ZlcmlmeS5zdHVkZW50
@@ -59,48 +59,48 @@
 						dbTF8jXsONg/RSWzM2N6J42swNHz1NzcVCbwtvlu8sPzLWftRGLZFLWpj3SJR3mr
 						UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Beans Group Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Beans</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.studentbeans.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Vincent</md:GivenName>
-      <md:SurName>Siebert</md:SurName>
-      <md:EmailAddress>mailto:vincent@thebeansgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Seren</md:GivenName>
-      <md:SurName>Altiner</md:SurName>
-      <md:EmailAddress>mailto:seren@thebeansgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Vincent</md:GivenName>
-      <md:SurName>Siebert</md:SurName>
-      <md:EmailAddress>mailto:vincent@thebeansgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Beans Group Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Beans</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.studentbeans.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vincent</md:GivenName>
+    <md:SurName>Siebert</md:SurName>
+    <md:EmailAddress>mailto:vincent@thebeansgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Seren</md:GivenName>
+    <md:SurName>Altiner</md:SurName>
+    <md:EmailAddress>mailto:seren@thebeansgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vincent</md:GivenName>
+    <md:SurName>Siebert</md:SurName>
+    <md:EmailAddress>mailto:vincent@thebeansgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml b/swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml
index 16918b0e..ef262a5b 100644
--- a/swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify2.newsbank.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-03T15:24:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-03T15:24:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify2.newsbank.com/Shibboleth.sso/WAYF/Chooser"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify2.newsbank.com/Shibboleth.sso/OpenAthens"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify2.newsbank.com/Shibboleth.sso/WAYF/Chooser"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify2.newsbank.com/Shibboleth.sso/OpenAthens"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJDCCAgygAwIBAgIJAMub3zkdNgfVMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHZlcmlmeTIubmV3c2JhbmsuY29tMB4XDTExMDcxNDEyMzkzMVoXDTMxMDcw
 						OTEyMzkzMVowHzEdMBsGA1UEAxMUdmVyaWZ5Mi5uZXdzYmFuay5jb20wggEiMA0G
@@ -32,38 +32,38 @@
 						+ESKGLjDRtNoR/JbVhqjWLtch4moDKBQNuTvP/geXckpGdfNycQXKK6mDm5fSGw2
 						Zr9OPFlTRFs5qBv23HfpNMyeg0Eytp3lzTOvzOCX0M7pidl/y9KtNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NewsBank, inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NewsBank</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.newsbank.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Majonen</md:SurName>
-      <md:EmailAddress>mailto:jmajonen@newsbank.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>John</md:GivenName>
-      <md:SurName>Majonen</md:SurName>
-      <md:EmailAddress>mailto:jmajonen@newsbank.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NewsBank, inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NewsBank</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newsbank.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Majonen</md:SurName>
+    <md:EmailAddress>mailto:jmajonen@newsbank.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Majonen</md:SurName>
+    <md:EmailAddress>mailto:jmajonen@newsbank.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
index 90870f99..8dff47c0 100644
--- a/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://versions-test.ligo.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://versions-test.ligo.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LIGO Software Control System - Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://versions-test.ligo.org/spinfo.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://versions-test.ligo.org/spprivacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://versions-test.ligo.org/img/ligologo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://versions-test.ligo.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LIGO Software Control System - Test</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://versions-test.ligo.org/spinfo.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://versions-test.ligo.org/spprivacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://versions-test.ligo.org/img/ligologo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIJAPye2jVyCBsPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEWdpdC10ZXN0LmxpZ28ub3JnMB4XDTE1MDQwNjE5MzkwNFoXDTI1MDQwMzE5
 MzkwNFowHDEaMBgGA1UEAxMRZ2l0LXRlc3QubGlnby5vcmcwggEiMA0GCSqGSIb3
@@ -42,39 +42,39 @@ JZnzDqFZPYEd9nsqzrxaLf3hwNT80Q83d7x9W9SNfTPZuXPz7WALiLVGHZ5KYDiH
 10KjvQgiFW3ujH1jfcsiU9BDJG7OpXFdAXiU95kuWk2RbAZDFAQ8qI1usaew0zS2
 djNCMsASHgON9D2b2vfcNdMr0yIbOT36yypVw/4KHc1pAMaf7vBc
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LIGO Software Control System - Test</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Thomas Downes</md:GivenName>
-      <md:EmailAddress>thomas.downes@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UWM LSC Help</md:GivenName>
-      <md:EmailAddress>uwm-help@cgca.uwm.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LIGO Software Control System - Test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas Downes</md:GivenName>
+    <md:EmailAddress>thomas.downes@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UWM LSC Help</md:GivenName>
+    <md:EmailAddress>uwm-help@cgca.uwm.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml b/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
index b1cf47a6..90cca1a9 100644
--- a/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vetucation.vu-wien.ac.at/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-12-18T18:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-12-18T18:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vetucation</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">Vetucation</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</mdui:Description>
+        <mdui:Description xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.vetmeduni.ac.at/en/infos/vetucation-privacy-policy-shibboleth/</mdui:PrivacyStatementURL>
+        <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
+        <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Vetucation</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="de">Vetucation</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</mdui:Description>
-          <mdui:Description xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</mdui:Description>
-          <mdui:InformationURL xml:lang="de">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.vetmeduni.ac.at/en/infos/vetucation-privacy-policy-shibboleth/</mdui:PrivacyStatementURL>
-          <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
-          <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJ0uN/nroe1EMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJ0uN/nroe1EMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGHZldHVjYXRpb24udnUtd2llbi5hYy5hdDAeFw0xNTEwMDgwOTE2MDlaFw0y
 NTEwMDUwOTE2MDlaMCMxITAfBgNVBAMTGHZldHVjYXRpb24udnUtd2llbi5hYy5h
 dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcquQ1PwnT0kh8Lnj7+
@@ -65,54 +65,54 @@ p/ElK1Ifeztv7H+Af42jzwhYuLF/YhXDBekcyPXjqjobxRWzgKkqp+FtxZzOAoY8
 74e9Pp+cKc3ZkqNh5DQy9zStiClBdHta8mh8m4jGUOyUz3qy1IuFZ64Fx5e3p+Dn
 mPmdVWCZHlIbHEZLKp9V+fu71Q==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Vetucation</md:ServiceName>
-        <md:ServiceName xml:lang="de">Vetucation</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</md:ServiceDescription>
-        <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>E-Learning</md:GivenName>
-      <md:SurName>Support Team</md:SurName>
-      <md:EmailAddress>mailto:elearning@vetmeduni.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>E-Learning</md:GivenName>
-      <md:SurName>Support Team</md:SurName>
-      <md:EmailAddress>mailto:elearning@vetmeduni.ac.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Vetucation</md:ServiceName>
+      <md:ServiceName xml:lang="de">Vetucation</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</md:ServiceDescription>
+      <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Learning</md:GivenName>
+    <md:SurName>Support Team</md:SurName>
+    <md:EmailAddress>mailto:elearning@vetmeduni.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>E-Learning</md:GivenName>
+    <md:SurName>Support Team</md:SurName>
+    <md:EmailAddress>mailto:elearning@vetmeduni.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
index eb56c959..5a50c9a2 100644
--- a/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vho.aaf.edu.au-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vho.aaf.edu.au/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aaf.edu.au" registrationInstant="2010-12-06T12:35:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aaf.edu.au</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aaf.edu.au" registrationInstant="2010-12-06T12:35:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aaf.edu.au</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AAF Virtual Home</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Australian Access Federation Virtual Home Organization</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">^([a-zA-Z0-9-]{1,63}\.){0,2}vho\.aaf\.edu\.au$</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">AAF Virtual Home</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Australian Access Federation Virtual Home Organization</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">^([a-zA-Z0-9-]{1,63}\.){0,2}vho\.aaf\.edu\.au$</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=vho.aaf.edu.au</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANmymmwJai/+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=vho.aaf.edu.au</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANmymmwJai/+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDnZoby5hYWYuZWR1LmF1MB4XDTE0MDgxNDA1MDI1OFoXDTM0MDgwOTA1MDI1
 OFowGTEXMBUGA1UEAxMOdmhvLmFhZi5lZHUuYXUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC+rU6AApNBp4f2e0oRp5D1xgRw/DbY/6bc1juqR3IQ3Exn
@@ -39,50 +39,50 @@ VqjFhrIoKIUYnm273r00sMkQ1RlsuWQOpeOIxdtVF03ePutS2nFMFYS5LSWATm4S
 dya+JvRuLxrfFiBKrO5Rjs4sv9buELCZ+rVVHXn6cXfmSviGuedRTIXNqOp81qNq
 Q7xGcAxovDCv5oRVo3yliESIPPT/41JjPymodvFNDP4SNJFhfGIWW9SVDXkq1fFH
 LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService index="1" isDefault="false" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
-      <md:ArtifactResolutionService index="2" isDefault="false" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vho.aaf.edu.au/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vho.aaf.edu.au/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vho.aaf.edu.au/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vho.aaf.edu.au/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au/idp/profile/SAML2/SOAP/ECP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">^([a-zA-Z0-9-]{1,63}\.){0,2}vho\.aaf\.edu\.au$</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=vho.aaf.edu.au</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANmymmwJai/+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService index="1" isDefault="false" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
+    <md:ArtifactResolutionService index="2" isDefault="false" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vho.aaf.edu.au/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vho.aaf.edu.au/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vho.aaf.edu.au/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vho.aaf.edu.au/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au/idp/profile/SAML2/SOAP/ECP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">^([a-zA-Z0-9-]{1,63}\.){0,2}vho\.aaf\.edu\.au$</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=vho.aaf.edu.au</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANmymmwJai/+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDnZoby5hYWYuZWR1LmF1MB4XDTE0MDgxNDA1MDI1OFoXDTM0MDgwOTA1MDI1
 OFowGTEXMBUGA1UEAxMOdmhvLmFhZi5lZHUuYXUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC+rU6AApNBp4f2e0oRp5D1xgRw/DbY/6bc1juqR3IQ3Exn
@@ -99,58 +99,58 @@ VqjFhrIoKIUYnm273r00sMkQ1RlsuWQOpeOIxdtVF03ePutS2nFMFYS5LSWATm4S
 dya+JvRuLxrfFiBKrO5Rjs4sv9buELCZ+rVVHXn6cXfmSviGuedRTIXNqOp81qNq
 Q7xGcAxovDCv5oRVo3yliESIPPT/41JjPymodvFNDP4SNJFhfGIWW9SVDXkq1fFH
 LlmjJm9hYPxJyxlhjchh/4tGprdMSlHa+v8xlw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">vho.aaf.edu.au</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">AAF Virtual Home</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.aaf.edu.au</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Australian Access Federation</md:Company>
-      <md:GivenName>Terry</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:t.smith@aaf.edu.au</md:EmailAddress>
-      <md:TelephoneNumber>(07) 3138 2424</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Australian Access Federation</md:Company>
-      <md:GivenName>Bradley</md:GivenName>
-      <md:SurName>Beddoes</md:SurName>
-      <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Australian Access Federation</md:Company>
-      <md:GivenName>AAF</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vho.aaf.edu.au:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="commonName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganizationType"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobileNumber"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="email"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonLegalName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.27856.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="auEduPersonSharedToken"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homeOrganization"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationalUnit"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">vho.aaf.edu.au</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AAF Virtual Home</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aaf.edu.au</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Australian Access Federation</md:Company>
+    <md:GivenName>Terry</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:t.smith@aaf.edu.au</md:EmailAddress>
+    <md:TelephoneNumber>(07) 3138 2424</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Australian Access Federation</md:Company>
+    <md:GivenName>Bradley</md:GivenName>
+    <md:SurName>Beddoes</md:SurName>
+    <md:EmailAddress>mailto:b.beddoes@aaf.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Australian Access Federation</md:Company>
+    <md:GivenName>AAF</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@aaf.edu.au</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml
index dd364ee1..be56c89f 100644
--- a/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vince.csueastbay.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://vince.csueastbay.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csueastbay.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">California State University, East Bay</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://vince.csueastbay.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csueastbay.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">California State University, East Bay</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAJfj/FNmMcHe0xPOV8us8po5lTWAMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHZpbmNlLmNzdWVhc3RiYXkuZWR1MB4XDTEwMDQwNzE3
 NTYyMloXDTMwMDQwNzE3NTYyMlowHzEdMBsGA1UEAxMUdmluY2UuY3N1ZWFzdGJh
@@ -38,24 +38,24 @@ Qc8LJ6ETsbSEOO22H9s1zBFA7eFtgbVJQXnncmyuP6ysmp7I8JzschRC8hd11mIZ
 xJDXvlpdRC1sHZ2/0U7h70Nzz/k9NK4+O3hR89/NU81ub+7d/TCECa/gj2F8RnOo
 z6yMjX4JYAX5nFs0wOheuQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vince.csueastbay.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vince.csueastbay.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vince.csueastbay.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vince.csueastbay.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csueastbay.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vince.csueastbay.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vince.csueastbay.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vince.csueastbay.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vince.csueastbay.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csueastbay.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAJfj/FNmMcHe0xPOV8us8po5lTWAMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHZpbmNlLmNzdWVhc3RiYXkuZWR1MB4XDTEwMDQwNzE3
 NTYyMloXDTMwMDQwNzE3NTYyMlowHzEdMBsGA1UEAxMUdmluY2UuY3N1ZWFzdGJh
@@ -75,27 +75,27 @@ Qc8LJ6ETsbSEOO22H9s1zBFA7eFtgbVJQXnncmyuP6ysmp7I8JzschRC8hd11mIZ
 xJDXvlpdRC1sHZ2/0U7h70Nzz/k9NK4+O3hR89/NU81ub+7d/TCECa/gj2F8RnOo
 z6yMjX4JYAX5nFs0wOheuQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">California State University, East Bay</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">California State University, East Bay</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www20.csueastbay.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt Collins</md:GivenName>
-      <md:EmailAddress>matt.collins@csueastbay.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ashok Kumar</md:GivenName>
-      <md:EmailAddress>ashok.kumar@csueastbay.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dave Bartholomew</md:GivenName>
-      <md:EmailAddress>dave.bartholomew@csueastbay.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">California State University, East Bay</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">California State University, East Bay</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www20.csueastbay.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt Collins</md:GivenName>
+    <md:EmailAddress>matt.collins@csueastbay.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ashok Kumar</md:GivenName>
+    <md:EmailAddress>ashok.kumar@csueastbay.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave Bartholomew</md:GivenName>
+    <md:EmailAddress>dave.bartholomew@csueastbay.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
index 3f24717a..913769be 100644
--- a/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vip.espci.fr/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-31T18:03:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-31T18:03:42Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espci.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ESPCI ParisTech</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACRElEQVQ4y32TS0hUYRTHf/fOeLV55Yt0LCXEB2IPxKBF9NgI5bogXElZm8BFixLbtKqFuKlNZmErW4i2CRcm6SZCowZSm0wyx/EVzqSO453nvaeFho9m5oOz+50f3/c/50NESFeDfnnmC8v1TIxKhpOvsfhgcOZ1/xx94SSuVExGQZmDUc2iMOT5ebXzS3T66xq3QfYxioikFehJtMdjG0trgWCBADHD5OKpitHGUpoKslkGUMNxrpFGYrMSdxccXjQRVAXsmpWPXt+lhodvlrbiKNuCBM2zIeV7wqAmlaTcwZigYtWyWJjz0/v0FZ4Xb5kNcA9AdWgMBdc3qyeWtyaDER4dFFTmMryyEmCgp5+Brj42gutQbGd8avU8gJIwxOXxb25YVAXTFArznJ+LbdzKseIJx6B/iu7mm3dbUAywWrethgn5RSvyrs2tiJh4g7IV0XUbgAjYHbaoaaq9tU0dDSzMl2LPAkXZfzV/GH2+S1FBwZGtev7lqCgQjURzJn/8usGcrxS79n8zgM3CUogWFeCQBe/eOYgIR4/k4a4oAtNMPeMcK/5VGlUAl8aT7dXcFeS5bNRVl0AyhSBhQCBKVFhWATSLTJw+5qwqzHWMG6bs5GRSd6Ic4sZuo2HCnwj1Z+q/TU89v3K5hjs7sSpoFmbKnJx1as62QIT7uq7nnqwuA1UFU0BPQIn790hfe8e543RmqXvee7BiSan0hWTkvXdVuNAuVLXGez5JdzgmtoMsmb5qKCatLz9sDgd1qU3H/AXA2mdOrmGYzgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.espci.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ESPCI ParisTech</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espci.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ESPCI ParisTech</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACRElEQVQ4y32TS0hUYRTHf/fOeLV55Yt0LCXEB2IPxKBF9NgI5bogXElZm8BFixLbtKqFuKlNZmErW4i2CRcm6SZCowZSm0wyx/EVzqSO453nvaeFho9m5oOz+50f3/c/50NESFeDfnnmC8v1TIxKhpOvsfhgcOZ1/xx94SSuVExGQZmDUc2iMOT5ebXzS3T66xq3QfYxioikFehJtMdjG0trgWCBADHD5OKpitHGUpoKslkGUMNxrpFGYrMSdxccXjQRVAXsmpWPXt+lhodvlrbiKNuCBM2zIeV7wqAmlaTcwZigYtWyWJjz0/v0FZ4Xb5kNcA9AdWgMBdc3qyeWtyaDER4dFFTmMryyEmCgp5+Brj42gutQbGd8avU8gJIwxOXxb25YVAXTFArznJ+LbdzKseIJx6B/iu7mm3dbUAywWrethgn5RSvyrs2tiJh4g7IV0XUbgAjYHbaoaaq9tU0dDSzMl2LPAkXZfzV/GH2+S1FBwZGtev7lqCgQjURzJn/8usGcrxS79n8zgM3CUogWFeCQBe/eOYgIR4/k4a4oAtNMPeMcK/5VGlUAl8aT7dXcFeS5bNRVl0AyhSBhQCBKVFhWATSLTJw+5qwqzHWMG6bs5GRSd6Ic4sZuo2HCnwj1Z+q/TU89v3K5hjs7sSpoFmbKnJx1as62QIT7uq7nnqwuA1UFU0BPQIn790hfe8e543RmqXvee7BiSan0hWTkvXdVuNAuVLXGez5JdzgmtoMsmb5qKCatLz9sDgd1qU3H/AXA2mdOrmGYzgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.espci.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ESPCI ParisTech</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
@@ -50,13 +50,13 @@ MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
 M3PXyfI7EheNPXVG8+6JL5disJ3pvtZwIrzh3ApWc4NDE2BISXejQZxpl5wVtCt+
 aWaLoR3kbEdTYA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
@@ -88,26 +88,26 @@ MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
 M3PXyfI7EheNPXVG8+6JL5disJ3pvtZwIrzh3ApWc4NDE2BISXejQZxpl5wVtCt+
 aWaLoR3kbEdTYA==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vip.espci.fr/shib13/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ESPCI ParisTech</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ESPCI ParisTech</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.espci.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Emmanuel Dreyfus</md:SurName>
-      <md:EmailAddress>Emmanuel.Dreyfus@espci.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Jacques Puig</md:SurName>
-      <md:EmailAddress>Jean-Jacques.Puig@espci.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vip.espci.fr/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ESPCI ParisTech</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ESPCI ParisTech</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.espci.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Emmanuel Dreyfus</md:SurName>
+    <md:EmailAddress>Emmanuel.Dreyfus@espci.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Jacques Puig</md:SurName>
+    <md:EmailAddress>Jean-Jacques.Puig@espci.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml b/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml
index bb205628..f7e8b898 100644
--- a/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vis-dev.arc-ts.umich.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/Login" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/TimeSyncTokenLogin" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ARC Connect (development instance)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Provides simple, remote, interactive access to Flux, the University of Michigan's High Performance Computer cluster.  Also provides Jupyter notebook integration, R integration, job submission and monitoring, and allocation availability and usage information on U-M ARC-TS clusters.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://vis-dev.arc-ts.umich.edu/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/Login" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/TimeSyncTokenLogin" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ARC Connect (development instance)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Provides simple, remote, interactive access to Flux, the University of Michigan's High Performance Computer cluster.  Also provides Jupyter notebook integration, R integration, job submission and monitoring, and allocation availability and usage information on U-M ARC-TS clusters.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://vis-dev.arc-ts.umich.edu/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFDzCCAvegAwIBAgIJAIkyszqJJL78MA0GCSqGSIb3DQEBDQUAMCMxITAfBgNV
 BAMTGHZpcy1kZXYuYXJjLXRzLnVtaWNoLmVkdTAeFw0xNTExMDQxNzU1MjVaFw0y
 NTExMDExNzU1MjVaMCMxITAfBgNVBAMTGHZpcy1kZXYuYXJjLXRzLnVtaWNoLmVk
@@ -51,31 +51,31 @@ GwPMAqGH3ZwTYdTPQF5xyLsl/hMZVv10UiM/FmnV3z9Edeh/IhQlOBz+OFpcej0a
 3p/lWewNIoAppkUecAD0258JCkaGhrzygHKtbttyiuexWaQdm784t6E6lYnaVLcE
 i+37
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">ARC Connect (development instance)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Provides simple, remote, interactive access to Flux, the University of Michigan's High Performance Computer cluster.  Also provides Jupyter notebook integration, R integration, job submission and monitoring, and allocation availability and usage information on U-M ARC-TS clusters.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Flux Support Staff</md:GivenName>
-      <md:EmailAddress>flux-support-staff@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ARC-TS</md:GivenName>
-      <md:EmailAddress>hpc-support@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">ARC Connect (development instance)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Provides simple, remote, interactive access to Flux, the University of Michigan's High Performance Computer cluster.  Also provides Jupyter notebook integration, R integration, job submission and monitoring, and allocation availability and usage information on U-M ARC-TS clusters.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Flux Support Staff</md:GivenName>
+    <md:EmailAddress>flux-support-staff@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ARC-TS</md:GivenName>
+    <md:EmailAddress>hpc-support@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml
index b7826c31..d8884205 100644
--- a/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vision.port.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-26T14:21:02Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-26T14:21:02Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">A Vision of Britain through Time</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Local history data including maps, boundaries, statistics and text; for viewing and download.</mdui:Description>
+        <mdui:Logo height="82" width="182">https://vision.port.ac.uk/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vision.port.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vision.port.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">A Vision of Britain through Time</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Local history data including maps, boundaries, statistics and text; for viewing and download.</mdui:Description>
-          <mdui:Logo height="82" width="182">https://vision.port.ac.uk/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vision.port.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vision.port.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZjCCAk4CCQCfVVv6ur+XEjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJH
 						QjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYD
 						VQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxGjAYBgNVBAMTEXZpc2lvbi5w
@@ -37,34 +37,34 @@
 						2SYCBBl+Wx6rH3woTVcZkK3+ObMLVS+nFxGTFS3+KrjhXwHpVLiNwXQQVafhwq8T
 						PHXgjMKQeSp7JQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vision.port.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Portsmouth</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">A Vision of Britain through Time</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.port.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paula</md:GivenName>
-      <md:SurName>Aucott</md:SurName>
-      <md:EmailAddress>mailto:gbhgis@port.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paula</md:GivenName>
-      <md:SurName>Aucott</md:SurName>
-      <md:EmailAddress>mailto:gbhgis@port.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vision.port.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Portsmouth</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">A Vision of Britain through Time</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.port.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paula</md:GivenName>
+    <md:SurName>Aucott</md:SurName>
+    <md:EmailAddress>mailto:gbhgis@port.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paula</md:GivenName>
+    <md:SurName>Aucott</md:SurName>
+    <md:EmailAddress>mailto:gbhgis@port.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
index 15474c03..46dfd63b 100644
--- a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vm-idp.paris-sorbonne.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T10:38:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T10:38:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Paris-Sorbonne Universite</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMyswMjowMGtf30gAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzMrMDI6MDAaAmf0AAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.paris-sorbonne.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Paris-Sorbonne Universite</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Paris-Sorbonne Universite</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMyswMjowMGtf30gAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzMrMDI6MDAaAmf0AAAAAElFTkSuQmCC</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.paris-sorbonne.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Paris-Sorbonne Universite</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjSgAwIBAgIVAMI/RmCj23hGRPU+v9uRMFWtW9obMA0GCSqGSIb3DQEB
 BQUAMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJpcy1zb3Jib25uZS5mcjAeFw0xMzA3
 MjQxNDAxMDNaFw0zMzA3MjQxNDAxMDNaMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJp
@@ -39,13 +39,13 @@ C2AglrZ2PAyVyFeA9T4sDI83Hw0TBXCGFlPKXAkxWw/DuATXn5ChB2ixfTmsxqvl
 KIhv18lDXRbS+DWI8nyXf/0TFFjjKFbfApQc11hVeHZWwDzjMexG2L/6pbt8rjDs
 hJGtnPWpe4IxhR2gkYkT1DdmPuvOIWlF0FJjuUGBBlA=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDSzCCAjOgAwIBAgIUc0FQTVYKXqv1YkZNpjccybeOcxMwDQYJKoZIhvcNAQEF
 BQAwIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyMB4XDTEzMDYx
 ODEzMTg0OFoXDTMzMDYxODEzMTg0OFowIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlz
@@ -65,26 +65,26 @@ rd2bCFrxuxvvj5td6FA+RgFyJyZ9UTAmzwVXzly6vxG9yGh9XXYzNXmcJtK07FDf
 I9JBAYDkTmGHFdS+c5GS+S4hUxdUCsnY9yNgwB3Ew/7r+IDDI2asBlICoLlCaO39
 lS5dpBgbSWTr2qcKD9KMAsG2n1+05Z0NNeohOEIEXg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Paris-Sorbonne Universite</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Paris-Sorbonne Universite</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.paris-sorbonne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NGUYEN Manh Hung</md:SurName>
-      <md:EmailAddress>manh-hung.nguyen@paris-sorbonne.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Brahim MARIR</md:SurName>
-      <md:EmailAddress>brahim.marir@paris-sorbonne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Paris-Sorbonne Universite</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Paris-Sorbonne Universite</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.paris-sorbonne.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NGUYEN Manh Hung</md:SurName>
+    <md:EmailAddress>manh-hung.nguyen@paris-sorbonne.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Brahim MARIR</md:SurName>
+    <md:EmailAddress>brahim.marir@paris-sorbonne.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml
index 793fdeff..567b1f96 100644
--- a/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vm-jorum-live.mimas.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-04T13:11:04Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-04T13:11:04Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jorum Server</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources</mdui:Description>
+        <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jorum Server</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources</mdui:Description>
-          <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIJANQP2jdRCfzwMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXZtLWpvcnVtLWxpdmUubWltYXMuYWMudWswHhcNMTIxMDAyMTM1MjE0WhcN
 						MjIwOTMwMTM1MjE0WjAkMSIwIAYDVQQDExl2bS1qb3J1bS1saXZlLm1pbWFzLmFj
@@ -40,44 +40,44 @@
 						Xu5sshZWFQXfzhiXmZNHQ9StFCt9ZZ7g+ozYkRcqwicS8n3kx14xe4GiOnbQl1id
 						MeubT2ge0DJHn1WTCVIhuNIylBw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="17"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Jorum Server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jorum.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Ryan</md:SurName>
-      <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Ryan</md:SurName>
-      <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="17"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Jorum Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jorum.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Ryan</md:SurName>
+    <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Ryan</md:SurName>
+    <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml
index 403e120b..50aad75f 100644
--- a/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vm-jorum.ds.man.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T09:08:36Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T09:08:36Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Manchester: Jorum Staging Server</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources.</mdui:Description>
+        <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The University of Manchester: Jorum Staging Server</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources.</mdui:Description>
-          <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLTCCAhWgAwIBAgIJALvdFCXrleHwMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNoaWJ0ZXN0LmpvcnVtLmFjLnVrMB4XDTEyMTIxMjEyNTEyMFoXDTE3MTIx
 						MTEyNTEyMFowHzEdMBsGA1UEAxMUc2hpYnRlc3Quam9ydW0uYWMudWswggEiMA0G
@@ -40,44 +40,44 @@
 						IGN531pXBsZhIwlrO13Z5laL4pqG9NDuYWeETHWNpRYRXp8TDLugPCQbkRMGf+wq
 						Jw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum Staging Server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jorum.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Ryan</md:SurName>
-      <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Ryan</md:SurName>
-      <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum Staging Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jorum.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Ryan</md:SurName>
+    <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Ryan</md:SurName>
+    <md:EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml
index 66b60a96..379a340e 100644
--- a/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vm-shibboleth.umb.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Massachusetts Boston</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Massachusetts, Boston</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.umb.edu</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Massachusetts Boston</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Massachusetts, Boston</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.umb.edu</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFvzCCBKegAwIBAgIQXRVC/prBbahteHW9QGc2kDANBgkqhkiG9w0BAQsFADB2
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
@@ -53,13 +53,13 @@ HtJWIZDdRewvv3CjsvC8HEMOCF/ccGj6DN5GgnyQ0K8a/MjldjomVWJ7mgB3p0Hw
 h5hVfhvFBc3oaiIZO4BFagetIk+nb7HBj5Av0BmZUMY24RJk7kaNUspVfnr7cl7S
 S+Nii5H5ZBvs91SaKPTriRVVu4CleuRbdvYmjRbWVhQvnJk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE7jCCA9agAwIBAgIJAI//ogStsrTSMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9u
 MR4wHAYDVQQKExVVbml2IG9mIE1hc3NhY2h1c2V0dHMxDDAKBgNVBAsTA0NJUzEe
@@ -88,23 +88,23 @@ p9Hd1O93RXm+dicsMK+dOf/T9ib36nnNu/5DfrxipBrB4tHtXj4O3BPgUBPfcJbr
 x/5ep7qDHRpz9gSjUcVeDXb6Owd/Pa31D77U9ouYegjbEUUFQIeM6ikx6zturblH
 L5ygSdWzCKrTk65VWO6vYl+x
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-shibboleth.umb.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-shibboleth.umb.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-shibboleth.umb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-shibboleth.umb.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-shibboleth.umb.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-shibboleth.umb.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFvzCCBKegAwIBAgIQXRVC/prBbahteHW9QGc2kDANBgkqhkiG9w0BAQsFADB2
 MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
 MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
@@ -137,13 +137,13 @@ HtJWIZDdRewvv3CjsvC8HEMOCF/ccGj6DN5GgnyQ0K8a/MjldjomVWJ7mgB3p0Hw
 h5hVfhvFBc3oaiIZO4BFagetIk+nb7HBj5Av0BmZUMY24RJk7kaNUspVfnr7cl7S
 S+Nii5H5ZBvs91SaKPTriRVVu4CleuRbdvYmjRbWVhQvnJk=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE7jCCA9agAwIBAgIJAI//ogStsrTSMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
 VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9u
 MR4wHAYDVQQKExVVbml2IG9mIE1hc3NhY2h1c2V0dHMxDDAKBgNVBAsTA0NJUzEe
@@ -172,19 +172,19 @@ p9Hd1O93RXm+dicsMK+dOf/T9ib36nnNu/5DfrxipBrB4tHtXj4O3BPgUBPfcJbr
 x/5ep7qDHRpz9gSjUcVeDXb6Owd/Pa31D77U9ouYegjbEUUFQIeM6ikx6zturblH
 L5ygSdWzCKrTk65VWO6vYl+x
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Massachusetts Boston</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Massachusetts Boston</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://umb.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>leonard kroll</md:GivenName>
-      <md:EmailAddress>leonard.kroll@umb.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Massachusetts Boston</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Massachusetts Boston</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://umb.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>leonard kroll</md:GivenName>
+    <md:EmailAddress>leonard.kroll@umb.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
index b8eda06e..979786a8 100644
--- a/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmfetid.iamm.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-19T13:59:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-19T13:59:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iamm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CIHEAM / IAMM</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADfklEQVQ4y3WTbVDTBQDGf/9t8j42xkQ2uRCZvIzRhZAg3TwMUwzssPLsugjy+uCKyuIuLU3SuqtOuqyEROuU7IOSHJhWvHhxIaGZCBSkSBuDHYJu4xhsHHth/z5VXl2/T8+H5/fteQT+jUnUEEVZ9PS5ok1xHWnttxJlrgW9BUnxRbScpl4Y5H/ZJ+4JLa6ZF7LqRMPTJtFvlYgPm54Tya4XX3u3RMx/fqdIubfuXkXydyoRjx2MWf/exP7Xw1PSBexeA4k7tjPueZDkTBmVay/waPoA9J41sfZ691+aFIBnxJf47cy+pQkOBqxS2v/QkZW2isFfQigoSCNEEuDVo1qcEY+jjDXzwvqj9zmNJ3T2zoZmQTCJilxf5czKeCvd1jJcPjV+Vy91VUVk6RNYEgzS2T9GnzlA88+zaIR6rrzRhPHwK/QFDj8gwUbFUzn9vLmhjfG+IXJX+bhUW0FYaAhej5f5hQDxKjkHyg2olowyt5DHuiO19PVmgOTmbim5+e+0XopJ7rA8RpI6ioeytWzMSeLL9kEau27Ses2KZXKGfL2WwuxExm0iFscspfd3MOWaV0mkDluaWu4iTBokPU1LSZ6O1qsWbticKKPCiJWHYZ+Zp6PXikoeTvOP49yeaOf4rhay480q6TJDUZX5w+rowZFRTn68nNLtqei0MeiWx/D9VQtW2zS7tq0hPTEWr3+R0Agfbp+GQ+f1DNtVixK3ImHk5c83M3j3SZ6oyMQx6yE7ZRnb1qUy4XRjnfbw7CMZGA0JTDg9DFwfRSbzY7utwe3WzsjcKVvaTpyyFwiJkeg1Y3TX3aB4jQ5FZAhGQwIrtUoCgSBj9jm6huxcHvDzze49iEUr2PpFZ4+ASYyLtb5/59uqGvY3ptLveotNOeHEyRfZWZJFUCZhYHiSHYcuIEp0qJVyipJr8HkjOXnnbL6Mz4S7ylqxemTy9IGALJWwCDj19RUUmkj8wSCfHL9FtlGHIlpGQfwH2H166psqQJv5Ha3CZQmA+UXhYFnD+ZYfftrARm0d/dV7WREn0NLjJFndRmDuGmGBGPaWDlGs/x0i1EPk6Lf+M2UAy0dnKGySK8WL+UsVEhq60/F7Zhj+tB6HY4FzrVkc+3U1naKp0b/auJm3BR+A8J9HVooZjFOO2FQoDU5o85KmBPNsomNKsaUHUfsVR4Sue+t/AsOzae5ylJ+FAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.iamm.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Personnel du CIHEAM / IAMM</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CIHEAM / IAMM</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel du CIHEAM / IAMM</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iamm.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CIHEAM / IAMM</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADfklEQVQ4y3WTbVDTBQDGf/9t8j42xkQ2uRCZvIzRhZAg3TwMUwzssPLsugjy+uCKyuIuLU3SuqtOuqyEROuU7IOSHJhWvHhxIaGZCBSkSBuDHYJu4xhsHHth/z5VXl2/T8+H5/fteQT+jUnUEEVZ9PS5ok1xHWnttxJlrgW9BUnxRbScpl4Y5H/ZJ+4JLa6ZF7LqRMPTJtFvlYgPm54Tya4XX3u3RMx/fqdIubfuXkXydyoRjx2MWf/exP7Xw1PSBexeA4k7tjPueZDkTBmVay/waPoA9J41sfZ691+aFIBnxJf47cy+pQkOBqxS2v/QkZW2isFfQigoSCNEEuDVo1qcEY+jjDXzwvqj9zmNJ3T2zoZmQTCJilxf5czKeCvd1jJcPjV+Vy91VUVk6RNYEgzS2T9GnzlA88+zaIR6rrzRhPHwK/QFDj8gwUbFUzn9vLmhjfG+IXJX+bhUW0FYaAhej5f5hQDxKjkHyg2olowyt5DHuiO19PVmgOTmbim5+e+0XopJ7rA8RpI6ioeytWzMSeLL9kEau27Ses2KZXKGfL2WwuxExm0iFscspfd3MOWaV0mkDluaWu4iTBokPU1LSZ6O1qsWbticKKPCiJWHYZ+Zp6PXikoeTvOP49yeaOf4rhay480q6TJDUZX5w+rowZFRTn68nNLtqei0MeiWx/D9VQtW2zS7tq0hPTEWr3+R0Agfbp+GQ+f1DNtVixK3ImHk5c83M3j3SZ6oyMQx6yE7ZRnb1qUy4XRjnfbw7CMZGA0JTDg9DFwfRSbzY7utwe3WzsjcKVvaTpyyFwiJkeg1Y3TX3aB4jQ5FZAhGQwIrtUoCgSBj9jm6huxcHvDzze49iEUr2PpFZ4+ASYyLtb5/59uqGvY3ptLveotNOeHEyRfZWZJFUCZhYHiSHYcuIEp0qJVyipJr8HkjOXnnbL6Mz4S7ylqxemTy9IGALJWwCDj19RUUmkj8wSCfHL9FtlGHIlpGQfwH2H166psqQJv5Ha3CZQmA+UXhYFnD+ZYfftrARm0d/dV7WREn0NLjJFndRmDuGmGBGPaWDlGs/x0i1EPk6Lf+M2UAy0dnKGySK8WL+UsVEhq60/F7Zhj+tB6HY4FzrVkc+3U1naKp0b/auJm3BR+A8J9HVooZjFOO2FQoDU5o85KmBPNsomNKsaUHUfsVR4Sue+t/AsOzae5ylJ+FAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.iamm.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Personnel du CIHEAM / IAMM</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CIHEAM / IAMM</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Personnel du CIHEAM / IAMM</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDJzCCAg+gAwIBAgIUa6YcSsah7wzB8e/uovuAIHgDDikwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMB4XDTE0MDMxOTE0MzUxMloX
 DTM0MDMxOTE0MzUxMlowGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMIIBIjAN
@@ -39,21 +39,21 @@ aFmAtn0cvucCFRDk7+BxejNbAi0cZWFz9yRaD2ACeJAZuNPt7giuIDjVX1hsD76f
 Oa/zVHg8v6w2WtOYhe/6PW6Aw0vPRStXXissHMStkekSzPRrHxZqu99YyyobYCKi
 I4Uca1MsJ2JD+Ds5G4kRkfKAWM9UDePCbVe9FM9SbU7rY9j+vHlnYjQpHg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmfetid.iamm.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CIHEAM / IAMM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CIHEAM / IAMM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iamm.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>assistance@iamm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmfetid.iamm.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CIHEAM / IAMM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CIHEAM / IAMM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iamm.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>assistance@iamm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index ce0e3942..56cdfd7f 100644
--- a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmidgw3.miun.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miun.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Mittuniversitetet OLD</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mid Sweden University OLD</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter hos Mittuniversitetet</mdui:Description>
+        <mdui:Description xml:lang="en">Mid Sweden University Identity Provider, used by employees and students at Mid Sweden University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>miun.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miun.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Mittuniversitetet OLD</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Mid Sweden University OLD</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter hos Mittuniversitetet</mdui:Description>
-          <mdui:Description xml:lang="en">Mid Sweden University Identity Provider, used by employees and students at Mid Sweden University</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-          <mdui:Logo xml:lang="sv" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>miun.se</mdui:DomainHint>
-          <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
-          <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
 DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
@@ -59,26 +59,26 @@ A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
 I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miun.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miun.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
 BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
 DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
@@ -98,36 +98,36 @@ A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
 I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet OLD</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Mid Sweden University OLD</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.miun.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Mid Sweden University</md:Company>
-      <md:SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</md:SurName>
-      <md:EmailAddress>mailto:SystemDriftIT@miun.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 771 975 000</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Mid Sweden University</md:Company>
-      <md:SurName>Ove Olander</md:SurName>
-      <md:EmailAddress>mailto:Ove.Olander@miun.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 63 165787</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Mid Sweden University</md:Company>
-      <md:SurName>IT Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet OLD</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University OLD</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.miun.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</md:SurName>
+    <md:EmailAddress>mailto:SystemDriftIT@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 771 975 000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>Ove Olander</md:SurName>
+    <md:EmailAddress>mailto:Ove.Olander@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 63 165787</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
index 009fe294..40cd6d62 100644
--- a/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmshib.ufrpe.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrpe.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrpe.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrpe.br/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrpe.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ufrpe.br/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.ufrpe.br/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
 bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
 BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
@@ -41,26 +41,26 @@ MKNAqfS7wH7beXEE283UQ6l6Sd45HEqaLAAqnF//j43t772tN3MtmL9Qd/WUyzTb
 xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
 8a0HXbnnqC9q4O13ua1oVyg4O0Br9KBW9y4bro1ub/hBmt8n4lg31kvC0a0=
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmshib.ufrpe.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrpe.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmshib.ufrpe.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufrpe.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
 bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
@@ -81,24 +81,24 @@ xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
 8a0HXbnnqC9q4O13ua1oVyg4O0Br9KBW9y4bro1ub/hBmt8n4lg31kvC0a0=
                     
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ufrpe.br/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Fred Medeiros</md:SurName>
-      <md:EmailAddress>coord.suporte@nti.ufrpe.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ufrpe.br/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Fred Medeiros</md:SurName>
+    <md:EmailAddress>coord.suporte@nti.ufrpe.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml b/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
index fc7fd9fb..8f53cc33 100644
--- a/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
+++ b/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://voparis-auth.obspm.fr/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-04T14:37:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-04T14:37:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">VO Paris Authentication</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://voparis-auth.obspm.fr/</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Authentification VO Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://voparis-srv.obspm.fr/portal/privacy_policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">VO Paris Authentication</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://voparis-auth.obspm.fr/</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Authentification VO Paris</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://voparis-srv.obspm.fr/portal/privacy_policy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDBjCCAe6gAwIBAgIJANXkggHBesKeMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjAeFw0xNTAyMDQxMzI4MDlaFw0yNTAy
 MDExMzI4MDlaMCAxHjAcBgNVBAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjCCASIw
@@ -45,13 +45,13 @@ U4f0PwCtKDt6yuk8zcvPCNStQlT3udLzIb4szTSS2Mcdb+k+LJdN0AulJYZG0L3p
 UkePHzLUtvkC2YNySU+2LKUzZbyGxR3mXQ5mk/F0mrpk6Yn/frplA6nYGIWM7tb4
 8BTF+jExj09ZCw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDBjCCAe6gAwIBAgIJANXkggHBesKeMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjAeFw0xNTAyMDQxMzI4MDlaFw0yNTAy
 MDExMzI4MDlaMCAxHjAcBgNVBAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjCCASIw
@@ -70,32 +70,28 @@ U4f0PwCtKDt6yuk8zcvPCNStQlT3udLzIb4szTSS2Mcdb+k+LJdN0AulJYZG0L3p
 UkePHzLUtvkC2YNySU+2LKUzZbyGxR3mXQ5mk/F0mrpk6Yn/frplA6nYGIWM7tb4
 8BTF+jExj09ZCw==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://voparis-auth.obspm.fr/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voparis-auth.obspm.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Authentification VO Paris</md:ServiceName>
-        <md:ServiceName xml:lang="en">VO Paris Authentication</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Observatoire de Paris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Observatoire de Paris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.obspm.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>vo.paris@obspm.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://voparis-auth.obspm.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voparis-auth.obspm.fr/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Authentification VO Paris</md:ServiceName>
+      <md:ServiceName xml:lang="en">VO Paris Authentication</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Observatoire de Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Observatoire de Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.obspm.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>vo.paris@obspm.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml
index de166e2b..0f58a918 100644
--- a/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://voting.wlv.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-29T14:29:29Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-29T14:29:29Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://voting.wlv.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="60" width="80">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">University of Wolverhampton - Voting</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Wolverhampton - Voting system</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://voting.wlv.ac.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="60" width="80">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">University of Wolverhampton - Voting</mdui:DisplayName>
-          <mdui:Description xml:lang="en">University of Wolverhampton - Voting system</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -33,13 +33,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -57,38 +57,38 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton - Voting</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Wolverhampton - Voting</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vph3.crous-caen.fr.xml b/swamid-interfederations-2.0/vph3.crous-caen.fr.xml
index aff1b323..8ef9efad 100644
--- a/swamid-interfederations-2.0/vph3.crous-caen.fr.xml
+++ b/swamid-interfederations-2.0/vph3.crous-caen.fr.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://vph3.crous-caen.fr">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-03-29T11:48:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-03-29T11:48:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">http://vph3.crous-caen.fr</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://vph3.crous-caen.fr</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Plateforme Heberg3 Crous Caen Normandie</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Plateforme Heberg3 du CROUS de Caen</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Plateforme Heberg3 Crous Caen Normandie</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">http://vph3.crous-caen.fr</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://vph3.crous-caen.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Plateforme Heberg3 Crous Caen Normandie</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Plateforme Heberg3 du CROUS de Caen</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Plateforme Heberg3 Crous Caen Normandie</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEAzCCAuugAwIBAgIJAJVg+Nww7wK7MA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
 VQQGEwJGUjEPMA0GA1UECAwGRlJBTkNFMQ0wCwYDVQQHDARDQUVOMRYwFAYDVQQKDA1Dcm91cyBkZSBDYWVuMQ4wDAYDVQQLDAVjaXRldTENMAsGA1UEAwwEdnBoMzEx
 MC8GCSqGSIb3DQEJARYic2VydmljZS1pbmZvcm1hdGlxdWVAY3JvdXMtY2Flbi5m
@@ -46,13 +46,13 @@ BQADggEBAAxO2xd1D+mV476MEqanj3Hz/BEbRheLbsHt/lKOuyVnus5PuDkr7c7i
 NB/eC8fAfv0wEgjYXgONiPWyoWQAcIbWSGgBHAlO+3L67i+8/nYhbJB2D1laSJoE
 fkymJDb8szoEXufaaDkRmm7tqOfAtCU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEAzCCAuugAwIBAgIJAJVg+Nww7wK7MA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
 VQQGEwJGUjEPMA0GA1UECAwGRlJBTkNFMQ0wCwYDVQQHDARDQUVOMRYwFAYDVQQKDA1Dcm91cyBkZSBDYWVuMQ4wDAYDVQQLDAVjaXRldTENMAsGA1UEAwwEdnBoMzEx
 MC8GCSqGSIb3DQEJARYic2VydmljZS1pbmZvcm1hdGlxdWVAY3JvdXMtY2Flbi5m
@@ -74,34 +74,29 @@ BQADggEBAAxO2xd1D+mV476MEqanj3Hz/BEbRheLbsHt/lKOuyVnus5PuDkr7c7i
 NB/eC8fAfv0wEgjYXgONiPWyoWQAcIbWSGgBHAlO+3L67i+8/nYhbJB2D1laSJoE
 fkymJDb8szoEXufaaDkRmm7tqOfAtCU=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://vph3.crous-caen.fr/Shibboleth.sso/SAML/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://vph3.crous-caen.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Plateforme Heberg3 du CROUS de Caen</md:ServiceName>
-        <md:ServiceName xml:lang="en">http://vph3.crous-caen.fr</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Plateforme Heberg3 Crous Caen Normandie</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Plateforme Heberg3 Crous Caen Normandie</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CROUS de Caen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CROUS de Caen</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crous-caen.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>service.informatique@crous-caen.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://vph3.crous-caen.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://vph3.crous-caen.fr/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Plateforme Heberg3 du CROUS de Caen</md:ServiceName>
+      <md:ServiceName xml:lang="en">http://vph3.crous-caen.fr</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Plateforme Heberg3 Crous Caen Normandie</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Plateforme Heberg3 Crous Caen Normandie</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CROUS de Caen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CROUS de Caen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crous-caen.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>service.informatique@crous-caen.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml
index f504ef0c..5e1453e3 100644
--- a/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vpp.midlands3cities.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-17T10:01:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-17T10:01:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">M3C VPP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Virtual Postgraduate Platform</mdui:Description>
+        <mdui:Logo height="64" width="143">https://vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">M3C VPP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Virtual Postgraduate Platform</mdui:Description>
-          <mdui:Logo height="64" width="143">https://vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIJAOAjIQJx+4c/MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXZwcC5taWRsYW5kczNjaXRpZXMuYWMudWswHhcNMTUwOTE1MTEyMjQxWhcN
 						MjUwOTEyMTEyMjQxWjAkMSIwIAYDVQQDExl2cHAubWlkbGFuZHMzY2l0aWVzLmFj
@@ -54,42 +54,42 @@
 						hCljjUhEyX/lIWuZjv5jZI8bCsviOM+ZLBwhoVpj1NMicj7PCeVP7k7RjnHM4qN+
 						cevd/sPqVI0kteZSRYR9CQgLkco=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">M3C VPP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Betts</md:SurName>
-      <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Nottingham</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">M3C VPP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:itservicedesk@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Betts</md:SurName>
+    <md:EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml
index 3b7ce313..08fcbdfb 100644
--- a/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vsp2.edina.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -35,13 +35,13 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
 						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
@@ -66,61 +66,61 @@
 						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
 						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="30"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">EDINA VSP2 Default</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>EDINA HelpDesk</md:GivenName>
-      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ben</md:GivenName>
-      <md:SurName>Soares</md:SurName>
-      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="30"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EDINA VSP2 Default</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://edina.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>EDINA HelpDesk</md:GivenName>
+    <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ben</md:GivenName>
+    <md:SurName>Soares</md:SurName>
+    <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml
index ba5260da..406d1eb1 100644
--- a/swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vsu-pbslive-01v.vsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://library.vsu.edu/shiberror.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Virginia State University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://library.vsu.edu/shiberror.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Virginia State University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAIcZqh5/AQ5ogKy4ZUjxI8jD0RUFMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3ZzdS1wYnNsaXZlLTAxdi52c3UuZWR1MB4XDTExMDgx
 NjE1MzMwMVoXDTMxMDgxNjE1MzMwMVowIjEgMB4GA1UEAxMXdnN1LXBic2xpdmUt
@@ -38,23 +38,23 @@ p8h8HgbrqjICbbP8B0uOwkM0smyzys0EKEGkW3mRjSIEt08uo9zZTQ3V05pqys2Q
 oXaut0JB32Q85fICOS/qkRYjCQQwtvU5Rwfl3bK0nFhaYAQyWLcoqfV/kGrIDmmr
 WMq+i0naoDk/DX9b/TYx/Yg95/dtcnC86iSZsA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDSDCCAjCgAwIBAgIVAIcZqh5/AQ5ogKy4ZUjxI8jD0RUFMA0GCSqGSIb3DQEB
 BQUAMCIxIDAeBgNVBAMTF3ZzdS1wYnNsaXZlLTAxdi52c3UuZWR1MB4XDTExMDgx
 NjE1MzMwMVoXDTMxMDgxNjE1MzMwMVowIjEgMB4GA1UEAxMXdnN1LXBic2xpdmUt
@@ -74,26 +74,26 @@ p8h8HgbrqjICbbP8B0uOwkM0smyzys0EKEGkW3mRjSIEt08uo9zZTQ3V05pqys2Q
 oXaut0JB32Q85fICOS/qkRYjCQQwtvU5Rwfl3bK0nFhaYAQyWLcoqfV/kGrIDmmr
 WMq+i0naoDk/DX9b/TYx/Yg95/dtcnC86iSZsA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Virginia State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Virginia State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vsu.edu/pages/1.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robert Schnettler</md:GivenName>
-      <md:EmailAddress>rschnettler@vsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sherod Moses</md:GivenName>
-      <md:EmailAddress>smoses@vsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tessa Perry</md:GivenName>
-      <md:EmailAddress>tperry@vsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Virginia State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Virginia State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vsu.edu/pages/1.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert Schnettler</md:GivenName>
+    <md:EmailAddress>rschnettler@vsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sherod Moses</md:GivenName>
+    <md:EmailAddress>smoses@vsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tessa Perry</md:GivenName>
+    <md:EmailAddress>tperry@vsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml b/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
index 9df5d36c..f9bd7dd6 100644
--- a/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
+++ b/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vushib-idp.vanderbilt.edu/idp/Shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://vushib-idp.vanderbilt.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vanderbilt.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vanderbilt University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://vushib-idp.vanderbilt.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vanderbilt.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Vanderbilt University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE3zCCA8egAwIBAgIJAIh2ymY/vivJMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
 ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxIjAgBgNVBAMT
@@ -50,13 +50,13 @@ NcdJvhGs+Y+Nt7TlI5EQISWldvARwXV6M8pI5UyIwOBW8iteHsBkawF4v/rsVl5w
 WGu23sqFkBbwCw3tWPnn+2l3IjPiettdirZInC+j5QsocT9Tesc4CPm29BuFK0Ec
 zdub
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEKzCCAxOgAwIBAgIJAIKe0tZdqVr/MA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCVE4xEjAQBgNVBAcMCU5hc2h2aWxsZTEeMBwGA1UE
 CgwVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQ0wCwYDVQQLDARWVUlUMSIwIAYDVQQD
@@ -81,26 +81,26 @@ uv70NlXEEw+3l92tBXshhoc9CWcvE8p65ZDx7pmk8AtQEUT014Ie4roIQQ5yp7/3
 6rWAv7bdFuGzyTk452DEz9anBPeYXP9tQE5YfGx2XFmyfJC4rtT0N2x0EdnZ8Hyf
 D+k9Zg2iGzOcDf0/XiLU
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vushib-idp.vanderbilt.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vanderbilt.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vushib-idp.vanderbilt.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vanderbilt.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIE3zCCA8egAwIBAgIJAIh2ymY/vivJMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
 ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxIjAgBgNVBAMT
@@ -129,13 +129,13 @@ NcdJvhGs+Y+Nt7TlI5EQISWldvARwXV6M8pI5UyIwOBW8iteHsBkawF4v/rsVl5w
 WGu23sqFkBbwCw3tWPnn+2l3IjPiettdirZInC+j5QsocT9Tesc4CPm29BuFK0Ec
 zdub
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEKzCCAxOgAwIBAgIJAIKe0tZdqVr/MA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
 VQQGEwJVUzELMAkGA1UECAwCVE4xEjAQBgNVBAcMCU5hc2h2aWxsZTEeMBwGA1UE
 CgwVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQ0wCwYDVQQLDARWVUlUMSIwIAYDVQQD
@@ -160,27 +160,27 @@ uv70NlXEEw+3l92tBXshhoc9CWcvE8p65ZDx7pmk8AtQEUT014Ie4roIQQ5yp7/3
 6rWAv7bdFuGzyTk452DEz9anBPeYXP9tQE5YfGx2XFmyfJC4rtT0N2x0EdnZ8Hyf
 D+k9Zg2iGzOcDf0/XiLU
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Vanderbilt University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Vanderbilt University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vanderbilt.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Lee Brewer</md:GivenName>
-      <md:EmailAddress>Lee.Brewer@vanderbilt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lee Brewer</md:GivenName>
-      <md:EmailAddress>Lee.Brewer@vanderbilt.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>VUIT IDEV</md:GivenName>
-      <md:EmailAddress>mis_idis@list.vanderbilt.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vanderbilt University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vanderbilt University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vanderbilt.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lee Brewer</md:GivenName>
+    <md:EmailAddress>Lee.Brewer@vanderbilt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lee Brewer</md:GivenName>
+    <md:EmailAddress>Lee.Brewer@vanderbilt.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>VUIT IDEV</md:GivenName>
+    <md:EmailAddress>mis_idis@list.vanderbilt.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
index 1374197b..8d315ef1 100644
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vvc.niif.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>niifi</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>niifi</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">NIIF kollaborációs portál</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NIIF Voice Video Collaboration Service</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn</mdui:Description>
+        <mdui:Description xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">NIIF kollaborációs portál</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">NIIF Voice Video Collaboration Service</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn</mdui:Description>
-          <mdui:Description xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>vvc.niif.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
-        <md:ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>NIIF AAI</md:SurName>
-      <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Video Admin</md:SurName>
-      <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Video Admin</md:SurName>
-      <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>vvc.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
+      <md:ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>NIIF AAI</md:SurName>
+    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Video Admin</md:SurName>
+    <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Video Admin</md:SurName>
+    <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml b/swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml
index fee10fd8..2f4a6dfa 100644
--- a/swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vwww.itslearning.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSjCCAjKgAwIBAgIJAMta8TnXJcroMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG3Z3d3cuZWxvZ2luLml0c2xlYXJuaW5nLmNvbTAeFw0xMTAyMTgxMzA3NDZa
 						Fw0yMTAyMTUxMzA3NDZaMCYxJDAiBgNVBAMTG3Z3d3cuZWxvZ2luLml0c2xlYXJu
@@ -27,25 +27,25 @@
 						zqyv/l+j9cjqywds1og9dhnz/QwuWxYkaFatUN4XUMiUYE7Y8Vq11D6c2i1XSOYF
 						K+kRpFiXVF8cgB84mxDx+1zN/jVusGRfE4yyWzkL
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vwww.itslearning.com/elogin/logout.aspx"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vwww.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">it's learning UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">it's learning UK Limited: verification</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Waseemr</md:GivenName>
-      <md:SurName>Akhtar</md:SurName>
-      <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Waseemr</md:GivenName>
-      <md:SurName>Akhtar</md:SurName>
-      <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vwww.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vwww.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">it's learning UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">it's learning UK Limited: verification</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Waseemr</md:GivenName>
+    <md:SurName>Akhtar</md:SurName>
+    <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Waseemr</md:GivenName>
+    <md:SurName>Akhtar</md:SurName>
+    <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml
index f61344c7..d25adc39 100644
--- a/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wakshib1.wakefield.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-16T16:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-16T16:45:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wakefield.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wakefield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlYCCQChpNcFSrUPmTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQGEwJH
 						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVdha2VmaWVsZDEa
 						MBgGA1UEChMRV2FrZWZpZWxkIENvbGxlZ2UxITAfBgNVBAMTGHdha3NoaWIxLndh
@@ -33,26 +33,26 @@
 						2mduGi9SFFVrYv8N7aLs8QqdjP3nAVlZxB0Ts1r21TCeun+6Ns8/4tMvwLTDjzat
 						B0jkCgiVDEKc3OFBaVsdSQPX
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wakshib1.wakefield.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wakefield.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wakshib1.wakefield.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wakefield.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlYCCQChpNcFSrUPmTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQGEwJH
 						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVdha2VmaWVsZDEa
 						MBgGA1UEChMRV2FrZWZpZWxkIENvbGxlZ2UxITAfBgNVBAMTGHdha3NoaWIxLndh
@@ -73,27 +73,27 @@
 						2mduGi9SFFVrYv8N7aLs8QqdjP3nAVlZxB0Ts1r21TCeun+6Ns8/4tMvwLTDjzat
 						B0jkCgiVDEKc3OFBaVsdSQPX
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wakefield College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wakefield College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wakefield.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Richardson</md:SurName>
-      <md:EmailAddress>mailto:s.richardson@wakefield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Watts</md:SurName>
-      <md:EmailAddress>mailto:a.watts@wakefield.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wakefield College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wakefield College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wakefield.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Richardson</md:SurName>
+    <md:EmailAddress>mailto:s.richardson@wakefield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Watts</md:SurName>
+    <md:EmailAddress>mailto:a.watts@wakefield.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wase.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/wase.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 893ad70f..b192b6cc 100644
--- a/swamid-interfederations-2.0/wase.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/wase.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wase.princeton.edu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WASE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wase.princeton.edu/docs/WASE.docx</mdui:InformationURL>
+        <mdui:Logo height="110" width="341" xml:lang="en">https://wase.princeton.edu/princeton/views/images/waselogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WASE</mdui:DisplayName>
-          <mdui:Description xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wase.princeton.edu/docs/WASE.docx</mdui:InformationURL>
-          <mdui:Logo height="110" width="341" xml:lang="en">https://wase.princeton.edu/princeton/views/images/waselogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEHTCCAwWgAwIBAgIJAL4y/XFN1PzFMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
 VQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTESMBAGA1UEBwwJUHJpbmNldG9u
 MR0wGwYDVQQKDBRQcmluY2V0b24gVW5pdmVyc2l0eTEMMAoGA1UECwwDT0lUMRsw
@@ -45,44 +45,44 @@ sxMYJJMblm8Xicl2LBWOZMhL45IdnW56vWWAcQohSUL0Ef+xoDCPshjpHcRfklnr
 6/LWT0MNU5MgF8g8yh7lksUdfKk0BQx+bBQDDVUwZVt4XVhRjYCl//Ql9BxE+v5O
 SQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">WASE</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin Perry</md:GivenName>
-      <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wase.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WASE</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin Perry</md:GivenName>
+    <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/waseqa.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/waseqa.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 598471a4..96808795 100644
--- a/swamid-interfederations-2.0/waseqa.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/waseqa.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WASEQA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://waseqa.princeton.edu/docs/WASE.docx</mdui:InformationURL>
+        <mdui:Logo height="110" width="341" xml:lang="en">https://waseqa.princeton.edu/princeton/views/images/waselogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WASEQA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://waseqa.princeton.edu/docs/WASE.docx</mdui:InformationURL>
-          <mdui:Logo height="110" width="341" xml:lang="en">https://waseqa.princeton.edu/princeton/views/images/waselogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEITCCAwmgAwIBAgIJAP8rNEz5zOpsMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
 VQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTESMBAGA1UEBwwJUHJpbmNldG9u
 MR0wGwYDVQQKDBRQcmluY2V0b24gVW5pdmVyc2l0eTEMMAoGA1UECwwDT0lUMR0w
@@ -45,44 +45,44 @@ dPA7U07xTXT0t/5Y03Qu6YykrT+p7+HywL7zuE/77P9r8PX6hoeQi8tpaF8xbFhB
 vSW0LlZUuYNosLc2s0lhK+4G5ce0OtFTkN63/TjLMaFiXFfTHxt+ysWNEOOQOP3a
 NMeRiNs=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">WASEQA</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin Perry</md:GivenName>
-      <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://waseqa.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WASEQA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WASE allows the scheduling of office/advising hour appointments via a web interface. The system can sync appointments into Exchange or Google calendars. It has a reminder system. It supports LTI integration. </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin Perry</md:GivenName>
+    <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 9d2289a4..0f1f9b18 100644
--- a/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WASP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">WASP allows the scheduling of office/advising hour appointments via a web interface.  The system can sync appointments into Exchange of Google calendars.  It has a reminder system.  It supports LTI integration.  </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wasp.princeton.edu/docs/WASP.docx</mdui:InformationURL>
+        <mdui:Logo height="110" width="341" xml:lang="en">https://wasp.princeton.edu/princeton/views/images/wasplogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WASP</mdui:DisplayName>
-          <mdui:Description xml:lang="en">WASP allows the scheduling of office/advising hour appointments via a web interface.  The system can sync appointments into Exchange of Google calendars.  It has a reminder system.  It supports LTI integration.  </mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wasp.princeton.edu/docs/WASP.docx</mdui:InformationURL>
-          <mdui:Logo height="110" width="341" xml:lang="en">https://wasp.princeton.edu/princeton/views/images/wasplogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEHTCCAwWgAwIBAgIJAPRNAT0aQ+S5MA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
 VQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTESMBAGA1UEBwwJUHJpbmNldG9u
 MR0wGwYDVQQKDBRQcmluY2V0b24gVW5pdmVyc2l0eTEMMAoGA1UECwwDT0lUMRsw
@@ -45,44 +45,44 @@ v9mcs6CLIR7LnZ7OzHcWxv0yvEnG6NoCn6AKA1NlVodardk5G9AetJUsq6azJl70
 XD0CM2DXnzaFsSdZVsfS/EXgliB6PcEkMr0O2ue45mCIwag7Y+hXuMfg/eDtfubN
 mQ==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">WASP</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">WASP allows the scheduling of office/advising hour appointments via a web interface.  The system can sync appointments into Exchange of Google calendars.  It has a reminder system.  It supports LTI integration.  </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kevin Perry</md:GivenName>
-      <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serge Goldstein</md:GivenName>
-      <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WASP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WASP allows the scheduling of office/advising hour appointments via a web interface.  The system can sync appointments into Exchange of Google calendars.  It has a reminder system.  It supports LTI integration.  </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kevin Perry</md:GivenName>
+    <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serge Goldstein</md:GivenName>
+    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
index db3c1c27..4b202bb1 100644
--- a/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://wayf.onderwijsgroeptilburg.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-11T20:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-11T20:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">onderwijsgroeptilburg.nl</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogt013.nl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Onderwijsgroep Tilburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Onderwijsgroep Tilburg</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Onderwijsgroep Tilburg</mdui:Description>
+        <mdui:Description xml:lang="en">Onderwijsgroep Tilburg</mdui:Description>
+        <mdui:Logo height="23" width="108">https://static.surfconext.nl/logos/idp/onderwijsgroep-tilburg.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
+        <mdui:Keywords xml:lang="nl">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">onderwijsgroeptilburg.nl</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogt013.nl</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="nl">Onderwijsgroep Tilburg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Onderwijsgroep Tilburg</mdui:DisplayName>
-          <mdui:Description xml:lang="nl">Onderwijsgroep Tilburg</mdui:Description>
-          <mdui:Description xml:lang="en">Onderwijsgroep Tilburg</mdui:Description>
-          <mdui:Logo height="23" width="108">https://static.surfconext.nl/logos/idp/onderwijsgroep-tilburg.png</mdui:Logo>
-          <mdui:Keywords xml:lang="en">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
-          <mdui:Keywords xml:lang="nl">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/136abb0da6cd182f8cf4a20bae83700e"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="nl">Onderwijsgroep Tilburg</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Onderwijsgroep Tilburg</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="nl">Onderwijsgroep Tilburg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Onderwijsgroep Tilburg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="nl">http://www.onderwijsgroeptilburg.nl/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.onderwijsgroeptilburg.nl/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SURFconext support</md:GivenName>
-      <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-      <md:GivenName>SURFcert</md:GivenName>
-      <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/136abb0da6cd182f8cf4a20bae83700e"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Onderwijsgroep Tilburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Onderwijsgroep Tilburg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">Onderwijsgroep Tilburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Onderwijsgroep Tilburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.onderwijsgroeptilburg.nl/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.onderwijsgroeptilburg.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SURFcert</md:GivenName>
+    <md:EmailAddress>cert@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml
index bc90a0c6..c9e3bc3a 100644
--- a/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wccidp.west-cheshire.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-09T14:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-09T14:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-cheshire.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-cheshire.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIELDCCAxSgAwIBAgIJALbBsFNhx0GLMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
 						VQQGEwJHQjERMA8GA1UECAwIQ2hlc2hpcmUxFzAVBgNVBAcMDkVsbGVzbWVyZSBQ
 						b3J0MR4wHAYDVQQKDBVXZXN0IENoZXNoaXJlIENvbGxlZ2UxGTAXBgNVBAsMEE5l
@@ -37,26 +37,26 @@
 						fM/hzk/TNCxzJfh7dfU6mdVsSwq0J3hLAxHf7tSzXLRruF/9VruFlXSWwX+0brFn
 						OWNVr2kgXYhLkUAS9p7LWg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.west-cheshire.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-cheshire.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.west-cheshire.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">west-cheshire.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIELDCCAxSgAwIBAgIJALbBsFNhx0GLMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
 						VQQGEwJHQjERMA8GA1UECAwIQ2hlc2hpcmUxFzAVBgNVBAcMDkVsbGVzbWVyZSBQ
 						b3J0MR4wHAYDVQQKDBVXZXN0IENoZXNoaXJlIENvbGxlZ2UxGTAXBgNVBAsMEE5l
@@ -81,27 +81,27 @@
 						fM/hzk/TNCxzJfh7dfU6mdVsSwq0J3hLAxHf7tSzXLRruF/9VruFlXSWwX+0brFn
 						OWNVr2kgXYhLkUAS9p7LWg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">West Cheshire College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">West Cheshire College (WCC)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.west-cheshire.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Allmark</md:SurName>
-      <md:EmailAddress>mailto:sallmark@west-cheshire.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Allmark</md:SurName>
-      <md:EmailAddress>mailto:sallmark@west-cheshire.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">West Cheshire College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">West Cheshire College (WCC)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.west-cheshire.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Allmark</md:SurName>
+    <md:EmailAddress>mailto:sallmark@west-cheshire.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Allmark</md:SurName>
+    <md:EmailAddress>mailto:sallmark@west-cheshire.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml
index 2350208d..17fbaa76 100644
--- a/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://web.oriel.ox.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-16T16:12:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-16T16:12:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/TCCAeWgAwIBAgIJAM1GWdcimaKPMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEndlYi5vcmllbC5veC5hYy51azAeFw0xNTExMTAxMjQxMDRaFw0yNTExMDcx
 						MjQxMDRaMB0xGzAZBgNVBAMTEndlYi5vcmllbC5veC5hYy51azCCASIwDQYJKoZI
@@ -47,41 +47,41 @@
 						tzJrFvKSNaYWk6SyEoDAYus7GsvcL+zzCKmKuXzzZgj8ih4GnUH6OtdNXvGz4YjU
 						IA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Oxford, Oriel College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@oriel.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@oriel.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford, Oriel College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@oriel.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@oriel.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml
index e941b523..31ebb1a1 100644
--- a/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/webanno.sfs.uni-tuebingen.de.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webanno.sfs.uni-tuebingen.de">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-03-22T22:32:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-03-22T22:32:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN WebAnno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN WebAnno</mdui:DisplayName>
+        <mdui:Description xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</mdui:Description>
+        <mdui:Description xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</mdui:Description>
+        <mdui:Logo height="128" width="128">https://webanno.github.io/webanno/assets/img/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://webanno.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://webanno.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">CLARIN WebAnno</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CLARIN WebAnno</mdui:DisplayName>
-          <mdui:Description xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</mdui:Description>
-          <mdui:Description xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</mdui:Description>
-          <mdui:Logo height="128" width="128">https://webanno.github.io/webanno/assets/img/logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://webanno.sfs.uni-tuebingen.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://webanno.sfs.uni-tuebingen.de/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
 R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
 aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
@@ -66,48 +66,48 @@ pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
 ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
 ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/POST"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">CLARIN WebAnno</md:ServiceName>
-        <md:ServiceName xml:lang="en">CLARIN WebAnno</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marie</md:GivenName>
-      <md:SurName>Hinrichs</md:SurName>
-      <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marie</md:GivenName>
-      <md:SurName>Hinrichs</md:SurName>
-      <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marie</md:GivenName>
-      <md:SurName>Hinrichs</md:SurName>
-      <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARIN WebAnno</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN WebAnno</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml
index 86172395..7fe6f1fa 100644
--- a/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.auburn.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auburn.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Auburn University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Auburn University</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.auburn.edu/main/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auburn.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Auburn University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for Auburn University</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.auburn.edu/main/privacy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAP+RnuTUpl6o8ybIdQ+XuaJSmmQaMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVkdTAeFw0xMzAyMDUyMjAz
 MzZaFw0zMzAyMDUyMjAzMzZaMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVk
@@ -40,23 +40,23 @@ LJv5DwkNnuWkyYh8A5wn6DynGEFRKyJ/oTMVdvBdvWt63lfyFJf/Npj+xd3rZ5Su
 6vmB4iooPamlJxBIBRkQA5xi+zcVfuQvOfJ412EFk979S4zqt/jED/2ZDRPodkcZ
 cUPWqk0unJg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.auburn.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.auburn.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.auburn.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.auburn.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.auburn.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auburn.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.auburn.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.auburn.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.auburn.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.auburn.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.auburn.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auburn.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDNDCCAhygAwIBAgIVAP+RnuTUpl6o8ybIdQ+XuaJSmmQaMA0GCSqGSIb3DQEB
 BQUAMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVkdTAeFw0xMzAyMDUyMjAz
 MzZaFw0zMzAyMDUyMjAzMzZaMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVk
@@ -76,26 +76,26 @@ LJv5DwkNnuWkyYh8A5wn6DynGEFRKyJ/oTMVdvBdvWt63lfyFJf/Npj+xd3rZ5Su
 6vmB4iooPamlJxBIBRkQA5xi+zcVfuQvOfJ412EFk979S4zqt/jED/2ZDRPodkcZ
 cUPWqk0unJg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.auburn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Auburn University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Auburn University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.auburn.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian Anderson</md:GivenName>
-      <md:EmailAddress>anderbr@auburn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brian Anderson</md:GivenName>
-      <md:EmailAddress>anderbr@auburn.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OIT Helpdesk</md:GivenName>
-      <md:EmailAddress>helpdesk@auburn.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.auburn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Auburn University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Auburn University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.auburn.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian Anderson</md:GivenName>
+    <md:EmailAddress>anderbr@auburn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brian Anderson</md:GivenName>
+    <md:EmailAddress>anderbr@auburn.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OIT Helpdesk</md:GivenName>
+    <md:EmailAddress>helpdesk@auburn.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml
index a9de8d4f..35c46a5a 100644
--- a/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.cmc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.cmc.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Claremont McKenna College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider service for Claremont McKenna College.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.cmc.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Claremont McKenna College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider service for Claremont McKenna College.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDWzCCAkOgAwIBAgIUdpkFxVnLjHw29WkEImbR9wGOCcUwDQYJKoZIhvcNAQEF
 BQAwJzElMCMGA1UEAxMcd2ViYXV0aC5jbGFyZW1vbnRtY2tlbm5hLmVkdTAeFw0x
 MzA5MjUyMTQ0NDdaFw0zMzA5MjUyMTQ0NDdaMCcxJTAjBgNVBAMTHHdlYmF1dGgu
@@ -40,33 +40,33 @@ TXsJyRTIBjXcneMWAbGFmXIHfSgKuTaVYEMEU/qojdAgn3oLeMiuOK2e2mg37r4G
 E3QIN8c2JvIbeEfy2vWy2KUf91EsPWGaL35jHbZQj0CFj5CCxjEBOmDciPVq3+D+
 BiV98zaRzZEkS+1uWpkqkJjsjpGu6OoulUkarBQY6aMfvJ5QDgWDyQURKaJEeIg=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.cmc.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.cmc.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.cmc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.cmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Claremont McKenna College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Claremont McKenna College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cmc.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeremy Whaley</md:GivenName>
-      <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Jeremy Whaley</md:GivenName>
-      <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jeremy Whaley</md:GivenName>
-      <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeremy Whaley</md:GivenName>
-      <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.cmc.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.cmc.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.cmc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.cmc.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Claremont McKenna College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Claremont McKenna College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cmc.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeremy Whaley</md:GivenName>
+    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Jeremy Whaley</md:GivenName>
+    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jeremy Whaley</md:GivenName>
+    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy Whaley</md:GivenName>
+    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml
index 84243c35..8a3ad500 100644
--- a/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.meredith.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meredith.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Meredith College</mdui:DisplayName>
+        <mdui:Logo height="68" width="342" xml:lang="en">https://webauth.meredith.edu/idp/images/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meredith.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Meredith College</mdui:DisplayName>
-          <mdui:Logo height="68" width="342" xml:lang="en">https://webauth.meredith.edu/idp/images/logo.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAPpigo3Xyo77zwHIdEmW2w5SdOEHMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHdlYmF1dGgubWVyZWRpdGguZWR1MB4XDTEyMDkxODEz
 MjQ0MFoXDTMyMDkxODEzMjQ0MFowHzEdMBsGA1UEAxMUd2ViYXV0aC5tZXJlZGl0
@@ -39,23 +39,23 @@ LuzOEYHp2Jyoo792oHFYHONwuiFuRKfFcZnd05NSFKaKmRU4GoADXAIWF9XRH15V
 yE6fz+Nc9bddyeGayzz45GriXWsLgrERYVBITe/U2ZLi8xrQqbaPCc6tyx9Jdnqe
 oR7d65KJbWVyo0k+ZPUtsw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.meredith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.meredith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.meredith.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.meredith.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.meredith.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meredith.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.meredith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.meredith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.meredith.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.meredith.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.meredith.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meredith.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDPDCCAiSgAwIBAgIVAPpigo3Xyo77zwHIdEmW2w5SdOEHMA0GCSqGSIb3DQEB
 BQUAMB8xHTAbBgNVBAMTFHdlYmF1dGgubWVyZWRpdGguZWR1MB4XDTEyMDkxODEz
 MjQ0MFoXDTMyMDkxODEzMjQ0MFowHzEdMBsGA1UEAxMUd2ViYXV0aC5tZXJlZGl0
@@ -75,18 +75,18 @@ LuzOEYHp2Jyoo792oHFYHONwuiFuRKfFcZnd05NSFKaKmRU4GoADXAIWF9XRH15V
 yE6fz+Nc9bddyeGayzz45GriXWsLgrERYVBITe/U2ZLi8xrQqbaPCc6tyx9Jdnqe
 oR7d65KJbWVyo0k+ZPUtsw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.meredith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Meredith College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Meredith College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.meredith.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Victor Fayed</md:GivenName>
-      <md:EmailAddress>techservices@meredith.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.meredith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Meredith College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Meredith College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.meredith.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Victor Fayed</md:GivenName>
+    <md:EmailAddress>techservices@meredith.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml
index 4c22a323..b83110f3 100644
--- a/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.njit.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.njit.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">njit.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">New Jersey Institute of Technology</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.njit.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">njit.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">New Jersey Institute of Technology</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIG/DCCBeSgAwIBAgIQB/fmHShEQYuz/UoWXr96MzANBgkqhkiG9w0BAQUFADBm
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
@@ -58,23 +58,23 @@ J7I7AxQmXSLwuaY78W7l8a9IkzmJz8Wt5TAydYM6eSMPK+kny68aC3m67yVMejaZ
 fN3QE4xJol0bLnB32DpY4LHNYpBuP+/UEupUPDprc/tUjaO4yaE+zibXTstrX6Md
 MFSqMAoE31SDA9ZeOi1yqg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.njit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.njit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.njit.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.njit.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.njit.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">njit.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.njit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.njit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.njit.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.njit.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.njit.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">njit.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIG/DCCBeSgAwIBAgIQB/fmHShEQYuz/UoWXr96MzANBgkqhkiG9w0BAQUFADBm
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
@@ -114,26 +114,26 @@ J7I7AxQmXSLwuaY78W7l8a9IkzmJz8Wt5TAydYM6eSMPK+kny68aC3m67yVMejaZ
 fN3QE4xJol0bLnB32DpY4LHNYpBuP+/UEupUPDprc/tUjaO4yaE+zibXTstrX6Md
 MFSqMAoE31SDA9ZeOi1yqg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.njit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">New Jersey Institute of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">New Jersey Institute of Technology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.njit.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>University Information Systems</md:GivenName>
-      <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>University Information Systems</md:GivenName>
-      <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>University Information Systems</md:GivenName>
-      <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.njit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New Jersey Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New Jersey Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.njit.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>University Information Systems</md:GivenName>
+    <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>University Information Systems</md:GivenName>
+    <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>University Information Systems</md:GivenName>
+    <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml
index 74fee934..783696de 100644
--- a/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.scrippscollege.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.scrippscollege.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scrippscollege.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scripps College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider service for Scripps College.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.scrippscollege.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scrippscollege.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Scripps College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider service for Scripps College.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVAOpDjT7coAA9QWrjD1kbiAsVt7zDMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGndlYmF1dGguc2NyaXBwc2NvbGxlZ2UuZWR1MB4XDTE0
 MDgyOTAwMDYyMloXDTM0MDgyOTAwMDYyMlowJTEjMCEGA1UEAxMad2ViYXV0aC5z
@@ -39,33 +39,33 @@ czwZlKdDGYB8sMf0o933y/SPyjqSjOENNSE02l0sSjJkrYkAM0IBNb7E44rJZj0x
 F0ImO4Fv5/Vy2RaahHaHoC4lvUix0pR4w8d50k/XEkCoEMu1Ekvdh05rFNZA8WtD
 B9BnGxr829tOOS2Sq1zdJCXsYF2fIKksQq3xvl8iFiRmA7YXD2mOvg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scripps College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scripps College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scrippscollege.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Jeff Sessler</md:GivenName>
-      <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jeff Sessler</md:GivenName>
-      <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jeff Sessler</md:GivenName>
-      <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Jeff Sessler</md:GivenName>
-      <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scripps College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scripps College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scrippscollege.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jeff Sessler</md:GivenName>
+    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeff Sessler</md:GivenName>
+    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jeff Sessler</md:GivenName>
+    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Jeff Sessler</md:GivenName>
+    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml
index 1be238fa..d6567cee 100644
--- a/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.shib.lsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.lsu.edu/404.shtml" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Louisiana State University</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://webauth.shib.lsu.edu/shibboleth/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.lsu.edu/itpolicy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="200" xml:lang="en">https://webauth.shib.lsu.edu/shibboleth/images/lsulogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.lsu.edu/404.shtml" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Louisiana State University</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://webauth.shib.lsu.edu/shibboleth/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.lsu.edu/itpolicy</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="200" xml:lang="en">https://webauth.shib.lsu.edu/shibboleth/images/lsulogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEYTCCA0mgAwIBAgIJAKzhFxTleiexMA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
 VQQGEwJVUzESMBAGA1UECAwJTG91aXNpYW5hMRQwEgYDVQQHDAtCYXRvbiBSb3Vn
 ZTEjMCEGA1UECgwaTG91aXNpYW5hIFN0YXRlIFVuaXZlcnNpdHkxKDAmBgNVBAsM
@@ -50,24 +50,24 @@ WcZP9FLd6yFxgEMSNhWYDcL+HAe4PFH9N98MhugSnQwaybJhdG8J0ig18S+9vSil
 uh8s0yON8U0+JjL/iuXv+hjwOUWvGFjFBaoIwwWpcciNJALoQy9gI7RqFd7QHJIi
 m4gMSZsHCXLYo9JbH1WYKEqJJDdZ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.shib.lsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.shib.lsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEYTCCA0mgAwIBAgIJAKzhFxTleiexMA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
 VQQGEwJVUzESMBAGA1UECAwJTG91aXNpYW5hMRQwEgYDVQQHDAtCYXRvbiBSb3Vn
 ZTEjMCEGA1UECgwaTG91aXNpYW5hIFN0YXRlIFVuaXZlcnNpdHkxKDAmBgNVBAsM
@@ -93,23 +93,23 @@ WcZP9FLd6yFxgEMSNhWYDcL+HAe4PFH9N98MhugSnQwaybJhdG8J0ig18S+9vSil
 uh8s0yON8U0+JjL/iuXv+hjwOUWvGFjFBaoIwwWpcciNJALoQy9gI7RqFd7QHJIi
 m4gMSZsHCXLYo9JbH1WYKEqJJDdZ
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Louisiana State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Louisiana State University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lsu.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shibboleth Technical</md:GivenName>
-      <md:EmailAddress>security@lsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shibboleth Administrator</md:GivenName>
-      <md:EmailAddress>security@lsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Louisiana State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Louisiana State University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lsu.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Technical</md:GivenName>
+    <md:EmailAddress>security@lsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth Administrator</md:GivenName>
+    <md:EmailAddress>security@lsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml
index 8d9486c9..cb2b1985 100644
--- a/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.soton.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-11T17:23:46Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-11T17:23:46Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAOWKrrq2ddtGOxs+OVFZBurJpwm8MA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE3dlYmF1dGguc290b24uYWMudWswHhcNMTAwODE2MTY1
 						NTQwWhcNMzAwODE2MTY1NTQwWjAeMRwwGgYDVQQDExN3ZWJhdXRoLnNvdG9uLmFj
@@ -30,26 +30,26 @@
 						wHZNu7DWMxWh1OxdYrCJn8Sknnsy/EJABXPvMPsuq/6/4fBezlxYdgYDRE0w3tgB
 						HPqnW/Pnrm26uMgi
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">soton.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIVAOWKrrq2ddtGOxs+OVFZBurJpwm8MA0GCSqGSIb3DQEB
 						BQUAMB4xHDAaBgNVBAMTE3dlYmF1dGguc290b24uYWMudWswHhcNMTAwODE2MTY1
 						NTQwWhcNMzAwODE2MTY1NTQwWjAeMRwwGgYDVQQDExN3ZWJhdXRoLnNvdG9uLmFj
@@ -69,26 +69,26 @@
 						wHZNu7DWMxWh1OxdYrCJn8Sknnsy/EJABXPvMPsuq/6/4fBezlxYdgYDRE0w3tgB
 						HPqnW/Pnrm26uMgi
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Southampton</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.soton.ac.uk/iss/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serviceline</md:GivenName>
-      <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Clayton</md:GivenName>
-      <md:SurName>Peters</md:SurName>
-      <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Southampton</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.soton.ac.uk/iss/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serviceline</md:GivenName>
+    <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clayton</md:GivenName>
+    <md:SurName>Peters</md:SurName>
+    <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml
index a57d560b..acd4f18a 100644
--- a/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.umaryland.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umaryland.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Maryland Baltimore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The University of Maryland, Baltimore (UMB) is the State's public health, law and human services university devoted to excellence in professional and graduate education, research, patient care, and public service. As a diverse community of outstanding faculty, staff and students, and using state-of-the-art technological support, we educate leaders in health care delivery, biomedical science, global health, social work and the law. We emphasize interdisciplinary education and research in an atmosphere that explicitly values civility, diversity, collaboration, teamwork and accountability. By conducting internationally recognized research to cure disease and to improve the health, social functioning and just treatment of the people we serve, we foster economic development in the City, State, and nation. We are committed to ensuring that the knowledge we generate provides maximum benefit to society and directly enhances our various communities.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.umaryland.edu/cits/policies/privacy_policy.doc</mdui:PrivacyStatementURL>
+        <mdui:Logo height="89" width="340" xml:lang="en">https://directory.umaryland.edu/shibboleth/umblogo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umaryland.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Maryland Baltimore</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The University of Maryland, Baltimore (UMB) is the State's public health, law and human services university devoted to excellence in professional and graduate education, research, patient care, and public service. As a diverse community of outstanding faculty, staff and students, and using state-of-the-art technological support, we educate leaders in health care delivery, biomedical science, global health, social work and the law. We emphasize interdisciplinary education and research in an atmosphere that explicitly values civility, diversity, collaboration, teamwork and accountability. By conducting internationally recognized research to cure disease and to improve the health, social functioning and just treatment of the people we serve, we foster economic development in the City, State, and nation. We are committed to ensuring that the knowledge we generate provides maximum benefit to society and directly enhances our various communities.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.umaryland.edu/cits/policies/privacy_policy.doc</mdui:PrivacyStatementURL>
-          <mdui:Logo height="89" width="340" xml:lang="en">https://directory.umaryland.edu/shibboleth/umblogo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAIJL3xlKBtxM29EgLG3uO45k3D/WMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnlsYW5kLmVkdTAeFw0xMjEwMjYx
 NjQ5MDRaFw0zMjEwMjYxNjQ5MDRaMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnls
@@ -44,24 +44,24 @@ oy9sjvoB6Q2spGvKL9ztGS7DArQ5vmppu/cW6KLyKxvlex0l2eqSLc6ykbmmsZfS
 C3tP4wi5CZgqM/Ak34O9PntDHTUgXUUmK0TAXJqXwsRffYByDJFXlNgTQWLiYf5e
 pnBcdqtVQcuIV+E+RUNLcxS0b5w=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umaryland.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umaryland.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.umaryland.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umaryland.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umaryland.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umaryland.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umaryland.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.umaryland.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umaryland.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umaryland.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIVAIJL3xlKBtxM29EgLG3uO45k3D/WMA0GCSqGSIb3DQEB
 BQUAMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnlsYW5kLmVkdTAeFw0xMjEwMjYx
 NjQ5MDRaFw0zMjEwMjYxNjQ5MDRaMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnls
@@ -81,31 +81,31 @@ oy9sjvoB6Q2spGvKL9ztGS7DArQ5vmppu/cW6KLyKxvlex0l2eqSLc6ykbmmsZfS
 C3tP4wi5CZgqM/Ak34O9PntDHTUgXUUmK0TAXJqXwsRffYByDJFXlNgTQWLiYf5e
 pnBcdqtVQcuIV+E+RUNLcxS0b5w=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Maryland Baltimore</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umaryland.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brian Coats</md:GivenName>
-      <md:EmailAddress>bscoats@umaryland.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Brent Nickles</md:GivenName>
-      <md:EmailAddress>brent@umaryland.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Brian Coats</md:GivenName>
-      <md:EmailAddress>bscoats@umaryland.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Help Desk</md:GivenName>
-      <md:EmailAddress>help@umaryland.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Maryland Baltimore</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umaryland.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brian Coats</md:GivenName>
+    <md:EmailAddress>bscoats@umaryland.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Brent Nickles</md:GivenName>
+    <md:EmailAddress>brent@umaryland.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Brian Coats</md:GivenName>
+    <md:EmailAddress>bscoats@umaryland.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Help Desk</md:GivenName>
+    <md:EmailAddress>help@umaryland.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml
index 685843fd..3ffe129d 100644
--- a/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.umass.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umass.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Massachusetts Amherst</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umass.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Massachusetts Amherst</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCzCCAfOgAwIBAgIJAOlOLgIUKVQ4MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
 BAMMEXdlYmF1dGgudW1hc3MuZWR1MB4XDTE1MDYxMTE0NDEyMFoXDTI1MDYwODE0
 NDEyMFowHDEaMBgGA1UEAwwRd2ViYXV0aC51bWFzcy5lZHUwggEiMA0GCSqGSIb3
@@ -40,23 +40,23 @@ NPBh63Pk9Gv7Re6v8GhKdzwgcWvYMuuB0sTT4sAnnBCk5cWKbq82MjhE6j8cFtft
 aS+HBnPJbqy6mvY0QGjDBsjELvRUs2UgCgq+/SItQAK3pT2aWh5xlD29Z3vxSPZB
 boJsiAVVlmU6bfxOdpHv
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umass.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umass.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umass.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umass.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umass.edu/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umass.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umass.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umass.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umass.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umass.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umass.edu/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umass.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDCzCCAfOgAwIBAgIJAOlOLgIUKVQ4MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
 BAMMEXdlYmF1dGgudW1hc3MuZWR1MB4XDTE1MDYxMTE0NDEyMFoXDTI1MDYwODE0
 NDEyMFowHDEaMBgGA1UEAwwRd2ViYXV0aC51bWFzcy5lZHUwggEiMA0GCSqGSIb3
@@ -75,30 +75,30 @@ NPBh63Pk9Gv7Re6v8GhKdzwgcWvYMuuB0sTT4sAnnBCk5cWKbq82MjhE6j8cFtft
 aS+HBnPJbqy6mvY0QGjDBsjELvRUs2UgCgq+/SItQAK3pT2aWh5xlD29Z3vxSPZB
 boJsiAVVlmU6bfxOdpHv
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umass.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Massachusetts Amherst</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Massachusetts Amherst</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umass.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Identity Management</md:GivenName>
-      <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Security Response Team</md:GivenName>
-      <md:EmailAddress>security@oit.umass.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umass.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Massachusetts Amherst</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Massachusetts Amherst</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umass.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Identity Management</md:GivenName>
+    <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Security Response Team</md:GivenName>
+    <md:EmailAddress>security@oit.umass.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml
index 82c2821f..e89bcaf1 100644
--- a/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.uncc.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://webauth.uncc.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncc.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of North Carolina At Charlotte</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of North Carolina at Charlotte.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://webauth.uncc.edu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://legal.uncc.edu/website-use-policies/privacy-statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="56" width="128" xml:lang="en">https://www.uncc.edu/sites/all/themes/unccedu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://webauth.uncc.edu/error.html" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncc.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of North Carolina At Charlotte</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider for University of North Carolina at Charlotte.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://webauth.uncc.edu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://legal.uncc.edu/website-use-policies/privacy-statement</mdui:PrivacyStatementURL>
-          <mdui:Logo height="56" width="128" xml:lang="en">https://www.uncc.edu/sites/all/themes/unccedu/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUE9Q+gC5nxV1laEjS/0Wz6pcH+RQwDQYJKoZIhvcNAQEF
 BQAwGzEZMBcGA1UEAxMQd2ViYXV0aC51bmNjLmVkdTAeFw0xNDA1MDYxNzQxNDJa
 Fw0zNDA1MDYxNzQxNDJaMBsxGTAXBgNVBAMTEHdlYmF1dGgudW5jYy5lZHUwggEi
@@ -41,31 +41,31 @@ eoJcrDRHrbt9fzobxOyhzU2qpaTZjMDTFD/du9GERjsz4TXRZcCvArOL7i1S8qWd
 uhC6wP1FE5HmACR4pPylxXJbvSLCKqLGmT8xYKb2VthIY4sBXIpQZ7C0FUn4p+bd
 Yv8S+IWg7U+XmXCrOaV03/kqASJCZW3gxtXJ3KKfsiH4tPfx3Wn3Msi03ZeVYMc=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.uncc.edu/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.uncc.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.uncc.edu/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of North Carolina At Charlotte</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of North Carolina At Charlotte</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uncc.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Enterprise Web Services</md:GivenName>
-      <md:EmailAddress>EnterpriseWebServices-group@uncc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Enterprise Web Services</md:GivenName>
-      <md:EmailAddress>EnterpriseWebServices-group@uncc.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Service Desk</md:GivenName>
-      <md:EmailAddress>help@uncc.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.uncc.edu/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.uncc.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.uncc.edu/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of North Carolina At Charlotte</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of North Carolina At Charlotte</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uncc.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Enterprise Web Services</md:GivenName>
+    <md:EmailAddress>EnterpriseWebServices-group@uncc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Enterprise Web Services</md:GivenName>
+    <md:EmailAddress>EnterpriseWebServices-group@uncc.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Service Desk</md:GivenName>
+    <md:EmailAddress>help@uncc.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml
index b001320d..7e4736dd 100644
--- a/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webauth.wfunet.wfu.edu/saml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wfu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wake Forest University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A collegiate university in Winston-Salem, North Carolina distinguished by small classes and faculty-student engagement.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.wfu.edu/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wfu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Wake Forest University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A collegiate university in Winston-Salem, North Carolina distinguished by small classes and faculty-student engagement.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.wfu.edu/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDujCCAqICCQClvb4cN5x9LjANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
 VVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRYwFAYDVQQHEw1XaW5zdG9uLVNh
 bGVtMR8wHQYDVQQKExZXYWtlIEZvcmVzdCBVbml2ZXJzaXR5MRwwGgYDVQQLExNJ
@@ -42,27 +42,27 @@ k7wZlbX+lnCbYnRT6c5Ay9q6riXxBOVYbzeecMkQ22+bTlAQGMVOxynVGGwQe4xs
 bRE/uhZ/zVFWLsdRji9vHMegVzyM2tLsi4NVpZU+7+HRlfpoCTfJ2kVcwTD7uo0s
 MdFwU7yHsWvE5KjlyUnbqen4zlzTnr7k+uEMAr2zEMMWhAe/Z5GXAfBnQ9jJbg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.wfunet.wfu.edu/saml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.wfunet.wfu.edu/saml/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Wake Forest University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wake Forest University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wfu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS SAML Admin</md:GivenName>
-      <md:EmailAddress>is-saml-admin@wfu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>IS SAML Admin</md:GivenName>
-      <md:EmailAddress>is-saml-admin@wfu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>help@wfu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.wfunet.wfu.edu/saml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.wfunet.wfu.edu/saml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Wake Forest University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wake Forest University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wfu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS SAML Admin</md:GivenName>
+    <md:EmailAddress>is-saml-admin@wfu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IS SAML Admin</md:GivenName>
+    <md:EmailAddress>is-saml-admin@wfu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>help@wfu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
index 204152d1..67833e54 100644
--- a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
+++ b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webclass.uran.ua/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-03-15T11:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-03-15T11:05:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webclass.uran.ua/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webclass.uran.ua/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WEB-class</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Conference server and online learning system of PEANO federation</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://webclass.uran.ua/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://webclass.uran.ua/webclass_privacy_policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webclass.uran.ua/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webclass.uran.ua/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WEB-class</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Conference server and online learning system of PEANO federation</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://webclass.uran.ua/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://webclass.uran.ua/webclass_privacy_policy.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://webclass.uran.ua/shibboleth</ds:KeyName>
-          <ds:KeyName>webclass.uran.ua</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://webclass.uran.ua/shibboleth</ds:KeyName>
+        <ds:KeyName>webclass.uran.ua</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIJAIE/TOjTP6h5MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEHdlYmNsYXNzLnVyYW4udWEwHhcNMTUwMzEzMTQyOTE0WhcNMTgwMzEyMTQy
 OTE0WjAbMRkwFwYDVQQDExB3ZWJjbGFzcy51cmFuLnVhMIIBIjANBgkqhkiG9w0B
@@ -40,37 +40,37 @@ qkHYLsLMUECsCuyBVC3sEnCyR/ZV0iXMLrXwmb1dY5oWev1WsO1bjtFTw+MjQ2uc
 54nKzfvAurdiaw0fmSiF/GTvuviifNLJiwYtQWcfJVIb1bCoQQwNPpWWkxFKbjc+
 3o/EQJNrHD5zELEvuKkmcc3+EqOT4ysmvAxLWrG0oT8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webclass.uran.ua/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webclass.uran.ua/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webclass.uran.ua/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">WEB-class</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Conference server and online learning system of PEANO federation</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Association URAN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">URAN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uran.ua/~eng/frames.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Yevhenii</md:GivenName>
-      <md:SurName>Preobrazhenskyi</md:SurName>
-      <md:EmailAddress>mailto:admins@uran.ua</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webclass.uran.ua/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webclass.uran.ua/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webclass.uran.ua/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">WEB-class</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Conference server and online learning system of PEANO federation</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Association URAN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">URAN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uran.ua/~eng/frames.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Yevhenii</md:GivenName>
+    <md:SurName>Preobrazhenskyi</md:SurName>
+    <md:EmailAddress>mailto:admins@uran.ua</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
index 6643631a..7a39a0f5 100644
--- a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webinar.nordu.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <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://webinar.nordu.net/Shibboleth.sso/WAYF/wayf.swamid.se"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/WAYF/idp.protectnetwork.org"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/nordu.net" index="3"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">NORDUnet Webinar Service</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md: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://webinar.nordu.net/Shibboleth.sso/WAYF/wayf.swamid.se"/>
-        <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://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/WAYF/idp.protectnetwork.org"/>
-        <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://webinar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/nordu.net" index="3"/>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">NORDUnet Webinar Service</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>webinar.nordu.net</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=webinar.nordu.net</ds:X509SubjectName>
-            <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAOOLN7U/T/soMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>webinar.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=webinar.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAOOLN7U/T/soMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMTEXdlYmluYXIubm9yZHUubmV0MB4XDTEyMTAxMTA3MzUzNloXDTIyMTAwOTA3
 MzUzNlowHDEaMBgGA1UEAxMRd2ViaW5hci5ub3JkdS5uZXQwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQCkHGDzNHGHWdCZ8xkrLKElxJmO1uWZ5+GAr46J
@@ -50,43 +50,43 @@ M/V1YBDfNPXMh3BYl3g6lxG5qdqYbEoNXrnrMwV6N0BixrjBmoI7K2cEUWW9pwQ8
 rZSHynfzD3dUndFFJVNzwQKyGttlsQGxS0CL5jZS0cWz/p9uvOz+kf4CEqS9QA7o
 euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
-        <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>NORDUnet NOC</md:Company>
-      <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 7f5b3c40..4611d15f 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-16T14:52:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-16T14:52:39Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+        <mdui:Description xml:lang="de">WebLicht ist eine Service-orientierte Architektur (SOA) zur Erstellung annotierter Textcorpora.</mdui:Description>
+        <mdui:Description xml:lang="en">WebLicht is a service orchestration and execution environment for automatic linguistic annotation.</mdui:Description>
+        <mdui:Logo height="50" width="190">https://weblicht.sfs.uni-tuebingen.de/weblichtwiki/weblicht_button2.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
-          <mdui:Description xml:lang="de">WebLicht ist eine Service-orientierte Architektur (SOA) zur Erstellung annotierter Textcorpora.</mdui:Description>
-          <mdui:Description xml:lang="en">WebLicht is a service orchestration and execution environment for automatic linguistic annotation.</mdui:Description>
-          <mdui:Logo height="50" width="190">https://weblicht.sfs.uni-tuebingen.de/weblichtwiki/weblicht_button2.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
 EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
 R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
 aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
@@ -66,49 +66,49 @@ pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
 ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
 ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">WebLicht</md:ServiceName>
-        <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">WebLicht ist eine Service-orientierte Architektur (SOA) zur Erstellung annotierter Textcorpora.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">WebLicht is a service orchestration and execution environment for automatic linguistic annotation.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marie</md:GivenName>
-      <md:SurName>Hinrichs</md:SurName>
-      <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marie</md:GivenName>
-      <md:SurName>Hinrichs</md:SurName>
-      <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marie</md:GivenName>
-      <md:SurName>Hinrichs</md:SurName>
-      <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">WebLicht</md:ServiceName>
+      <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">WebLicht ist eine Service-orientierte Architektur (SOA) zur Erstellung annotierter Textcorpora.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">WebLicht is a service orchestration and execution environment for automatic linguistic annotation.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marie</md:GivenName>
+    <md:SurName>Hinrichs</md:SurName>
+    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml b/swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml
index babc81a1..b9a3bc6b 100644
--- a/swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml
+++ b/swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblogin.albany.edu/shibboleth/idp2">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://wiki.albany.edu/x/A4ZvAg" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">albany.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University At Albany, State University of New York</mdui:DisplayName>
+        <mdui:Logo height="150" width="203" xml:lang="en">https://maenad.csc.albany.edu/incommon/logo_A1_pms269-InCommon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://wiki.albany.edu/x/A4ZvAg" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">albany.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University At Albany, State University of New York</mdui:DisplayName>
-          <mdui:Logo height="150" width="203" xml:lang="en">https://maenad.csc.albany.edu/incommon/logo_A1_pms269-InCommon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAKWha+CKTeinjttEcaqLm7fQSZLLMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3dlYmxvZ2luLmFsYmFueS5lZHUwHhcNMDkwMjExMTk1
 NDE0WhcNMjkwMjExMTk1NDE0WjAeMRwwGgYDVQQDExN3ZWJsb2dpbi5hbGJhbnku
@@ -42,23 +42,23 @@ nftVP/rsZZ6nr0wJBZfPbhiBDAuzamzI05QHB+sFskVXB6Z8h2KawwNSrjgc2poj
 QWzZNOuth932vN8p2Lc6iI5v5bC/QSDDBlZ7tl+Uj/ejZC9b9WG/y83RrM333twp
 Kq1D/QWBwg4oa9Zq
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/Artifact" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.albany.edu/idp2/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.albany.edu/idp2/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.albany.edu/idp2/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">albany.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/Artifact" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.albany.edu/idp2/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.albany.edu/idp2/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.albany.edu/idp2/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">albany.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDODCCAiCgAwIBAgIVAKWha+CKTeinjttEcaqLm7fQSZLLMA0GCSqGSIb3DQEB
 BQUAMB4xHDAaBgNVBAMTE3dlYmxvZ2luLmFsYmFueS5lZHUwHhcNMDkwMjExMTk1
 NDE0WhcNMjkwMjExMTk1NDE0WjAeMRwwGgYDVQQDExN3ZWJsb2dpbi5hbGJhbnku
@@ -78,19 +78,19 @@ nftVP/rsZZ6nr0wJBZfPbhiBDAuzamzI05QHB+sFskVXB6Z8h2KawwNSrjgc2poj
 QWzZNOuth932vN8p2Lc6iI5v5bC/QSDDBlZ7tl+Uj/ejZC9b9WG/y83RrM333twp
 Kq1D/QWBwg4oa9Zq
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML2/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University At Albany, State University of New York</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University At Albany, State University of New York</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.albany.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Bry-Ann Yates</md:GivenName>
-      <md:EmailAddress>byates@albany.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML2/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University At Albany, State University of New York</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University At Albany, State University of New York</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.albany.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Bry-Ann Yates</md:GivenName>
+    <md:EmailAddress>byates@albany.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.htw-berlin.de-idp-shibboleth.xml b/swamid-interfederations-2.0/weblogin.htw-berlin.de-idp-shibboleth.xml
index d9fa2bd4..245d879e 100644
--- a/swamid-interfederations-2.0/weblogin.htw-berlin.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/weblogin.htw-berlin.de-idp-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblogin.htw-berlin.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-12-16T08:29:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-12-16T08:29:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">htw-berlin.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">HTW Berlin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HTW Berlin</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Hochschule fuer Technik und Wirtschaft Berlin - HTW-Berlin - University of Applied Sciences</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of "Hochschule fuer Technik und Wirtschaft Berlin" - HTW-Berlin - University of Applied Sciences</mdui:Description>
+        <mdui:Logo height="16" width="16">https://weblogin.htw-berlin.de/idp/favicon.ico</mdui:Logo>
+        <mdui:Logo height="71" width="120">https://weblogin.htw-berlin.de/idp/pix/htw-logo-120x71.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.htw-berlin.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www-en.htw-berlin.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.rz.htw-berlin.de/dokumente/ordnungen</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.rz.htw-berlin.de/dokumente/ordnungen</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">htw-berlin.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">HTW Berlin</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">HTW Berlin</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Hochschule fuer Technik und Wirtschaft Berlin - HTW-Berlin - University of Applied Sciences</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of "Hochschule fuer Technik und Wirtschaft Berlin" - HTW-Berlin - University of Applied Sciences</mdui:Description>
-          <mdui:Logo height="16" width="16">https://weblogin.htw-berlin.de/idp/favicon.ico</mdui:Logo>
-          <mdui:Logo height="71" width="120">https://weblogin.htw-berlin.de/idp/pix/htw-logo-120x71.jpg</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.htw-berlin.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www-en.htw-berlin.de</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="de">http://www.rz.htw-berlin.de/dokumente/ordnungen</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.rz.htw-berlin.de/dokumente/ordnungen</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
 BhMCREUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIHVuZCBXaXJ0
 c2NoYWZ0IEJlcmxpbjEMMAoGA1UECxMDSFJaMTYwNAYDVQQDEy1Ib2Noc2NodWxl
 IGZ1ZXIgVGVjaG5payB1bmQgV2lydHNjaGFmdCBCZXJsaW4xHzAdBgkqhkiG9w0B
@@ -62,15 +62,15 @@ f6YyoyCAudgbc17e4WNIrUpTar/bTYADU9Su9LOKqYJIXLMaEKGGLphj/qNuDJWr
 mYsimCph52UoBOWuRwW450pEgDRnOuKh7IgzzF8dcVwwrwXLwet03scNe6UZ2FCF
 mAA2wSACHA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
 BhMCREUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIHVuZCBXaXJ0
 c2NoYWZ0IEJlcmxpbjEMMAoGA1UECxMDSFJaMTYwNAYDVQQDEy1Ib2Noc2NodWxl
 IGZ1ZXIgVGVjaG5payB1bmQgV2lydHNjaGFmdCBCZXJsaW4xHzAdBgkqhkiG9w0B
@@ -105,31 +105,31 @@ f6YyoyCAudgbc17e4WNIrUpTar/bTYADU9Su9LOKqYJIXLMaEKGGLphj/qNuDJWr
 mYsimCph52UoBOWuRwW450pEgDRnOuKh7IgzzF8dcVwwrwXLwet03scNe6UZ2FCF
 mAA2wSACHA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.htw-berlin.de/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://weblogin.htw-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.htw-berlin.de:8443/idp/profile/SAML2/SOAP/SLO" ResponseLocation="https://weblogin.htw-berlin.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.htw-berlin.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">htw-berlin.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.htw-berlin.de/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://weblogin.htw-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.htw-berlin.de:8443/idp/profile/SAML2/SOAP/SLO" ResponseLocation="https://weblogin.htw-berlin.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.htw-berlin.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.htw-berlin.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">htw-berlin.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
 BhMCREUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIHVuZCBXaXJ0
 c2NoYWZ0IEJlcmxpbjEMMAoGA1UECxMDSFJaMTYwNAYDVQQDEy1Ib2Noc2NodWxl
 IGZ1ZXIgVGVjaG5payB1bmQgV2lydHNjaGFmdCBCZXJsaW4xHzAdBgkqhkiG9w0B
@@ -164,15 +164,15 @@ f6YyoyCAudgbc17e4WNIrUpTar/bTYADU9Su9LOKqYJIXLMaEKGGLphj/qNuDJWr
 mYsimCph52UoBOWuRwW450pEgDRnOuKh7IgzzF8dcVwwrwXLwet03scNe6UZ2FCF
 mAA2wSACHA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblogin.htw-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=weblogin.htw-berlin.de,OU=Hochschulrechenzentrum,O=Hochschule fuer Technik und Wirtschaft Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGMzCCBRugAwIBAgIHGn0y2d2LYDANBgkqhkiG9w0BAQsFADCBrDELMAkGA1UE
 BhMCREUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIHVuZCBXaXJ0
 c2NoYWZ0IEJlcmxpbjEMMAoGA1UECxMDSFJaMTYwNAYDVQQDEy1Ib2Noc2NodWxl
 IGZ1ZXIgVGVjaG5payB1bmQgV2lydHNjaGFmdCBCZXJsaW4xHzAdBgkqhkiG9w0B
@@ -207,28 +207,28 @@ f6YyoyCAudgbc17e4WNIrUpTar/bTYADU9Su9LOKqYJIXLMaEKGGLphj/qNuDJWr
 mYsimCph52UoBOWuRwW450pEgDRnOuKh7IgzzF8dcVwwrwXLwet03scNe6UZ2FCF
 mAA2wSACHA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.htw-berlin.de/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e476</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e476</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">HTW Berlin</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">HTW Berlin</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.htw-berlin.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www-en.htw-berlin.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zech</md:GivenName>
-      <md:SurName>Stefan</md:SurName>
-      <md:EmailAddress>mailto:Stefan.Zech+IdP@HTW-Berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT</md:GivenName>
-      <md:SurName>Helpcenter</md:SurName>
-      <md:EmailAddress>mailto:IT-Helpcenter@HTW-Berlin.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.htw-berlin.de/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e476</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e476</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">HTW Berlin</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">HTW Berlin</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.htw-berlin.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www-en.htw-berlin.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zech</md:GivenName>
+    <md:SurName>Stefan</md:SurName>
+    <md:EmailAddress>mailto:Stefan.Zech+IdP@HTW-Berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT</md:GivenName>
+    <md:SurName>Helpcenter</md:SurName>
+    <md:EmailAddress>mailto:IT-Helpcenter@HTW-Berlin.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
index 6b0decc3..04e99f5d 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblogin.uu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns="" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns="" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uu.se</mdui:DomainHint>
+        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-          <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-          <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-          <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-          <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-          <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-          <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-          <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
-        </mdui:UIInfo>
-        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DomainHint>uu.se</mdui:DomainHint>
-          <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-          <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-          <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-          <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-          <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-          <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-          <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-          <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-          <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-        </mdui:DiscoHints>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
 DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
@@ -70,26 +70,26 @@ XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
 MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
 BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
 DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
@@ -109,36 +109,36 @@ XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
 MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:Company>Uppsala University</md:Company>
-      <md:SurName>SAML2 admins</md:SurName>
-      <md:EmailAddress>mailto:uadm-team_plattform@lists.uu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 70 425 0477</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Uppsala University</md:Company>
-      <md:SurName>John Morrison</md:SurName>
-      <md:EmailAddress>mailto:john.morrison@uadm.uu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46 70 425 0477</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Uppsala University</md:Company>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
-      <md:TelephoneNumber>+46184717890</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala University</md:Company>
+    <md:SurName>SAML2 admins</md:SurName>
+    <md:EmailAddress>mailto:uadm-team_plattform@lists.uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 425 0477</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala University</md:Company>
+    <md:SurName>John Morrison</md:SurName>
+    <md:EmailAddress>mailto:john.morrison@uadm.uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 70 425 0477</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46184717890</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
index 34e4be0a..45c78d68 100644
--- a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -1,122 +1,122 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://webproxysrv.uniarts.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniarts.se</shibmd:Scope>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniarts.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniarts.se</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
-          <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Stockholm University of the Arts</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Stockholm University of the Arts</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uniarts.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Lars</md:GivenName>
-      <md:SurName>Lind</md:SurName>
-      <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-      <md:TelephoneNumber>+46(0)849400220</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Stockholm University of the Arts</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms konstnärliga högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University of the Arts</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniarts.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Lars</md:GivenName>
+    <md:SurName>Lind</md:SurName>
+    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
+    <md:TelephoneNumber>+46(0)849400220</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml
index 69744d51..10bc8f02 100644
--- a/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webso.iup.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iup.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Indiana University of Pennsylvania</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.iup.edu/itsupportcenter/howto.aspx?id=70227</mdui:InformationURL>
+        <mdui:Logo height="110" width="83" xml:lang="en">https://webso.iup.edu/images/iup_mdui.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iup.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Indiana University of Pennsylvania</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">http://www.iup.edu/itsupportcenter/howto.aspx?id=70227</mdui:InformationURL>
-          <mdui:Logo height="110" width="83" xml:lang="en">https://webso.iup.edu/images/iup_mdui.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDIDCCAgigAwIBAgIVAOTnWFQvSD+86kNUXPzAVSUthutDMA0GCSqGSIb3DQEB
 BQUAMBgxFjAUBgNVBAMTDXdlYnNvLml1cC5lZHUwHhcNMDkwMzA1MTMzMzQ3WhcN
 MjkwMzA1MTMzMzQ3WjAYMRYwFAYDVQQDEw13ZWJzby5pdXAuZWR1MIIBIjANBgkq
@@ -42,29 +42,29 @@ E1FPQQZOlPKXXqbtsD8dPE6/05AKTAL2VzlX0DmM9bJSRjuyynjG/D9DGOueC2LM
 JC0OdrACruIN43LmFSS/ll4Y68if3BdC2oS97FaAb6yjdPxfSWKiOej/0+LSrZww
 6mcl5+FgTKV8i5U1jSa7iuj4KQ+wwOluYy+5qz2M4xPk9g09
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webso.iup.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webso.iup.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webso.iup.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webso.iup.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Indiana University of Pennsylvania</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Indiana University of Pennsylvania</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.iup.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Paul Grieggs</md:GivenName>
-      <md:EmailAddress>pmgriegg@iup.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig Pluchinsky</md:GivenName>
-      <md:EmailAddress>tsc-sysadmin@iup.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Craig Pluchinsky</md:GivenName>
-      <md:EmailAddress>craigp@iup.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webso.iup.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webso.iup.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webso.iup.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webso.iup.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Indiana University of Pennsylvania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Indiana University of Pennsylvania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iup.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Paul Grieggs</md:GivenName>
+    <md:EmailAddress>pmgriegg@iup.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig Pluchinsky</md:GivenName>
+    <md:EmailAddress>tsc-sysadmin@iup.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Craig Pluchinsky</md:GivenName>
+    <md:EmailAddress>craigp@iup.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/websso.pomona.edu-.xml b/swamid-interfederations-2.0/websso.pomona.edu-.xml
index b29ce241..bdc69dc0 100644
--- a/swamid-interfederations-2.0/websso.pomona.edu-.xml
+++ b/swamid-interfederations-2.0/websso.pomona.edu-.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://websso.pomona.edu/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="http://www.pomona.edu/bad_request" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pomona.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Pomona College</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Pomona College Shibboleth IdP</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://its.pomona.edu/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.pomona.edu/administration/privacy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="125" width="300" xml:lang="en">https://community.pomona.edu/image/2013-design-update/logo-new.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="http://www.pomona.edu/bad_request" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pomona.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Pomona College</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Pomona College Shibboleth IdP</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://its.pomona.edu/about/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.pomona.edu/administration/privacy/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="125" width="300" xml:lang="en">https://community.pomona.edu/image/2013-design-update/logo-new.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAO9nGE8c+lQhK2F0lPJxljFyJ4EzMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmNhczEuY2FtcHVzLnBvbW9uYS5lZHUwHhcNMTMxMjE3
 MjE0MTAxWhcNMzMxMjE3MjE0MTAxWjAhMR8wHQYDVQQDExZjYXMxLmNhbXB1cy5w
@@ -45,23 +45,23 @@ jMW6DSKHP7nPB+TVqHV21WnrhlVqcWbXSpzRMemw+zcnbCemcPpLcm1gPyyTcWxY
 JAIZ5JbZfzs6DKluH3EJomGA7QTN7nwEYwEN/WUoCPfToQrmtQn9ycaSKru8cxS5
 nh1jiNEqWZbGOpO4My5jVY+FG0TRRRQE
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas1.campus.pomona.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas1.campus.pomona.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas1.campus.pomona.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pomona.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas1.campus.pomona.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas1.campus.pomona.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas1.campus.pomona.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pomona.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDRDCCAiygAwIBAgIVAO9nGE8c+lQhK2F0lPJxljFyJ4EzMA0GCSqGSIb3DQEB
 BQUAMCExHzAdBgNVBAMTFmNhczEuY2FtcHVzLnBvbW9uYS5lZHUwHhcNMTMxMjE3
 MjE0MTAxWhcNMzMxMjE3MjE0MTAxWjAhMR8wHQYDVQQDExZjYXMxLmNhbXB1cy5w
@@ -81,30 +81,30 @@ jMW6DSKHP7nPB+TVqHV21WnrhlVqcWbXSpzRMemw+zcnbCemcPpLcm1gPyyTcWxY
 JAIZ5JbZfzs6DKluH3EJomGA7QTN7nwEYwEN/WUoCPfToQrmtQn9ycaSKru8cxS5
 nh1jiNEqWZbGOpO4My5jVY+FG0TRRRQE
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Pomona College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pomona College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pomona.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Abbie Lennox</md:GivenName>
-      <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Abbie Lennox</md:GivenName>
-      <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>Abbie Lennox</md:GivenName>
-      <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Pomona ITS</md:GivenName>
-      <md:EmailAddress>ServiceDesk@pomona.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Pomona College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pomona College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pomona.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Abbie Lennox</md:GivenName>
+    <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Abbie Lennox</md:GivenName>
+    <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>Abbie Lennox</md:GivenName>
+    <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Pomona ITS</md:GivenName>
+    <md:EmailAddress>ServiceDesk@pomona.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml b/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml
index b019d7e1..e2401778 100644
--- a/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webteam-stg.twig-world.com/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-07T12:14:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-07T12:14:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/shibtest"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/shibtest"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIJALXTHCbfgCS8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGndlYnRlYW0tc3RnLnR3aWctd29ybGQuY29tMB4XDTE0MDgwNjEwMzYwOFoX
 						DTI0MDgwMzEwMzYwOFowJTEjMCEGA1UEAxMad2VidGVhbS1zdGcudHdpZy13b3Js
@@ -45,44 +45,44 @@
 						9GXpkmbBiiE1ND5VcU9SaEgQk98BnTNN88f2jH6ATtPl5AmFHozBuiZVzG7dEVgI
 						0xbtTIvqLbzy305vFXaMQEmBOi5iaPTKkpIp
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Web Team Staging Shibboleth SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.twig-world.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Web Team Staging Shibboleth SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.twig-world.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webtut.fccn.pt.xml b/swamid-interfederations-2.0/webtut.fccn.pt.xml
index 9305eb5b..48f5785a 100644
--- a/swamid-interfederations-2.0/webtut.fccn.pt.xml
+++ b/swamid-interfederations-2.0/webtut.fccn.pt.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webtut.fccn.pt">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WebTUT Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">Serviço WebTUT</mdui:DisplayName>
+        <mdui:Description xml:lang="en">WebRTC in context example application</mdui:Description>
+        <mdui:Description xml:lang="pt">Aplicação exemplo de uso da tecnologia WebRTC</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WebTUT Service</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt">Serviço WebTUT</mdui:DisplayName>
-          <mdui:Description xml:lang="en">WebRTC in context example application</mdui:Description>
-          <mdui:Description xml:lang="pt">Aplicação exemplo de uso da tecnologia WebRTC</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC7jCCAdYCCQD02c5n0jI2ODANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJQ
 VDERMA8GA1UECgwIRkNUfEZDQ04xFzAVBgNVBAMMDndlYnR1dC5mY2NuLnB0MB4X
 DTE2MDEyODE2MzMzN1oXDTE5MDEyNzE2MzMzN1owOTELMAkGA1UEBhMCUFQxETAP
@@ -38,13 +38,13 @@ J0uE73E8LuN77O+enbjj/TeW3Zt2hurd/hpuFhBcAspFOoVQvMuMjjTaFkcdlQYg
 w3ks4BHE7Nswn/fPRvccX08mW/u8qM1o3NIaoCOBJRf4dyQuv22+K0y5a+3wH9o8
 QZfzDc9Vmm18OJtspKB74+x7JkNv6iszqOH6gvzq4qvkRw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC7jCCAdYCCQD02c5n0jI2ODANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJQ
 VDERMA8GA1UECgwIRkNUfEZDQ04xFzAVBgNVBAMMDndlYnR1dC5mY2NuLnB0MB4X
 DTE2MDEyODE2MzMzN1oXDTE5MDEyNzE2MzMzN1owOTELMAkGA1UEBhMCUFQxETAP
@@ -62,36 +62,36 @@ J0uE73E8LuN77O+enbjj/TeW3Zt2hurd/hpuFhBcAspFOoVQvMuMjjTaFkcdlQYg
 w3ks4BHE7Nswn/fPRvccX08mW/u8qM1o3NIaoCOBJRf4dyQuv22+K0y5a+3wH9o8
 QZfzDc9Vmm18OJtspKB74+x7JkNv6iszqOH6gvzq4qvkRw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-logout.php/webtut.fccn.pt"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-acs.php/webtut.fccn.pt" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml1-acs.php/webtut.fccn.pt" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-acs.php/webtut.fccn.pt" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml1-acs.php/webtut.fccn.pt/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">WebTUT Service</md:ServiceName>
-        <md:ServiceName xml:lang="pt">Serviço WebTUT</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">WebRTC in context example application</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="pt">Aplicação exemplo de uso da tecnologia WebRTC</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="pt">FCT|FCCN</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">FCT|FCCN</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="pt">FCT|FCCN</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">FCT|FCCN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.fccn.pt</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Administrator</md:GivenName>
-      <md:EmailAddress>mailto:stv@fccn.pt</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-logout.php/webtut.fccn.pt"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-acs.php/webtut.fccn.pt" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml1-acs.php/webtut.fccn.pt" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-acs.php/webtut.fccn.pt" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml1-acs.php/webtut.fccn.pt/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">WebTUT Service</md:ServiceName>
+      <md:ServiceName xml:lang="pt">Serviço WebTUT</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WebRTC in context example application</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="pt">Aplicação exemplo de uso da tecnologia WebRTC</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="pt">FCT|FCCN</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">FCT|FCCN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="pt">FCT|FCCN</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">FCT|FCCN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.fccn.pt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>mailto:stv@fccn.pt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml b/swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml
index 2129f9ae..854fdc21 100644
--- a/swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://western.sclintra.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://western.sclintra.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SCLogic Western Washington</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SCLogic Western Washington IntraOmni SP </mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://western.sclintra.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">SCLogic Western Washington</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SCLogic Western Washington IntraOmni SP </mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC6zCCAdOgAwIBAgIJAKwDandpFO7gMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDDEwLTE5Mi01Mi0yNTAeFw0xNTA5MjQxOTQxMTRaFw0yNTA5MjExOTQxMTRa
 MBcxFTATBgNVBAMTDDEwLTE5Mi01Mi0yNTCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -37,30 +37,30 @@ XsBq5dZeH029RBNtcVEbkWsgyyN3tmH0fWQCSTdxNUgdMeZWQGygvgT1Vi6hXkjw
 9OVs9KruqiRJcNXXjecaBpewkc6ZdsE5t/hKwGy9fl4tWFqAV+KeZKIVTLtByl1m
 dcdsCGBQNcRm3+jsd9CVy4E4T8t/lypkeuUrPJKJ/Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">SCLogic Western Washington</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">SCLogic Western Washington IntraOmni SP </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SCLogic</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">SCLogic</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sclogic.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Josh Sullivan</md:GivenName>
-      <md:EmailAddress>jsullivan@sclogic.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Warren Evans</md:GivenName>
-      <md:EmailAddress>wevans@sclogic.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SCLogic Western Washington</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SCLogic Western Washington IntraOmni SP </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SCLogic</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SCLogic</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sclogic.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Josh Sullivan</md:GivenName>
+    <md:EmailAddress>jsullivan@sclogic.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Warren Evans</md:GivenName>
+    <md:EmailAddress>wevans@sclogic.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
index a4206875..f51f23a9 100644
--- a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://whoami.cesnet.cz/idp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T11:47:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/other</saml:AttributeValue>
+        <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T11:47:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/other</saml:AttributeValue>
-          <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CESNET employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CESNETu.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ces.net/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.cesnet.cz/</mdui:InformationURL>
+        <mdui:Logo height="88" width="200">https://pki.cesnet.cz/_media/cs/cesnet-logo-200.gif</mdui:Logo>
+        <mdui:Logo height="177" width="400">https://pki.cesnet.cz/_media/cs/cesnet-logo-400.gif</mdui:Logo>
+        <mdui:Logo height="353" width="800">https://pki.cesnet.cz/_media/cs/cesnet-logo-800.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for CESNET employees.</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CESNETu.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.ces.net/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.cesnet.cz/</mdui:InformationURL>
-          <mdui:Logo height="88" width="200">https://pki.cesnet.cz/_media/cs/cesnet-logo-200.gif</mdui:Logo>
-          <mdui:Logo height="177" width="400">https://pki.cesnet.cz/_media/cs/cesnet-logo-400.gif</mdui:Logo>
-          <mdui:Logo height="353" width="800">https://pki.cesnet.cz/_media/cs/cesnet-logo-800.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAPtcN7LUM3UEz0yqfmOvpr0tZtYOMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU4
 WhcNMzUxMjE0MDkyMjU4WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
@@ -52,13 +52,13 @@ JF6us/yB6hcAf6ML7DyXW+o4q+35HHmAjBUssXHU70iLOiTnIfbEgxl54Af7xKpZ
 8Ww45V9t2dJ5YU6wzoa0Aqy0abm0RxkWu6igXjpcS+XaSl5n+J+tFEZBRtJZ5mBv
 EQWIvarHy4CabFyOcb1Bl3UHfvQyi3R4RfQsEIYaYBa/5c3LJr3KC8mWCA8vuPx+
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUNHGiLWEdd83k9nZ70899LxlSksMwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQd2hvYW1pLmNlc25ldC5jejAeFw0xNTEyMTQwOTIyNTZa
 Fw0zNTEyMTQwOTIyNTZaMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owggEi
@@ -77,13 +77,13 @@ QkEL4dP6M+eo5ZIDvndTF+vb9Uxt+SFttFETS/2RzneYXzCsa/5wWDIsmwNwMRYN
 1RjGMhjQ0DLx4PyEhrOqzWBGFM00qSWypY29SQ/nYGRpjBkvOYasT8eHIovD9M8C
 bmD1QX2KicdJm3oC14xc3Amm2Ja4YeystmRZO0H4z0oVN/zhBT90pjKf4yuF+Bs=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMGRAZNgX7x88WED24sBgvq/prF/MA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU3
 WhcNMzUxMjE0MDkyMjU3WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
@@ -102,31 +102,31 @@ dQ4u7VaUTaGleUKF8dZfEc8okQUqeSNAIpTAxzAwQC3crVdtyhH4luP/vFvWwLMg
 V2DvXG/+7HDskpb5nE9Vy3lunkwSZLsBCJHFpU8GWSuhrXpIJjelw7yswEHpep0Q
 D/3xRElbMqPKyidtXPj29chPYs3GsBrvgaXjoNnOwQhB8lS1T2JbrvG/OPVIQojD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SLO"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://whoami.cesnet.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://whoami.cesnet.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAPtcN7LUM3UEz0yqfmOvpr0tZtYOMA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU4
 WhcNMzUxMjE0MDkyMjU4WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
@@ -145,13 +145,13 @@ JF6us/yB6hcAf6ML7DyXW+o4q+35HHmAjBUssXHU70iLOiTnIfbEgxl54Af7xKpZ
 8Ww45V9t2dJ5YU6wzoa0Aqy0abm0RxkWu6igXjpcS+XaSl5n+J+tFEZBRtJZ5mBv
 EQWIvarHy4CabFyOcb1Bl3UHfvQyi3R4RfQsEIYaYBa/5c3LJr3KC8mWCA8vuPx+
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUNHGiLWEdd83k9nZ70899LxlSksMwDQYJKoZIhvcNAQEL
 BQAwGzEZMBcGA1UEAwwQd2hvYW1pLmNlc25ldC5jejAeFw0xNTEyMTQwOTIyNTZa
 Fw0zNTEyMTQwOTIyNTZaMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owggEi
@@ -170,13 +170,13 @@ QkEL4dP6M+eo5ZIDvndTF+vb9Uxt+SFttFETS/2RzneYXzCsa/5wWDIsmwNwMRYN
 1RjGMhjQ0DLx4PyEhrOqzWBGFM00qSWypY29SQ/nYGRpjBkvOYasT8eHIovD9M8C
 bmD1QX2KicdJm3oC14xc3Amm2Ja4YeystmRZO0H4z0oVN/zhBT90pjKf4yuF+Bs=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDLDCCAhSgAwIBAgIVAMGRAZNgX7x88WED24sBgvq/prF/MA0GCSqGSIb3DQEB
 CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU3
 WhcNMzUxMjE0MDkyMjU3WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
@@ -195,30 +195,30 @@ dQ4u7VaUTaGleUKF8dZfEc8okQUqeSNAIpTAxzAwQC3crVdtyhH4luP/vFvWwLMg
 V2DvXG/+7HDskpb5nE9Vy3lunkwSZLsBCJHFpU8GWSuhrXpIJjelw7yswEHpep0Q
 D/3xRElbMqPKyidtXPj29chPYs3GsBrvgaXjoNnOwQhB8lS1T2JbrvG/OPVIQojD
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CESNET, a. l. e.</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">CESNET, z. s. p. o.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Oppolzer</md:SurName>
-      <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Tomasek</md:SurName>
-      <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET, a. l. e.</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">CESNET, z. s. p. o.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Oppolzer</md:SurName>
+    <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Tomasek</md:SurName>
+    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml b/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml
index f125c577..702fb271 100644
--- a/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml
+++ b/swamid-interfederations-2.0/wifi.dir.garr.it-12081-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor 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>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WIFI provided by GARR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WIFI erogato da GARR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wi-Fi connection to the wireless network in GARR (Rome, IT). This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
+        <mdui:Description xml:lang="it">Connessione Wi-Fi alla rete wireless di GARR nella sede di Roma (IT). Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WIFI provided by GARR</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">WIFI erogato da GARR</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Wi-Fi connection to the wireless network in GARR (Rome, IT). This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
-          <mdui:Description xml:lang="it">Connessione Wi-Fi alla rete wireless di GARR nella sede di Roma (IT). Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
@@ -54,39 +54,39 @@ T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
 3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
 Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">WIFI connection provided by GARR</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WIFI connection provided by GARR</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
index 04348696..2f8000a8 100644
--- a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
+++ b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.espci.fr/saml/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-05T10:14:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-05T10:14:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://wifi.espci.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://wifi.espci.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
@@ -54,13 +54,13 @@ Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
 gE9rxe6IbLS5rd9eqf0PzBg/1OS1EYOWmdbnkODnpBi2mcBWfHKVBL2IKbyfFHul
 aczMFss205TH+mugaX6YVXl77eIw9xzO7G4SZn+P9tPo0xalGN15rIoQJ1Q=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
@@ -91,13 +91,13 @@ Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
 gE9rxe6IbLS5rd9eqf0PzBg/1OS1EYOWmdbnkODnpBi2mcBWfHKVBL2IKbyfFHul
 aczMFss205TH+mugaX6YVXl77eIw9xzO7G4SZn+P9tPo0xalGN15rIoQJ1Q=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIFpjCCBI6gAwIBAgIRAOE+20QrI5x/Eygq7lsxhZAwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMjAzMTkwMDAwMDBaFw0xNTAzMTkyMzU5NTlaMIGCMQswCQYD
@@ -130,34 +130,30 @@ pAVuaQQi/FxV7jkz+Rm4HD8R3bhRdVSCpe+2ukW91t385ZQCJuFawcdTDEeHGaDI
 1bjPX+IrBAd71rGTiMlhH5VUaYUNPJkTxVWJwhCimQztzNGk0CY+ze424o3soWOZ
 2JBnPLINws7O5w==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.espci.fr/saml/postResponse" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">ESPCI ParisTech - Accès WiFi</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.espci.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Emmanuel Dreyfus</md:SurName>
-      <md:EmailAddress>Emmanuel.Dreyfus@espci.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jean-Jacques Puig</md:SurName>
-      <md:EmailAddress>Jean-Jacques.Puig@espci.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.espci.fr/saml/postResponse" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">ESPCI ParisTech - Accès WiFi</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.espci.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Emmanuel Dreyfus</md:SurName>
+    <md:EmailAddress>Emmanuel.Dreyfus@espci.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jean-Jacques Puig</md:SurName>
+    <md:EmailAddress>Jean-Jacques.Puig@espci.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml b/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml
index 1528e297..fd245b1d 100644
--- a/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki-cswarm.crc.nd.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CSWARM Wiki Instance</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Wiki server used by the C-SWARM project.  Developers use it for reporting on their progress of their tasks and to collaborate.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CSWARM Wiki Instance</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Wiki server used by the C-SWARM project.  Developers use it for reporting on their progress of their tasks and to collaborate.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDITCCAgmgAwIBAgIJANq01pu3iuXoMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 BAMTHndpa2ktY3N3YXJtLnZpcnR1YWwuY3JjLm5kLmVkdTAeFw0xNTEwMjgxNjU5
 MzZaFw0yNTEwMjUxNjU5MzZaMCkxJzAlBgNVBAMTHndpa2ktY3N3YXJtLnZpcnR1
@@ -37,32 +37,32 @@ ZGYxADLpdUyM2Hc2ShuG6EIWbrj+8+Spl7/0FhyXJneBVDCZ5utPedSF2kVU7LUi
 q20EjYgBqitT37jf7A+xGxQbWOLA8KCiqoeuJmf1yaCSVRKYHc1DviPtgpg4P1wL
 VLYCFWSF1zm/rknkR1j+w0KNisGpbK3TqeBCxNGPt1uT0TvxLw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">CSWARM Wiki Instance</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">The Wiki server used by the C-SWARM project.  Developers use it for reporting on their progress of their tasks and to collaborate.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Notre Dame</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Notre Dame</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nd.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Antelmo Aguilar</md:GivenName>
-      <md:EmailAddress>aaguilar@nd.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Caleb Reinking</md:GivenName>
-      <md:EmailAddress>creinkin@nd.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CSWARM Wiki Instance</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The Wiki server used by the C-SWARM project.  Developers use it for reporting on their progress of their tasks and to collaborate.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Notre Dame</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Notre Dame</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nd.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Antelmo Aguilar</md:GivenName>
+    <md:EmailAddress>aaguilar@nd.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Caleb Reinking</md:GivenName>
+    <md:EmailAddress>creinkin@nd.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
index acad158b..076d79dc 100644
--- a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="https://wiki.edugain.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.edugain.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.edugain.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.edugain.org/eduGAIN:Privacy_policy</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">eduGAIN Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://wiki.edugain.org/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="de">eduGAIN Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um Webdienste für eduGAIN anzupassen.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">eduGAIN Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ce wiki met à disposition des recommandations et instructions expliquant comment intégrer des services web dans eduGAIN.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://wiki.edugain.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.edugain.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:PrivacyStatementURL xml:lang="en">https://wiki.edugain.org/eduGAIN:Privacy_policy</mdui:PrivacyStatementURL>
-          <mdui:DisplayName xml:lang="en">eduGAIN Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://wiki.edugain.org/</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="de">eduGAIN Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um Webdienste für eduGAIN anzupassen.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">eduGAIN Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Ce wiki met à disposition des recommandations et instructions expliquant comment intégrer des services web dans eduGAIN.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC9zCCAd+gAwIBAgIJAMU9QRxFmNAuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEHdpa2kuZWR1Z2Fpbi5vcmcwHhcNMTMwNzA0MTAzMTE0WhcNMjMwNzAyMTAz
 MTE0WjAbMRkwFwYDVQQDExB3aWtpLmVkdWdhaW4ub3JnMIIBIjANBgkqhkiG9w0B
@@ -47,41 +47,41 @@ XklReN3a7H5LfzJZNw/IsEt/iII3vM0C3CG4udft7vPHUxoz/sg7vLB1QI5oCIKQ
 czsnN6gKOhE3R9xBXmXEAe+7t0j+xUllfMpzN1visnwJfrBqmPxWZtoAofjZBUxy
 nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/>
-      <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact"/>
-      <md:AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP"/>
-      <md:AssertionConsumerService index="4" isDefault="true" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST"/>
-      <md:AssertionConsumerService index="5" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">eduGAIN Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="email" isRequired="false" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="surname" isRequired="false" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" isRequired="false" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">geant.net</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>eduGAIN</md:GivenName>
-      <md:SurName>Integration</md:SurName>
-      <md:EmailAddress>mailto:edugain-integration@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>eduGAIN</md:GivenName>
-      <md:SurName>Operation</md:SurName>
-      <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact"/>
+    <md:AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP"/>
+    <md:AssertionConsumerService index="4" isDefault="true" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST"/>
+    <md:AssertionConsumerService index="5" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">eduGAIN Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="email" isRequired="false" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" isRequired="false" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" isRequired="false" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">geant.net</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>eduGAIN</md:GivenName>
+    <md:SurName>Integration</md:SurName>
+    <md:EmailAddress>mailto:edugain-integration@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduGAIN</md:GivenName>
+    <md:SurName>Operation</md:SurName>
+    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
index f3a72a18..5640e0ce 100644
--- a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.helsinki.fi/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Helsinki Wiki Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Tool for group collaboration and web-publishing.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Helsinki Wiki Service</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Tool for group collaboration and web-publishing.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="fi">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEmzCCA4OgAwIBAgIRAL/NhOjMkfeL3Flgd4NNgaswDQYJKoZIhvcNAQELBQAw
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmzCCA4OgAwIBAgIRAL/NhOjMkfeL3Flgd4NNgaswDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
 IENBIDIwHhcNMTUwMjIzMDAwMDAwWhcNMTgwMzE5MjM1OTU5WjA+MSEwHwYDVQQL
@@ -49,46 +49,46 @@ qbSXxHWnzqpf+0zfDG6D3VO16gkJUXzBRv/kM81RnlV3/iYqKZC/Qd3S3c5jklxU
 ArWOB2iYWyMs+VyAa7QpzFb/8B+OavnRsPefw07lCBqqo6ppoVeuOemONAgbhXwj
 z9noWRAiG/hZbUjEfQ1sWvT/TLwjdWzTstDFmp59tex3SSbq02IZSCimUGp6OJVS
 N4ZdWQZqu5CJ4NhvqVlUpnxq9UfK5HSPDf6iGa7ogw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</md:ServiceName>
-        <md:ServiceName xml:lang="en">University of Helsinki Wiki Service</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Erkki</md:GivenName>
-      <md:SurName>Aalto</md:SurName>
-      <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Janne</md:GivenName>
-      <md:SurName>Peltonen</md:SurName>
-      <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Erkki</md:GivenName>
-      <md:SurName>Aalto</md:SurName>
-      <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">University of Helsinki Wiki Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Erkki</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Erkki</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml b/swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml
index cedcec6d..09e202ae 100644
--- a/swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.idem.garrservices.it-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.idem.garrservices.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-02-29T15:26:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2016-02-29T15:26:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IDEM GARR AAI Wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IDEM GARR AAI Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wiki for IDEM Federation provided by GARR</mdui:Description>
+        <mdui:Description xml:lang="it">Wiki per la federazione IDEM erogato da GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/About_(EN)</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/About_(IT)</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/Privacy_Policy_(EN)</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/Privacy_Policy_(IT)</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IDEM GARR AAI Wiki</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">IDEM GARR AAI Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Wiki for IDEM Federation provided by GARR</mdui:Description>
-          <mdui:Description xml:lang="it">Wiki per la federazione IDEM erogato da GARR</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/About_(EN)</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/About_(IT)</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/Privacy_Policy_(EN)</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">https://wiki.idem.garrservices.it/GARR-AAI-fed/index.php/Privacy_Policy_(IT)</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDQDCCAiigAwIBAgIJAKTzjRttnw28MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 BAMTGXdpa2kuaWRlbS5nYXJyc2VydmljZXMuaXQwHhcNMTYwMjI5MTM1NzI4WhcN
 MjYwMjI2MTM1NzI4WjAkMSIwIAYDVQQDExl3aWtpLmlkZW0uZ2FycnNlcnZpY2Vz
@@ -48,50 +48,50 @@ DjHfs4IoDccg5qAXMfFpRA7YcPpnq302RNSRSQB9Ua1fu5tjpUfMiaEZpZAuJYjh
 2HX7QTpJMY99+nan1QBSY8XEZn69EZToLctNW/sgn+eD9+R8JPL0MtMwl5UwncVs
 kZgH+efgngYNisvrFmBVVu7k1/E=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">IDEM GARR AAI Wiki</md:ServiceName>
-        <md:ServiceName xml:lang="it">IDEM GARR AAI Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Wiki for IDEM Federation provided by GARR</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="it">Wiki per la federazione IDEM erogato da GARR</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="it">Wiki per la federazione IDEM erogato da GARR</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Wiki for the IDEM Federation provided by GARR</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IDEM</md:GivenName>
-      <md:SurName>Staff</md:SurName>
-      <md:EmailAddress>mailto:idem-staff@garr.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.idem.garrservices.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">IDEM GARR AAI Wiki</md:ServiceName>
+      <md:ServiceName xml:lang="it">IDEM GARR AAI Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wiki for IDEM Federation provided by GARR</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Wiki per la federazione IDEM erogato da GARR</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">Wiki per la federazione IDEM erogato da GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Wiki for the IDEM Federation provided by GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IDEM</md:GivenName>
+    <md:SurName>Staff</md:SurName>
+    <md:EmailAddress>mailto:idem-staff@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml
index 4030c1c5..9800596e 100644
--- a/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.larpp.internet2.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is an activity funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) as part of the Scalable Privacy grant awarded to Internet2.   This activity supports pilot schools to investigate privacy management software, named PrivacyLens, to provide users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP supports the LARPP wiki.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.larpp.internet2.edu/confluence/display/SPIN/SP+Information</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="275" xml:lang="en">https://wiki.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is an activity funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) as part of the Scalable Privacy grant awarded to Internet2.   This activity supports pilot schools to investigate privacy management software, named PrivacyLens, to provide users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP supports the LARPP wiki.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.larpp.internet2.edu/confluence/display/SPIN/SP+Information</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="275" xml:lang="en">https://wiki.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIJAL9sC3mP5/uMMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 BAMTHHJlZ2lzdHJ5LmxhcnBwLmludGVybmV0Mi5lZHUwHhcNMTQwNDI5MTYwOTQz
 WhcNMjQwNDI2MTYwOTQzWjAnMSUwIwYDVQQDExxyZWdpc3RyeS5sYXJwcC5pbnRl
@@ -42,39 +42,39 @@ wz1/tj+w3FgJhPG0qY+TOMGPSe+UagL2O4LMAyFk7I8vEWi60BlO52npDhaYGXeo
 mA/jv7XqqSBfGCvHS973BG/tP1XfuwmpJqgx00x0wQlbPweIH3RmmCg3S11ZCZi8
 Qpkmgq5ZqYDMrzfYjwLpl5kpRrMdP/1Nw6g2BGe6qA==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is an activity funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) as part of the Scalable Privacy grant awarded to Internet2.   This activity supports pilot schools to investigate privacy management software, named PrivacyLens, to provide users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP supports the LARPP wiki.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Tracy Beth Mitrano</md:GivenName>
-      <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>LARPP Technical Support</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LARPP Support</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LARPP Incident Response</md:GivenName>
-      <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is an activity funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) as part of the Scalable Privacy grant awarded to Internet2.   This activity supports pilot schools to investigate privacy management software, named PrivacyLens, to provide users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP supports the LARPP wiki.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tracy Beth Mitrano</md:GivenName>
+    <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>LARPP Technical Support</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LARPP Support</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LARPP Incident Response</md:GivenName>
+    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
index dab6fa69..bd471f9d 100644
--- a/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.ligo.org/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.ligo.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">LIGO Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Primary LIGO Scientific Collaboration wiki</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.ligo.org/Main/SPInformationURL</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.ligo.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">LIGO Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Primary LIGO Scientific Collaboration wiki</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://wiki.ligo.org/Main/SPInformationURL</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
-          <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
 ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
 BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
@@ -49,41 +49,41 @@ rlVaEUap5FC3UzyTmKCkL65y0emhsR+6CEnmyTq5qOlMeyrgKlIJ8YXf/xj6oUaD
 6Zqf7DNzVW6gez9VkUlhivSgXaAfAZ9aJJn/aOsK3BUjJTmUCvps1F6THRr4tc0+
 fMO5DI9dhv07eg==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">LIGO Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Primary LIGO Scientific Collaboration wiki</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott Koranda</md:GivenName>
-      <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Warren Anderson</md:GivenName>
-      <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-      <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-      <md:GivenName>LIGO Security Committee</md:GivenName>
-      <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LIGO Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Primary LIGO Scientific Collaboration wiki</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott Koranda</md:GivenName>
+    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Warren Anderson</md:GivenName>
+    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
+    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
+    <md:GivenName>LIGO Security Committee</md:GivenName>
+    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
index 629107f0..07c43802 100644
--- a/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.moonshot.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-23T10:58:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-23T10:58:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moonshot Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</mdui:Description>
+        <mdui:Logo height="300" width="300">https://wiki.moonshot.ja.net/download/thumbnails/786450/global.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Moonshot Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</mdui:Description>
-          <mdui:Logo height="300" width="300">https://wiki.moonshot.ja.net/download/thumbnails/786450/global.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJAI2lVwLRmJlYMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHdpa2kubW9vbnNob3QuamEubmV0MB4XDTE0MDEyMjE1NTUyMloXDTI0MDEy
 						MDE1NTUyMlowHzEdMBsGA1UEAxMUd2lraS5tb29uc2hvdC5qYS5uZXQwggEiMA0G
@@ -48,47 +48,47 @@
 						njlrDErSFqTmSYL6RiJyx24bQfVdDporsXDSrMprH3B2SIIXNHMDNWxraXUDTtg1
 						0oPZBY6WCg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Moonshot Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Moonshot Wiki</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://wiki.moonshot.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Bishop</md:SurName>
-      <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Bishop</md:SurName>
-      <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Moonshot Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moonshot Wiki</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://wiki.moonshot.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Bishop</md:SurName>
+    <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Bishop</md:SurName>
+    <md:EmailAddress>mailto:Adam.bishop@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.osris.org.xml b/swamid-interfederations-2.0/wiki.osris.org.xml
index 56663572..6df01886 100644
--- a/swamid-interfederations-2.0/wiki.osris.org.xml
+++ b/swamid-interfederations-2.0/wiki.osris.org.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.osris.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.osris.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Open Storage Research Infrastructure</mdui:DisplayName>
+        <mdui:Description xml:lang="en">OSiRIS will provide a distributed, multi-institutional storage infrastructure that lets researchers write, manage, and share data from their own computing facility locations.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.osris.org</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.osris.org/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Open Storage Research Infrastructure</mdui:DisplayName>
-          <mdui:Description xml:lang="en">OSiRIS will provide a distributed, multi-institutional storage infrastructure that lets researchers write, manage, and share data from their own computing facility locations.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.osris.org</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIC8TCCAdmgAwIBAgIJAPPtURtwvG1+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDndpa2kub3NyaXMub3JnMB4XDTE2MDExNTIwMDQ1N1oXDTI2MDExMjIwMDQ1
 N1owGTEXMBUGA1UEAxMOd2lraS5vc3Jpcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
@@ -39,40 +39,40 @@ GwvpWl7Y60MxyalNn4qcqpyaE4macMbIUFX9Z7dl6omabFtDaAvxs18OzwT0AN0D
 fnCGgpa42xnggcZe/ghOHK2MbL0B4Q/R5Gmmj9QKbb6FzGFuyXZr3EmqZM4toGLD
 5WjtmZyVsNlqGoDtO350UYicc4AHu2Bic9RtuyvJq5ONACyMNw==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.osris.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.osris.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.osris.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Open Storage Research Infrastructure</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">OSiRIS will provide a distributed, multi-institutional storage infrastructure that lets researchers write, manage, and share data from their own computing facility locations.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Benjeman Meekhof</md:GivenName>
-      <md:EmailAddress>bmeekhof@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Benjeman Meekhof</md:GivenName>
-      <md:EmailAddress>bmeekhof@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Shawn McKee</md:GivenName>
-      <md:EmailAddress>smckee@umich.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.osris.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.osris.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.osris.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Open Storage Research Infrastructure</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">OSiRIS will provide a distributed, multi-institutional storage infrastructure that lets researchers write, manage, and share data from their own computing facility locations.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Benjeman Meekhof</md:GivenName>
+    <md:EmailAddress>bmeekhof@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Benjeman Meekhof</md:GivenName>
+    <md:EmailAddress>bmeekhof@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shawn McKee</md:GivenName>
+    <md:EmailAddress>smckee@umich.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml
index 9dab45a4..ded0b81c 100644
--- a/swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.research.data.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-05T11:55:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-05T11:55:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAPaPm8gVAm0BMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHNydjAxMzAxMB4XDTE1MDQwMjEyNTg0MloXDTI1MDMzMDEyNTg0MlowEzER
 						MA8GA1UEAxMIc3J2MDEzMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -47,42 +47,42 @@
 						fMj+8DR9bBmmZhRcV8DA+DPc0/Q3pN3tjX9qS8h8rM7Ij96SImWe3GK+I22zbHP1
 						jKWKgcjpB9wcSv4VfzZNGluFtw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research Data Wiki</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.data.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Serviceline</md:GivenName>
-      <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Clayton</md:GivenName>
-      <md:SurName>Peters</md:SurName>
-      <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Southampton</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research Data Wiki</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.data.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Serviceline</md:GivenName>
+    <md:EmailAddress>mailto:Serviceline@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clayton</md:GivenName>
+    <md:SurName>Peters</md:SurName>
+    <md:EmailAddress>mailto:C.L.Peters@soton.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
index 097830e0..3067b031 100644
--- a/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/EDS"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/EDS" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The wiki hosting the documentation for Shibboleth.
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/EDS"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/EDS" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The wiki hosting the documentation for Shibboleth.
 					Unauthenticated users may view the existing documentation. Authenticated users
 					may create new documentation pages and edit existing ones.
 				</mdui:Description>
-          <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
 						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
 						VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw
@@ -54,62 +54,62 @@
 						L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R
 						9h5hlBTGD3PULSFmCdkgxtwIyd855Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Shibboleth.net Wiki</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Shibboleth.net Wiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				The wiki hosting the documentation for Shibboleth.
 				Unauthenticated user may view the existing documentation. Authenticated users
 				may create new documentation pages and edit existing ones. 
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Shibboleth Federated Wiki</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.shibboleth.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shibboleth.Net Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:contact@shibboleth.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Cantor</md:SurName>
-      <md:EmailAddress>mailto:cantor.2@osu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:ukfed@iay.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Shibboleth Federated Wiki</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.shibboleth.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shibboleth.Net Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:contact@shibboleth.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Cantor</md:SurName>
+    <md:EmailAddress>mailto:cantor.2@osu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:ukfed@iay.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
index 919b7621..c5c3d7ef 100644
--- a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki2.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">http://cofre.reuna.cl/index.php/es/reglas-federacion</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="es">http://cofre.reuna.cl/index.php/es/reglas-federacion</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wiki - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Wiki - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Wiki Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Wiki de RedCLARA</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="1"/>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="2"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Wiki - RedCLARA</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">Wiki - RedCLARA</mdui:DisplayName>
-          <mdui:Description xml:lang="en">RedCLARA's Wiki Service</mdui:Description>
-          <mdui:Description xml:lang="es">Servicio de Wiki de RedCLARA</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>*.redclara.net</ds:KeyName>
-          <ds:KeyName>redclara.net</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.redclara.net</ds:KeyName>
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
 MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
@@ -53,16 +53,16 @@ I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
 yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
 s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>*.redclara.net</ds:KeyName>
-          <ds:KeyName>redclara.net</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-            <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.redclara.net</ds:KeyName>
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
 aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
 MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
@@ -91,50 +91,50 @@ I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
 yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
 s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Wiki - RedCLARA</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Wiki - RedCLARA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 Wiki - RedCLARA
 </md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Authentication Support</md:GivenName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical Support</md:GivenName>
-      <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Urban</md:SurName>
-      <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
index 354f2e3a..95325ce7 100644
--- a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wikis.ncl.ac.uk/shibboleth/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0zCCAbugAwIBAgIJAJ5lZZ3UDF+vMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
 						BAMTBHdvb2wwHhcNMTAwNzIxMTUwNjAyWhcNMjAwNzE4MTUwNjAyWjAPMQ0wCwYD
 						VQQDEwR3b29sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq9QD8/89
@@ -28,13 +28,13 @@
 						+/se1eh3vEctX9ZbP3mjDEzhlm3ru/jHCQmBfaneobWjg11tv9WUmBBz0FlcXiLx
 						Fht0jB8U9w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0zCCAbugAwIBAgIJAJ5lZZ3UDF+vMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
 						BAMTBHdvb2wwHhcNMTAwNzIxMTUwNjAyWhcNMjAwNzE4MTUwNjAyWjAPMQ0wCwYD
 						VQQDEwR3b29sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq9QD8/89
@@ -52,37 +52,37 @@
 						+/se1eh3vEctX9ZbP3mjDEzhlm3ru/jHCQmBfaneobWjg11tv9WUmBBz0FlcXiLx
 						Fht0jB8U9w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle University Wiki Server</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Franks</md:SurName>
-      <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Franks</md:SurName>
-      <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Newcastle upon Tyne</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle University Wiki Server</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Franks</md:SurName>
+    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Franks</md:SurName>
+    <md:EmailAddress>mailto:chris.franks@ncl.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml b/swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml
index 5e9b6cb4..b6c0722d 100644
--- a/swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml
+++ b/swamid-interfederations-2.0/wikispaces.psu.edu-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wikispaces.psu.edu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wikispaces.psu.edu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Penn State WikiSpaces</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://wikispaces.psu.edu/dashboard.action</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.psu.edu/web-privacy-statement</mdui:PrivacyStatementURL>
+        <mdui:Logo height="70" width="130" xml:lang="en">https://www.dept.psu.edu/ids/public/psulogoforincommon.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wikispaces.psu.edu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Penn State WikiSpaces</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="en">https://wikispaces.psu.edu/dashboard.action</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.psu.edu/web-privacy-statement</mdui:PrivacyStatementURL>
-          <mdui:Logo height="70" width="130" xml:lang="en">https://www.dept.psu.edu/ids/public/psulogoforincommon.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDzDCCArQCCQDCI8d9i9pvjzANBgkqhkiG9w0BAQUFADCBpzELMAkGA1UEBhMC
 VVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEYMBYGA1UEBwwPVW5pdmVyc2l0eSBQ
 YXJrMSowKAYDVQQKDCFUaGUgUGVubnN5bHZhbmlhIFN0YXRlIFVuaXZlcnNpdHkx
@@ -45,37 +45,37 @@ th9ZAPsvojAxSWpkwLIv5ZteTks99bAUsYE81dPx8hNIqSLDxsOROawCnrhTEowy
 +Yv+iYmBO0r1b3xOFejbmcyGKJzOgu8rje7pSASVviqwvjxAtAZ3iIlZZSQ8Tk/o
 YB840Gg/4ow3pdRVwzYL/g==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Penn State WikiSpaces</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Pennsylvania State University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Penn State</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.psu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Phil Devan</md:GivenName>
-      <md:EmailAddress>pmd@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rich Cropp</md:GivenName>
-      <md:EmailAddress>rac@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christopher Hubing</md:GivenName>
-      <md:EmailAddress>cjh@psu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wikispaces.psu.edu/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Penn State WikiSpaces</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Pennsylvania State University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Penn State</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.psu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Phil Devan</md:GivenName>
+    <md:EmailAddress>pmd@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rich Cropp</md:GivenName>
+    <md:EmailAddress>rac@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christopher Hubing</md:GivenName>
+    <md:EmailAddress>cjh@psu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wmich.brightspace.com-shibboleth-sp.xml b/swamid-interfederations-2.0/wmich.brightspace.com-shibboleth-sp.xml
index 65fa3837..dec6d50b 100644
--- a/swamid-interfederations-2.0/wmich.brightspace.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/wmich.brightspace.com-shibboleth-sp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wmich.brightspace.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wmich.brightspace.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WMU-WMU – Desire2Learn</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Western Michigan University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wmich.brightspace.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WMU-WMU – Desire2Learn</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Western Michigan University</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIJAJfQaVPFKqWmMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFXdtaWNoLmJyaWdodHNwYWNlLmNvbTAeFw0xNjA0MjcxNjU5MTdaFw00MTA0
 MjExNjU5MTdaMCAxHjAcBgNVBAMTFXdtaWNoLmJyaWdodHNwYWNlLmNvbTCCASIw
@@ -38,35 +38,35 @@ B28B6YilK1CGDmDwgKq5QYRa4Og4TsTonpyh42FZenxfKCXF7C0J9v+zB8rEH6nN
 fgjmjzz0hGXbbCkGWhpyBE1K2DNJWiW9zpSGhlW7sjPHfXmcLHnAj1p7ygwpi/Ll
 PekFQMjk631y/Ie61X3KDXf1I06Lbp6uGE3BJprmFBtiYAzsteiOcsjA6c/JVrI=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wmich.brightspace.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wmich.brightspace.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wmich.brightspace.com/Shibboleth.sso/SLO/POST"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">WMU-WMU – Desire2Learn</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Western Michigan University</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Desire2Learn Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Desire2Learn Inc.</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.desire2learn.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mike Kaastra</md:GivenName>
-      <md:EmailAddress>Mike.Kaastra@D2L.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Derek Sproul</md:GivenName>
-      <md:EmailAddress>Derek.Sproul@D2L.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wmich.brightspace.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wmich.brightspace.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wmich.brightspace.com/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wmich.brightspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WMU-WMU – Desire2Learn</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Western Michigan University</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Desire2Learn Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Desire2Learn Inc.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.desire2learn.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mike Kaastra</md:GivenName>
+    <md:EmailAddress>Mike.Kaastra@D2L.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Derek Sproul</md:GivenName>
+    <md:EmailAddress>Derek.Sproul@D2L.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml b/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml
index 78af8909..2c55ca08 100644
--- a/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wpkfl-shibidp.fullsail.com/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullsail.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Full Sail University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Full Sail University Checkpoint SSO</mdui:Description>
+        <mdui:Logo height="143" width="200" xml:lang="en">https://checkpoint.fullsail.edu/idp/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullsail.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Full Sail University</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Full Sail University Checkpoint SSO</mdui:Description>
-          <mdui:Logo height="143" width="200" xml:lang="en">https://checkpoint.fullsail.edu/idp/images/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIVAIpG49/ZzLIEkCOJeLi5E3E159voMA0GCSqGSIb3DQEB
 BQUAMCUxIzAhBgNVBAMTGndwa2ZsLXNoaWJpZHAuZnVsbHNhaWwuY29tMB4XDTEz
 MTAyOTE3NDc0OFoXDTMzMTAyOTE3NDc0OFowJTEjMCEGA1UEAxMad3BrZmwtc2hp
@@ -40,31 +40,31 @@ Ujhflurc9F3FwFJgWyYbJJ2COhaEVRBoi7yfzHeRDUqmDWdvxZgJc0TU0BR0epn1
 BqP0e3zKh+INk8C7cmxuq5PNOeoliw+vfUzWIaunVslvid8v3DtscZjw5BpOw41l
 fJOsETM8ltGzWjTd7OTear4ubIHQ6AxT7JemRt+AYPJbKG2VxsUP+Q==
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://checkpoint.fullsail.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://checkpoint.fullsail.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Full Sail University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Full Sail University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fullsail.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Zach Segal</md:GivenName>
-      <md:EmailAddress>zsegal@fullsail.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Chris Johnson</md:GivenName>
-      <md:EmailAddress>cjohnson@fullsail.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Mark Gilbert</md:GivenName>
-      <md:EmailAddress>markg@fullsail.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Zach Segal</md:GivenName>
-      <md:EmailAddress>zsegal@fullsail.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://checkpoint.fullsail.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://checkpoint.fullsail.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Full Sail University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Full Sail University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fullsail.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Zach Segal</md:GivenName>
+    <md:EmailAddress>zsegal@fullsail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Chris Johnson</md:GivenName>
+    <md:EmailAddress>cjohnson@fullsail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark Gilbert</md:GivenName>
+    <md:EmailAddress>markg@fullsail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zach Segal</md:GivenName>
+    <md:EmailAddress>zsegal@fullsail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
index 20ad98ff..2d84a7e3 100644
--- a/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wsso.vscht.cz/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-22T11:17:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-22T11:17:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vscht.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Chemistry and Technology, Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the University of Chemistry and Technology in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysoké školy chemicko-technologické v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vscht.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vscht.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://wsso.vscht.cz/logo_vscht_40px.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vscht.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">University of Chemistry and Technology, Prague</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students of the University of Chemistry and Technology in Prague</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysoké školy chemicko-technologické v Praze</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vscht.cz/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.vscht.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="40">https://wsso.vscht.cz/logo_vscht_40px.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIJAKMDfYjjTNSxMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXdzc28udnNjaHQuY3owHhcNMTUwODI4MTIyNTMwWhcNMTgwODI3MTIyNTMw
 WjAYMRYwFAYDVQQDEw13c3NvLnZzY2h0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -50,27 +50,27 @@ bbSHKhb7Sw0eukh47Ojn/utVyEDb7DWYqt+fK398r/OszgQpKd0M5e8Rml8wEv3W
 wuwwICx8lcu0GWQYTWR2+DVgH2hebKgY
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wsso.vscht.cz/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wsso.vscht.cz/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vscht.cz</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wsso.vscht.cz/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wsso.vscht.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vscht.cz</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIJAKMDfYjjTNSxMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXdzc28udnNjaHQuY3owHhcNMTUwODI4MTIyNTMwWhcNMTgwODI3MTIyNTMw
 WjAYMRYwFAYDVQQDEw13c3NvLnZzY2h0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -90,27 +90,27 @@ bbSHKhb7Sw0eukh47Ojn/utVyEDb7DWYqt+fK398r/OszgQpKd0M5e8Rml8wEv3W
 wuwwICx8lcu0GWQYTWR2+DVgH2hebKgY
 
                     </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vscht.cz/?jazyk=en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.vscht.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Antonin</md:GivenName>
-      <md:SurName>Mares</md:SurName>
-      <md:EmailAddress>antonin.mares@vscht.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vscht.cz/?jazyk=en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.vscht.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Antonin</md:GivenName>
+    <md:SurName>Mares</md:SurName>
+    <md:EmailAddress>antonin.mares@vscht.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml
index d7bc8bde..45882f77 100644
--- a/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-cvdc.eng.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-02-18T13:59:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-02-18T13:59:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Vehicle Dynamics Consortium</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eng.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Vehicle Dynamics Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eng.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml
index 55a1a241..2a5518bc 100644
--- a/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-falcon.csx.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-15T15:21:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-15T15:21:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Falcon CMS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Falcon CMS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml
index d6c12efa..74111633 100644
--- a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-test.cartoons.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-22T11:33:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-22T11:33:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">British Cartoon Archive (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test British Cartoon Archive service (not for public use)</mdui:Description>
+        <mdui:Logo height="65" width="234">https://www.cartoons.ac.uk/sites/all/themes/bcad/images/logos/bcad-logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">British Cartoon Archive (TEST)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Test British Cartoon Archive service (not for public use)</mdui:Description>
-          <mdui:Logo height="65" width="234">https://www.cartoons.ac.uk/sites/all/themes/bcad/images/logos/bcad-logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAMiPLClDkawOMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDnppbS5rZW50LmFjLnVrMB4XDTE1MDUyMDA5MDcyN1oXDTI1MDUxNzA5MDcy
 						N1owGTEXMBUGA1UEAxMOemltLmtlbnQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
@@ -49,43 +49,43 @@
 						USCw5T+HW93iJy6Ahg2jRcqCdGXUD/5pBUCTPWowHX2/9E82fYJd4uZ2TyLXg1d+
 						M/ElR/YUGJ1yZyTm50nw+N4kb3Wp+NkDEUAKufNe5n7oP+2IQw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive (TEST)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matthew</md:GivenName>
-      <md:SurName>Slowe</md:SurName>
-      <md:EmailAddress>mailto:M.Slowe@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matthew</md:GivenName>
+    <md:SurName>Slowe</md:SurName>
+    <md:EmailAddress>mailto:M.Slowe@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
index 6673209c..f7af1276 100644
--- a/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-test.idcore.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-12T09:09:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-12T09:09:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGzCCAgOgAwIBAgIJAJAAsD9TBIokMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
 						BAMTHGFwcHMtZHJ1cGFsLXRlc3QuaXMuZWQuYWMudWswHhcNMTIwNjIxMTM1MTEx
 						WhcNMjIwNjE5MTM1MTExWjAnMSUwIwYDVQQDExxhcHBzLWRydXBhbC10ZXN0Lmlz
@@ -43,38 +43,38 @@
 						nbfZgQy3OZ9zShOmhaJpShvkgztB0r1q55RzjQfdTYN5pfDBspKndopTxqBhdGqD
 						VBgdEXg/axCSZt/2f8yLZu21VjLiSHjqdx3XCjYE5g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Management</md:GivenName>
-      <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Service Management</md:GivenName>
-      <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Management</md:GivenName>
+    <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Service Management</md:GivenName>
+    <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml
index f6d4eb71..452649e2 100644
--- a/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-test.portal.ted.is.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-24T16:17:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-24T16:17:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJAOMgICS11sdUMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNhdC1lcC1rYjF0LmVkLmFjLnVrMB4XDTEyMDIwODE2MzY0OFoXDTIyMDIw
 						NTE2MzY0OFowHzEdMBsGA1UEAxMUc2F0LWVwLWtiMXQuZWQuYWMudWswggEiMA0G
@@ -31,28 +31,28 @@
 						5RYt3aDcXU8r+g+CZebDDcdBQtsEyWM8uV9rebdthAnmNG5XWLzRux7RuE/AnZee
 						MMLJTT1Uzw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - TEST Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Application Technology Management</md:GivenName>
-      <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - TEST Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Application Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml
index f01ea25a..01f770e6 100644
--- a/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-test.ted.is.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T09:37:16Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T09:37:16Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBjCCAe6gAwIBAgIJAPxnziiUKyZ8MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXNhdC13ZWIta2IxdC5lZC5hYy51azAeFw0xMzA3MTIxMDUzMjdaFw0yMzA3
 						MTAxMDUzMjdaMCAxHjAcBgNVBAMTFXNhdC13ZWIta2IxdC5lZC5hYy51azCCASIw
@@ -46,41 +46,41 @@
 						wDxLtTKopgZv59F6rJ2XK+pISqynmu0u1Yx9c9sALZ8juKgF6vzB54wRCwHIBUE2
 						ntsJEvhCORTfww==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Timetabling Web Apps - TEST Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Apps Technology Management</md:GivenName>
-      <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Timetabling Web Apps - TEST Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Apps Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml
index 6d28b259..62b8d4be 100644
--- a/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-trg.eng.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-13T11:44:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-13T11:44:59Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Transportation Research Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www-trg.eng.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Transportation Research Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www-trg.eng.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml
index ccee40c3..3ee7fdd0 100644
--- a/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-trn.portal.ted.is.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-29T16:36:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-29T16:36:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAN7T0EIFcj+3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3NhdC1lcC10cm4uZWQuYWMudWswHhcNMTIwMjIxMTUzODI1WhcNMjIwMjE4
 						MTUzODI1WjAeMRwwGgYDVQQDExNzYXQtZXAtdHJuLmVkLmFjLnVrMIIBIjANBgkq
@@ -31,28 +31,28 @@
 						exvBK4kYz/Z6sPdpxk/pJLuMWhVr2gjWCy50hm7bKnihbBEiwy/Qpai5aEPtGVGf
 						NjLiOw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - TRN Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Application Technology Management</md:GivenName>
-      <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - TRN Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Application Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml b/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml
index 5e4ca69c..0aec4033 100644
--- a/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.123library.org/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-02T10:40:16Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-02T10:40:16Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDfDCCAmSgAwIBAgIJAOqpAln6yGDwMA0GCSqGSIb3DQEBBQUAMDIxEzARBgNV
 						BAoTCjEyM0xpYnJhcnkxGzAZBgNVBAMTEnd3dy4xMjNsaWJyYXJ5Lm9yZzAeFw0x
 						NTAxMDkxNjI0NTVaFw0yNTAxMDYxNjI0NTVaMDIxEzARBgNVBAoTCjEyM0xpYnJh
@@ -28,27 +28,27 @@
 						FZl7Wye00MsuE+Rphr+nsnbjKJquxjSUe1K/Ayb4RfoQz5Z4G9g0skthUkl0IsUr
 						OoPW3kslUwruNUj/IpAl13p9ahFKw3C83XJgOQmtZog=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.123library.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.123library.org/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.123library.org/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.123library.org/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">123Doc Education Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">123 Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.123library.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Benjamin</md:SurName>
-      <md:EmailAddress>mailto:timbenjamin@123doc.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Benjamin</md:SurName>
-      <md:EmailAddress>mailto:timbenjamin@123doc.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.123library.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.123library.org/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.123library.org/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.123library.org/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">123Doc Education Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">123 Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.123library.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Benjamin</md:SurName>
+    <md:EmailAddress>mailto:timbenjamin@123doc.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Benjamin</md:SurName>
+    <md:EmailAddress>mailto:timbenjamin@123doc.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml b/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml
index 0dc2d8f4..e241f056 100644
--- a/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.2simple.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-30T17:24:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-30T17:24:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/E2BN"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/GLOW"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/LCC"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/RM"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/EMBC"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/SWGFL"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/WAYFlondon"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/netmedia"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/protectnetwork"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/fronter"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/networcs"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/kidder"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/WAYF"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/E2BN"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/GLOW"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/LCC"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/RM"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/EMBC"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/SWGFL"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/WAYFlondon"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/netmedia"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/protectnetwork"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/fronter"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/networcs"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/kidder"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.2simple.com/Shibboleth.sso/WAYF"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDXjCCAkYCCQDmolVNvs2UvTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
 						QjEYMBYGA1UECBMPIEdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAb
 						BgNVBAoTFDJTaW1wbGUgU29mdHdhcmUgTHRkMRgwFgYDVQQDEw93d3cuMnNpbXBs
@@ -46,38 +46,38 @@
 						ktlw6l0ChTv1LWlcCHKpbW8yUqzBzMq+xubbpw6T1bcfN70zz9s0CPzv6b36idbh
 						1UE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.2simple.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.2simple.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.2simple.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.2simple.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.2simple.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.2simple.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">2Simple Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">2Simple Software</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.2simple.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Barnett</md:SurName>
-      <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Barnett</md:SurName>
-      <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.2simple.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.2simple.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.2simple.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.2simple.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.2simple.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.2simple.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">2Simple Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">2Simple Software</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.2simple.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Barnett</md:SurName>
+    <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Barnett</md:SurName>
+    <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml
index 424f26ea..c2e637a0 100644
--- a/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.abersu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T14:36:21Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T14:36:21Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.abersu.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.abersu.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.abersu.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.abersu.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abersu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aberystwyth University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abersu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abersu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aberystwyth University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abersu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml b/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml
index b1f9ae50..fe0c94d7 100644
--- a/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.abintegro.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-15T15:23:38Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-15T15:23:38Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.abintegro.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Abintegro Career Centre</mdui:DisplayName>
+        <mdui:Description xml:lang="en">E-learning and employability solutions for careers services and training departments.</mdui:Description>
+        <mdui:Logo height="80" width="220">https://www.abintegro.com/Images/AbintegroLogo-220-80.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.abintegro.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Abintegro Career Centre</mdui:DisplayName>
-          <mdui:Description xml:lang="en">E-learning and employability solutions for careers services and training departments.</mdui:Description>
-          <mdui:Logo height="80" width="220">https://www.abintegro.com/Images/AbintegroLogo-220-80.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAJ2y3/Ipx0rcMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCGFiaW50YWEyMB4XDTEzMDgxNDIzMTI1NFoXDTIzMDgxMjIzMTI1NFowEzER
 						MA8GA1UEAxMIYWJpbnRhYTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -49,42 +49,42 @@
 						1QLpZpLaDMTcC5r1tLHfZcEIDo1Zop9cMEJr5+vbYtMi0GxLGZdHVQ8supUNDNgp
 						3/OQ0NRj9PRqf24c2oftTWePWQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abintegro.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abintegro.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.abintegro.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abintegro.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abintegro.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abintegro.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abintegro.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Abintegro Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Abintegro Career Centre</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.abintegro.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@abintegro.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Hilmi</md:GivenName>
-      <md:SurName>Sunay</md:SurName>
-      <md:EmailAddress>mailto:hilmi@abintegro.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abintegro.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abintegro.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.abintegro.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abintegro.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abintegro.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abintegro.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abintegro.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Abintegro Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Abintegro Career Centre</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.abintegro.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@abintegro.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Hilmi</md:GivenName>
+    <md:SurName>Sunay</md:SurName>
+    <md:EmailAddress>mailto:hilmi@abintegro.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml
index 4809a850..52990fb8 100644
--- a/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.accessible.com/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-09T09:50:32Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-09T09:50:32Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.accessible.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.accessible.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Accessible Archives</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Accessible Archives, searching for archived historical information.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.accessible.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.accessible.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Accessible Archives</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Accessible Archives, searching for archived historical information.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAJ+6AdB4y2zzMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHNlcnZlcjAxMB4XDTEyMDQxMDAxNDE0MFoXDTIyMDQwODAxNDE0MFowEzER
 						MA8GA1UEAxMIc2VydmVyMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -33,49 +33,49 @@
 						/DIS94RKu/qrZio7WyuIxlmFsZkmg8pkmpc6OWrxWKvMnsrxQc3Vv7/zxlp5Y2QK
 						/JXMj4kKkCKtCRxhdwUHIhoEJA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.accessible.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.accessible.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.accessible.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.accessible.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.accessible.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.accessible.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.accessible.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.accessible.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.accessible.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.accessible.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.accessible.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Accessible Archives, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Accessible Archives</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.accessible-archives.com/about-accessible-archives/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Thomas</md:GivenName>
-      <md:SurName>Nagy</md:SurName>
-      <md:EmailAddress>mailto:tnagy@accessible.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joseph</md:GivenName>
-      <md:SurName>Paulsen</md:SurName>
-      <md:EmailAddress>mailto:jpaulsen@accessible.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Sheridan</md:SurName>
-      <md:EmailAddress>mailto:csheridan@accessible.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joseph</md:GivenName>
-      <md:SurName>Paulsen</md:SurName>
-      <md:EmailAddress>mailto:jpaulsen@accessible.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Sheridan</md:SurName>
-      <md:EmailAddress>mailto:csheridan@accessible.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.accessible.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.accessible.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.accessible.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.accessible.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.accessible.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.accessible.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.accessible.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.accessible.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.accessible.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.accessible.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.accessible.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Accessible Archives, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Accessible Archives</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.accessible-archives.com/about-accessible-archives/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Nagy</md:SurName>
+    <md:EmailAddress>mailto:tnagy@accessible.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joseph</md:GivenName>
+    <md:SurName>Paulsen</md:SurName>
+    <md:EmailAddress>mailto:jpaulsen@accessible.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Sheridan</md:SurName>
+    <md:EmailAddress>mailto:csheridan@accessible.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joseph</md:GivenName>
+    <md:SurName>Paulsen</md:SurName>
+    <md:EmailAddress>mailto:jpaulsen@accessible.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Sheridan</md:SurName>
+    <md:EmailAddress>mailto:csheridan@accessible.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml
index 42237e81..b1568cd6 100644
--- a/swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.adults.ccinform.co.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-08T16:44:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-08T16:44:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC0DCCAbigAwIBAgIQbO4D+GhIqKdCoNWSt0VMLDANBgkqhkiG9w0BAQUFADAk
 						MSIwIAYDVQQDExl3d3cuYWR1bHRzLmNjaW5mb3JtLmNvLnVrMB4XDTE1MDMzMDIz
 						MDAwMFoXDTI1MDQwNjIzMDAwMFowJDEiMCAGA1UEAxMZd3d3LmFkdWx0cy5jY2lu
@@ -27,28 +27,28 @@
 						IID+/DeMoXDChzs/p497+rsW0tyTmj3frG5pTg7OAjRUEsa6/BCsjO46O/p/qeli
 						mTMILQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinformadults.co.uk/ccinformadults/shibboleth/samlhandler" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinformadults.co.uk/ccinformadults/ccinformadults/shibboleth/samlhandler" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CCI Adults</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://adults.ccinform.co.uk</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shane</md:GivenName>
-      <md:SurName>Yin</md:SurName>
-      <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CCInform Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinformadults.co.uk/ccinformadults/shibboleth/samlhandler" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinformadults.co.uk/ccinformadults/ccinformadults/shibboleth/samlhandler" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CCI Adults</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://adults.ccinform.co.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shane</md:GivenName>
+    <md:SurName>Yin</md:SurName>
+    <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CCInform Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml b/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml
index 84fb7542..593f23fb 100644
--- a/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.annualreviews.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrzCCApegAwIBAgIJAISIclSx3A7XMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						iujg9yy7LLghWoiFqZt5zyZQSM98eYrrvsNcOIzS5k/eyJ2e/KiY8ZjTH+jjXcr4
 						rbsCePE5Q048c63PRvd2Wb705n2Fsdwfw1JDN+s4ZAZ9Umc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.annualreviews.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.annualreviews.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.annualreviews.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Annual Reviews</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.annualreviews.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.annualreviews.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.annualreviews.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.annualreviews.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Annual Reviews</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.annualreviews.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
index 30ddf30e..b131068e 100644
--- a/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.archer.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-22T12:59:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-22T12:59:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.archer.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.archer.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ARCHER SAFE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SAFE service administration for ARCHER</mdui:Description>
+        <mdui:Logo height="83" width="259">https://www.archer.ac.uk/assets/img/archer_logo_259.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.archer.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.archer.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ARCHER SAFE</mdui:DisplayName>
-          <mdui:Description xml:lang="en">SAFE service administration for ARCHER</mdui:Description>
-          <mdui:Logo height="83" width="259">https://www.archer.ac.uk/assets/img/archer_logo_259.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAPNKT3NJhvy6MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHd3dy5hcmNoZXIuYWMudWswHhcNMTQwODI3MTUxNjExWhcNMjQwODI0MTUx
 						NjExWjAbMRkwFwYDVQQDExB3d3cuYXJjaGVyLmFjLnVrMIIBIjANBgkqhkiG9w0B
@@ -52,46 +52,46 @@
 						jhhNJTBgE5N2TUn+dyUgezjdNQ2hGrgUsFcvpEs0vPUufMbKYu+q904waWu0Ogul
 						pbOFcMFgJJJ7jDa/ks8fgt6NX85BKIDwE0AZ3ce6AzEikZKWhGJTDnRYZQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.archer.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">ARCHER SAFE</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">SAFE service administration for ARCHER</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ARCHER SAFE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.archer.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Archer Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@archer.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Stephen</md:GivenName>
-      <md:SurName>Booth</md:SurName>
-      <md:EmailAddress>mailto:s.booth@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.archer.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">ARCHER SAFE</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SAFE service administration for ARCHER</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ARCHER SAFE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.archer.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Archer Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@archer.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Stephen</md:GivenName>
+    <md:SurName>Booth</md:SurName>
+    <md:EmailAddress>mailto:s.booth@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml b/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml
index 0d7ff541..f9acd729 100644
--- a/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ascopubs.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T15:42:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T15:42:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Journals of the American Society of Clinical Oncology</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ascopubs.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Journals of the American Society of Clinical Oncology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ascopubs.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
index fe82eb63..aa871837 100644
--- a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.asmscience.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:36:54Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:36:54Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
@@ -29,13 +29,13 @@
 						etGuGMwdTlZcDiknmfJT4zwcf6U1kXLon29n9b+6/Yq9wo+XYXd+HjGNmaJAhZm3
 						mWuKjo4lfM11tPcrL+QV0g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
@@ -57,23 +57,23 @@
 						etGuGMwdTlZcDiknmfJT4zwcf6U1kXLon29n9b+6/Yq9wo+XYXd+HjGNmaJAhZm3
 						mWuKjo4lfM11tPcrL+QV0g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.asmscience.org/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.asmscience.org/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ASM Science</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.asmscience.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service</md:GivenName>
-      <md:EmailAddress>mailto:service@asmusa.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.asmscience.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.asmscience.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ASM Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asmscience.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service</md:GivenName>
+    <md:EmailAddress>mailto:service@asmusa.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml b/swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml
index 10b39b50..27e1b14f 100644
--- a/swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.astonsu.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-08T09:46:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-08T09:46:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.astonsu.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.astonsu.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.astonsu.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.astonsu.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.astonsu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.astonsu.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aston Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.astonsu.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.astonsu.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.astonsu.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.astonsu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.astonsu.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aston Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.astonsu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
index ce2ce496..24afdeda 100644
--- a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.audionetwork.nen.gov.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/lgfl-uso"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/swgfl-merlin"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/lgfl-uso"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/swgfl-merlin"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSDCCAjCgAwIBAgIJAI9De290KMmjMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG3d3dy5hdWRpb25ldHdvcmsubmVuLmdvdi51azAeFw0xNjA0MDQxMjA0NDla
 						Fw0yNjA0MDIxMjA0NDlaMCYxJDAiBgNVBAMTG3d3dy5hdWRpb25ldHdvcmsubmVu
@@ -47,47 +47,47 @@
 						qJWu76dirfXs/94KyGifoqEnn/x6anu70lEhOelauKILot8oovzk9NgQW3r4T9rL
 						ucr/IH/AZ5ql3zVht/DYm/eSHqFItcWR9pgj3w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">South West Grid for Learning Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">South West Grid for Learning Trust: Audio Networks free audio resources for the NEN community</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swgfl.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Chapman</md:SurName>
-      <md:EmailAddress>mailto:phil@atomwide.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Phil</md:GivenName>
-      <md:SurName>Chapman</md:SurName>
-      <md:EmailAddress>mailto:phil@atomwide.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">South West Grid for Learning Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">South West Grid for Learning Trust: Audio Networks free audio resources for the NEN community</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swgfl.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Chapman</md:SurName>
+    <md:EmailAddress>mailto:phil@atomwide.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Phil</md:GivenName>
+    <md:SurName>Chapman</md:SurName>
+    <md:EmailAddress>mailto:phil@atomwide.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml
index 6fd5f18c..195d775e 100644
--- a/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bathspasu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-16T11:04:20Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-16T11:04:20Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bath Spa University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bathspasu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bath Spa University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bathspasu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml
index 61cc53ea..957e6120 100644
--- a/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bathstudent.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -25,38 +25,38 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bathstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bathstudent.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: BathStudent.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bathstudent.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bathstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bathstudent.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: BathStudent.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bathstudent.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml b/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml
index 77a12463..e037aaf1 100644
--- a/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bfi.org.uk/inview/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-09T17:30:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-09T17:30:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAJCZAVBpmy3YMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHJvYmluc29uMB4XDTA5MTAwMTE0MTA0NFoXDTE5MDkyOTE0MTA0NFowEzER
 						MA8GA1UEAxMIcm9iaW5zb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -27,13 +27,13 @@
 						3CIwNpT/P4STvqGoRTAoioiBoZycIY3GCaV57iTiT6eN0aEXWwwZX3uoqhd6H2tS
 						8Q3adyi7hXpgTa3/E7CprovtpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC3zCCAcegAwIBAgIJAJCZAVBpmy3YMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
 						BAMTCHJvYmluc29uMB4XDTA5MTAwMTE0MTA0NFoXDTE5MDkyOTE0MTA0NFowEzER
 						MA8GA1UEAxMIcm9iaW5zb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
@@ -51,35 +51,35 @@
 						3CIwNpT/P4STvqGoRTAoioiBoZycIY3GCaV57iTiT6eN0aEXWwwZX3uoqhd6H2tS
 						8Q3adyi7hXpgTa3/E7CprovtpQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">British Film Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British Film Institute: BFI InView</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bfi.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Online Support</md:GivenName>
-      <md:EmailAddress>mailto:online.support@bfi.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Online Technical</md:GivenName>
-      <md:EmailAddress>mailto:online.technical@bfi.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">British Film Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Film Institute: BFI InView</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bfi.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Online Support</md:GivenName>
+    <md:EmailAddress>mailto:online.support@bfi.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Online Technical</md:GivenName>
+    <md:EmailAddress>mailto:online.technical@bfi.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml b/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml
index ae952d36..b8aa9e6b 100644
--- a/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bioone.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDoTCCAomgAwIBAgIJAJjXSA+eCVerMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						oznstpE1RBJHa+apJ8N1d+K2N9Ki2S2GYGl2g9Z82UGSvirtJTnZY6TANrYKFKnd
 						WjtPYywjxsAyOSn7irW8nyLDn8sA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bioone.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bioone.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bioone.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: BioOne</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bioone.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bioone.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bioone.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bioone.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: BioOne</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bioone.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml b/swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml
index 80c0b804..d376f4c2 100644
--- a/swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.birpublications.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-24T17:34:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-24T17:34:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID+jCCAuKgAwIBAgIJAPs6J7wBa9+AMA0GCSqGSIb3DQEBBQUAMFExIDAeBgNV
 						BAMTF3d3dy5iaXJwdWJsaWNhdGlvbnMub3JnMS0wKwYDVQQDEyRiaXJwdWJzLmJp
 						ci1wcm9kLmxpdGVyYXR1bW9ubGluZS5jb20wHhcNMTQwMTI0MTEyNzAzWhcNMjQw
@@ -33,24 +33,24 @@
 						nTfnIQ4baN5Zgm+QRbEVn7mRA7b2HYA+SQyh8B9wmYbWZ9Aerfg5hXAw5POHIZzS
 						tvSA3VPNsgDJZ/VDCPw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.birpublications.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.birpublications.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.birpublications.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">BIR Publications</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.birpublications.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.birpublications.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.birpublications.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.birpublications.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">BIR Publications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.birpublications.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml b/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml
index b05d0121..db284ee5 100644
--- a/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bridgemaneducation.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-03T16:48:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-03T16:48:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkwCCQDwazyRKFeJxDANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNVBAoTFUJy
 						aWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1hbmVkdWNh
@@ -30,13 +30,13 @@
 						7hKuJsm4gzUh4ULwmXRX4dO9qQedCXa3Gcazu8RU+rGVpJmSQcRXph7zzN+OIPM9
 						G4rHrVYGfPY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkwCCQDwazyRKFeJxDANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNVBAoTFUJy
 						aWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1hbmVkdWNh
@@ -57,38 +57,38 @@
 						7hKuJsm4gzUh4ULwmXRX4dO9qQedCXa3Gcazu8RU+rGVpJmSQcRXph7zzN+OIPM9
 						G4rHrVYGfPY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Bridgeman Art Library Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Bridgeman Art Library Limited: Bridgeman Education</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bridgemaneducation.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sean</md:GivenName>
-      <md:SurName>Chambers</md:SurName>
-      <md:EmailAddress>mailto:sean.chambers@bridgemanimages.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sean</md:GivenName>
-      <md:SurName>Chambers</md:SurName>
-      <md:EmailAddress>mailto:sean.chambers@bridgemanimages.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Bridgeman Art Library Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Bridgeman Art Library Limited: Bridgeman Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bridgemaneducation.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sean</md:GivenName>
+    <md:SurName>Chambers</md:SurName>
+    <md:EmailAddress>mailto:sean.chambers@bridgemanimages.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sean</md:GivenName>
+    <md:SurName>Chambers</md:SurName>
+    <md:EmailAddress>mailto:sean.chambers@bridgemanimages.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml b/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml
index 3fd57018..a941708a 100644
--- a/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.brightonsu.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-14T10:33:25Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-14T10:33:25Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.brightonsu.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.brightonsu.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.brightonsu.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.brightonsu.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.brightonsu.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.brightonsu.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.brightonsu.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brighton Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.brightonsu.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.brightonsu.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.brightonsu.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.brightonsu.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brighton Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.brightonsu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml
index 37d6fbac..bb65cd48 100644
--- a/swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bristolsu.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-07T14:33:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-07T14:33:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.bristolsu.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.bristolsu.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Bristol Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bristolsu.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Bristol Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bristolsu.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
index 84bac40b..1660753f 100644
--- a/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.british-history.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-10T16:11:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-10T16:11:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.british-history.ac.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">British History Online</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Additional premium content including The Parliament Rolls of Medieval
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.british-history.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">British History Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Additional premium content including The Parliament Rolls of Medieval
 					England (Edward I to Henry VII), all the volumes of the Calendar of
 					State Papers, Domestic 1537-1714, the Calendars of State Papers for
 					Scotland and Ireland, plus the Calendar of Close Rolls</mdui:Description>
-          <mdui:Logo height="33" width="487">https://www.british-history.ac.uk/images/logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="33" width="487">https://www.british-history.ac.uk/images/logo.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJALh/eAye3WYvMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXd3dy5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTAwOTAyMDczODE4WhcN
 						MjAwODMwMDczODE4WjAkMSIwIAYDVQQDExl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
@@ -50,13 +50,13 @@
 						JyLIrCA/d3S+4FGrnDNNVr0KWD/h2M53lhk5ohh147oP6qwVOwqalnMIqzHDjFrm
 						Vh9RR1SnWTuXhAGE8kZHTZLj7wi3sg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJALh/eAye3WYvMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXd3dy5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTAwOTAyMDczODE4WhcN
 						MjAwODMwMDczODE4WjAkMSIwIAYDVQQDExl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
@@ -75,43 +75,43 @@
 						JyLIrCA/d3S+4FGrnDNNVr0KWD/h2M53lhk5ohh147oP6qwVOwqalnMIqzHDjFrm
 						Vh9RR1SnWTuXhAGE8kZHTZLj7wi3sg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British History Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.british-history.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Blaney</md:SurName>
-      <md:EmailAddress>mailto:Jonathan.Blaney@sas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Steer</md:SurName>
-      <md:EmailAddress>mailto:Martin.Steer@sas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British History Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.british-history.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Blaney</md:SurName>
+    <md:EmailAddress>mailto:Jonathan.Blaney@sas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Steer</md:SurName>
+    <md:EmailAddress>mailto:Martin.Steer@sas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml
index 7c73243a..2db9d4e8 100644
--- a/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.britishonlinearchives.co.uk/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYzCCAkugAwIBAgIJAIntgQVy9bMDMA0GCSqGSIb3DQEBBQUAMEgxIDAeBgNV
 						BAoMF0JyaXRpc2ggT25saW5lIEFyY2hpdmVzMSQwIgYDVQQDDBticml0aXNob25s
 						aW5lYXJjaGl2ZXMuY28udWswHhcNMTQxMjIyMTczNTE1WhcNMjQxMjE5MTczNTE1
@@ -28,13 +28,13 @@
 						bYGNjeYztEjaKkYDheCy8PqJAk5WLJMmxPR+/6Vb7uhJDDOYEnnmaLFL5uQIbWdd
 						uKhMiG0GAg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYzCCAkugAwIBAgIJAIntgQVy9bMDMA0GCSqGSIb3DQEBBQUAMEgxIDAeBgNV
 						BAoMF0JyaXRpc2ggT25saW5lIEFyY2hpdmVzMSQwIgYDVQQDDBticml0aXNob25s
 						aW5lYXJjaGl2ZXMuY28udWswHhcNMTQxMjIyMTczNTE1WhcNMjQxMjE5MTczNTE1
@@ -55,27 +55,27 @@
 						bYGNjeYztEjaKkYDheCy8PqJAk5WLJMmxPR+/6Vb7uhJDDOYEnnmaLFL5uQIbWdd
 						uKhMiG0GAg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Microform Imaging Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Microform Imaging Limited: British Online Archives</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.microform.co.uk/archival-publishing.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Sarsfield</md:SurName>
-      <md:EmailAddress>mailto:dsarsfield@microform.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Gill</md:SurName>
-      <md:EmailAddress>mailto:martin@serversure.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Microform Imaging Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Microform Imaging Limited: British Online Archives</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.microform.co.uk/archival-publishing.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Sarsfield</md:SurName>
+    <md:EmailAddress>mailto:dsarsfield@microform.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Gill</md:SurName>
+    <md:EmailAddress>mailto:martin@serversure.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml b/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml
index dc24d1b3..2ad0d03b 100644
--- a/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.bucksstudentsunion.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T14:09:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T14:09:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,33 +30,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Buckingham New University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bucksstudentsunion.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Buckingham New University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bucksstudentsunion.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cairn.info-.xml b/swamid-interfederations-2.0/www.cairn.info-.xml
index 2f2df106..98a2d311 100644
--- a/swamid-interfederations-2.0/www.cairn.info-.xml
+++ b/swamid-interfederations-2.0/www.cairn.info-.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cairn.info/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T10:38:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/documentation</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/commercial</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T10:38:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/documentation</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/commercial</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CAIRN</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">http://www.cairn.info</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Created in September 2005 by four Belgian and French publishers, today Cairn offers the most comprehensive collection of publications in the French language in the humanities and social sciences available online. In 2015, more than 400 journals and around 5,000 eBooks from major French, Belgian and Swiss publishers are available on www.cairn.info. Students, scholars and librarians all over the world are thus able to access more than 200,000 full-text articles and book chapters online.
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CAIRN</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">http://www.cairn.info</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Created in September 2005 by four Belgian and French publishers, today Cairn offers the most comprehensive collection of publications in the French language in the humanities and social sciences available online. In 2015, more than 400 journals and around 5,000 eBooks from major French, Belgian and Swiss publishers are available on www.cairn.info. Students, scholars and librarians all over the world are thus able to access more than 200,000 full-text articles and book chapters online.
 To make this content more visible and accessible to non–francophone scholars, Cairn.info (with the support of the CNL, a French governmental agency dedicated to the promotion of French publications around the world) has designed a special interface, www.cairn-int.info, enabling internet users to browse and easily find content from French journals without speaking a word of French.</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">CAIRN</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Cairn est né de la volonté de quatre maisons d’édition (Belin, De Boeck, La Découverte et Erès) ayant en charge la publication et la diffusion de revues de sciences humaines et sociales, d’unir leurs efforts pour améliorer leur présence sur l’Internet, et de proposer à d’autres acteurs souhaitant développer une version électronique de leurs publications, les outils techniques et commerciaux développés à cet effet. L’ambition de Cairn est d’aider les maisons d’édition, organismes ou associations en charge de la publication de revues de sciences humaines francophones à gérer la double publication de ces revues. Dans ce but, les services de Cairn couvrent à la fois la fabrication papier et électronique, la distribution papier (gestion des abonnements, routage) et électronique (texte intégral en ligne, distribution des métadonnées auprès des sites et bases bibliographiques), ainsi que la diffusion et la promotion de ces revues auprès des publics auxquels elles s’adressent.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.cairn.info/vie-privee.php</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:DisplayName xml:lang="fr">CAIRN</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Cairn est né de la volonté de quatre maisons d’édition (Belin, De Boeck, La Découverte et Erès) ayant en charge la publication et la diffusion de revues de sciences humaines et sociales, d’unir leurs efforts pour améliorer leur présence sur l’Internet, et de proposer à d’autres acteurs souhaitant développer une version électronique de leurs publications, les outils techniques et commerciaux développés à cet effet. L’ambition de Cairn est d’aider les maisons d’édition, organismes ou associations en charge de la publication de revues de sciences humaines francophones à gérer la double publication de ces revues. Dans ce but, les services de Cairn couvrent à la fois la fabrication papier et électronique, la distribution papier (gestion des abonnements, routage) et électronique (texte intégral en ligne, distribution des métadonnées auprès des sites et bases bibliographiques), ainsi que la diffusion et la promotion de ces revues auprès des publics auxquels elles s’adressent.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.cairn.info/vie-privee.php</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDjTCCAnWgAwIBAgIJAMmy5uzTdK+3MA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNV
 BAYTAkJFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxDjAMBgNVBAoMBUNBSVJOMQ4w
 DAYDVQQLDAVDQUlSTjEXMBUGA1UEAwwOd3d3LmNhaXJuLmluZm8wHhcNMTYwNTEw
@@ -49,13 +49,13 @@ sZkf0roY7oLJQooFDiRFZdgINUHuzcg8Pys0uE2uXouKztFF51xOnnKTNDx2Eu/l
 jQTLugjY/wKH/2aeRzCOAYTyXrXYiP7zvCX39zZRU0uUFw4lPYJZ+fEaYiH1vKVi
 GQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDjTCCAnWgAwIBAgIJAMmy5uzTdK+3MA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNV
 BAYTAkJFMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxDjAMBgNVBAoMBUNBSVJOMQ4w
 DAYDVQQLDAVDQUlSTjEXMBUGA1UEAwwOd3d3LmNhaXJuLmluZm8wHhcNMTYwNTEw
@@ -77,13 +77,13 @@ sZkf0roY7oLJQooFDiRFZdgINUHuzcg8Pys0uE2uXouKztFF51xOnnKTNDx2Eu/l
 jQTLugjY/wKH/2aeRzCOAYTyXrXYiP7zvCX39zZRU0uUFw4lPYJZ+fEaYiH1vKVi
 GQ==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICgzCCAeygAwIBAgIJANHZ2qyvCn4GMA0GCSqGSIb3DQEBBQUAMDYxCzAJBgNV
 BAYTAkJFMQ4wDAYDVQQKEwVDQUlSTjEXMBUGA1UEAxMOd3d3LmNhaXJuLmluZm8w
 HhcNMDgwMTMxMTAxMTUzWhcNMjgwMTI2MTAxMTUzWjA2MQswCQYDVQQGEwJCRTEO
@@ -99,32 +99,31 @@ MBICLC8YFFEfEEpF1hLcMcJBqLQYaaqhFw6olWUogbU8eX9Wvz1qKEZwKryJkrAs
 oDjy4c/5nHwxlFZheFLcnWiQdxmv9qjtZqV41SSn7zNVX0U9YUoY6lrtSZH/4Btk
 E25Bh11XZRlFI1reece1ILLnGQ7t3Hw=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cairn.info/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cairn.info/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">CAIRN</md:ServiceName>
-        <md:ServiceName xml:lang="en">CAIRN</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Cairn est né de la volonté de quatre maisons d’édition (Belin, De Boeck, La Découverte et Erès) ayant en charge la publication et la diffusion de revues de sciences humaines et sociales, d’unir leurs efforts pour améliorer leur présence sur l’Internet, et de proposer à d’autres acteurs souhaitant développer une version électronique de leurs publications, les outils techniques et commerciaux développés à cet effet. L’ambition de Cairn est d’aider les maisons d’édition, organismes ou associations en charge de la publication de revues de sciences humaines francophones à gérer la double publication de ces revues. Dans ce but, les services de Cairn couvrent à la fois la fabrication papier et électronique, la distribution papier (gestion des abonnements, routage) et électronique (texte intégral en ligne, distribution des métadonnées auprès des sites et bases bibliographiques), ainsi que la diffusion et la promotion de ces revues auprès des publics auxquels elles s’adressent.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Created in September 2005 by four Belgian and French publishers, today Cairn offers the most comprehensive collection of publications in the French language in the humanities and social sciences available online. In 2015, more than 400 journals and around 5,000 eBooks from major French, Belgian and Swiss publishers are available on www.cairn.info. Students, scholars and librarians all over the world are thus able to access more than 200,000 full-text articles and book chapters online.
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cairn.info/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cairn.info/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">CAIRN</md:ServiceName>
+      <md:ServiceName xml:lang="en">CAIRN</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Cairn est né de la volonté de quatre maisons d’édition (Belin, De Boeck, La Découverte et Erès) ayant en charge la publication et la diffusion de revues de sciences humaines et sociales, d’unir leurs efforts pour améliorer leur présence sur l’Internet, et de proposer à d’autres acteurs souhaitant développer une version électronique de leurs publications, les outils techniques et commerciaux développés à cet effet. L’ambition de Cairn est d’aider les maisons d’édition, organismes ou associations en charge de la publication de revues de sciences humaines francophones à gérer la double publication de ces revues. Dans ce but, les services de Cairn couvrent à la fois la fabrication papier et électronique, la distribution papier (gestion des abonnements, routage) et électronique (texte intégral en ligne, distribution des métadonnées auprès des sites et bases bibliographiques), ainsi que la diffusion et la promotion de ces revues auprès des publics auxquels elles s’adressent.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Created in September 2005 by four Belgian and French publishers, today Cairn offers the most comprehensive collection of publications in the French language in the humanities and social sciences available online. In 2015, more than 400 journals and around 5,000 eBooks from major French, Belgian and Swiss publishers are available on www.cairn.info. Students, scholars and librarians all over the world are thus able to access more than 200,000 full-text articles and book chapters online.
 To make this content more visible and accessible to non–francophone scholars, Cairn.info (with the support of the CNL, a French governmental agency dedicated to the promotion of French publications around the world) has designed a special interface, www.cairn-int.info, enabling internet users to browse and easily find content from French journals without speaking a word of French.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CAIRN SA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CAIRN SA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cairn.info/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>De Vathaire Jean-Baptiste</md:SurName>
-      <md:EmailAddress>jb.devathaire@cairn.info</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Benjamin Hennon</md:SurName>
-      <md:EmailAddress>benjamin.hennon@pythagoria.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CAIRN SA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CAIRN SA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cairn.info/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>De Vathaire Jean-Baptiste</md:SurName>
+    <md:EmailAddress>jb.devathaire@cairn.info</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Benjamin Hennon</md:SurName>
+    <md:EmailAddress>benjamin.hennon@pythagoria.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml b/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml
index 7338ffa7..f0c4f2e4 100644
--- a/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml
+++ b/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.callforparticipants.com/institutional-login/entity">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T09:10:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T09:10:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID6DCCAtACCQCgXYYpGzPTKTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgTD05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBxMKTm90dGluZ2hh
 						bTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFydGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMX
@@ -32,13 +32,13 @@
 						zTTuNWP2F9pytZF0Racu2+9FklyvRddQmsR4rU8gi4xOYVLyExa+2bY1xbltSfce
 						nXJLz+6Nyjo9A8l1BcShxxx5EgFyaSm69KloNzt+KaF3ZfmY/D6AJyCwQiA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID6DCCAtACCQCgXYYpGzPTKTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
 						R0IxGDAWBgNVBAgTD05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBxMKTm90dGluZ2hh
 						bTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFydGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMX
@@ -61,26 +61,26 @@
 						zTTuNWP2F9pytZF0Racu2+9FklyvRddQmsR4rU8gi4xOYVLyExa+2bY1xbltSfce
 						nXJLz+6Nyjo9A8l1BcShxxx5EgFyaSm69KloNzt+KaF3ZfmY/D6AJyCwQiA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-logout.php/cfp-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-acs.php/cfp-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml1-acs.php/cfp-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-acs.php/cfp-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml1-acs.php/cfp-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Call For Participants Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Call For Participants</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.callforparticipants.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:help@callforparticipants.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IT-Support</md:GivenName>
-      <md:EmailAddress>mailto:it-support@callforparticipants.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-logout.php/cfp-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-acs.php/cfp-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml1-acs.php/cfp-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-acs.php/cfp-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml1-acs.php/cfp-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Call For Participants Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Call For Participants</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.callforparticipants.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:help@callforparticipants.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT-Support</md:GivenName>
+    <md:EmailAddress>mailto:it-support@callforparticipants.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml
index f3cdfd89..b7342020 100644
--- a/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cans.org.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-03T14:04:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-03T14:04:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cans.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cans.org.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cans.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cans.org.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIJALDeNSvqu4X6MA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
 						BAMTKHdlYnN0YXJzLWNhbnMuc2VydmVycy5yYmwtbWVyLm1pc3AuY28udWswHhcN
 						MTEwNzI1MjAyMjI2WhcNMjEwNzIyMjAyMjI2WjAzMTEwLwYDVQQDEyh3ZWJzdGFy
@@ -44,40 +44,40 @@
 						0WyK0Tt3t/i0LHeIbcaOpcPdnjr/x7Dg8/9X1DRfpJMDK5UogWENLgN9fz0SdqDp
 						ubozEJC8LUak3g0570yFN0h++A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cans.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Citizens Advice Notes Service Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Citizens Advice Notes Service Trust: Legal Information</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cans.org.uk/libraries-public/about</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Emil</md:GivenName>
-      <md:SurName>Muthu</md:SurName>
-      <md:EmailAddress>mailto:emil@webstarsltd.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Emil</md:GivenName>
-      <md:SurName>Muthu</md:SurName>
-      <md:EmailAddress>mailto:emil@webstarsltd.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cans.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Citizens Advice Notes Service Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Citizens Advice Notes Service Trust: Legal Information</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cans.org.uk/libraries-public/about</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Emil</md:GivenName>
+    <md:SurName>Muthu</md:SurName>
+    <md:EmailAddress>mailto:emil@webstarsltd.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Emil</md:GivenName>
+    <md:SurName>Muthu</md:SurName>
+    <md:EmailAddress>mailto:emil@webstarsltd.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml
index 673e9e5f..3c3c0606 100644
--- a/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cardiffmetsu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-12T14:11:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-12T14:11:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate> 
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate> 
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff Met Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiffmetsu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff Met Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiffmetsu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml
index a64ef694..4712ef69 100644
--- a/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cardiffstudents.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-11T15:15:02Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-11T15:15:02Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cardiffstudents.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cardiffstudents.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cardiffstudents.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cardiffstudents.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffstudents.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cardiff University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cardiffstudents.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffstudents.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cardiff University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cardiffstudents.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml b/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml
index 76d5cfd2..adee114d 100644
--- a/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.careers.lon.ac.uk/democareerstagged/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-04T11:24:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-04T11:24:49Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJAJPY5z7XWwecMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG3RjZy13ZWIxLnVuaXZlcnNlLmxvbi5hYy51azAeFw0xMzA2MjAwNzUwMjFa
 						Fw0yMzA2MTgwNzUwMjFaMCYxJDAiBgNVBAMTG3RjZy13ZWIxLnVuaXZlcnNlLmxv
@@ -47,48 +47,48 @@
 						w9qCuNdqoL5x0OgfmC+3xvT85uiiaAbdy+Cu53q8rrR17umI/XttfPua7Jt7d8Xx
 						Sr5dPjZqO2crIixHjMSNLD23Ao0e9R1fOzF9lw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Careers Tagged Demo Organization</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.thecareersgroup.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Sum</md:SurName>
-      <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Sum</md:SurName>
-      <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philippe</md:GivenName>
-      <md:SurName>Donnette</md:SurName>
-      <md:EmailAddress>mailto:philippe.donnette@careers.lon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Careers Tagged Demo Organization</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.thecareersgroup.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Sum</md:SurName>
+    <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Sum</md:SurName>
+    <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philippe</md:GivenName>
+    <md:SurName>Donnette</md:SurName>
+    <md:EmailAddress>mailto:philippe.donnette@careers.lon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml b/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml
index 044d8c17..413b9e92 100644
--- a/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.careers.lon.ac.uk/thecareersgroup/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-29T13:17:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-29T13:17:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDITCCAgmgAwIBAgIJAKcSnujgFBigMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
 						BAMTHnRjZy13ZWIwMS5jYXJlZXJzLmxvbmRvbi5hYy51azAeFw0xNDA0MjkxNTA3
 						NDFaFw0yNDA0MjYxNTA3NDFaMCkxJzAlBgNVBAMTHnRjZy13ZWIwMS5jYXJlZXJz
@@ -48,48 +48,48 @@
 						7FPP4F+X38NeJyGnV5h0I0IPJQ1yWnz19mkJgnaw1p/BrpnWt6j2R0bOoEGmFnIP
 						Byh3uXWX9AMHZ5q9YlCZ1VLYiECEI17sD5J0ufdOvQZeuSaIrw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Careers Group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.thecareersgroup.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Sum</md:SurName>
-      <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Sum</md:SurName>
-      <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philippe</md:GivenName>
-      <md:SurName>Donnette</md:SurName>
-      <md:EmailAddress>mailto:philippe.donnette@careers.lon.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Careers Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.thecareersgroup.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Sum</md:SurName>
+    <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Sum</md:SurName>
+    <md:EmailAddress>mailto:andy.sum@careers.lon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philippe</md:GivenName>
+    <md:SurName>Donnette</md:SurName>
+    <md:EmailAddress>mailto:philippe.donnette@careers.lon.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml b/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
index a8a525bc..11e7c62a 100644
--- a/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.careknowledge.com/ukfed/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-04T12:52:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-04T12:52:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CareKnowledge</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CareKnowledge helps you keep your social care knowledge and practice up to date.</mdui:Description>
+        <mdui:Logo height="110" width="275">https://www.careknowledge.com/App_Themes/ck/img/logo-full-colour.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CareKnowledge</mdui:DisplayName>
-          <mdui:Description xml:lang="en">CareKnowledge helps you keep your social care knowledge and practice up to date.</mdui:Description>
-          <mdui:Logo height="110" width="275">https://www.careknowledge.com/App_Themes/ck/img/logo-full-colour.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDgjCCAmqgAwIBAgIJAOJNb5Ku1GAjMA0GCSqGSIb3DQEBBQUAMDQxFjAUBgNV
 						BAoTDU9MTSBHcm91cCBMdGQxGjAYBgNVBAMTEWNhcmVrbm93bGVkZ2UuY29tMB4X
 						DTE1MDkwMTA5MDEwMVoXDTI1MDgyOTA5MDEwMVowNDEWMBQGA1UEChMNT0xNIEdy
@@ -37,13 +37,13 @@
 						1E1VZ+aWVHjwYQwYYI0dMVXneNLgdgqnwZzKgdWA9XgfPAyHtn+9Nip1xdxMLgOh
 						14Vn2MYizmznFanAaXjq/VTYfu7b9KwW7Nl91socK3ZCSS4e04Q=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDgjCCAmqgAwIBAgIJAOJNb5Ku1GAjMA0GCSqGSIb3DQEBBQUAMDQxFjAUBgNV
 						BAoTDU9MTSBHcm91cCBMdGQxGjAYBgNVBAMTEWNhcmVrbm93bGVkZ2UuY29tMB4X
 						DTE1MDkwMTA5MDEwMVoXDTI1MDgyOTA5MDEwMVowNDEWMBQGA1UEChMNT0xNIEdy
@@ -64,25 +64,25 @@
 						1E1VZ+aWVHjwYQwYYI0dMVXneNLgdgqnwZzKgdWA9XgfPAyHtn+9Nip1xdxMLgOh
 						14Vn2MYizmznFanAaXjq/VTYfu7b9KwW7Nl91socK3ZCSS4e04Q=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OLM Pavilion Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Pavilion Publishing and Media Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.careknowledge.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:tim.smith@olmgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:tim.smith@olmgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OLM Pavilion Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Pavilion Publishing and Media Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.careknowledge.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:tim.smith@olmgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:tim.smith@olmgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml
index a5c4b41d..7c5e626d 100644
--- a/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cartoons.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-09T14:10:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-09T14:10:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cartoons.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cartoons.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cartoons.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cartoons.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cartoons.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cartoons.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cartoons.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cartoons.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICzjCCAbagAwIBAgIBADANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVjd3d3
 						MTAeFw0xMDAyMjMxNjExMzVaFw0yMDAyMjExNjExMzVaMBAxDjAMBgNVBAMTBWN3
 						d3cxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwMqCZUo+LIGMYOD5
@@ -49,46 +49,46 @@
 						ME7Ylv10JKK8LtZy3SD0t9MmDQewAgi5hIH4UbXYXx3mNGcidUnc42Due57YgYE2
 						DXY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Bonnie</md:GivenName>
-      <md:SurName>Ferguson</md:SurName>
-      <md:EmailAddress>mailto:B.Ferguson@kent.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Kent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bonnie</md:GivenName>
+    <md:SurName>Ferguson</md:SurName>
+    <md:EmailAddress>mailto:B.Ferguson@kent.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
index 225aa938..bac70083 100644
--- a/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ccinform.co.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-22T14:54:28Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-22T14:54:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZTCCAk2gAwIBAgIJAKKRPRBvWSX/MA0GCSqGSIb3DQEBBQUAMEkxKjAoBgNV
 						BAoMIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEbMBkGA1UEAwwS
 						d3d3LmNjaW5mb3JtLmNvLnVrMB4XDTEzMDkyNjEzNTY1N1oXDTIzMDkyNDEzNTY1
@@ -30,28 +30,28 @@
 						bAQtPE/MMyP0ySM4FRsyJyHiFYJN+OzoU8iW4qt6AqmzV0YKqhkzo5AkH+5H0ysD
 						YZLwgoUJadub
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CC Inform</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shane</md:GivenName>
-      <md:SurName>Yin</md:SurName>
-      <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>CCInform Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CC Inform</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shane</md:GivenName>
+    <md:SurName>Yin</md:SurName>
+    <md:EmailAddress>mailto:Shane.Yin@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>CCInform Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml
index f0ac5ae4..32a3ee1f 100644
--- a/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.childlink.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-01T16:19:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-01T16:19:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Childlink Information Service</mdui:DisplayName>
+        <mdui:Logo height="60" width="80">https://www.childlink.co.uk/images/childlink_wayf_logo.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.childlink.co.uk/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Childlink Information Service</mdui:DisplayName>
-          <mdui:Logo height="60" width="80">https://www.childlink.co.uk/images/childlink_wayf_logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.childlink.co.uk/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC/DCCAeQCCQCh6QBQgqGHfDANBgkqhkiG9w0BAQUFADBAMQswCQYDVQQGEwJH
 						QjETMBEGA1UEChMKQ2hpbGQgTGluazEcMBoGA1UEAxMTd3d3LmNoaWxkbGluay5j
 						by51azAeFw0xNDA0MTAxMDExMDlaFw0zNDA0MDUxMDExMDlaMEAxCzAJBgNVBAYT
@@ -50,46 +50,46 @@
 						nKVEi4fGw65i9apDSYscpk2Kvyeu89/UGTq1N3UZdZqkIMgr/Y9TZL5w+n4kl1aN
 						T58weS7Nep9P2UuLPrDhrbAGb0fT0LHFBkeMy2Z8/5JH5HRqCt60B9Z0Xtz7/Fyh
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Childlink Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Childlink Information Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.childlink.co.uk/about_us.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>McCune</md:SurName>
-      <md:EmailAddress>mailto:adammccune@gmail.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>McCune</md:SurName>
-      <md:EmailAddress>mailto:adammccune@gmail.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Childlink Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Childlink Information Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.childlink.co.uk/about_us.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>McCune</md:SurName>
+    <md:EmailAddress>mailto:adammccune@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>McCune</md:SurName>
+    <md:EmailAddress>mailto:adammccune@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
index 26d155da..6ba7f76e 100644
--- a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://www.clarin-pl.eu/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:33:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:33:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN-PL Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN-PL repository</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</mdui:Description>
+        <mdui:Logo height="32" width="32">https://clarin-pl.eu/dspace/themes/ClarinPlHomeTheme/images/favicon.ico</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://clarin-pl.eu/en/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://clarin-pl.eu/en/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">CLARIN-PL Repository</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">CLARIN-PL repository</mdui:DisplayName>
-          <mdui:Description xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</mdui:Description>
-          <mdui:Description xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</mdui:Description>
-          <mdui:Logo height="32" width="32">https://clarin-pl.eu/dspace/themes/ClarinPlHomeTheme/images/favicon.ico</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://clarin-pl.eu/en/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://clarin-pl.eu/en/privacy-policy/</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.clarin-pl.eu</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www.clarin-pl.eu</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJY4k9BoCNIOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.clarin-pl.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.clarin-pl.eu</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJY4k9BoCNIOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 BAMTEHd3dy5jbGFyaW4tcGwuZXUwHhcNMTQwMTA5MTA0ODE2WhcNMTcwMTA4MTA0
 ODE2WjAbMRkwFwYDVQQDExB3d3cuY2xhcmluLXBsLmV1MIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAvBHhZZZVue2D/m6KEnfbL/wufElA6XgLs0SqfGMh
@@ -49,55 +49,55 @@ W3DPk2honcInege0lU7RLULmgdtMVl/QCbEWDrJ8oq0bxYwoFrVCnZXFM7SHqEba
 W7A4zk79hxNAxNoqlUSnX0Tk2fQQXdSTjLXEF9WLUwfW86QlQdLLkaY9hco+w8NM
 SvKPZd5tNDWO1hE00kzKJDPhhJZs1wFS7Tf3SJ1M1D8=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">CLARIN-PL Repository</md:ServiceName>
-        <md:ServiceName xml:lang="en">CLARIN-PL repository</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marcin</md:GivenName>
-      <md:SurName>Pol</md:SurName>
-      <md:EmailAddress>mailto:marcin.pol@pwr.edu.pl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marcin</md:GivenName>
-      <md:SurName>Pol</md:SurName>
-      <md:EmailAddress>mailto:dspace@clarin-pl.eu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marcin</md:GivenName>
-      <md:SurName>Pol</md:SurName>
-      <md:EmailAddress>mailto:dspace@clarin-pl.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">CLARIN-PL Repository</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN-PL repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marcin</md:GivenName>
+    <md:SurName>Pol</md:SurName>
+    <md:EmailAddress>mailto:marcin.pol@pwr.edu.pl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marcin</md:GivenName>
+    <md:SurName>Pol</md:SurName>
+    <md:EmailAddress>mailto:dspace@clarin-pl.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marcin</md:GivenName>
+    <md:SurName>Pol</md:SurName>
+    <md:EmailAddress>mailto:dspace@clarin-pl.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
index f59aef8e..b8843fc1 100644
--- a/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.climatescience.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-05T15:47:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-05T15:47:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Cambridge Centre for Climate Science</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.climatescience.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cambridge Centre for Climate Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.climatescience.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml b/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml
index 108af7b7..8e7a7a76 100644
--- a/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.clinicalskills.net/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T11:29:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T11:29:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Clinical Skills Ltd</mdui:DisplayName>
+        <mdui:Description xml:lang="en">User-friendly illustrated clinical skills guidelines to help you develop and check your practice.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Clinical Skills Ltd</mdui:DisplayName>
-          <mdui:Description xml:lang="en">User-friendly illustrated clinical skills guidelines to help you develop and check your practice.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIJAM+hz84YeRWBMA0GCSqGSIb3DQEBCwUAMDoxFzAVBgNV
 						BAoMDkNsaW5pY2Fsc2tpbGxzMR8wHQYDVQQDDBZ3d3cuY2xpbmljYWxza2lsbHMu
 						bmV0MB4XDTE2MDExMTE0MzMyOFoXDTI2MDEwODE0MzMyOFowOjEXMBUGA1UECgwO
@@ -35,13 +35,13 @@
 						U6Jqa7X31ZZ3m7iPPtDXuB9rtcT56A0jGpn9kVOfCEYi0BnhKLSC7GFroMFaFvbT
 						aTbHhoBxeTbNVT1uBHURnKCtOdNyJJe/fDe6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDRzCCAi+gAwIBAgIJAM+hz84YeRWBMA0GCSqGSIb3DQEBCwUAMDoxFzAVBgNV
 						BAoMDkNsaW5pY2Fsc2tpbGxzMR8wHQYDVQQDDBZ3d3cuY2xpbmljYWxza2lsbHMu
 						bmV0MB4XDTE2MDExMTE0MzMyOFoXDTI2MDEwODE0MzMyOFowOjEXMBUGA1UECgwO
@@ -61,27 +61,27 @@
 						U6Jqa7X31ZZ3m7iPPtDXuB9rtcT56A0jGpn9kVOfCEYi0BnhKLSC7GFroMFaFvbT
 						aTbHhoBxeTbNVT1uBHURnKCtOdNyJJe/fDe6
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clinicalskills.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clinicalskills.net/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clinicalskills.net/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clinicalskills.net/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Clinical Skills Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Clinical Skills Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.clinicalskills.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sharon</md:GivenName>
-      <md:SurName>Kingman</md:SurName>
-      <md:EmailAddress>mailto:sharonkingman@clinicalskills.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Allington</md:SurName>
-      <md:EmailAddress>mailto:paul@intelligentpenguin.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clinicalskills.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clinicalskills.net/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clinicalskills.net/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clinicalskills.net/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Clinical Skills Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Clinical Skills Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.clinicalskills.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sharon</md:GivenName>
+    <md:SurName>Kingman</md:SurName>
+    <md:EmailAddress>mailto:sharonkingman@clinicalskills.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Allington</md:SurName>
+    <md:EmailAddress>mailto:paul@intelligentpenguin.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml
index faff87e1..76e44ad5 100644
--- a/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cnn.group.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-16T17:50:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-16T17:50:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Networks Network</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cnn.group.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Networks Network</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cnn.group.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml
index 82122df7..8a9eb9f4 100644
--- a/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.communistpartyarchive.org.uk/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-05T13:54:55Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-05T13:54:55Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzTCCArWgAwIBAgIJANL2QbULh4NnMA0GCSqGSIb3DQEBBQUAME0xIDAeBgNV
 						BAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVu
 						aXN0cGFydHlhcmNoaXZlLm9yZy51azAeFw0xMjA4MDcwOTU2MzFaFw0yMjA4MDUw
@@ -30,13 +30,13 @@
 						vLO0bK9UD3LPNN39N/wJzqKjhW7vC98egpagUfnEna+aK+QxCZLJDHelYlqdL0/0
 						8OPzZPdB5minjy+sO+WAQy4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDzTCCArWgAwIBAgIJANL2QbULh4NnMA0GCSqGSIb3DQEBBQUAME0xIDAeBgNV
 						BAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVu
 						aXN0cGFydHlhcmNoaXZlLm9yZy51azAeFw0xMjA4MDcwOTU2MzFaFw0yMjA4MDUw
@@ -59,27 +59,27 @@
 						vLO0bK9UD3LPNN39N/wJzqKjhW7vC98egpagUfnEna+aK+QxCZLJDHelYlqdL0/0
 						8OPzZPdB5minjy+sO+WAQy4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Microform Imaging Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Communist Party of Great Britain archive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.microform.co.uk/archival-publishing.php</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Sarsfield</md:SurName>
-      <md:EmailAddress>mailto:dsarsfield@microform.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Gill</md:SurName>
-      <md:EmailAddress>mailto:martin@serversure.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Microform Imaging Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Communist Party of Great Britain archive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.microform.co.uk/archival-publishing.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Sarsfield</md:SurName>
+    <md:EmailAddress>mailto:dsarsfield@microform.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Gill</md:SurName>
+    <md:EmailAddress>mailto:martin@serversure.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml b/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml
index 42f50e84..85f63864 100644
--- a/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.crcnetbase.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-01T17:17:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-01T17:17:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbjCCA1agAwIBAgIJANEyiht0lGz3MA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -35,25 +35,25 @@
 						+B02aD7lQHX2jczKW50vxU46gvji7sBWUlCeYT+JeBQpBKT6SOPtHBLcSNIwhDzG
 						U5jsgJ4S54QwA12aggwYfLERyqoQLPepkxvA2QygkK7JeQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.crcnetbase.com/action/samlACS" index="0"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Informa plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Informa plc: CRC Press</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crcnetbase.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Duane</md:GivenName>
-      <md:SurName>Schindler</md:SurName>
-      <md:EmailAddress>mailto:duane.schindler@taylorandfrancis.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Duane</md:GivenName>
-      <md:SurName>Schindler</md:SurName>
-      <md:EmailAddress>mailto:duane.schindler@taylorandfrancis.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.crcnetbase.com/action/samlACS" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Informa plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Informa plc: CRC Press</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crcnetbase.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Duane</md:GivenName>
+    <md:SurName>Schindler</md:SurName>
+    <md:EmailAddress>mailto:duane.schindler@taylorandfrancis.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Duane</md:GivenName>
+    <md:SurName>Schindler</md:SurName>
+    <md:EmailAddress>mailto:duane.schindler@taylorandfrancis.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml
index a98ad7d1..8ea65bbb 100644
--- a/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.creativeclub.co.uk/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-20T11:44:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-20T11:44:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIJAJNBy2AlSZCeMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
 						BAMTI3VrLWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB4XDTA5MDYz
 						MDA5NTAzMFoXDTE5MDYyODA5NTAzMFowLjEsMCoGA1UEAxMjdWstYnJvLWlpcy0x
@@ -29,13 +29,13 @@
 						WLqvM4GE7PTvOXAdB18th+p8IreWjHR/Qz0CuhhrHXZtFyu68QBLBPvLikydoYvM
 						3mQlrA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIJAJNBy2AlSZCeMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
 						BAMTI3VrLWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB4XDTA5MDYz
 						MDA5NTAzMFoXDTE5MDYyODA5NTAzMFowLjEsMCoGA1UEAxMjdWstYnJvLWlpcy0x
@@ -55,36 +55,36 @@
 						WLqvM4GE7PTvOXAdB18th+p8IreWjHR/Qz0CuhhrHXZtFyu68QBLBPvLikydoYvM
 						3mQlrA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ebiquity plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ebiquity plc: Creative Club</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ebiquity.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Creative Club Client Services</md:GivenName>
-      <md:EmailAddress>mailto:CreativeClub.CustomerSupport@ebiquity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Anthony</md:GivenName>
-      <md:SurName>Wong</md:SurName>
-      <md:EmailAddress>mailto:antony.wong@ebiquity.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ebiquity plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ebiquity plc: Creative Club</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ebiquity.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Creative Club Client Services</md:GivenName>
+    <md:EmailAddress>mailto:CreativeClub.CustomerSupport@ebiquity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anthony</md:GivenName>
+    <md:SurName>Wong</md:SurName>
+    <md:EmailAddress>mailto:antony.wong@ebiquity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml
index 57ad0d75..d63c2865 100644
--- a/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cypnow.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T07:45:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T07:45:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Children and Young People Now</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Children &amp; Young People Now is a magazine for professionals working with children and young people</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Children and Young People Now</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Children &amp; Young People Now is a magazine for professionals working with children and young people</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJAKKEvzTa1baZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC2xpYmx5bnguY29tMB4XDTE1MDcwMTE0MzA1OFoXDTI1MDYyODE0MzA1OFow
 						FjEUMBIGA1UEAxMLbGlibHlueC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -50,43 +50,43 @@
 						7wGBxTNZk8z8Ob/CFJI79t38xZnP8cBEr4vlE27ld7HGu1mzBZPi6d4pAhpOcIvG
 						tkJW/9JlQ93sBxUk0E1HbTlYxtXFbNCVwqEWcg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LibLynx LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Children and Young People Now</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.markallengroup.com/ma-education/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Pollard</md:SurName>
-      <md:EmailAddress>mailto:tom.pollard@markallengroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Dixon</md:SurName>
-      <md:EmailAddress>mailto:paul@liblynx.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LibLynx LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Children and Young People Now</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.markallengroup.com/ma-education/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Pollard</md:SurName>
+    <md:EmailAddress>mailto:tom.pollard@markallengroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Dixon</md:SurName>
+    <md:EmailAddress>mailto:paul@liblynx.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml
index 2990b893..3ce2b2b1 100644
--- a/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dailywhat.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-10T15:57:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-10T15:57:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.dailywhat.org.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.dailywhat.org.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJAO7V64q3+QyMMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXRpbi1laC13ZWIwMDEwHhcNMTMwOTIxMTgzNDUzWhcNMjMwOTE5MTgzNDUz
 						WjAYMRYwFAYDVQQDEw10aW4tZWgtd2ViMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -46,43 +46,43 @@
 						AWMb1wiURu0Lw4Ywgpkrd91bJIyoPDc2VJO9ABs4pHeG3NKaNjSY1suN4R5A4dfG
 						V4hOHeRDvUlKIx3SpSVrMWsRCywyIdzIWrknAgdCJM2qIQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dailywhat.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Tinopolis Interactive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Tinopolis Interactive Limited: Daily What</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tinopolis.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Orig</md:GivenName>
-      <md:SurName>Jones</md:SurName>
-      <md:EmailAddress>mailto:orig.jones@tinopolis.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Orig</md:GivenName>
-      <md:SurName>Jones</md:SurName>
-      <md:EmailAddress>mailto:orig.jones@tinopolis.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dailywhat.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Tinopolis Interactive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Tinopolis Interactive Limited: Daily What</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tinopolis.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Orig</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:orig.jones@tinopolis.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Orig</md:GivenName>
+    <md:SurName>Jones</md:SurName>
+    <md:EmailAddress>mailto:orig.jones@tinopolis.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
index 72d122c2..f12e48fc 100644
--- a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dawsonera.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T17:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T17:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.dawsonera.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dawsonera.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dawsonera.com/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dawsonera.com/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.dawsonera.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dawsonera.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dawsonera.com/Shibboleth.sso/Login" index="1"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dawsonera.com/Shibboleth.sso/Login" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqjCCApKgAwIBAgIJAPw17BZZ42GoMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
 						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
 						VQQKEwlzZW1hbnRpY28xGjAYBgNVBAMTEXd3dy5kYXdzb25lcmEuY29tMB4XDTE0
@@ -48,54 +48,54 @@
 						YPUWnO6LjnDWB5N9pwW+4I/Aqr4RGYA07Qbzwwpy4EcLBjb8rksf65XfEKsJifBh
 						K4PtNVSuIlt/QvKTAsFlP4X3c46Ol501WcVbYoD9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dawsonera.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dawsonera.com/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dawsonera.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dawson Books Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dawsonera SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dawsonera.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth.support@dawsonbooks.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Weaver</md:SurName>
-      <md:EmailAddress>mailto:tim.weaver@dawsonbooks.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Helen</md:GivenName>
-      <md:SurName>Stratford</md:SurName>
-      <md:EmailAddress>mailto:helen.stratford@dawsonbooks.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dawsonera.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dawsonera.com/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dawsonera.com/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dawson Books Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dawsonera SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dawsonera.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth.support@dawsonbooks.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Weaver</md:SurName>
+    <md:EmailAddress>mailto:tim.weaver@dawsonbooks.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Helen</md:GivenName>
+    <md:SurName>Stratford</md:SurName>
+    <md:EmailAddress>mailto:helen.stratford@dawsonbooks.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml b/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml
index babc5bca..415616b4 100644
--- a/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.degruyter.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGzCCAgOgAwIBAgIEJQQdIDANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
 						d3cuZGVncnV5dGVyLmNvbTAeFw0xNTAxMTUxNzE0MTdaFw0xODAyMDMxNzE0MTda
 						MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
@@ -26,40 +26,40 @@
 						4YHNuVnvZuZuDKiJeM31WWr2LVjP15YoQ6S9lfsLo1NOHvlz/1/nV5y07MAHNEA1
 						sS0svq7Jyv+IC8DB2S6yhH1Ew5R4ufZ887dEvMlJCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.degruyter.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.degruyter.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.degruyter.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.degruyter.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Walter de Gruyter GmbH &amp; Co KG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Walter de Gruyter GmbH &amp; Co KG: De Gruyter Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.degruyter.de/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>De Gruyter Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:service@degruyter.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scott</md:GivenName>
-      <md:SurName>Cipriano</md:SurName>
-      <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Matt</md:GivenName>
-      <md:SurName>Warren</md:SurName>
-      <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Harlan</md:GivenName>
-      <md:SurName>McCanne</md:SurName>
-      <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>iFactory</md:GivenName>
-      <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.degruyter.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.degruyter.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.degruyter.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.degruyter.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Walter de Gruyter GmbH &amp; Co KG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Walter de Gruyter GmbH &amp; Co KG: De Gruyter Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.degruyter.de/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>De Gruyter Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:service@degruyter.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scott</md:GivenName>
+    <md:SurName>Cipriano</md:SurName>
+    <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Warren</md:SurName>
+    <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Harlan</md:GivenName>
+    <md:SurName>McCanne</md:SurName>
+    <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>iFactory</md:GivenName>
+    <md:EmailAddress>mailto:dgsupport@safaribooksonline.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml
index 71763c37..3b3132a7 100644
--- a/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.demontfortstudents.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-21T11:30:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-21T11:30:00Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.demontfortstudents.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.demontfortstudents.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,13 +28,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -52,37 +52,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">De Montfort Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.demontfortstudents.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">De Montfort Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.demontfortstudents.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.digicert.com-sso.xml b/swamid-interfederations-2.0/www.digicert.com-sso.xml
index cca335a0..9f568323 100644
--- a/swamid-interfederations-2.0/www.digicert.com-sso.xml
+++ b/swamid-interfederations-2.0/www.digicert.com-sso.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.digicert.com/sso">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-04-09T08:51:55Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-04-09T08:51:55Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Trusted Certificate Service (TCS)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Members from TCS-subscribing institutions can request personal, e-science personal, and e-science robot certificates here.</mdui:Description>
+        <mdui:Logo height="58" width="224">https://www.digicert.com/images/d3/digicert-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">GÉANT Trusted Certificate Service (TCS)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Members from TCS-subscribing institutions can request personal, e-science personal, and e-science robot certificates here.</mdui:Description>
-          <mdui:Logo height="58" width="224">https://www.digicert.com/images/d3/digicert-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFHzCCBAegAwIBAgIQDSPffA+3kdjXI6kqvoyBtDANBgkqhkiG9w0BAQsFADBl
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHzCCBAegAwIBAgIQDSPffA+3kdjXI6kqvoyBtDANBgkqhkiG9w0BAQsFADBl
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBTSEEyIEFzc3VyZWQg
 SUQgQ0EwHhcNMTUwNDA3MDAwMDAwWhcNMTgwNzA1MTIwMDAwWjBtMQswCQYDVQQG
@@ -42,13 +42,13 @@ OiC2mZ2dG5VUXk1eR7qAKafGoNkOWzY6K0yb7NlUtGQDbZ5kBUqxH7z1uIPtjEBx
 jv9ka0zHozKT+/vtNbAta7iuQtM05y2fSjXLeGpcTxnootfcFJtbpxiODd77a1Ax
 0b2CWHv1aZaDQHlMjsf1ZaVPjHkgLlTFAtgzceimrdGM7PM/EHUFHP94H1EggcYt
 n4mgYE+xr/VoR6tzNtvfyLXqxA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFHzCCBAegAwIBAgIQDSPffA+3kdjXI6kqvoyBtDANBgkqhkiG9w0BAQsFADBl
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHzCCBAegAwIBAgIQDSPffA+3kdjXI6kqvoyBtDANBgkqhkiG9w0BAQsFADBl
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBTSEEyIEFzc3VyZWQg
 SUQgQ0EwHhcNMTUwNDA3MDAwMDAwWhcNMTgwNzA1MTIwMDAwWjBtMQswCQYDVQQG
@@ -76,47 +76,47 @@ OiC2mZ2dG5VUXk1eR7qAKafGoNkOWzY6K0yb7NlUtGQDbZ5kBUqxH7z1uIPtjEBx
 jv9ka0zHozKT+/vtNbAta7iuQtM05y2fSjXLeGpcTxnootfcFJtbpxiODd77a1Ax
 0b2CWHv1aZaDQHlMjsf1ZaVPjHkgLlTFAtgzceimrdGM7PM/EHUFHP94H1EggcYt
 n4mgYE+xr/VoR6tzNtvfyLXqxA==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digicert.com/sso/saml/SingleLogout"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.digicert.com/sso/saml/SingleLogout"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digicert.com/sso/saml/SSO" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digicert.com/sso/saml/SSO" index="1"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">DigiCert's TCS Portal</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-          <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">urn:mace:terena.org:tcs:personal-user</saml:AttributeValue>
-          <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">urn:mace:terena.org:tcs:escience-user</saml:AttributeValue>
-        </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">DigiCert Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">DigiCert</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.digicert.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>DigiCert</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:support@digicert.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>GÉANT</md:GivenName>
-      <md:SurName>TCS Policy Management Authority</md:SurName>
-      <md:EmailAddress>mailto:tcs-pma@lists.geant.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>DigiCert</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:support@digicert.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digicert.com/sso/saml/SingleLogout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.digicert.com/sso/saml/SingleLogout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digicert.com/sso/saml/SSO" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digicert.com/sso/saml/SSO" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">DigiCert's TCS Portal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">urn:mace:terena.org:tcs:personal-user</saml:AttributeValue>
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">urn:mace:terena.org:tcs:escience-user</saml:AttributeValue>
+      </md:RequestedAttribute>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">DigiCert Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DigiCert</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.digicert.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>DigiCert</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@digicert.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>GÉANT</md:GivenName>
+    <md:SurName>TCS Policy Management Authority</md:SurName>
+    <md:EmailAddress>mailto:tcs-pma@lists.geant.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>DigiCert</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@digicert.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml b/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
index 29f92771..6e5f2d44 100644
--- a/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
+++ b/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.digitalmeasures.com/shibboleth-sp/">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEwTCCA6mgAwIBAgIJAI9+wkih8GQMMA0GCSqGSIb3DQEBBQUAMIGbMQswCQYD
 						VQQGEwJVUzESMBAGA1UECBMJV2lzY29uc2luMRIwEAYDVQQHEwlNaWx3YXVrZWUx
 						GTAXBgNVBAoTEERpZ2l0YWwgTWVhc3VyZXMxIDAeBgNVBAMTF3d3dy5kaWdpdGFs
@@ -51,35 +51,35 @@
 						vh8D4o/W5q32axmmKH3s85TeSyUoQ4RS7/NgsjYQI7lnODeVSgWcUl1+c+NfPNiu
 						1vpIbPTlEVEvmNPl69Zi3A9T7I/p
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.digitalmeasures.com/Shibboleth.sso/SAML/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://digitalmeasures.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.digitalmeasures.com/Shibboleth.sso/SAML/POST" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digital Measures, LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Measures</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.digitalmeasures.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Digital Measures</md:GivenName>
-      <md:EmailAddress>mailto:info@digitalmeasures.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Digital Measures</md:GivenName>
-      <md:EmailAddress>mailto:info@digitalmeasures.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.digitalmeasures.com/Shibboleth.sso/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://digitalmeasures.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.digitalmeasures.com/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digital Measures, LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Measures</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.digitalmeasures.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Digital Measures</md:GivenName>
+    <md:EmailAddress>mailto:info@digitalmeasures.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Digital Measures</md:GivenName>
+    <md:EmailAddress>mailto:info@digitalmeasures.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/www.digitaltheatreplus.com.xml
index e5c89134..2da722b4 100644
--- a/swamid-interfederations-2.0/www.digitaltheatreplus.com.xml
+++ b/swamid-interfederations-2.0/www.digitaltheatreplus.com.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.digitaltheatreplus.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T14:56:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T14:56:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="60" width="104">https://digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Digital Theatre Plus</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="60" width="104">https://digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">Digital Theatre Plus</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDSzCCAjOgAwIBAgIJAIF+/2SALpqQMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
 						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
 						MB4XDTE1MDMwNTE2NTAzM1oXDTI1MDMwMjE2NTAzM1owNzE1MDMGA1UEAxMsaXAt
@@ -36,34 +36,34 @@
 						fYj5FNoRpffRMQ9+MNEm/aK+SFpy1nXtc1XtD1sEqtnLGiIQMUhgEtvnas82T1f1
 						rxodZ8fzQWvmeZ7qOiheeiTxu5Fwylj1xVBJ7suMMQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Digital Theatre.com Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Theatre Plus</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.digitaltheatreplus.com/about-us</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jonathan</md:GivenName>
-      <md:SurName>Ware</md:SurName>
-      <md:EmailAddress>mailto:support@digitaltheatre.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Carly</md:GivenName>
-      <md:SurName>Britton</md:SurName>
-      <md:EmailAddress>mailto:support@vualto.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Digital Theatre.com Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Theatre Plus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.digitaltheatreplus.com/about-us</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Ware</md:SurName>
+    <md:EmailAddress>mailto:support@digitaltheatre.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carly</md:GivenName>
+    <md:SurName>Britton</md:SurName>
+    <md:EmailAddress>mailto:support@vualto.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml b/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml
index 9b47bf66..68fd09bd 100644
--- a/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dl.begellhouse.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDATCCAemgAwIBAgIBADANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDExZ3d3cu
 						ZGwuYmVnZWxsaG91c2UuY29tMB4XDTA5MTEwMjE3MzYzNVoXDTE5MTAzMTE3MzYz
 						NVowITEfMB0GA1UEAxMWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTCCASIwDQYJKoZI
@@ -26,13 +26,13 @@
 						P4j8jBZlm09UY2vIfbVGHkXfF2bY8oUHwtJvdrJNOfQMcAabjX4JjAXtzPoylgQ7
 						dbHMS9g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDATCCAemgAwIBAgIBADANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDExZ3d3cu
 						ZGwuYmVnZWxsaG91c2UuY29tMB4XDTA5MTEwMjE3MzYzNVoXDTE5MTAzMTE3MzYz
 						NVowITEfMB0GA1UEAxMWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTCCASIwDQYJKoZI
@@ -51,36 +51,36 @@
 						P4j8jBZlm09UY2vIfbVGHkXfF2bY8oUHwtJvdrJNOfQMcAabjX4JjAXtzPoylgQ7
 						dbHMS9g=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Begell House Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Begell House Digital Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dl.begellhouse.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Begell House Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:orders@begellhouse.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alex</md:GivenName>
-      <md:SurName>Judin</md:SurName>
-      <md:EmailAddress>mailto:alex@offsiteteam.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Begell House Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Begell House Digital Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dl.begellhouse.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Begell House Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:orders@begellhouse.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Judin</md:SurName>
+    <md:EmailAddress>mailto:alex@offsiteteam.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml
index 5dd1e686..579dd925 100644
--- a/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.e-lawstudent.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.elawstudent.com/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.elawstudent.com/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAJlseYQQY0a6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3M0MC5jYWxsaWR1czAwMS5uZXQwHhcNMTEwODI5MDk0OTI5WhcNMjEwODI2
 						MDk0OTI5WjAeMRwwGgYDVQQDExNzNDAuY2FsbGlkdXMwMDEubmV0MIIBIjANBgkq
@@ -40,44 +40,44 @@
 						KmpxYZDCeeCRX2kzgxVvOCSh/EIu6FSVtYogyMJcTJhfjpIP9c++PnmKaXvvrdku
 						k7tDPQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elawstudent.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elawstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">e-lawstudent</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">e-lawstudent</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.e-lawstudent.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Naylor</md:SurName>
-      <md:EmailAddress>mailto:simon@e-lawstudent.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Naylor</md:SurName>
-      <md:EmailAddress>mailto:simon@e-lawstudent.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elawstudent.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elawstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">e-lawstudent</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">e-lawstudent</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e-lawstudent.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Naylor</md:SurName>
+    <md:EmailAddress>mailto:simon@e-lawstudent.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Naylor</md:SurName>
+    <md:EmailAddress>mailto:simon@e-lawstudent.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml b/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
index 4cbc995d..c0cc3a18 100644
--- a/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
+++ b/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ebi.ac.uk/ega/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ebi.ac.uk/ega/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The European Genome-phenome Archive</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">European Genome-phenome Archive</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n ylläpitämä datan arkistointi- ja jakopalvelu  biolääketieteen tutkimusprojekteille.</mdui:Description>
+        <mdui:Description xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</mdui:Description>
+        <mdui:Logo height="62" width="180">https://www.ebi.ac.uk/ega/sites/ebi.ac.uk.ega/files/documents/images/EMBL_EBI_RGB_petrol_lo-res.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="en">NGS genotype variation cancer diabetes disease</mdui:Keywords>
+        <mdui:InformationURL xml:lang="en">https://www.ebi.ac.uk/ega/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ebi.ac.uk/about/cookies</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ebi.ac.uk/ega/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The European Genome-phenome Archive</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="fi">European Genome-phenome Archive</mdui:DisplayName>
-          <mdui:Description xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n ylläpitämä datan arkistointi- ja jakopalvelu  biolääketieteen tutkimusprojekteille.</mdui:Description>
-          <mdui:Description xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</mdui:Description>
-          <mdui:Logo height="62" width="180">https://www.ebi.ac.uk/ega/sites/ebi.ac.uk.ega/files/documents/images/EMBL_EBI_RGB_petrol_lo-res.jpg</mdui:Logo>
-          <mdui:Keywords xml:lang="en">NGS genotype variation cancer diabetes disease</mdui:Keywords>
-          <mdui:InformationURL xml:lang="en">https://www.ebi.ac.uk/ega/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.ebi.ac.uk/about/cookies</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMOTGo+6cOgBMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMOTGo+6cOgBMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 BAMTFHZlcy1lYmktMTAuZWJpLmFjLnVrMB4XDTEyMTEyMjA5MTc1MloXDTIyMTEy
 MDA5MTc1MlowHzEdMBsGA1UEAxMUdmVzLWViaS0xMC5lYmkuYWMudWswggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjS5ePByst+LtG8/i7+C7nl/qWQLsF
@@ -39,38 +39,38 @@ sfLW43EnSzV7e0PSQWCpyd4zM9o5AXFN8W5DxT3xxDgSLKVLfcPhhmWZY0j0Smif
 0OgHpkYrmnMoXOPgcKOQORrB7QD1ULnn3eYFaGxbi7J5/tkB8eFPphWtBI7p5YzZ
 5NBxB7QhViLbVlolHx/UoJnmcnFcHXtdEcgvmCcxqlFSE17911r3zKWdRIXiNoot
 u7YBIOFkbw==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ebi.ac.uk/ega/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">European Genome-phenome Archive</md:ServiceName>
-        <md:ServiceName xml:lang="en">The European Genome-phenome Archive</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n yllapitama datan arkistointi- ja jakopalvelu  biolaaketieteen tutkimusprojekteille.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.ebi.ac.uk/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.ebi.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jag</md:GivenName>
-      <md:SurName>Kandasamy</md:SurName>
-      <md:EmailAddress>mailto:kandaj@ebi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jag</md:GivenName>
-      <md:SurName>Kandasamy</md:SurName>
-      <md:EmailAddress>mailto:kandaj@ebi.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ebi.ac.uk/ega/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">European Genome-phenome Archive</md:ServiceName>
+      <md:ServiceName xml:lang="en">The European Genome-phenome Archive</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n yllapitama datan arkistointi- ja jakopalvelu  biolaaketieteen tutkimusprojekteille.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.ebi.ac.uk/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ebi.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jag</md:GivenName>
+    <md:SurName>Kandasamy</md:SurName>
+    <md:EmailAddress>mailto:kandaj@ebi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jag</md:GivenName>
+    <md:SurName>Kandasamy</md:SurName>
+    <md:EmailAddress>mailto:kandaj@ebi.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
index 2fbeb306..d10e8a3e 100644
--- a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eenet.ee/sso/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eenet.ee</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eenet.ee</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="et">Eesti Hariduse ja Teaduse Andmesidevõrk</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Estonian Education and Research Network</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="et">EENet (aevastaja)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">EENet (aevastaja)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="et">http://www.eenet.ee</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.eenet.ee/EENet/EENet_en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>TAAT</md:GivenName>
-      <md:SurName>Operations</md:SurName>
-      <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDpjCCAo4CCQDINHfRT/2NbzANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwHhcNMTYwMzE0MTE1NTMzWhcNMTkwMzE0MTE1NTMzWjCBlDELMAkGA1UEBhMCRUUxETAPBgNVBAgMCFRhcnR1bWFhMQ4wDAYDVQQHDAVUYXJ0dTEOMAwGA1UECgwFRUVOZXQxGTAXBgNVBAsMEFRlZW51c3RlIE9zYWtvbmQxFTATBgNVBAMMDGVlbmV0LmVlL3NzbzEgMB4GCSqGSIb3DQEJARYRdGVlbnVzZWRAZWVuZXQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfKb0HFR4cR/fpsQHIC6HJrWEWj+X5q+vqVdJ7Fcgk4paZzGkxACeVaK7ZXYexXs6UfzAzR6QDINNWbw4ThHtfjZx67CLQDLzqvXGqV1WuC0VFutkK+8xzYGi7JNOyT9vPiXI3kQsMS4iBF/0ai/UfDBHITGDfgi8cORgD2pAxacjXPv89E9C1Sc5GLGAXtRJbOK67kseCZRP0Es3swXv/cO91LK58MO3QTiXsxtQFNYFpZTSQmE6i/Di1YBATcYcbgFWvCCyFsqzbpJHs/zaAjW5VnQAsYOshS3ae8GBzIfVxelXggH4iqP5hbDTC5r5qGZjuzw/9IIqI/Vlr0007AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXRmwnfLZjGHEri0N1dJig/hQItjki8H3bji9hY13OLOTqB4gaxKk8pYWwaf7Hv1Nz17gkx6JdrQ2uub+kuGgT14fIx/Te4q2v1WUe4d9xRYZ59GBz5WgTv3BDRDxmtulyuvH7j9csmOB4pDL8FIUd/VzVxA90oMa1sOGMSUfZSCNUvElL59vOK+qeVX3UWOJRT54BBO7fPAGAgjFXK6YKKYZw1MekiMwqNzQ5oCJg91YWt5ELZvBAdBdQurRya6Tso6IXWyNyvipfFrJ+NIXWjzrEQ/OHRxBg5os8oXHwdaXac9UUlRDW1UEzIA+ljiU5r/riT9F/PSN6zlGdL9lQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="et">Eesti Hariduse ja Teaduse Andmesidevõrk</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Estonian Education and Research Network</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="et">EENet (aevastaja)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">EENet (aevastaja)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="et">http://www.eenet.ee</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.eenet.ee/EENet/EENet_en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TAAT</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
index 91b0ccc5..3a942085 100644
--- a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eki.ee/simplesamlphp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eki.ee</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eki.ee</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eki.ee/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eki.ee/simplesamlphp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="et">Eesti keele instituut</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Institute of the Estonian Language</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="et">Eesti keele instituut</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Institute of the Estonian Language</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="et">http://www.eki.ee</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.eki.ee</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>TAAT</md:GivenName>
-      <md:SurName>Operations</md:SurName>
-      <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eki.ee/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eki.ee/simplesamlphp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="et">Eesti keele instituut</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Institute of the Estonian Language</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="et">Eesti keele instituut</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of the Estonian Language</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="et">http://www.eki.ee</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.eki.ee</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TAAT</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml b/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml
index 2094cb3c..3061d362 100644
--- a/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.elgaronline.com/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-17T08:44:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-17T08:44:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBDCCAeygAwIBAgIEU6rnhTANBgkqhkiG9w0BAQUFADBEMSQwIgYDVQQKExtF
 						ZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5lbGdhcm9u
 						bGluZS5jb20wHhcNMTQwNjI1MTUxNTE3WhcNMjQwNjIyMTUxNTE3WjBEMSQwIgYD
@@ -28,13 +28,13 @@
 						TA+7CGeJEhhBdtMHAV7salX0SDV1XDS2icJrFqEbgsJADKM71qFneDNLP874hvmR
 						CYoHEdBLhyA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDBDCCAeygAwIBAgIEU6rnhTANBgkqhkiG9w0BAQUFADBEMSQwIgYDVQQKExtF
 						ZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5lbGdhcm9u
 						bGluZS5jb20wHhcNMTQwNjI1MTUxNTE3WhcNMjQwNjIyMTUxNTE3WjBEMSQwIgYD
@@ -53,27 +53,27 @@
 						TA+7CGeJEhhBdtMHAV7salX0SDV1XDS2icJrFqEbgsJADKM71qFneDNLP874hvmR
 						CYoHEdBLhyA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elgaronline.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elgaronline.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elgaronline.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elgaronline.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Edward Elgar Publishing Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Elgar Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.e-elgar.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Marissa</md:GivenName>
-      <md:SurName>Itkowsky</md:SurName>
-      <md:EmailAddress>mailto:mitkowsky@safaribooksonline.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Istratov</md:SurName>
-      <md:EmailAddress>mailto:mistratov@safaribooksonline.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elgaronline.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elgaronline.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elgaronline.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elgaronline.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Edward Elgar Publishing Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Elgar Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e-elgar.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marissa</md:GivenName>
+    <md:SurName>Itkowsky</md:SurName>
+    <md:EmailAddress>mailto:mitkowsky@safaribooksonline.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Istratov</md:SurName>
+    <md:EmailAddress>mailto:mistratov@safaribooksonline.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml
index 8ab7e7ea..06d97651 100644
--- a/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.elsevierclinicalskills.co.uk/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T17:12:23Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T17:12:23Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEJzCCAw+gAwIBAgIJAK+ojEV2iGtzMA0GCSqGSIb3DQEBBQUAMGoxPTA7BgNV
 						BAoTNEVsc2V2aWVyIEhlYWx0aCBTY2llbmNlcyAoVUspIC0gTW9zYnkgTnVyc2lu
 						ZyBTa2lsbHMxKTAnBgNVBAMTIHd3dy5lbHNldmllcmNsaW5pY2Fsc2tpbGxzLmNv
@@ -32,13 +32,13 @@
 						lEzrc5CYKrBhI+iVeb1LWLJQvBUsN5JPKKL93k+KlUtMbvCRoqUuScrmVTjDN7/n
 						l2zTfF8JeZK/evs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEJzCCAw+gAwIBAgIJAK+ojEV2iGtzMA0GCSqGSIb3DQEBBQUAMGoxPTA7BgNV
 						BAoTNEVsc2V2aWVyIEhlYWx0aCBTY2llbmNlcyAoVUspIC0gTW9zYnkgTnVyc2lu
 						ZyBTa2lsbHMxKTAnBgNVBAMTIHd3dy5lbHNldmllcmNsaW5pY2Fsc2tpbGxzLmNv
@@ -63,27 +63,27 @@
 						lEzrc5CYKrBhI+iVeb1LWLJQvBUsN5JPKKL93k+KlUtMbvCRoqUuScrmVTjDN7/n
 						l2zTfF8JeZK/evs=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Elsevier Clinical Skills</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.elsevierclinicalskills.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Isaacs</md:SurName>
-      <md:EmailAddress>mailto:g.isaacs@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Terence</md:GivenName>
-      <md:SurName>Clifton</md:SurName>
-      <md:EmailAddress>mailto:t.clifton@elsevier.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Elsevier Clinical Skills</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.elsevierclinicalskills.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Isaacs</md:SurName>
+    <md:EmailAddress>mailto:g.isaacs@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Terence</md:GivenName>
+    <md:SurName>Clifton</md:SurName>
+    <md:EmailAddress>mailto:t.clifton@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
index c79a200a..db3b9cf4 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
@@ -1,101 +1,101 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
 						BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
 						ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
@@ -115,38 +115,38 @@
 						uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
 						MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Emerald Group Publishing Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Emerald Live Site</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rob</md:GivenName>
-      <md:SurName>Wood</md:SurName>
-      <md:EmailAddress>mailto:rwood@emeraldinsight.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Laurence</md:GivenName>
-      <md:SurName>Parkin</md:SurName>
-      <md:EmailAddress>mailto:lparkin@emeraldinsight.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emerald Group Publishing Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Live Site</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rob</md:GivenName>
+    <md:SurName>Wood</md:SurName>
+    <md:EmailAddress>mailto:rwood@emeraldinsight.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Laurence</md:GivenName>
+    <md:SurName>Parkin</md:SurName>
+    <md:EmailAddress>mailto:lparkin@emeraldinsight.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
index 190ba0fe..d8ea7d19 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T14:43:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T14:43:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Emerald Insight</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Emerald is a global publisher linking research and practice to the benefit of society.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.emeraldinsight.com</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Emerald Insight</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Emerald is a global publisher linking research and practice to the benefit of society.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.emeraldinsight.com</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYw
 						NjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIB
@@ -36,24 +36,24 @@
 						Maa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3d
 						Bt7qcpd9uOc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Emerald Insight</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Insight</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-sp.xml b/swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-sp.xml
index bfb4943c..d02f8770 100644
--- a/swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-sp.xml
+++ b/swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-sp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emplaw.co.uk/simplesaml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T09:33:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T09:33:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">Online access to up to date employment law information and cases</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Emplaw Online</mdui:DisplayName>
+        <mdui:Logo height="100" width="298" xml:lang="en">https://www.emplaw.co.uk/sites/default/files/emplawlogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">Online access to up to date employment law information and cases</mdui:Description>
-          <mdui:DisplayName xml:lang="en">Emplaw Online</mdui:DisplayName>
-          <mdui:Logo height="100" width="298" xml:lang="en">https://www.emplaw.co.uk/sites/default/files/emplawlogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDizCCAnOgAwIBAgIJANLzbWrFslBjMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
 						aWRnaXRzIFB0eSBMdGQxFTATBgNVBAMMDGVtcGxhdy5jby51azAeFw0xNTAzMjMx
@@ -37,13 +37,13 @@
 						QdkRmWoWVJ2sip3jvJq+JuFtJr2Y0Kps/vq9oSUK6SjS8hSU7vKIS+9OsZeJzHTz
 						N0+As8bWQHWAY/vBGBv/lSY3DVItLlILfPqM8MH62/fiYaHD5D1l67w4hB2Mg70=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDizCCAnOgAwIBAgIJANLzbWrFslBjMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
 						BAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
 						aWRnaXRzIFB0eSBMdGQxFTATBgNVBAMMDGVtcGxhdy5jby51azAeFw0xNTAzMjMx
@@ -64,29 +64,29 @@
 						QdkRmWoWVJ2sip3jvJq+JuFtJr2Y0Kps/vq9oSUK6SjS8hSU7vKIS+9OsZeJzHTz
 						N0+As8bWQHWAY/vBGBv/lSY3DVItLlILfPqM8MH62/fiYaHD5D1l67w4hB2Mg70=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-logout.php/sp1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-logout.php/sp1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Constantia Associates Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Emplaw Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.emplaw.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Hall</md:SurName>
-      <md:EmailAddress>mailto:mike@juic3.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Hall</md:SurName>
-      <md:EmailAddress>mailto:mike@juic3.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-logout.php/sp1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-logout.php/sp1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Constantia Associates Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emplaw Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emplaw.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Hall</md:SurName>
+    <md:EmailAddress>mailto:mike@juic3.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Hall</md:SurName>
+    <md:EmailAddress>mailto:mike@juic3.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml
index 00b6e5e2..3c9cd295 100644
--- a/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.era-test.lib.ed.ac.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-28T16:29:18Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-28T16:29:18Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFTCCAf2gAwIBAgIJALOvgJMUhk7DMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGmxhYy1yZXBvLXRlc3Q3LmlzLmVkLmFjLnVrMB4XDTEzMDEyODE1MjA1M1oX
 						DTIzMDEyNjE1MjA1M1owJTEjMCEGA1UEAxMabGFjLXJlcG8tdGVzdDcuaXMuZWQu
@@ -40,39 +40,39 @@
 						Rzkx2kzgZA00Wvk+0EvmAXnoxIUZfpugV1Bw17LC7a2MnihRHvndiqmj59snZ9VI
 						74PyBeKyItPNiuEYH+2iw3VuHSvz91S6+A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Test digital repository from the University of Edinburgh</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.era-test.lib.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Systems</md:GivenName>
-      <md:EmailAddress>mailto:information.systems@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Colin</md:GivenName>
-      <md:SurName>Watt</md:SurName>
-      <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Test digital repository from the University of Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.era-test.lib.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Systems</md:GivenName>
+    <md:EmailAddress>mailto:information.systems@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml
index ef89017c..d3562a75 100644
--- a/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.era.lib.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-24T15:38:27Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-24T15:38:27Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFTCCAf2gAwIBAgIJAIOsYTB61XKdMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGmxhYy1yZXBvLWxpdmU3LmlzLmVkLmFjLnVrMB4XDTEzMDMyOTE0MTMxNFoX
 						DTIzMDMyNzE0MTMxNFowJTEjMCEGA1UEAxMabGFjLXJlcG8tbGl2ZTcuaXMuZWQu
@@ -40,39 +40,39 @@
 						4MHYYV6m3Xe5EtHSarPW+aqqKrL7IXrpuCLAg6FVb4ULBMisw2Nsp7zc03zLobTd
 						DJFYFLGtGnkAW0rtldK8ic92p7u2SzXZYw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital repository from the University of Edinburgh</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.era.lib.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Information Systems</md:GivenName>
-      <md:EmailAddress>mailto:information.systems@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Colin</md:GivenName>
-      <md:SurName>Watt</md:SurName>
-      <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital repository from the University of Edinburgh</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.era.lib.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Information Systems</md:GivenName>
+    <md:EmailAddress>mailto:information.systems@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Colin</md:GivenName>
+    <md:SurName>Watt</md:SurName>
+    <md:EmailAddress>mailto:colin.watt@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml
index a798a585..14a59de3 100644
--- a/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.essexstudent.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.essexstudent.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.essexstudent.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,36 +28,36 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.essexstudent.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.essexstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: essexstudent.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.essexstudent.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Essex SU Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:help@essexstudent.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.essexstudent.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.essexstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: essexstudent.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.essexstudent.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Essex SU Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:help@essexstudent.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml b/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml
index d9f8cfdb..4c7b01c0 100644
--- a/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.euppublishing.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrzCCApegAwIBAgIJAPbC/ThktAkhMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						ehQLiW/fDXfKCHtt3GjXNnU6xGbOtG6XilUD7a/Z5Pm4BhuanO04bmO84Q733a5r
 						TParqfMsNJY958o6cyuiHcpuhFjvsp7qkLi/kmTaOk1r6Pc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.euppublishing.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.euppublishing.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.euppublishing.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Edinburgh University Press</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.euppublishing.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.euppublishing.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.euppublishing.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.euppublishing.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Edinburgh University Press</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.euppublishing.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml b/swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml
index a48ab360..f76d6732 100644
--- a/swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.europeansources.info/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.europeansources.info/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.europeansources.info/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIJAKXvxs0f16ZOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5mbzAeFw0xMDExMDUwNDA1NDBaFw0z
 						MDEwMzEwNDA1NDBaMCMxITAfBgNVBAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5m
@@ -30,13 +30,13 @@
 						+uDpys5EQJlQYf7uL7LVSQgkhyjMvvQYDCzNjDsLFkneyWKAIj3c9ZUa5gk8nvSI
 						CxCvlN9hdNAKSPhbVe6gTSLw1Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPzCCAiegAwIBAgIJAKXvxs0f16ZOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5mbzAeFw0xMDExMDUwNDA1NDBaFw0z
 						MDEwMzEwNDA1NDBaMCMxITAfBgNVBAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5m
@@ -56,37 +56,37 @@
 						+uDpys5EQJlQYf7uL7LVSQgkhyjMvvQYDCzNjDsLFkneyWKAIj3c9ZUa5gk8nvSI
 						CxCvlN9hdNAKSPhbVe6gTSLw1Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.europeansources.info/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.europeansources.info/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.europeansources.info/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.europeansources.info/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">European Sources Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.europeansources.info/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>ESO Support</md:GivenName>
-      <md:EmailAddress>mailto:esowebmaster@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Philip </md:GivenName>
-      <md:SurName>Smart</md:SurName>
-      <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.europeansources.info/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.europeansources.info/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.europeansources.info/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.europeansources.info/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">European Sources Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.europeansources.info/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ESO Support</md:GivenName>
+    <md:EmailAddress>mailto:esowebmaster@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Philip </md:GivenName>
+    <md:SurName>Smart</md:SurName>
+    <md:EmailAddress>mailto:smartp@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml
index 3a06af5c..1f4bb940 100644
--- a/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eusa.ed.ac.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -25,38 +25,38 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Edinburgh University Students Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.eusa.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Edinburgh University Students Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eusa.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml b/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
index 9f2bd234..49104e95 100644
--- a/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.exacteditions.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMDCCAxigAwIBAgIJAISCsINDzLsWMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNV
 						BAoTEUV4YWN0RWRpdGlvbnMgTHRkMSAwHgYDVQQDExdsb2dpbi5leGFjdGVkaXRp
@@ -43,13 +43,13 @@
 						ROoLTRIDq01SmDnaiyOVTkGjNkNpR7PKj8Tr91upnrB0sE0u+R6JjEoI2bHoOQI0
 						wKxM0RWUQo8Ocu512fz2GE89mfQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMDCCAxigAwIBAgIJAISCsINDzLsWMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNV
 						BAoTEUV4YWN0RWRpdGlvbnMgTHRkMSAwHgYDVQQDExdsb2dpbi5leGFjdGVkaXRp
@@ -74,13 +74,13 @@
 						ROoLTRIDq01SmDnaiyOVTkGjNkNpR7PKj8Tr91upnrB0sE0u+R6JjEoI2bHoOQI0
 						wKxM0RWUQo8Ocu512fz2GE89mfQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8DCCAtigAwIBAgIJAKxba9CqnWAUMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UE
 						ChMSRXhhY3QgRWRpdGlvbnMgTHRkMQswCQYDVQQLEwJJVDEeMBwGA1UEAxMVd3d3
@@ -104,13 +104,13 @@
 						A7ecb0GjcvX16ir1D/d6Y3/E0guV3Ri4GpJ8/K3sz65n6Gqiwfm5yuehIOvniQih
 						BvmkLw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8DCCAtigAwIBAgIJAKxba9CqnWAUMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
 						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UE
 						ChMSRXhhY3QgRWRpdGlvbnMgTHRkMQswCQYDVQQLEwJJVDEeMBwGA1UEAxMVd3d3
@@ -134,40 +134,40 @@
 						A7ecb0GjcvX16ir1D/d6Y3/E0guV3Ri4GpJ8/K3sz65n6Gqiwfm5yuehIOvniQih
 						BvmkLw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.exacteditions.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.exacteditions.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.exacteditions.com/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.exacteditions.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Exact Editions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Exact Editions Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exacteditions.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Exact Editions Support</md:GivenName>
-      <md:EmailAddress>mailto:support@exacteditions.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Bruce</md:SurName>
-      <md:EmailAddress>mailto:tim.bruce@exacteditions.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.exacteditions.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.exacteditions.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.exacteditions.com/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.exacteditions.com/Shibboleth.sso/SAML/Artifact" index="12"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Exact Editions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Exact Editions Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exacteditions.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Exact Editions Support</md:GivenName>
+    <md:EmailAddress>mailto:support@exacteditions.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Bruce</md:SurName>
+    <md:EmailAddress>mailto:tim.bruce@exacteditions.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml b/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml
index 31cc6478..4ba7aaf6 100644
--- a/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.exeterguild.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -25,38 +25,38 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.exeterguild.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.exeterguild.org/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions: ExeterGuild.org</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.exeterguild.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.exeterguild.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.exeterguild.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions: ExeterGuild.org</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.exeterguild.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml b/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml
index 1511a36d..80c4815c 100644
--- a/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.future-science.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T14:48:01Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T14:48:01Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8TCCAtmgAwIBAgIJAK72JYaVEOKrMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -31,24 +31,24 @@
 						dA7ai3rZPltfny9pnfhwvyAG1SvimFqGjK1HnCK9M8BZafozi5VMwQQK8zyCzSh1
 						PhWHTeQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.future-science.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.future-science.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.future-science.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Future Science Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.future-science.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.future-science.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.future-science.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.future-science.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Future Science Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.future-science.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml b/swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml
index fcd77714..154ad6ef 100644
--- a/swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.futuremedicine.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID8TCCAtmgAwIBAgIJAJ/77lkMaSGrMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -31,24 +31,24 @@
 						CJpYbgCtuw3wcIbLndCEu88kiGZI+nKGariT+XxJCEgmZPZ5bjZahzfAn15+aK7m
 						JPGtRd4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.futuremedicine.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.futuremedicine.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.futuremedicine.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Future Medicine Ltd</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.futuremedicine.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.futuremedicine.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.futuremedicine.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.futuremedicine.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Future Medicine Ltd</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.futuremedicine.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml
index c4c153e2..9f6367f6 100644
--- a/swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.fxu.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-02T11:32:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-02T11:32:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.fxu.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.fxu.org.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.fxu.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.fxu.org.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.fxu.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Falmouth &amp; Exeter Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fxu.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.fxu.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Falmouth &amp; Exeter Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fxu.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.gft.eng.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.gft.eng.cam.ac.uk-shibboleth.xml
index fa1e0591..96398464 100644
--- a/swamid-interfederations-2.0/www.gft.eng.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.gft.eng.cam.ac.uk-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.gft.eng.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T14:42:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-26T14:42:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">The University of Cambridge Glass and Façade technology research group</mdui:Description>
+        <mdui:DisplayName xml:lang="en">The University of Cambridge Glass and Façade technology research group</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">The University of Cambridge Glass and Façade technology research group</mdui:Description>
-          <mdui:DisplayName xml:lang="en">The University of Cambridge Glass and Façade technology research group</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -54,42 +54,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Cambridge Glass and Façade technology research group</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.gft.eng.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gft.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Cambridge Glass and Façade technology research group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.gft.eng.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml
index 64437633..64f11b35 100644
--- a/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.gkunions.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T11:31:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T11:31:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gkunions.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.gkunions.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.gkunions.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.gkunions.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gkunions.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Greenwich and Kent Unions Together</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.gkunions.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gkunions.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Greenwich and Kent Unions Together</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.gkunions.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
index 0b3f9044..ec09548b 100644
--- a/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.glew.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-13T14:11:19Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-13T14:11:19Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.glew.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.glew.org.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="117" width="256">https://www.glew.org.uk/logosml.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Glew - Learning Made Simple</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Glew</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.glew.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.glew.org.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="117" width="256">https://www.glew.org.uk/logosml.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Glew - Learning Made Simple</mdui:Description>
-          <mdui:DisplayName xml:lang="en">Glew</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIJAONwxil6WuG0MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
 						BAMTIHMxNTQwNDg4Ni5vbmxpbmVob21lLXNlcnZlci5pbmZvMB4XDTEyMDcyNzEw
 						MDQzNFoXDTIyMDcyNTEwMDQzNFowKzEpMCcGA1UEAxMgczE1NDA0ODg2Lm9ubGlu
@@ -35,34 +35,34 @@
 						rHHEMaX104getbCsdeCtrOUdq+RwO6+hLEsBiNnIacKNOt1evrdDXDd02exSTXSe
 						606yHgGge9GO5GNooVTWmR5/DXyoAlDSxbnZpXzwvczR4exkYd2lb9a7mA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.glew.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.glew.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.glew.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Charles Love trading as Perfect Papers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glew</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glew.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Charlie</md:GivenName>
-      <md:SurName>Love</md:SurName>
-      <md:EmailAddress>mailto:charlie.love@compednet.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Charlie</md:GivenName>
-      <md:SurName>Love</md:SurName>
-      <md:EmailAddress>mailto:charlie.love@compednet.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.glew.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.glew.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.glew.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Charles Love trading as Perfect Papers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glew</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glew.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Charlie</md:GivenName>
+    <md:SurName>Love</md:SurName>
+    <md:EmailAddress>mailto:charlie.love@compednet.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Charlie</md:GivenName>
+    <md:SurName>Love</md:SurName>
+    <md:EmailAddress>mailto:charlie.love@compednet.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml
index aa354c74..4b2a80c2 100644
--- a/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.goglasgow.org.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-18T16:39:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-18T16:39:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.goglasgow.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.goglasgow.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEgDCCA2igAwIBAgIJAPMjaLYGwUMUMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHTAb
 						BgNVBAoTFEdsYXNnb3cgQ2l0eSBDb3VuY2lsMSAwHgYDVQQLExdHYXRld2F5IFNo
@@ -39,38 +39,38 @@
 						XP+CyHYMMkgvhpaX2mulTQmlzIJ70gcC/fyF2DiKGnbvoApfeneb6E9fiVk82k55
 						tGUYmA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Glasgow City Council</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Glasgow City Council: Glasgow Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.glasgow.gov.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Gillespie</md:SurName>
-      <md:EmailAddress>mailto:alistair.gillespie@ceg.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Alistair</md:GivenName>
-      <md:SurName>Gillespie</md:SurName>
-      <md:EmailAddress>mailto:Alistair.Gillespie@ceg.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Glasgow City Council</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow City Council: Glasgow Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glasgow.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Gillespie</md:SurName>
+    <md:EmailAddress>mailto:alistair.gillespie@ceg.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alistair</md:GivenName>
+    <md:SurName>Gillespie</md:SurName>
+    <md:EmailAddress>mailto:Alistair.Gillespie@ceg.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml b/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml
index ee1e7370..0e3eecfb 100644
--- a/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.guilfordjournals.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDrTCCApWgAwIBAgIJAKnRupkZlL3vMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						VB0Di9U3LXyKtrtkDze+28e1YM/C0+Z1L8iMRwc1Bl//37zvMFLQW76s9+yQMJVc
 						27TWzs2tyoA/K2JsjCy5trHj/oEhD2obZvDuvJ89VKDQ
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://guilfordjournals.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.guilfordjournals.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.guilfordjournals.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Guilford Press Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.guilford.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://guilfordjournals.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.guilfordjournals.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.guilfordjournals.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Guilford Press Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.guilford.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml
index b6d795be..03e1d1a6 100644
--- a/swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.hallamstudentsunion.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-25T14:09:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-25T14:09:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 					BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 					WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 					MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 					Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Sheffield Hallam Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hallamstudentsunion.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sheffield Hallam Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hallamstudentsunion.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml b/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml
index 5038cb6f..513565bd 100644
--- a/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.hellou.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-26T14:40:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-26T14:40:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.hellou.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.hellou.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJAKwi1R+TxXbDMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC2hlbGxvdS12bS0xMB4XDTEzMDYyNTEyMDczNloXDTIzMDYyMzEyMDczNlow
 						FjEUMBIGA1UEAxMLaGVsbG91LXZtLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -46,42 +46,42 @@
 						X+/lp3C7NhudW6fptQ7oOPK2Y4kfVCQqSOePlCIZEFZJazq+hLVyAC3LCZwNsG5x
 						4BPoHboks4uyA/aNN9nrxFADa386mQ20RKyzwg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hellou.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hellou.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hellou.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hellou.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hellou.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hellou.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hellou.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hellou.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hellou.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hellou.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hellou.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">helloU Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">helloU.com</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.hellou.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@hellou.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andrew</md:GivenName>
-      <md:SurName>Fidler</md:SurName>
-      <md:EmailAddress>mailto:andrew.fidler@hellou.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hellou.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hellou.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hellou.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hellou.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hellou.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hellou.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hellou.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hellou.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hellou.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hellou.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hellou.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">helloU Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">helloU.com</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.hellou.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@hellou.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Fidler</md:SurName>
+    <md:EmailAddress>mailto:andrew.fidler@hellou.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
index a0e84b5d..e91c58ba 100644
--- a/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.idcore.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-13T13:01:46Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-13T13:01:46Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.idcore.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.idcore.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="150" width="300">https://www.idcore.ac.uk/idcore-logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.idcore.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.idcore.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="150" width="300">https://www.idcore.ac.uk/idcore-logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAK7gd0sjQD2JMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF2FwcHMtZHJ1cGFsLmlzLmVkLmFjLnVrMB4XDTEyMDgyOTE1MTIxNVoXDTIy
 						MDgyNzE1MTIxNVowIjEgMB4GA1UEAxMXYXBwcy1kcnVwYWwuaXMuZWQuYWMudWsw
@@ -45,38 +45,38 @@
 						PwGx7cS/nQdkxdrixzw/1gfshcZE/K+3io2eb4dVZMVCyQgutiNCGb8JSarkKPcZ
 						1YCoQCcNbfG91gxyN612mg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.idcore.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.idcore.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Management</md:GivenName>
-      <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Service Management</md:GivenName>
-      <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.idcore.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.idcore.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Management</md:GivenName>
+    <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Service Management</md:GivenName>
+    <md:EmailAddress>mailto:w3hd@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml
index 4c1adcdf..c370c641 100644
--- a/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.images.group.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-05T14:38:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-05T14:38:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of Cambridge IMAGES Network</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.images.group.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of Cambridge IMAGES Network</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.images.group.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml
index 7a43ef56..1f8c20c2 100644
--- a/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.imperialhomesolutions.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-22T11:21:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-22T11:21:23Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC5TCCAc2gAwIBAgIJAPDeYJ9fK7sUMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
 						BAMTCmNwNS0zNTM0OTQwHhcNMTQwNDIyMDc0MzU1WhcNMjQwNDE5MDc0MzU1WjAV
 						MRMwEQYDVQQDEwpjcDUtMzUzNDk0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
@@ -49,57 +49,57 @@
 						ZF05+Alc7GbNsb53cAOFAehJEZiZOjbPtTkVTU/yZk0sTAXALQXnNjMBKFbn7dyB
 						vB9Gj0YneP92oYbUZ7AooBDGTwcCKxiM4A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Studentpad.co.uk Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Studentpad.co.uk Limited: Imperial Home Solutions Student Accommodation Search</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.studentpad.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Borman</md:SurName>
-      <md:EmailAddress>mailto:steve@studentpad.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Darren</md:GivenName>
-      <md:SurName>Steven</md:SurName>
-      <md:EmailAddress>mailto:Darren@studentpad.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Borman</md:SurName>
-      <md:EmailAddress>mailto:steve@studentpad.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Darren</md:GivenName>
-      <md:SurName>Steven</md:SurName>
-      <md:EmailAddress>mailto:Darren@studentpad.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Studentpad.co.uk Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Studentpad.co.uk Limited: Imperial Home Solutions Student Accommodation Search</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.studentpad.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Borman</md:SurName>
+    <md:EmailAddress>mailto:steve@studentpad.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Darren</md:GivenName>
+    <md:SurName>Steven</md:SurName>
+    <md:EmailAddress>mailto:Darren@studentpad.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Borman</md:SurName>
+    <md:EmailAddress>mailto:steve@studentpad.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Darren</md:GivenName>
+    <md:SurName>Steven</md:SurName>
+    <md:EmailAddress>mailto:Darren@studentpad.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml
index 04f74af8..10917e48 100644
--- a/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.independence.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-12T15:52:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-12T15:52:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.independence.co.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.independence.co.uk/Shibboleth.sso/WAYF"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Issues Online</mdui:DisplayName>
-          <mdui:Logo height="79" width="329">https://www.issuesonline.co.uk/resources/images/header/logo.png</mdui:Logo>
-          <mdui:Description xml:lang="en">Issues Online explores today's most important social issues through 
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.independence.co.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.independence.co.uk/Shibboleth.sso/WAYF"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Issues Online</mdui:DisplayName>
+        <mdui:Logo height="79" width="329">https://www.issuesonline.co.uk/resources/images/header/logo.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Issues Online explores today's most important social issues through 
 					articles, videos, ebooks &amp; more.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJALdHDkKittLZMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF3JlYWwxLnJlYWxuZXQyMDAwLmNvLnVrMB4XDTExMDgwMjEyMTYxNVoXDTIx
 						MDczMDEyMTYxNVowIjEgMB4GA1UEAxMXcmVhbDEucmVhbG5ldDIwMDAuY28udWsw
@@ -38,37 +38,37 @@
 						Ot71rokgeIjZSPUMPCSfu/PGiw2S8yxiEi8/5sXx0mbFNJ+SlamPNl8AYSONeiTu
 						CsJ2jfI9xrr+q7DFANi+HQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.independence.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.independence.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Independence Educational Publishers Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Independence Educational Publishers: Independence Issues Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://independence.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Issues</md:GivenName>
-      <md:EmailAddress>mailto:issues@independence.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Kari</md:GivenName>
-      <md:SurName>Sewell</md:SurName>
-      <md:EmailAddress>mailto:kari@realnet.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.independence.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.independence.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Independence Educational Publishers Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Independence Educational Publishers: Independence Issues Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://independence.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Issues</md:GivenName>
+    <md:EmailAddress>mailto:issues@independence.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Sewell</md:SurName>
+    <md:EmailAddress>mailto:kari@realnet.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml
index 14bbeb4a..009448cf 100644
--- a/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.infectiousdisease.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-06T12:47:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-06T12:47:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Infectious Diseases</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.infectiousdisease.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Infectious Diseases</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.infectiousdisease.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml
index 48f9c4bb..0dcf7ab4 100644
--- a/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ingentaconnect.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDbjCCAlagAwIBAgIES2K7ITANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
 						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEiMCAGA1UE
 						ChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEfMB0GA1UEAxMWd3d3LmluZ2Vu
@@ -28,23 +28,23 @@
 						wJdSYuAueKsqY3HJLDfnICkFvfLpptvKj28xxmkVb+qlKoGf6XX7toxw0O5WIa71
 						VS6MHJn5tjjxCiYXqnypfalg
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ingentaconnect.com/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Publishing Technology: IngentaConnect</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:help@ingentaconnect.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ingentaconnect.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology: IngentaConnect</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:help@ingentaconnect.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml b/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml
index ecf5bc5e..8ff4a710 100644
--- a/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.itslearning.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIJAOCa2W5sQVpdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFmVsb2dpbi5pdHNsZWFybmluZy5jb20wHhcNMTEwMTI1MDk0MTIyWhcNMjEw
 						MTIyMDk0MTIyWjAhMR8wHQYDVQQDExZlbG9naW4uaXRzbGVhcm5pbmcuY29tMIIB
@@ -27,25 +27,25 @@
 						ffAJBB8DdkCd3njov1flLlnfQHDh0o0/yPSJkkdknqxhFs7yvEV+c92gwZCFjwka
 						J4ZzgrTMRBGb/0XGn/eHvuvUdYY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/logout.aspx"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">it's learning UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">it's learning UK Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Waseemr</md:GivenName>
-      <md:SurName>Akhtar</md:SurName>
-      <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Waseemr</md:GivenName>
-      <md:SurName>Akhtar</md:SurName>
-      <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">it's learning UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">it's learning UK Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Waseemr</md:GivenName>
+    <md:SurName>Akhtar</md:SurName>
+    <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Waseemr</md:GivenName>
+    <md:SurName>Akhtar</md:SurName>
+    <md:EmailAddress>mailto:Waseem.Akhtar@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml b/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml
index a294d053..d86c7381 100644
--- a/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.j2e.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-08T15:13:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-08T15:13:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.j2e.com/secure/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.j2e.com/secure/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.j2e.com/secure/Shibboleth.sso/USO"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.j2e.com/secure/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.j2e.com/secure/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.j2e.com/secure/Shibboleth.sso/USO"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAPqSMDPu7s7hMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFnNlcnZlcjQwMjE1LnVrMm5ldC5jb20wHhcNMTAwODEyMTE0MTU2WhcNMjAw
 						ODA5MTE0MTU2WjAhMR8wHQYDVQQDExZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMIIB
@@ -44,52 +44,52 @@
 						i291jv0WzvQWVDfWSxY3Z869r+Y/bFqbhv9YXKwDSOx52sscAl1yjy0vDwuMKHyr
 						FzKrATccENnvJUM7hQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.j2e.com/secure/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML/Artifact" index="18"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Just2easy Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">j2e, online document processor from Just2easy Limited</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.j2e.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Danny</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Danny</md:GivenName>
-      <md:SurName>Young</md:SurName>
-      <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.j2e.com/secure/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML/Artifact" index="18"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Just2easy Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">j2e, online document processor from Just2easy Limited</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.j2e.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Danny</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Danny</md:GivenName>
+    <md:SurName>Young</md:SurName>
+    <md:EmailAddress>mailto:danny@j2e.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml b/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml
index 31a1dc9e..c20fc3f8 100644
--- a/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jbe-platform.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-19T13:22:11Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-19T13:22:11Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDujCCAqKgAwIBAgIET+iFsjANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
 						TkwxEjAQBgNVBAgTCUFtc3RlcmRhbTESMBAGA1UEBxMJQW1zdGVyZGFtMSowKAYD
 						VQQKEyFKb2huIEJlbmphbWlucyBQdWJsaXNoaW5nIENvbXBhbnkxIjAgBgNVBAsT
@@ -29,24 +29,24 @@
 						IdRzKxDMyNlEKi7HUPm2ZLkOs+PO4iieLSeJBdulWJ7pNlP0st2dE+aak59hOnjX
 						45KA8uRF+9bX7vRf7Ya0XkKgDuRFO3dQrS4d012lE2jtLyy92b6lEV5ur4GcCw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jbe-platform.com/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jbe-platform.com/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">John Benjamins Publishing Company</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.benjamins.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Anke</md:GivenName>
-      <md:SurName>de Looper</md:SurName>
-      <md:EmailAddress>mailto:anke.delooper@benjamins.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jbe-platform.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jbe-platform.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">John Benjamins Publishing Company</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.benjamins.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Anke</md:GivenName>
+    <md:SurName>de Looper</md:SurName>
+    <md:EmailAddress>mailto:anke.delooper@benjamins.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml
index 932cf907..f9a02666 100644
--- a/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jisc-collections.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-02-01T16:22:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-02-01T16:22:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jisc Collections</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Jisc Collections supports the procurement of digital content for education and research in the UK</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.jisc-collections.ac.uk/Documents/Jisc%20logo/Jisc_Logo_64x64px.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Jisc Collections</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Jisc Collections supports the procurement of digital content for education and research in the UK</mdui:Description>
-          <mdui:Logo height="64" width="64">https://www.jisc-collections.ac.uk/Documents/Jisc%20logo/Jisc_Logo_64x64px.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDUjCCAjoCCQDzQJpygfVTxjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGTAXBgNVBAoTEEpJ
 						U0MgQ29sbGVjdGlvbnMxHzAdBgNVBAMTFmppc2MtY29sbGVjdGlvbnMuYWMudWsw
@@ -39,37 +39,37 @@
 						/D9NN+plf4NJOs37pk8YfnyyVsR6Gz/eSjK2XgJVZ/7Xa6VIqcPwbvhaBfRpc8Zx
 						9tU+F6+/Gl/SQn9byiovbhO+UIGqktvx26oEnpbrV0suXvB8TvQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">JISC Collections</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Kidderminster</md:GivenName>
-      <md:EmailAddress>mailto:vlem@kidderminster.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mark</md:GivenName>
-      <md:SurName>Williams</md:SurName>
-      <md:EmailAddress>mailto:m.williams@jisc-collections.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JISC Collections</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kidderminster</md:GivenName>
+    <md:EmailAddress>mailto:vlem@kidderminster.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Williams</md:SurName>
+    <md:EmailAddress>mailto:m.williams@jisc-collections.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml
index 94eb9fd8..26a400cd 100644
--- a/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jiscmail.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T10:52:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T10:52:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JiscMail</mdui:DisplayName>
+        <mdui:Logo height="70" width="172">https://www.jiscmail.ac.uk/images/logo.jpg</mdui:Logo>
+        <mdui:Description xml:lang="en">The UK's national academic mailing list service</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">JiscMail</mdui:DisplayName>
-          <mdui:Logo height="70" width="172">https://www.jiscmail.ac.uk/images/logo.jpg</mdui:Logo>
-          <mdui:Description xml:lang="en">The UK's national academic mailing list service</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAMnG2CD3FyHGMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGppc2MudXMubHNvZnQuc2UwHhcNMTIwNjIyMTQzNjIyWhcNMjIwNjIwMTQz
 						NjIyWjAbMRkwFwYDVQQDExBqaXNjLnVzLmxzb2Z0LnNlMIIBIjANBgkqhkiG9w0B
@@ -35,46 +35,46 @@
 						pRA9vwB3NNTZ4B94nXNOZE1bLGTt+f8UbqqFYfn//GbssNhVTdAHVA5zzifiyb2q
 						bkRpHOJxwX+UOUUZeTtsUvXRTjmDGURupehIxv7NQjeS5H7OEw7osqzXwQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">JiscMail</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">JiscMail</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				The UK's national academic mailing list service
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">JiscMail Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jiscmail.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JISCmail helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpline@jiscmail.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Carl</md:GivenName>
-      <md:SurName>Vincent</md:SurName>
-      <md:EmailAddress>mailto:carl.vincent@jisc.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>l-soft</md:GivenName>
-      <md:EmailAddress>mailto:l-soft@jiscmail.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JiscMail Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jiscmail.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JISCmail helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpline@jiscmail.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Carl</md:GivenName>
+    <md:SurName>Vincent</md:SurName>
+    <md:EmailAddress>mailto:carl.vincent@jisc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>l-soft</md:GivenName>
+    <md:EmailAddress>mailto:l-soft@jiscmail.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml b/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml
index 1ee9aef2..54c267d6 100644
--- a/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jospt.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T09:44:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T09:44:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEDCCAfigAwIBAgIJAIF4dsDgrPDHMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXd3dy5qb3NwdC5vcmcwHhcNMTMwODA4MjEwMzAzWhcNMjMwODA2MjEwMzAz
 						WjAYMRYwFAYDVQQDEw13d3cuam9zcHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -28,24 +28,24 @@
 						zHanSf1XGKKcHrrokXUfhEyqvPeqSITfgDukJQwD/0dooF97bKxFURlwurDLbFG+
 						ckQwYEGAVSf+BbGw6J4+ERRlDJ4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jospt.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jospt.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jospt.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Journal of Orthopaedic &amp; Sports Physical Therapy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jospt.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jospt.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jospt.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jospt.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Journal of Orthopaedic &amp; Sports Physical Therapy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jospt.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jove.com-shibboleth.xml b/swamid-interfederations-2.0/www.jove.com-shibboleth.xml
index d555b236..713dc7f9 100644
--- a/swamid-interfederations-2.0/www.jove.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jove.com-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jove.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-03T19:35:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-03T19:35:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jove.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.jove.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC4jCCAcqgAwIBAgIJAMmZMgpgR98FMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
 						BAMTCWpvdmUtc2l0ZTAeFw0xNDA4MjYxOTI5NDVaFw0yNDA4MjMxOTI5NDVaMBQx
 						EjAQBgNVBAMTCWpvdmUtc2l0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
@@ -41,40 +41,40 @@
 						dU4byrEQ+k+7huxTc6arI5cagwL8GnpH6I0M6Ouj8T4RTmXHKWseJDXYCc9WNlN/
 						qa6mttqxIIeSvf7w0qq4buQC7/jHWQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jove.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jove.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jove.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jove.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jove.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jove.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jove.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jove.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jove.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jove.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jove.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">MYJOVE Corporation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Journal of Visualized Experiments</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jove.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:dan.robinson@jove.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dan</md:GivenName>
-      <md:SurName>Robinson</md:SurName>
-      <md:EmailAddress>mailto:dan.robinson@jove.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jove.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jove.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jove.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jove.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jove.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jove.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jove.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jove.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jove.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jove.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jove.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MYJOVE Corporation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Journal of Visualized Experiments</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jove.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:dan.robinson@jove.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dan</md:GivenName>
+    <md:SurName>Robinson</md:SurName>
+    <md:EmailAddress>mailto:dan.robinson@jove.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml
index 63269ad2..9d8a53f8 100644
--- a/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jusp.mimas.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">JUSP and IRUS-UK</mdui:DisplayName>
-          <mdui:Description xml:lang="en">JUSP offers centralised access to journal usage data. 
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">JUSP and IRUS-UK</mdui:DisplayName>
+        <mdui:Description xml:lang="en">JUSP offers centralised access to journal usage data. 
 					IRUS-UK enables IRs to share and expose COUNTER statistics.</mdui:Description>
-          <mdui:Logo height="165" width="630">https://www.jusp.mimas.ac.uk/images/jusp-irus.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="165" width="630">https://www.jusp.mimas.ac.uk/images/jusp-irus.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMTCCAxmgAwIBAgIJALKqYz/D1BgYMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
 						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
@@ -56,13 +56,13 @@
 						Hc6B9zDGUrAOwbap5IBazxgixzhlNLvnLBorLMTMtZNAQ5I8r9q1etiGsMwQxcbo
 						XSDkRlSDzotmgLAQd0N3B9PAolHl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEMTCCAxmgAwIBAgIJALKqYz/D1BgYMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
 						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
@@ -87,46 +87,46 @@
 						Hc6B9zDGUrAOwbap5IBazxgixzhlNLvnLBorLMTMtZNAQ5I8r9q1etiGsMwQxcbo
 						XSDkRlSDzotmgLAQd0N3B9PAolHl
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MIMAS: JISC Usage Stats Portal</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Meehan</md:SurName>
-      <md:EmailAddress>mailto:Paul.Meehan@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Meehan</md:SurName>
-      <md:EmailAddress>mailto:Paul.Meehan@manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MIMAS: JISC Usage Stats Portal</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Meehan</md:SurName>
+    <md:EmailAddress>mailto:Paul.Meehan@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Meehan</md:SurName>
+    <md:EmailAddress>mailto:Paul.Meehan@manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml b/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
index 9d13845a..9a9d9a5f 100644
--- a/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jvcs.ja.net/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-19T11:50:58Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-19T11:50:58Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">v-scene</mdui:DisplayName>
+        <mdui:Description xml:lang="en">v-scene enables you to launch or schedule H323 and Desktop videoconferences, record, stream and add guests.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">v-scene</mdui:DisplayName>
-          <mdui:Description xml:lang="en">v-scene enables you to launch or schedule H323 and Desktop videoconferences, record, stream and add guests.</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIERjCCAy6gAwIBAgIJALrNeL2vzXUQMA0GCSqGSIb3DQEBCwUAMIGjMQswCQYD
 						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3RvbDEWMBQG
 						A1UEChMNSmlzYyBTZXJ2aWNlczEaMBgGA1UECxMRSmlzYyBUZWNobm9sb2dpZXMx
@@ -50,89 +50,89 @@
 						LXX3Kfg5yiOFW+WsmdkZMCfAPJzrAq6rAg1JoyVC3v7Jk6CHNr5VnQPcNL+TaN9l
 						FIL5YwZINvpuWpxQUrsAfi47Yi6YfPNy9Yu7rVhl9GpNX8VaZYu6q7bM
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="5"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="6"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="7"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="8"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="39"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="40"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="41"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="42"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="43"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="45"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="46"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="47"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="48"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">v-scene</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">v-scene enables you to launch or schedule H323 and Desktop videoconferences, record, stream and add guests.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Janet Videoconference Booking Service (JVCS)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>JVCS</md:GivenName>
-      <md:SurName>v-scene@ja.net</md:SurName>
-      <md:EmailAddress>mailto:m.mcintosh@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Bonnett</md:SurName>
-      <md:EmailAddress>mailto:paul.bonnett@ja.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="5"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="7"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="8"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="48"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">v-scene</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">v-scene enables you to launch or schedule H323 and Desktop videoconferences, record, stream and add guests.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Jisc Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Janet Videoconference Booking Service (JVCS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ja.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>JVCS</md:GivenName>
+    <md:SurName>v-scene@ja.net</md:SurName>
+    <md:EmailAddress>mailto:m.mcintosh@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Bonnett</md:SurName>
+    <md:EmailAddress>mailto:paul.bonnett@ja.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml b/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml
index 2d6e717c..4461a256 100644
--- a/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml
@@ -1,28 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jwatch.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:17:08Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-16T18:17:08Z">
-		</mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -48,32 +47,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Journal Watch</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.jwatch.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Journal Watch</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jwatch.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml b/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml
index 9943e25b..83aa6852 100644
--- a/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.k-int.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T12:25:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T12:25:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">KI Generic Shib Endpoint</mdui:DisplayName>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.k-int.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.k-int.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">KI Generic Shib Endpoint</mdui:DisplayName>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.k-int.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.k-int.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAPE1DaMBDG/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE2RldmVsb3Blci5rLWludC5jb20wHhcNMTMxMjE1MTI1OTM3WhcNMjMxMjEz
 						MTI1OTM3WjAeMRwwGgYDVQQDExNkZXZlbG9wZXIuay1pbnQuY29tMIIBIjANBgkq
@@ -35,33 +35,33 @@
 						rvWQYSEnAU6ssX0Fhc+VOJsPwKqjApeIYHoM4CQ6etT4OC891iikBrMTOTmsLFNt
 						ASZsqA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.k-int.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.k-int.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.k-int.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.k-int.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.k-int.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.k-int.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.k-int.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.k-int.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.k-int.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.k-int.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Knowledge Integration Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">KI Generic Shib Endpoint</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.k-int.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@k-int.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ian</md:GivenName>
-      <md:SurName>Ibbotson</md:SurName>
-      <md:EmailAddress>mailto:ian.ibbotson@k-int.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.k-int.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.k-int.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.k-int.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.k-int.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.k-int.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.k-int.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.k-int.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.k-int.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.k-int.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.k-int.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Knowledge Integration Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KI Generic Shib Endpoint</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.k-int.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Ibbotson</md:SurName>
+    <md:EmailAddress>mailto:ian.ibbotson@k-int.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.karger.com-shibboleth.xml b/swamid-interfederations-2.0/www.karger.com-shibboleth.xml
index bc59577f..da0e7348 100644
--- a/swamid-interfederations-2.0/www.karger.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.karger.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.karger.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-21T10:43:07Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-21T10:43:07Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.karger.com/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/UKWAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/dfn-aai"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.karger.com/Shibboleth.sso/dfn-aai" index="2"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/gakunin-japan"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.karger.com/Shibboleth.sso/gakunin-japan" index="3"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.karger.com/Shibboleth.sso/DS" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/UKWAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/dfn-aai"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.karger.com/Shibboleth.sso/dfn-aai" index="2"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.karger.com/Shibboleth.sso/gakunin-japan"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.karger.com/Shibboleth.sso/gakunin-japan" index="3"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFDCCAfygAwIBAgIJAIcP5l5M0JUtMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDnd3dy5rYXJnZXIuY29tMB4XDTE1MDUyMjA5MzAyNFoXDTE4MDUyMjA5MzAy
 						NFowGTEXMBUGA1UEAxMOd3d3Lmthcmdlci5jb20wggEiMA0GCSqGSIb3DQEBAQUA
@@ -53,47 +53,47 @@
 						qKmFCc7jKOnls4+t+QmcmxilUL72Hf+dbbB6iCpRLPnaWUxwzrVkL5vEaGHCDVmF
 						3rcGxr9Zgf8PmN55LOJrZyh7DG4MCL+F
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.karger.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.karger.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.karger.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.karger.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.karger.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.karger.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">S. Karger AG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Karger Publishers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.karger.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nicolas</md:GivenName>
-      <md:SurName>Gindensperger</md:SurName>
-      <md:EmailAddress>mailto:n.gindensperger@karger.ch</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roland</md:GivenName>
-      <md:SurName>Hofer</md:SurName>
-      <md:EmailAddress>mailto:r.hofer@karger.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.karger.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.karger.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.karger.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.karger.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.karger.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.karger.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">S. Karger AG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Karger Publishers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.karger.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nicolas</md:GivenName>
+    <md:SurName>Gindensperger</md:SurName>
+    <md:EmailAddress>mailto:n.gindensperger@karger.ch</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roland</md:GivenName>
+    <md:SurName>Hofer</md:SurName>
+    <md:EmailAddress>mailto:r.hofer@karger.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml
index 4d42e317..c246f8dc 100644
--- a/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.kclsu.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-16T09:41:16Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-16T09:41:16Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kclsu.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kclsu.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,37 +28,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kclsu.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kclsu.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kclsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kclsu.org/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">King's College London Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kclsu.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kclsu.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kclsu.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kclsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kclsu.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">King's College London Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kclsu.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml
index 8da2d132..b2d6b01b 100644
--- a/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.kedst.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kedst.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kedst.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIURfg2ZT8NtoYlOeAkg68kLNLvU1IwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMB4XDTA5MDgwNDA4NDg1MVoX
 						DTI5MDgwNDA4NDg1MVowGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMIIBIjAN
@@ -29,26 +29,26 @@
 						VfNZvQZQ7jOmLqxKW5eMU15qdnZR5VzBxaShu21ZLBrmRFrikpO8KbtAvPW98Iz5
 						cD/spZeoVpsEQFY1hTmWUlp62t1wTcinHagogSqSVpwe8sPlB2mtRl9wIA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.kedst.ac.uk/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kedst.ac.uk/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kedst.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kedst.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kedst.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.kedst.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kedst.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kedst.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kedst.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kedst.ac.uk</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIURfg2ZT8NtoYlOeAkg68kLNLvU1IwDQYJKoZIhvcNAQEF
 						BQAwGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMB4XDTA5MDgwNDA4NDg1MVoX
 						DTI5MDgwNDA4NDg1MVowGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMIIBIjAN
@@ -67,27 +67,27 @@
 						VfNZvQZQ7jOmLqxKW5eMU15qdnZR5VzBxaShu21ZLBrmRFrikpO8KbtAvPW98Iz5
 						cD/spZeoVpsEQFY1hTmWUlp62t1wTcinHagogSqSVpwe8sPlB2mtRl9wIA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">King Edward VI College, Stourbridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">King Edward VI College, Stourbridge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kedst.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Woolley</md:SurName>
-      <md:EmailAddress>mailto:martin.woolley@kedst.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Martin</md:GivenName>
-      <md:SurName>Woolley</md:SurName>
-      <md:EmailAddress>mailto:martin.woolley@kedst.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">King Edward VI College, Stourbridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">King Edward VI College, Stourbridge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kedst.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Woolley</md:SurName>
+    <md:EmailAddress>mailto:martin.woolley@kedst.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Woolley</md:SurName>
+    <md:EmailAddress>mailto:martin.woolley@kedst.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml
index 66f67368..9d722466 100644
--- a/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.kentunion.co.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -25,38 +25,38 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Kent Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.kentunion.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Kent Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kentunion.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
index b2058d03..300dc885 100644
--- a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.keynote.co.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-15T09:50:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-15T09:50:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -44,13 +44,13 @@
 						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
 						iIcX2da2+HnwyJ4195yPUocmnA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -85,27 +85,27 @@
 						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
 						iIcX2da2+HnwyJ4195yPUocmnA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.keynote.co.uk/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.keynote.co.uk/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.keynote.co.uk/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Key Note Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Key Note: Market Intelligence</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.keynote.co.uk/GlobalFrame.htm</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Shaun</md:GivenName>
-      <md:SurName>Sole</md:SurName>
-      <md:EmailAddress>mailto:ssole@keynote.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ameet</md:GivenName>
-      <md:SurName>Shah</md:SurName>
-      <md:EmailAddress>mailto:ashah@mintel.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.keynote.co.uk/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.keynote.co.uk/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.keynote.co.uk/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Key Note Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Key Note: Market Intelligence</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.keynote.co.uk/GlobalFrame.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Shaun</md:GivenName>
+    <md:SurName>Sole</md:SurName>
+    <md:EmailAddress>mailto:ssole@keynote.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ameet</md:GivenName>
+    <md:SurName>Shah</md:SurName>
+    <md:EmailAddress>mailto:ashah@mintel.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
index 0635674a..95b2d3be 100644
--- a/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
+++ b/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.knodium.com/Shibboleth.sso/Metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.knodium.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.knodium.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Knodium</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Knodium is an online platform for collaboration.</mdui:Description>
+        <mdui:Logo height="158" width="350">https://www.knodium.com/images/logo-shib.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.knodium.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.knodium.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Knodium</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Knodium is an online platform for collaboration.</mdui:Description>
-          <mdui:Logo height="158" width="350">https://www.knodium.com/images/logo-shib.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9DCCAdygAwIBAgIJAMLknMjt03SjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
 						BAMTD3d3dy5rbm9kaXVtLmNvbTAeFw0xMjA5MTAxNTI2NTZaFw0yMjA5MDgxNTI2
 						NTZaMBoxGDAWBgNVBAMTD3d3dy5rbm9kaXVtLmNvbTCCASIwDQYJKoZIhvcNAQEB
@@ -36,57 +36,57 @@
 						Msv4N8MBOk9nESf3jQTPgkCvZee2t6h9xijoRP+IH5VD3hfq+H3lNKX7w7DkRqlR
 						dB55/ggB6okN6t5L8d+FUbKU3qI8VQmR8V4/NJ/F0EFmLzEklMUxsw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.knodium.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.knodium.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.knodium.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.knodium.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Knodium</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Knodium is an online platform for collaboration.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="swissEduPersonUniqueID" Name="urn:mace:switch.ch:attribute-def:swissEduPersonUniqueID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Knodium Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Knodium</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.knodium.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Web Support</md:GivenName>
-      <md:EmailAddress>mailto:webmaster@knodium.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Web Support</md:GivenName>
-      <md:EmailAddress>mailto:webmaster@knodium.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.knodium.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.knodium.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.knodium.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.knodium.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Knodium</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Knodium is an online platform for collaboration.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="swissEduPersonUniqueID" Name="urn:mace:switch.ch:attribute-def:swissEduPersonUniqueID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Knodium Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Knodium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.knodium.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Web Support</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@knodium.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Web Support</md:GivenName>
+    <md:EmailAddress>mailto:webmaster@knodium.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml
index b2229c32..d4511496 100644
--- a/swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.languagesciences.cam.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T09:24:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T09:24:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Language Sciences</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.languagesciences.cam.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Language Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.languagesciences.cam.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml b/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml
index b480b388..a1802f44 100644
--- a/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.lawtel.com/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T12:33:56Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T12:33:56Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkygAwIBAgIJAIQlCctZBRSMMA0GCSqGSIb3DQEBBQUAMCoxDzANBgNV
 						BAoTBkxhd3RlbDEXMBUGA1UEAxMOd3d3Lmxhd3RlbC5jb20wHhcNMTIwNTIxMTUz
 						MzE1WhcNMjIwNTE5MTUzMzE1WjAqMQ8wDQYDVQQKEwZMYXd0ZWwxFzAVBgNVBAMT
@@ -28,13 +28,13 @@
 						aZx1wevL8m5ioTXRA6hAmwUnnPZO/o7qIiQhuMFyvjHLVG6nHS3DO+c352LSRku4
 						SY88POEuhcQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDZDCCAkygAwIBAgIJAIQlCctZBRSMMA0GCSqGSIb3DQEBBQUAMCoxDzANBgNV
 						BAoTBkxhd3RlbDEXMBUGA1UEAxMOd3d3Lmxhd3RlbC5jb20wHhcNMTIwNTIxMTUz
 						MzE1WhcNMjIwNTE5MTUzMzE1WjAqMQ8wDQYDVQQKEwZMYXd0ZWwxFzAVBgNVBAMT
@@ -55,27 +55,27 @@
 						aZx1wevL8m5ioTXRA6hAmwUnnPZO/o7qIiQhuMFyvjHLVG6nHS3DO+c352LSRku4
 						SY88POEuhcQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lawtel.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lawtel.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lawtel.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lawtel.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Thomson Reuters (Professional) UK Limited: Lawtel</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.lawtel.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Prashanthi</md:GivenName>
-      <md:SurName>Bukka</md:SurName>
-      <md:EmailAddress>mailto:prashanthi.bukka@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Roy</md:GivenName>
-      <md:SurName>Paruchuri</md:SurName>
-      <md:EmailAddress>mailto:r.paruchuri@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lawtel.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lawtel.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lawtel.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lawtel.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Thomson Reuters (Professional) UK Limited: Lawtel</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.lawtel.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Prashanthi</md:GivenName>
+    <md:SurName>Bukka</md:SurName>
+    <md:EmailAddress>mailto:prashanthi.bukka@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Roy</md:GivenName>
+    <md:SurName>Paruchuri</md:SurName>
+    <md:EmailAddress>mailto:r.paruchuri@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml
index 21e4d943..46b7b260 100644
--- a/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.leedsuniversityunion.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,37 +28,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds University Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.leedsuniversityunion.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds University Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedsuniversityunion.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
index ff364a45..b0586443 100644
--- a/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.liebertonline.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-17T17:28:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-17T17:28:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mary Ann Liebert</mdui:DisplayName>
+        <mdui:Description xml:lang="en">&gt;Mary Ann Liebert publishes integrated media content in biotechnology, biomedical research, clinical medicine and surgery, among others.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.liebertpub.com/nv/company/about-us/1/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mary Ann Liebert</mdui:DisplayName>
-          <mdui:Description xml:lang="en">&gt;Mary Ann Liebert publishes integrated media content in biotechnology, biomedical research, clinical medicine and surgery, among others.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.liebertpub.com/nv/company/about-us/1/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMDCCAhigAwIBAgIJAKDOIiXpyPeZMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTAeFw0xNDAzMTQwNTAzNDlaFw0xNzAz
 						MTMwNTAzNDlaMCAxHjAcBgNVBAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTCCASIw
@@ -36,24 +36,24 @@
 						H4DFy1CDquP13ggw0RaFwt090YnGMoTxkwIHbNHOk0b3ja9yD2qxqfNmnGPscktq
 						ghHcPQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.liebertpub.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.liebertpub.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.liebertpub.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mary Ann Liebert, Inc. publishers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.liebertpub.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.liebertpub.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.liebertpub.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.liebertpub.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mary Ann Liebert, Inc. publishers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.liebertpub.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml
index c2bd63ef..c5f137a2 100644
--- a/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.listening-books.org.uk/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T15:02:27Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T15:02:27Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.listening-books.org.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Listening Books</mdui:DisplayName>
+        <mdui:Logo height="147" width="264">https://www.listening-books.org.uk/images/logotop1.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.listening-books.org.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Listening Books</mdui:DisplayName>
-          <mdui:Logo height="147" width="264">https://www.listening-books.org.uk/images/logotop1.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFTCCAf2gAwIBAgIJAKDYQGOVxDtoMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnRncGx3ZWIwMS50Z3BsaG9zdGVkLmxvY2FsMB4XDTExMTAyMDEwMjUxN1oX
 						DTIxMTAxNzEwMjUxN1owJTEjMCEGA1UEAxMadGdwbHdlYjAxLnRncGxob3N0ZWQu
@@ -33,34 +33,34 @@
 						xCgNUc6/n0jjZM/Y2EOq1yjqLVkMp3pWmvkSrPfnymIdLeGqJj7ItmTcGXrtXF0q
 						H7URozYYVkfDdLe3tdeszum1dhpLBArFfg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.listening-books.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Gallery Partnership Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Listening Books</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.listening-books.org.uk/what-we-do.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Joost</md:GivenName>
-      <md:SurName>Jens</md:SurName>
-      <md:EmailAddress>mailto:jjens@gallerypartnership.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Joost</md:GivenName>
-      <md:SurName>Jens</md:SurName>
-      <md:EmailAddress>mailto:jjens@gallerypartnership.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.listening-books.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Gallery Partnership Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Listening Books</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.listening-books.org.uk/what-we-do.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Joost</md:GivenName>
+    <md:SurName>Jens</md:SurName>
+    <md:EmailAddress>mailto:jjens@gallerypartnership.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Joost</md:GivenName>
+    <md:SurName>Jens</md:SurName>
+    <md:EmailAddress>mailto:jjens@gallerypartnership.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml b/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml
index 932bc904..ce7e56da 100644
--- a/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.litencyc.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.litencyc.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.litencyc.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.litencyc.com/Shibboleth.sso/Login" index="1"/>
+      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Literary Encyclopedia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Literary Encyclopedia is a digital repository of authoritative reference work on literary and cultural history</mdui:Description>
+        <mdui:Logo height="64" width="350">https://www.litencyc.com/images/v3_site/LitEncyc_logo_MDUI.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.litencyc.com/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.litencyc.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.litencyc.com/Shibboleth.sso/Login" index="1"/>
-        <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-        <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-        <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-        <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-        <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-        <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-        <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-        <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-        <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-        <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">The Literary Encyclopedia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Literary Encyclopedia is a digital repository of authoritative reference work on literary and cultural history</mdui:Description>
-          <mdui:Logo height="64" width="350">https://www.litencyc.com/images/v3_site/LitEncyc_logo_MDUI.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDCTCCAfGgAwIBAgIJAKScrCvlkuwdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 						BAMTFmRvbVUtMTItMzEtMzgtMDctMjYtOTUwHhcNMTIwNzExMjEyMzI4WhcNMjIw
 						NzA5MjEyMzI4WjAhMR8wHQYDVQQDExZkb21VLTEyLTMxLTM4LTA3LTI2LTk1MIIB
@@ -47,44 +47,44 @@
 						nris/BgppN8uzYbH32WCMJDb8oTNQCQECn3qGEHycVAIexAPSG8E3/mWt5QvT8ff
 						Zs5lSvRPKfa1dFXjRA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.litencyc.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.litencyc.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.litencyc.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.litencyc.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Literary Dictionary Company Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Literary Encyclopedia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.LitEncyc.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Clark</md:SurName>
-      <md:EmailAddress>mailto:RobertClark@LitEncyc.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Cristina</md:GivenName>
-      <md:SurName>Sandru</md:SurName>
-      <md:EmailAddress>mailto:cristinaSandru@litencyc.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.litencyc.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.litencyc.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.litencyc.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.litencyc.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Literary Dictionary Company Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Literary Encyclopedia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.LitEncyc.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Clark</md:SurName>
+    <md:EmailAddress>mailto:RobertClark@LitEncyc.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Cristina</md:GivenName>
+    <md:SurName>Sandru</md:SurName>
+    <md:EmailAddress>mailto:cristinaSandru@litencyc.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml b/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml
index 6f8ee220..bf648264 100644
--- a/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.loebclassics.com/oa/metadata">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-21T11:37:12Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-21T11:37:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIEVHOa+TANBgkqhkiG9w0BAQUFADBCMSEwHwYDVQQKExhI
 						YXJ2YXJkIFVuaXZlcnNpdHkgUHJlc3MxHTAbBgNVBAMTFHd3dy5sb2ViY2xhc3Np
 						Y3MuY29tMB4XDTE0MTEyNDIwNTQxN1oXDTI0MTEyMTIwNTQxN1owQjEhMB8GA1UE
@@ -28,13 +28,13 @@
 						KF/o29n+RjmGx0qq/O4JOrXY0Q0CwLqMm5iE7byW0+nW3hlg1AajC3SJRlWw9ldU
 						Jm6s2g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIEVHOa+TANBgkqhkiG9w0BAQUFADBCMSEwHwYDVQQKExhI
 						YXJ2YXJkIFVuaXZlcnNpdHkgUHJlc3MxHTAbBgNVBAMTFHd3dy5sb2ViY2xhc3Np
 						Y3MuY29tMB4XDTE0MTEyNDIwNTQxN1oXDTI0MTEyMTIwNTQxN1owQjEhMB8GA1UE
@@ -53,27 +53,27 @@
 						KF/o29n+RjmGx0qq/O4JOrXY0Q0CwLqMm5iE7byW0+nW3hlg1AajC3SJRlWw9ldU
 						Jm6s2g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.loebclassics.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.loebclassics.com/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">President and Fellows of Harvard College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Digital Loeb Classical Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.hup.harvard.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Norman</md:GivenName>
-      <md:SurName>Roye</md:SurName>
-      <md:EmailAddress>mailto:norman_roye@harvard.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Norman</md:GivenName>
-      <md:SurName>Roye</md:SurName>
-      <md:EmailAddress>mailto:norman_roye@harvard.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.loebclassics.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.loebclassics.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">President and Fellows of Harvard College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Digital Loeb Classical Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hup.harvard.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Norman</md:GivenName>
+    <md:SurName>Roye</md:SurName>
+    <md:EmailAddress>mailto:norman_roye@harvard.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Norman</md:GivenName>
+    <md:SurName>Roye</md:SurName>
+    <md:EmailAddress>mailto:norman_roye@harvard.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml
index 6761e98a..b782cf5e 100644
--- a/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.login.amdigital.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-04T15:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-04T15:40:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Adam Matthew resources</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Unique primary source collections from archives around the world; spanning the social sciences and humanities</mdui:Description>
+        <mdui:Logo height="132" width="286">https://www.login.amdigital.co.uk/images/MDUI-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Adam Matthew resources</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Unique primary source collections from archives around the world; spanning the social sciences and humanities</mdui:Description>
-          <mdui:Logo height="132" width="286">https://www.login.amdigital.co.uk/images/MDUI-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDQDCCAiigAwIBAgIJAOnoeaY+22sjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXd3dy5sb2dpbi5hbWRpZ2l0YWwuY28udWswHhcNMTMxMTIwMTYyNzE4WhcN
 						MTgxMTE5MTYyNzE4WjAkMSIwIAYDVQQDExl3d3cubG9naW4uYW1kaWdpdGFsLmNv
@@ -55,47 +55,47 @@
 						mEeoIiYaNa73mEKJuM5v0mSxz4BZJmjNaUgp+RlXOSf5UajsxGvvaaXPS+wswNNc
 						amjS1hLdrKCw7Y9NYB5V297KDVc=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Adam Matthew Digital Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Adam Matthew resources</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.amdigital.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Glyn</md:GivenName>
-      <md:SurName>Porritt</md:SurName>
-      <md:EmailAddress>mailto:glyn@amdigital.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dave</md:GivenName>
-      <md:SurName>Arthur</md:SurName>
-      <md:EmailAddress>mailto:dave@amdigital.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adam Matthew Digital Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Adam Matthew resources</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.amdigital.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Glyn</md:GivenName>
+    <md:SurName>Porritt</md:SurName>
+    <md:EmailAddress>mailto:glyn@amdigital.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dave</md:GivenName>
+    <md:SurName>Arthur</md:SurName>
+    <md:EmailAddress>mailto:dave@amdigital.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml
index ef79c34e..14906ccb 100644
--- a/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.login.dumgal.ac.uk/oala/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-05T15:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-05T15:58:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dumgal.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dumgal.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDwTCCAqmgAwIBAgIJAIgvuI4PmdjVMA0GCSqGSIb3DQEBBQUAMEkxJjAkBgNV
 						BAoTHUR1bWZyaWVzIGFuZCBHYWxsb3dheSBDb2xsZWdlMR8wHQYDVQQDExZ3d3cu
 						bG9naW4uZHVtZ2FsLmFjLnVrMB4XDTE0MDMyMDEzNTcwOFoXDTI0MDMxNzEzNTcw
@@ -35,25 +35,25 @@
 						gSTSTHHHRbGohR1hH9yzmrGN8ZzOsnLs+KkDCfFcCEvMjwjueCxpmcCp0Cf/zn9l
 						rZDiSl0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.login.dumgal.ac.uk/oala/sso"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.dumgal.ac.uk/oala/sso"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dumfries and Galloway College</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Dumfries and Galloway College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dumgal.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Baxter</md:SurName>
-      <md:EmailAddress>mailto:baxters@dumgal.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Eric</md:GivenName>
-      <md:SurName>Dunbar</md:SurName>
-      <md:EmailAddress>mailto:dunbare@dumgal.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.login.dumgal.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.dumgal.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dumfries and Galloway College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dumfries and Galloway College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dumgal.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Baxter</md:SurName>
+    <md:EmailAddress>mailto:baxters@dumgal.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Dunbar</md:SurName>
+    <md:EmailAddress>mailto:dunbare@dumgal.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml
index 03a9d504..82af0599 100644
--- a/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.londonmetsu.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-19T15:35:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-19T15:35:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Metropolitan University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.londonmetsu.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Metropolitan University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.londonmetsu.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml
index f9eadd19..af856a69 100644
--- a/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.lrb.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-30T13:36:59Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-30T13:36:59Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.lrb.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lrb.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London Review of Books</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to the London Review of Books archive</mdui:Description>
+        <mdui:Logo height="71" width="350">https://www.lrb.co.uk/shibboleth-sp/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.lrb.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lrb.co.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">London Review of Books</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access to the London Review of Books archive</mdui:Description>
-          <mdui:Logo height="71" width="350">https://www.lrb.co.uk/shibboleth-sp/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJANyqIs0OWWWhMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXd3dy5scmIuY28udWswHhcNMTMwNDEwMTUwODQ5WhcNMjMwNDA4MTUwODQ5
 						WjAYMRYwFAYDVQQDEw13d3cubHJiLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -50,43 +50,43 @@
 						eGkLyLvQrBJ3Rfmx2ukVAk5y/ajluFz9DQrG/jc5H9J6/ql4BXhfXsAH+PiIxbzI
 						KsYWHAVwkTwGO4W2Vf2JeTWKbVpWYsr7Ct32TqFFMS09FA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lrb.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LRB Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London Review of Books</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lrb.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Larkin</md:SurName>
-      <md:EmailAddress>mailto:clarkin@lrb.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Sowden</md:SurName>
-      <md:EmailAddress>mailto:csowden@lrb.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lrb.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LRB Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London Review of Books</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lrb.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Larkin</md:SurName>
+    <md:EmailAddress>mailto:clarkin@lrb.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Sowden</md:SurName>
+    <md:EmailAddress>mailto:csowden@lrb.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml
index adce0d61..38360f9f 100644
--- a/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.lsbsu.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-09T12:15:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-09T12:15:48Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lsbsu.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lsbsu.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsbsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsbsu.org/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London South Bank University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lsbsu.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsbsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsbsu.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London South Bank University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lsbsu.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml b/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml
index 7728ff27..e9f2cd61 100644
--- a/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.lsesu.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-24T10:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-24T10:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.lsesu.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lsesu.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.lsesu.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lsesu.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsesu.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsesu.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsesu.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsesu.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsesu.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsesu.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsesu.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">London School of Economics Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lsesu.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsesu.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsesu.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsesu.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsesu.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsesu.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsesu.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsesu.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">London School of Economics Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lsesu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml
index 049e0f4e..89f9c5f2 100644
--- a/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ltscotland.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-28T13:32:50Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-28T13:32:50Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/WAYF/Glow"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/WAYF/Glow"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJAMFVcb/xT28pMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGWx0c2Utd2ViMDEubHRzY290bGFuZC5jb20wHhcNMTAwNDA2MTEwODMzWhcN
 						MjAwNDAzMTEwODMzWjAkMSIwIAYDVQQDExlsdHNlLXdlYjAxLmx0c2NvdGxhbmQu
@@ -45,47 +45,47 @@
 						YJH+7toasSbjwqMusDEt0GMuMM0QqM8SFsTaAp7rBjnepE2gYVTK+RGloI+CCVoD
 						2XXgRAd0fVakFAhtv93JvF7VW3e5TA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Education Scotland</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Education Scotland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.educationscotland.gov.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Graham</md:GivenName>
-      <md:SurName>Wilson</md:SurName>
-      <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Education Scotland</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Education Scotland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.educationscotland.gov.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Graham</md:GivenName>
+    <md:SurName>Wilson</md:SurName>
+    <md:EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml
index 1b275ecf..09888650 100644
--- a/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.luu.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-05T11:23:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-05T11:23:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.luu.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.luu.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.luu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.luu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Leeds University Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.luu.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.luu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.luu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds University Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.luu.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml
index 85e324f5..a80dd852 100644
--- a/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.magonlinelibrary.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-20T16:06:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-20T16:06:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDPDCCAiSgAwIBAgIJAOxJ6oH31iOVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy5tYWdvbmxpbmVsaWJyYXJ5LmNvbTAeFw0xMzExMTkxNDAwNDNaFw0y
 						MzExMTcxNDAwNDNaMCMxITAfBgNVBAMTGHd3dy5tYWdvbmxpbmVsaWJyYXJ5LmNv
@@ -29,34 +29,34 @@
 						L3VNaZWA1Fyqvu8GyUoBgNijF9sChzzam3oaZyXSSwU/b06TsH6jQk2x+GV/rs3s
 						H8O0nQaQrC99XG29XrRI5Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.magonlinelibrary.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.magonlinelibrary.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.magonlinelibrary.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">MAG Online Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.magonlinelibrary.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sally</md:GivenName>
-      <md:SurName>Boettcher</md:SurName>
-      <md:EmailAddress>mailto:sally.boettcher@markallengroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chloe</md:GivenName>
-      <md:SurName>Roberts</md:SurName>
-      <md:EmailAddress>mailto:chloe.roberts@markallengroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.magonlinelibrary.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.magonlinelibrary.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.magonlinelibrary.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MAG Online Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.magonlinelibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sally</md:GivenName>
+    <md:SurName>Boettcher</md:SurName>
+    <md:EmailAddress>mailto:sally.boettcher@markallengroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chloe</md:GivenName>
+    <md:SurName>Roberts</md:SurName>
+    <md:EmailAddress>mailto:chloe.roberts@markallengroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml
index 2792b359..64b44d3f 100644
--- a/swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.maneyonline.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T18:04:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T18:04:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIJAJDMcsKQ9DnAMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3d3dy5tYW5leW9ubGluZS5jb20wHhcNMTMxMjEwMjAyODE3WhcNMjMxMjA4
 						MjAyODE3WjAeMRwwGgYDVQQDExN3d3cubWFuZXlvbmxpbmUuY29tMIIBIjANBgkq
@@ -28,24 +28,24 @@
 						5VgbqJ0kiLAkULR25Xk7W4xzu6vIfS0TaA22W2aPjRS187wziMPhq1nUDjk77YRh
 						u/QAd2A/WREM6D8cGegKwlPQ7DhdIZQMt7iZrB4uEsx9CLwYs5YwaegQhYY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.maneyonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.maneyonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.maneyonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Maney Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.maneyonline.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.maneyonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.maneyonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.maneyonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Maney Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.maneyonline.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mecenat.eu-sp.xml b/swamid-interfederations-2.0/www.mecenat.eu-sp.xml
index 3dd04cc7..ac212239 100644
--- a/swamid-interfederations-2.0/www.mecenat.eu-sp.xml
+++ b/swamid-interfederations-2.0/www.mecenat.eu-sp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mecenat.eu/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-07T16:22:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-07T16:22:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mecenat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="se">Mecenat</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Mecenat makes student life easier by providing discounts and benefits that are relevant to their studies.</mdui:Description>
+        <mdui:Description xml:lang="se">Mecenat underlättar för de studerande genom att förmedla rabatter och förmåner som är relevanta under studietiden.</mdui:Description>
+        <mdui:Logo height="140" width="250">https://www.mecenat.eu/img/federation-logo-2.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mecenat</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="se">Mecenat</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Mecenat makes student life easier by providing discounts and benefits that are relevant to their studies.</mdui:Description>
-          <mdui:Description xml:lang="se">Mecenat underlättar för de studerande genom att förmedla rabatter och förmåner som är relevanta under studietiden.</mdui:Description>
-          <mdui:Logo height="140" width="250">https://www.mecenat.eu/img/federation-logo-2.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEBTCCAu2gAwIBAgIJAPs0Eng4fXs9MA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIEdvdGFsYW5kMRMwEQYDVQQHDApHb3Ro
 						ZW5idXJnMRMwEQYDVQQKDApNZWNlbmF0IEFCMQswCQYDVQQLDAJJVDEaMBgGA1UE
@@ -42,13 +42,13 @@
 						0QxorqG3ULo0KrMjctRsRu6NNCM+JCBWviC/2onMxBGqM+1STvUDonTU9ifUk0ur
 						qV08FefidEfSPH1DnDsiPeu/KDdLWmfhQA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEBTCCAu2gAwIBAgIJAPs0Eng4fXs9MA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 						VQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIEdvdGFsYW5kMRMwEQYDVQQHDApHb3Ro
 						ZW5idXJnMRMwEQYDVQQKDApNZWNlbmF0IEFCMQswCQYDVQQLDAJJVDEaMBgGA1UE
@@ -72,38 +72,38 @@
 						0QxorqG3ULo0KrMjctRsRu6NNCM+JCBWviC/2onMxBGqM+1STvUDonTU9ifUk0ur
 						qV08FefidEfSPH1DnDsiPeu/KDdLWmfhQA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mecenat.eu/integrationservices/login.ashx" index="0" isDefault="true"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">Mecenat</md:ServiceName>
-        <md:ServiceName xml:lang="se">Mecenat</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Mecenat makes student life easier by providing discounts and benefits that are relevant to their studies.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="se">Mecenat underlättar för de studerande genom att förmedla rabatter och förmåner som är relevanta under studietiden.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Mecenat AB</md:OrganizationName>
-      <md:OrganizationName xml:lang="se">Mecenat AB</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mecenat</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="se">Mecenat</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mecenat.eu/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="se">http://www.mecenat.se/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Service</md:GivenName>
-      <md:EmailAddress>mailto:customerservice@mecenat.eu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Administrator</md:GivenName>
-      <md:EmailAddress>mailto:it@mecenat.eu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mecenat.eu/integrationservices/login.ashx" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">Mecenat</md:ServiceName>
+      <md:ServiceName xml:lang="se">Mecenat</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Mecenat makes student life easier by providing discounts and benefits that are relevant to their studies.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="se">Mecenat underlättar för de studerande genom att förmedla rabatter och förmåner som är relevanta under studietiden.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Mecenat AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="se">Mecenat AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mecenat</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Mecenat</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mecenat.eu/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="se">http://www.mecenat.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Service</md:GivenName>
+    <md:EmailAddress>mailto:customerservice@mecenat.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>mailto:it@mecenat.eu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index 1dd381f9..b697251c 100644
--- a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mediafora.net/simplesaml/module.php/saml/sp/metadata.php/media-network-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MediaFora</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="da">MediaFora</mdui:DisplayName>
+        <mdui:Description xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</mdui:Description>
+        <mdui:Description xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.mediafora.net/simplesaml/privacy-statement/</mdui:PrivacyStatementURL>
+        <mdui:Logo width="120" height="120">https://www.mediafora.net/mediafora-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">MediaFora</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="da">MediaFora</mdui:DisplayName>
-          <mdui:Description xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</mdui:Description>
-          <mdui:Description xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.mediafora.net/simplesaml/privacy-statement/</mdui:PrivacyStatementURL>
-          <mdui:Logo width="120" height="120">https://www.mediafora.net/mediafora-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-logout.php/media-network-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Media network forum</md:ServiceName>
-        <md:ServiceName xml:lang="da">Media netv&amp;aelig;rks forum</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Administrator</md:GivenName>
-      <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-logout.php/media-network-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Media network forum</md:ServiceName>
+      <md:ServiceName xml:lang="da">Media netv&amp;aelig;rks forum</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml b/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
index 38143222..966ecaac 100644
--- a/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.medicinescomplete.com/mc/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T15:06:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T15:06:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</mdui:DisplayName>
+        <mdui:Description xml:lang="en">MedicinesComplete provides online access to the world's leading drug and healthcare references.</mdui:Description>
+        <mdui:Logo height="36" width="217">https://www.medicinescomplete.com/mc/images/mc.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</mdui:DisplayName>
-          <mdui:Description xml:lang="en">MedicinesComplete provides online access to the world's leading drug and healthcare references.</mdui:Description>
-          <mdui:Logo height="36" width="217">https://www.medicinescomplete.com/mc/images/mc.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFZTCCBE2gAwIBAgISESFAs6LrxE6kf3dqQJu3Dy3vMA0GCSqGSIb3DQEBBQUA
 						MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
 						VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
@@ -47,13 +47,13 @@
 						zLwgFCx6+rsu3VEoJL7fcmI9tV4nHSgvX0BbxVN0hiMSmmLyVS4VHV3Sd5hUq0Ni
 						rGza4ZQu2FDvZCTsVhGeJY0WfVMF9XwyyptsUSurLL0+xH4/ureEj/A=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFZTCCBE2gAwIBAgISESFAs6LrxE6kf3dqQJu3Dy3vMA0GCSqGSIb3DQEBBQUA
 						MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
 						VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
@@ -84,29 +84,29 @@
 						zLwgFCx6+rsu3VEoJL7fcmI9tV4nHSgvX0BbxVN0hiMSmmLyVS4VHV3Sd5hUq0Ni
 						rGza4ZQu2FDvZCTsVhGeJY0WfVMF9XwyyptsUSurLL0+xH4/ureEj/A=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pharmpress.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Micah</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Micah</md:GivenName>
-      <md:SurName>Edwards</md:SurName>
-      <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pharmaceutical Press Ops Team</md:GivenName>
-      <md:EmailAddress>mailto:opsteam@rpharms.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pharmpress.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Micah</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Micah</md:GivenName>
+    <md:SurName>Edwards</md:SurName>
+    <md:EmailAddress>mailto:micah@cbcl.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pharmaceutical Press Ops Team</md:GivenName>
+    <md:EmailAddress>mailto:opsteam@rpharms.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
index 1132abd9..57210a00 100644
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:31:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:31:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</mdui:Description>
+        <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</mdui:Description>
-          <mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</mdui:Description>
-          <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.meertens.knaw.nl,OU=I&amp;A,O=KNAW,L=Amsterdam,ST=NH,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIF8TCCA9mgAwIBAgIJAPS1Y07BXsRDMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.meertens.knaw.nl,OU=I&amp;A,O=KNAW,L=Amsterdam,ST=NH,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF8TCCA9mgAwIBAgIJAPS1Y07BXsRDMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 VQQGEwJOTDELMAkGA1UECAwCTkgxEjAQBgNVBAcMCUFtc3RlcmRhbTENMAsGA1UE
 CgwES05BVzEMMAoGA1UECwwDSSZBMR0wGwYDVQQDDBR3d3cubWVlcnRlbnMua25h
 dy5ubDEiMCAGCSqGSIb3DQEJARYTc2VydmljZWRlc2tAa25hdy5ubDAeFw0xNDA1
@@ -64,55 +64,55 @@ WWcZ8uJ+ftZDNEGNvaTnRZLhxGxE9OWThvwL0iyOw8vEcWHm2JNRy3VkSvguFDcM
 MXWm4sBAe8iEXXkAxrflHdBubei1FTexa+Kl9lQ/ICrpmT+V1Jyi4DrdvS0+2ijb
 SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
-        <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>KNAW</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marc</md:GivenName>
-      <md:SurName>Kemps-Snijders</md:SurName>
-      <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marc</md:GivenName>
-      <md:SurName>Kemps-Snijders</md:SurName>
-      <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
+      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml b/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml
index 28f85bb8..851868d5 100644
--- a/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mitpressjournals.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDtTCCAp2gAwIBAgIJAOSUQ1IxKrLFMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						mxigOHHj//L5hysJNl6msFo3p88e1yNJt7z8PgFBdlzRdrizFfrqUYcX17WBfZ0I
 						kFKGffEJeigQ0XTt+EwxUqeIS4bJiCzP95FGjUysTQ7i029sfSQhXVg=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mitpressjournals.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mitpressjournals.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mitpressjournals.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: MIT Press Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mitpressjournals.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mitpressjournals.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mitpressjournals.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mitpressjournals.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: MIT Press Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mitpressjournals.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml b/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml
index a66eead4..48270ff8 100644
--- a/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.morganclaypool.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbjCCA1agAwIBAgIJANEyiht0lGz3MA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -33,24 +33,24 @@
 						+B02aD7lQHX2jczKW50vxU46gvji7sBWUlCeYT+JeBQpBKT6SOPtHBLcSNIwhDzG
 						U5jsgJ4S54QwA12aggwYfLERyqoQLPepkxvA2QygkK7JeQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.morganclaypool.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.morganclaypool.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.morganclaypool.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Morgan &amp; Claypool Publishers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.morganclaypool.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.morganclaypool.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.morganclaypool.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.morganclaypool.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Morgan &amp; Claypool Publishers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.morganclaypool.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml b/swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml
index c87055ee..d9caf323 100644
--- a/swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.myinterfase.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-11-20T11:39:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-11-20T11:39:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/testshib"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/testshib"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/testshib"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/testshib"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/testshib"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/testshib"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.myinterfase.com/Shibboleth.sso/login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEqjCCA5KgAwIBAgIJALAy5mejW0XwMA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
 						VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEZMBcGA1UE
 						ChMQQ1NPIFJlc2VhcmNoIEluYzETMBEGA1UECxMKcHJvZHVjdGlvbjEMMAoGA1UE
@@ -81,38 +81,38 @@
 						0/G9cmszj6oBd/EQznuxVJVvk6vpGBifh47t/LCWNd3rgPf2Rk3qx1HRoqcheJBK
 						pFT1skULlbFxWMSbnHzHd5evjh5a5B0pzmlrkXpAtVoIVAur0M8FX8+ts+mTNA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.myinterfase.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.myinterfase.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CSO Research, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CSO Research, Inc: Interfase</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.csoresearch.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Hiers</md:SurName>
-      <md:EmailAddress>mailto:thiers@csoresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Tim</md:GivenName>
-      <md:SurName>Hiers</md:SurName>
-      <md:EmailAddress>mailto:thiers@csoresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.myinterfase.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.myinterfase.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CSO Research, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CSO Research, Inc: Interfase</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.csoresearch.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Hiers</md:SurName>
+    <md:EmailAddress>mailto:thiers@csoresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tim</md:GivenName>
+    <md:SurName>Hiers</md:SurName>
+    <md:EmailAddress>mailto:thiers@csoresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml
index d9d32f20..70f0439e 100644
--- a/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mynsu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T08:23:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T08:23:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mynsu.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mynsu.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,33 +30,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Northumbria Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mynsu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Northumbria Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mynsu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml
index f03da33f..d9bbb11f 100644
--- a/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.napierstudents.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T09:14:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T09:14:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.napierstudents.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.napierstudents.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.napierstudents.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.napierstudents.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Napier Students Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.napierstudents.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.napierstudents.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.napierstudents.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Napier Students Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.napierstudents.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
index 345009f8..d54c883c 100644
--- a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nederlab.nl/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:24:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:24:43Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-          <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
+        <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</mdui:Description>
-          <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
-          <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.nederlab.nl</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.nederlab.nl,OU=I&amp;A,O=Meertens,L=Amsterdam,ST=Noord Holland,C=NL</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.nederlab.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.nederlab.nl,OU=I&amp;A,O=Meertens,L=Amsterdam,ST=Noord Holland,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
 VQQGEwJOTDEWMBQGA1UECAwNTm9vcmQgSG9sbGFuZDESMBAGA1UEBwwJQW1zdGVy
 ZGFtMREwDwYDVQQKDAhNZWVydGVuczEMMAoGA1UECwwDSSZBMRgwFgYDVQQDDA93
 d3cubmVkZXJsYWIubmwxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VkZXNrQGtuYXcu
@@ -65,55 +65,55 @@ anLI4k0jYr3bxxk2d325UpxVKnKp+vaIRli99xYLLroaiolrj8k981I4u1gBoEGD
 728wR2l94IA0c+LxNkOwwv4cwsnqO6QKeENxz/eN6RXVcrO1U7ZS2qVvKgQ9sORu
 7Hwjg9MqBq4i
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
-        <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
-        <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>KNAW</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marc</md:GivenName>
-      <md:SurName>Kemps-Snijders</md:SurName>
-      <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Marc</md:GivenName>
-      <md:SurName>Kemps-Snijders</md:SurName>
-      <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
+      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml b/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml
index b67796da..3fae11a2 100644
--- a/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nejm.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-08-06T15:48:45Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-08-06T15:48:45Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAIBpEkq6FhlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 						BAMTDHd3dy5uZWptLm9yZzAeFw0xMzA3MTAyMTA3MDJaFw0yMzA3MDgyMTA3MDJa
 						MBcxFTATBgNVBAMTDHd3dy5uZWptLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -28,24 +28,24 @@
 						3y2fAMI1ef+C1XDMkJBYSS/o9AiY5VF+TSmsgpN4Etlr2BCk2aOvfEsi0cQMuThu
 						ZN3XBFLXsiMX/MLD9bpLrA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nejm.org/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nejm.org/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nejm.org/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: New England Journal of Medicine</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nejm.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nejm.org/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nejm.org/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nejm.org/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: New England Journal of Medicine</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nejm.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nescolsa.com-shibboleth.xml b/swamid-interfederations-2.0/www.nescolsa.com-shibboleth.xml
index 98793678..c1affe7c 100644
--- a/swamid-interfederations-2.0/www.nescolsa.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nescolsa.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nescolsa.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T12:23:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T12:23:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nescolsa.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nescolsa.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,33 +30,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolsa.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nescolsa.com/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nescolsa.com/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">North East Scotland College Students' Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nescolsa.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolsa.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolsa.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nescolsa.com/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nescolsa.com/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nescolsa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">North East Scotland College Students' Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nescolsa.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml
index 5b0e7f16..c97849c1 100644
--- a/swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nescolvoting.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-06T11:49:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-06T11:49:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,33 +30,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NESCOL Students' Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nescolvoting.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NESCOL Students' Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nescolvoting.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml b/swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml
index ceb20da8..34e66728 100644
--- a/swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.newscientist.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-08T14:20:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-08T14:20:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">New Scientist (Test)</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">New Scientist (Test)</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -38,13 +38,13 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
 						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
 						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
@@ -68,37 +68,37 @@
 						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
 						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/saml2/post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/saml2/art" index="3"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">New Scientist (Test)</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">New Scientist (Test)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reed Business Information - New Scientist (Shibboleth Test)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reedbusiness.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Help</md:GivenName>
-      <md:EmailAddress>mailto:customerhelp@newscientist.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/saml2/post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/saml2/art" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">New Scientist (Test)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">New Scientist (Test)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reed Business Information - New Scientist (Shibboleth Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reedbusiness.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Help</md:GivenName>
+    <md:EmailAddress>mailto:customerhelp@newscientist.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
index e5e942e0..ccb9ad2a 100644
--- a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nordbiomed.net/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
+        <mdui:Description xml:lang="fi">Biolääketieteen Moodle verkkokursseja Nordbiomed ohjelman opiskelijoille</mdui:Description>
+        <mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
-          <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
-          <mdui:Description xml:lang="fi">Biolääketieteen Moodle verkkokursseja Nordbiomed ohjelman opiskelijoille</mdui:Description>
-          <mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIQTEIjMmXuufcFuvtWfJihPTANBgkqhkiG9w0BAQsFADBf
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIQTEIjMmXuufcFuvtWfJihPTANBgkqhkiG9w0BAQsFADBf
 MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
 DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
 HhcNMTUwNzE3MDAwMDAwWhcNMTYwODA4MjM1OTU5WjBdMSEwHwYDVQQLExhEb21h
@@ -48,45 +48,45 @@ aoxFqzTcOzeHsZzkHWCetMuJ3C2U7zJ7zlM5d00CKq4KUMPw4aIWa1ZVZzY6w7fk
 ygsKkxkMt53Bgz+kboZ2Za7f8+mI1WSwOXGZ7JZvA1silbYaWqAOP/Q2p0YTonc/
 cb9svLVNv1dY7g+DHfHECFu9SLjl/htYmWWoUtL/59m+nPGPmDL6I/rjdzGtVGXi
 PbMcpBprCNt05806/04coPb2RbK0VDV5DG00Z/kNoGxR</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nordbiomed.net/nordbiosaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nordbiomed.net/nordbiosaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1" isDefault="true"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="fi">Nordbiomed.net Moodle</md:ServiceName>
-        <md:ServiceName xml:lang="en">Nordbiomed.net Moodle</md:ServiceName>
-        <md:ServiceName xml:lang="sv">Nordbiomed.net Moodle</md:ServiceName>
-        <md:ServiceDescription xml:lang="fi">NordBioMed.net asiantuntijat kehittavat aktiivisesti kursseja biolaaketieteen alalle, taatakseen opetuksen laadun. Kursseja on mukana kehittamassa Karolinska Institutet, seka Ita-suomen, Turun , Bergenin ja Koopenhaminan yliopistot.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Nordic programmes of biomedicine have worked together in order to develop the field's teaching and quality management. This NordBioMed.net, comprising Karolinska Institutet and the Universities of Eastern Finland, Turku, Bergen and Copenhagen, is actively</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="sv">Nordiska program for biomedicin har arbetat tillsammans for att utveckla  undervisning och kvalitetsstyrning. NordBioMed.net som  bestar av Karolinska Institutet, universiteten i ostra Finland, Abo,  Bergen och Kopenhamn, har aktivt utvecklat gemens</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="fi">Mediamaisteri</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">Mediamaisteri</md:OrganizationName>
-      <md:OrganizationName xml:lang="sv">Mediamaisteri</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="fi">Mediamaisteri</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Mediamaisteri</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="sv">Mediamaisteri</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="fi">http://www.mediamaisteri.com</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.mediamaisteri.com</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="sv">http://www.mediamaisteri.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Henri</md:GivenName>
-      <md:SurName>Urpalainen</md:SurName>
-      <md:EmailAddress>mailto:henri.urpalainen@mediamaisteri.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Henri</md:GivenName>
-      <md:SurName>Urpalainen</md:SurName>
-      <md:EmailAddress>mailto:henri.urpalainen@mediamaisteri.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nordbiomed.net/nordbiosaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nordbiomed.net/nordbiosaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Nordbiomed.net Moodle</md:ServiceName>
+      <md:ServiceName xml:lang="en">Nordbiomed.net Moodle</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Nordbiomed.net Moodle</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">NordBioMed.net asiantuntijat kehittavat aktiivisesti kursseja biolaaketieteen alalle, taatakseen opetuksen laadun. Kursseja on mukana kehittamassa Karolinska Institutet, seka Ita-suomen, Turun , Bergenin ja Koopenhaminan yliopistot.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Nordic programmes of biomedicine have worked together in order to develop the field's teaching and quality management. This NordBioMed.net, comprising Karolinska Institutet and the Universities of Eastern Finland, Turku, Bergen and Copenhagen, is actively</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Nordiska program for biomedicin har arbetat tillsammans for att utveckla  undervisning och kvalitetsstyrning. NordBioMed.net som  bestar av Karolinska Institutet, universiteten i ostra Finland, Abo,  Bergen och Kopenhamn, har aktivt utvecklat gemens</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Mediamaisteri</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Mediamaisteri</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Mediamaisteri</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Mediamaisteri</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mediamaisteri</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Mediamaisteri</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.mediamaisteri.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.mediamaisteri.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.mediamaisteri.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Henri</md:GivenName>
+    <md:SurName>Urpalainen</md:SurName>
+    <md:EmailAddress>mailto:henri.urpalainen@mediamaisteri.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Henri</md:GivenName>
+    <md:SurName>Urpalainen</md:SurName>
+    <md:EmailAddress>mailto:henri.urpalainen@mediamaisteri.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml b/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml
index ae5e33d4..0c99f8c7 100644
--- a/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nrcresearchpress.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDtTCCAp2gAwIBAgIJALKKItp/j602MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						vMIejpaSZn0yf3ZFn8eebCpLnlVN0FLNCgel39FLMGqNbey0wpFbzocv4fvX6pmi
 						Bz9FTGLHvLqpoRV/zghBPM32BhT8U6PJfC56HlfNfbRtx9nHZK2GfJw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nrcresearchpress.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nrcresearchpress.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nrcresearchpress.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: NRC Research Press</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.nrcresearchpress.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nrcresearchpress.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nrcresearchpress.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nrcresearchpress.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: NRC Research Press</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nrcresearchpress.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml b/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml
index 933a70ce..01c43f6a 100644
--- a/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.numeriquepremium.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-06T09:24:40Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-06T09:24:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo6gAwIBAgIEVClg0jANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
 						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
@@ -31,13 +31,13 @@
 						sYwXGiixYKkmEHyqXZ04jYokm0cdrARdVvFexRd/m+0OO+25MxuBDEmCs+8HZD1c
 						wWYy4HqaGBWV3Iotfxxdus9i8nenq47abSQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo6gAwIBAgIEVClg0jANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
 						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
@@ -59,23 +59,23 @@
 						sYwXGiixYKkmEHyqXZ04jYokm0cdrARdVvFexRd/m+0OO+25MxuBDEmCs+8HZD1c
 						wWYy4HqaGBWV3Iotfxxdus9i8nenq47abSQ=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.numeriquepremium.com/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.numeriquepremium.com/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NUMéRIQUE PREMIUM</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.numeriquepremium.com/shibboleth/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Info</md:GivenName>
-      <md:EmailAddress>mailto:info@numeriquepremium.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.numeriquepremium.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.numeriquepremium.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NUMéRIQUE PREMIUM</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.numeriquepremium.com/shibboleth/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:EmailAddress>mailto:info@numeriquepremium.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml
index e0927327..3b19acea 100644
--- a/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nurseryworld.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T09:25:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T09:25:05Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nursery World</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Nursery World is a magazine for practitioners across the early years of education and childcare</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Nursery World</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Nursery World is a magazine for practitioners across the early years of education and childcare</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJAKKEvzTa1baZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC2xpYmx5bnguY29tMB4XDTE1MDcwMTE0MzA1OFoXDTI1MDYyODE0MzA1OFow
 						FjEUMBIGA1UEAxMLbGlibHlueC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -50,43 +50,43 @@
 						7wGBxTNZk8z8Ob/CFJI79t38xZnP8cBEr4vlE27ld7HGu1mzBZPi6d4pAhpOcIvG
 						tkJW/9JlQ93sBxUk0E1HbTlYxtXFbNCVwqEWcg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">LibLynx LLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Nursery World</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.markallengroup.com/ma-education/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Tom</md:GivenName>
-      <md:SurName>Pollard</md:SurName>
-      <md:EmailAddress>mailto:tom.pollard@markallengroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Dixon</md:SurName>
-      <md:EmailAddress>mailto:paul@liblynx.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LibLynx LLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nursery World</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.markallengroup.com/ma-education/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tom</md:GivenName>
+    <md:SurName>Pollard</md:SurName>
+    <md:EmailAddress>mailto:tom.pollard@markallengroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Dixon</md:SurName>
+    <md:EmailAddress>mailto:paul@liblynx.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml
index 910e7663..69d33986 100644
--- a/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nusu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T14:18:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T14:18:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nusu.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nusu.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nusu.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nusu.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nusu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Newcastle University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.nusu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nusu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Newcastle University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.nusu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml
index f8433d18..cfd65130 100644
--- a/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.oecd-ilibrary.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-15T11:47:50Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-15T11:47:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnDCCAoSgAwIBAgIEU6fsvDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
@@ -31,24 +31,24 @@
 						Q7n9nLR+KmfcwvAMmS0umw+Gro7ijmRUHdpOaM9TaH5JPFPDjd2cBvWqtLg7XWSd
 						8XfpcsLFcbF8WxkBPuoQDw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.oecd-ilibrary.org/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OECD iLibrary [LIVE]</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.oecd-ilibrary.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Talvinder</md:GivenName>
-      <md:SurName>Matharu</md:SurName>
-      <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.oecd-ilibrary.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OECD iLibrary [LIVE]</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.oecd-ilibrary.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml
index 47f5bb9d..c97a159c 100644
--- a/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ohsu.edu/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor errorURL="https://www.ohsu.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohsu.edu</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Oregon Health &amp; Science University</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor errorURL="https://www.ohsu.edu/idp/error.jsp" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohsu.edu</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Oregon Health &amp; Science University</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKiKGs+N1BpUHsMJYEAJU0TUP6QMMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTAeFw0wOTExMTcyMjUwNTJaFw0y
 OTExMTcyMjUwNTJaMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTCCASIwDQYJKoZI
@@ -37,23 +37,23 @@ udBseAs0D9Q9aL0OofrcQLcNdaGsJzLilDVM/UU7cSCwKATWuuLJGKgNlepjyq5Q
 z2lDp/HktHga9plFDjee7YRsH4N/9e1Z+3mKzs9QRANCAfDeTz9iFo8lJqo4sRdp
 SHajk3KEnqZKbsvlZC70uJpwvS9dn3E0G9esB/ps3tM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.ohsu.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ohsu.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.ohsu.edu/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ohsu.edu/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ohsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohsu.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.ohsu.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ohsu.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.ohsu.edu/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ohsu.edu/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ohsu.edu/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohsu.edu</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDHDCCAgSgAwIBAgIVAKiKGs+N1BpUHsMJYEAJU0TUP6QMMA0GCSqGSIb3DQEB
 BQUAMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTAeFw0wOTExMTcyMjUwNTJaFw0y
 OTExMTcyMjUwNTJaMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTCCASIwDQYJKoZI
@@ -72,23 +72,23 @@ udBseAs0D9Q9aL0OofrcQLcNdaGsJzLilDVM/UU7cSCwKATWuuLJGKgNlepjyq5Q
 z2lDp/HktHga9plFDjee7YRsH4N/9e1Z+3mKzs9QRANCAfDeTz9iFo8lJqo4sRdp
 SHajk3KEnqZKbsvlZC70uJpwvS9dn3E0G9esB/ps3tM=
           </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ohsu.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.ohsu.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Oregon Health &amp; Science University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Oregon Health &amp; Science University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ohsu.edu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Denny Hyde</md:GivenName>
-      <md:EmailAddress>hyded@ohsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Sean Vanderheiden</md:GivenName>
-      <md:EmailAddress>vanderhe@ohsu.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ohsu.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.ohsu.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Oregon Health &amp; Science University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Oregon Health &amp; Science University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ohsu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Denny Hyde</md:GivenName>
+    <md:EmailAddress>hyded@ohsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sean Vanderheiden</md:GivenName>
+    <md:EmailAddress>vanderhe@ohsu.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
index 98e53370..5c77a4c7 100644
--- a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaccessrepository.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T08:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Open Access Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Open Access Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</mdui:Description>
+        <mdui:Description xml:lang="it">Archivio Open Access dei prodotti della ricerca (pubblicazioni, software, dati, ecc.) dell'INFN ed altri organismi di ricerca italiani</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.openaccessrepository.it/service/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.openaccessrepository.it/service/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.openaccessrepository.it/help/privacy-policy?ln=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.openaccessrepository.it/help/privacy-policy?ln=it</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Open Access Repository</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">Open Access Repository</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</mdui:Description>
-          <mdui:Description xml:lang="it">Archivio Open Access dei prodotti della ricerca (pubblicazioni, software, dati, ecc.) dell'INFN ed altri organismi di ricerca italiani</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.openaccessrepository.it/service/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.openaccessrepository.it/service/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.openaccessrepository.it/help/privacy-policy?ln=en</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.openaccessrepository.it/help/privacy-policy?ln=it</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEgzCCA2ugAwIBAgIQAcOBBEDrU0NaTC9JniJAAjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDYyMzAwMDAwMFoXDTE3MDYyMjIzNTk1OVowSTEhMB8GA1UE
@@ -50,33 +50,33 @@ h/rBSQ+HrCM6vkeKTW79h7Wy6u3dlag1vD2ToM/0Sp7x16auORbwST05kRr83pJB
 xoOiE+hrgoBGwJidjNIMD641bADIz8WXCWpy0QVCuBzdufaa1vJszW3r1Y6cVyBL
 VGXrPl4Lcw==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Open Access Repository</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Italian National Institute for Nuclear Physics</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">INFN</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.infn.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Open Access Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Italian National Institute for Nuclear Physics</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.infn.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 01e48d0a..9a622a3b 100644
--- a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaire.eu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">OpenAire 2020</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">OpenAire 2020</mdui:DisplayName>
+        <mdui:Description xml:lang="en">OpenAIRE2020 is a funded project to develop and maintain the infrastructure to support the European Commission OA policy</mdui:Description>
+        <mdui:Description xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.openaire.eu/project-factsheets</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">https://www.openaire.eu/openaire-report-gr</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.openaire.eu/141-privacy-policy/813-edu-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://www.openaire.eu/privacy-gr</mdui:PrivacyStatementURL>
+        <mdui:Logo width="123" height="175" xml:lang="en">https://www.openaire.eu/images/site_images/OpenAIREplus_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">OpenAire 2020</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">OpenAire 2020</mdui:DisplayName>
-          <mdui:Description xml:lang="en">OpenAIRE2020 is a funded project to develop and maintain the infrastructure to support the European Commission OA policy</mdui:Description>
-          <mdui:Description xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.openaire.eu/project-factsheets</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">https://www.openaire.eu/openaire-report-gr</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.openaire.eu/141-privacy-policy/813-edu-privacy</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="el">https://www.openaire.eu/privacy-gr</mdui:PrivacyStatementURL>
-          <mdui:Logo width="123" height="175" xml:lang="en">https://www.openaire.eu/images/site_images/OpenAIREplus_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">OpenAire2020</md:ServiceName>
-        <md:ServiceName xml:lang="el">OpenAire2020</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">OpenAIRE2020 is a project aiming to develop and maintain the infrastructure to support the European Commission OA policy</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Athena- Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Αθηνά-Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Athena Research Center</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Ερευνητικό Κέντρο Αθηνά</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/en.html</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Athena Research Center</md:Company>
-      <md:GivenName>Eri</md:GivenName>
-      <md:SurName>Katsari</md:SurName>
-      <md:EmailAddress>gkatsari@di.uoa.gr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Athena Research Center</md:Company>
-      <md:GivenName>Katerina</md:GivenName>
-      <md:SurName>Iatropoulou</md:SurName>
-      <md:EmailAddress>kiatrop@di.uoa.gr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">OpenAire2020</md:ServiceName>
+      <md:ServiceName xml:lang="el">OpenAire2020</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">OpenAIRE2020 is a project aiming to develop and maintain the infrastructure to support the European Commission OA policy</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Athena- Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Αθηνά-Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Athena Research Center</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ερευνητικό Κέντρο Αθηνά</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/en.html</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Athena Research Center</md:Company>
+    <md:GivenName>Eri</md:GivenName>
+    <md:SurName>Katsari</md:SurName>
+    <md:EmailAddress>gkatsari@di.uoa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Athena Research Center</md:Company>
+    <md:GivenName>Katerina</md:GivenName>
+    <md:SurName>Iatropoulou</md:SurName>
+    <md:EmailAddress>kiatrop@di.uoa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 7c776f3d..1903fc72 100644
--- a/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openconext.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-27T09:48:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAO7J6UVBF5npHFtCjVbTtqowDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSd3d3Lm9wZW5jb25leHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshLGkfHyjl3dS+a9L1nIrSD+IV4wtahRasBOMZnOL1he79EKtjSRMNuaWiKu7wuhJp19nnKjihTiwXZgEL/k3TBq1PbNRDktjqjmSt+rA2mO62Sq0E4iX7hSkEzoz42t4pNZgai1ZMd8i7eSW2B+NoxjO13vMQOSsD7jkmQoRPBiIJqomywfGsPG3lGLwGK+FwE8rJLwgtF7CA3XzFizEWaPPh6qX0Jj9dydbVMwLrV48Odzdd6KsdorVSkn+QHZXnKnMHbqhh6gJ/6kBi9ibMKyxmnz/NoHNT6ucC6UrKyudCcP5jWAjc6SUkywUYwYhTx47OkBqa/7BdJIzW0q0wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFA4WYkSuaxKJ0nVB3wQrym1/KGfbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ3d3cub3BlbmNvbmV4dC5vcmcwDQYJKoZIhvcNAQEFBQADggEBAJkBKGDSNFIY/BtAyhWfRYPwmV0tCtldSc2fh+biELxCX+9hlkhQ322mUEbdX4P31ZQRaEV53bvFq+Jn3oOGzwvJU+Vz+PO3rmMRVdCgFblXjtpisTDEhFlG6XeHZNIEow1hbgfk+NhrZ92ItQWr/cW9DPmxhhIDkoQZoj2L5cxTNO1qV10Of3oJ6nkykTMmYvpKNfdmYp0XtJ3nab1e0auoL6nG0iFNrIthAofuHYokH5Nl3qhu0mpI1w8Z3kyKhbGGjWUg1ej1Jh0xh0+xriMIvVG+WwtUY+K+4+1d23iwct1KqfjSurn15TiqY9hwkqIZcJ3JWpGnk3HYQctmTjY=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAO7J6UVBF5npHFtCjVbTtqowDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSd3d3Lm9wZW5jb25leHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshLGkfHyjl3dS+a9L1nIrSD+IV4wtahRasBOMZnOL1he79EKtjSRMNuaWiKu7wuhJp19nnKjihTiwXZgEL/k3TBq1PbNRDktjqjmSt+rA2mO62Sq0E4iX7hSkEzoz42t4pNZgai1ZMd8i7eSW2B+NoxjO13vMQOSsD7jkmQoRPBiIJqomywfGsPG3lGLwGK+FwE8rJLwgtF7CA3XzFizEWaPPh6qX0Jj9dydbVMwLrV48Odzdd6KsdorVSkn+QHZXnKnMHbqhh6gJ/6kBi9ibMKyxmnz/NoHNT6ucC6UrKyudCcP5jWAjc6SUkywUYwYhTx47OkBqa/7BdJIzW0q0wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFA4WYkSuaxKJ0nVB3wQrym1/KGfbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ3d3cub3BlbmNvbmV4dC5vcmcwDQYJKoZIhvcNAQEFBQADggEBAJkBKGDSNFIY/BtAyhWfRYPwmV0tCtldSc2fh+biELxCX+9hlkhQ322mUEbdX4P31ZQRaEV53bvFq+Jn3oOGzwvJU+Vz+PO3rmMRVdCgFblXjtpisTDEhFlG6XeHZNIEow1hbgfk+NhrZ92ItQWr/cW9DPmxhhIDkoQZoj2L5cxTNO1qV10Of3oJ6nkykTMmYvpKNfdmYp0XtJ3nab1e0auoL6nG0iFNrIthAofuHYokH5Nl3qhu0mpI1w8Z3kyKhbGGjWUg1ej1Jh0xh0+xriMIvVG+WwtUY+K+4+1d23iwct1KqfjSurn15TiqY9hwkqIZcJ3JWpGnk3HYQctmTjY=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openconext.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openconext.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="nl">OpenConext Community</md:ServiceName>
-        <md:ServiceName xml:lang="en">OpenConext Community</md:ServiceName>
-        <md:ServiceDescription xml:lang="nl">OpenConext Community</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">OpenConext Community</md:ServiceDescription>
-        <md:RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:mace:dir:attribute-def:displayName" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:mace:dir:attribute-def:mail" isRequired="true"/>
-        <md:RequestedAttribute Name="urn:mace:dir:attribute-def:uid" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OpenConext</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">OpenConext</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.openconext.org</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Frans</md:GivenName>
-      <md:SurName>Ward</md:SurName>
-      <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Frans</md:GivenName>
-      <md:SurName>Ward</md:SurName>
-      <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frans</md:GivenName>
-      <md:SurName>Ward</md:SurName>
-      <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-27T09:48:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAO7J6UVBF5npHFtCjVbTtqowDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSd3d3Lm9wZW5jb25leHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshLGkfHyjl3dS+a9L1nIrSD+IV4wtahRasBOMZnOL1he79EKtjSRMNuaWiKu7wuhJp19nnKjihTiwXZgEL/k3TBq1PbNRDktjqjmSt+rA2mO62Sq0E4iX7hSkEzoz42t4pNZgai1ZMd8i7eSW2B+NoxjO13vMQOSsD7jkmQoRPBiIJqomywfGsPG3lGLwGK+FwE8rJLwgtF7CA3XzFizEWaPPh6qX0Jj9dydbVMwLrV48Odzdd6KsdorVSkn+QHZXnKnMHbqhh6gJ/6kBi9ibMKyxmnz/NoHNT6ucC6UrKyudCcP5jWAjc6SUkywUYwYhTx47OkBqa/7BdJIzW0q0wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFA4WYkSuaxKJ0nVB3wQrym1/KGfbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ3d3cub3BlbmNvbmV4dC5vcmcwDQYJKoZIhvcNAQEFBQADggEBAJkBKGDSNFIY/BtAyhWfRYPwmV0tCtldSc2fh+biELxCX+9hlkhQ322mUEbdX4P31ZQRaEV53bvFq+Jn3oOGzwvJU+Vz+PO3rmMRVdCgFblXjtpisTDEhFlG6XeHZNIEow1hbgfk+NhrZ92ItQWr/cW9DPmxhhIDkoQZoj2L5cxTNO1qV10Of3oJ6nkykTMmYvpKNfdmYp0XtJ3nab1e0auoL6nG0iFNrIthAofuHYokH5Nl3qhu0mpI1w8Z3kyKhbGGjWUg1ej1Jh0xh0+xriMIvVG+WwtUY+K+4+1d23iwct1KqfjSurn15TiqY9hwkqIZcJ3JWpGnk3HYQctmTjY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAO7J6UVBF5npHFtCjVbTtqowDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSd3d3Lm9wZW5jb25leHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshLGkfHyjl3dS+a9L1nIrSD+IV4wtahRasBOMZnOL1he79EKtjSRMNuaWiKu7wuhJp19nnKjihTiwXZgEL/k3TBq1PbNRDktjqjmSt+rA2mO62Sq0E4iX7hSkEzoz42t4pNZgai1ZMd8i7eSW2B+NoxjO13vMQOSsD7jkmQoRPBiIJqomywfGsPG3lGLwGK+FwE8rJLwgtF7CA3XzFizEWaPPh6qX0Jj9dydbVMwLrV48Odzdd6KsdorVSkn+QHZXnKnMHbqhh6gJ/6kBi9ibMKyxmnz/NoHNT6ucC6UrKyudCcP5jWAjc6SUkywUYwYhTx47OkBqa/7BdJIzW0q0wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFA4WYkSuaxKJ0nVB3wQrym1/KGfbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ3d3cub3BlbmNvbmV4dC5vcmcwDQYJKoZIhvcNAQEFBQADggEBAJkBKGDSNFIY/BtAyhWfRYPwmV0tCtldSc2fh+biELxCX+9hlkhQ322mUEbdX4P31ZQRaEV53bvFq+Jn3oOGzwvJU+Vz+PO3rmMRVdCgFblXjtpisTDEhFlG6XeHZNIEow1hbgfk+NhrZ92ItQWr/cW9DPmxhhIDkoQZoj2L5cxTNO1qV10Of3oJ6nkykTMmYvpKNfdmYp0XtJ3nab1e0auoL6nG0iFNrIthAofuHYokH5Nl3qhu0mpI1w8Z3kyKhbGGjWUg1ej1Jh0xh0+xriMIvVG+WwtUY+K+4+1d23iwct1KqfjSurn15TiqY9hwkqIZcJ3JWpGnk3HYQctmTjY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openconext.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openconext.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="nl">OpenConext Community</md:ServiceName>
+      <md:ServiceName xml:lang="en">OpenConext Community</md:ServiceName>
+      <md:ServiceDescription xml:lang="nl">OpenConext Community</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">OpenConext Community</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:displayName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:uid" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OpenConext</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">OpenConext</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.openconext.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Frans</md:GivenName>
+    <md:SurName>Ward</md:SurName>
+    <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Frans</md:GivenName>
+    <md:SurName>Ward</md:SurName>
+    <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frans</md:GivenName>
+    <md:SurName>Ward</md:SurName>
+    <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
index 39642749..e1d985e8 100644
--- a/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.opensciencedatacloud.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-26T12:55:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-26T12:55:32Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Open Science Data Cloud Console</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The OSDC provides cloud computing and storage services for the scientific research community.</mdui:Description>
+        <mdui:Logo height="35" width="205">https://www.opensciencedatacloud.org/misc/logo_sm.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Open Science Data Cloud Console</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The OSDC provides cloud computing and storage services for the scientific research community.</mdui:Description>
-          <mdui:Logo height="35" width="205">https://www.opensciencedatacloud.org/misc/logo_sm.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIF7zCCA9cCCQCicdy6qcU4ZDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
 						VVMxCzAJBgNVBAgMAklMMRAwDgYDVQQHDAdDaGljYWdvMSAwHgYDVQQKDBdPcGVu
 						IFNjaWVuY2UgRGF0YSBDbG91ZDEqMCgGA1UECwwhTGFib3JhdG9yeSBmb3IgQWR2
@@ -68,51 +68,51 @@
 						8FqqDNY7Ln1LMtV3f5mKjt+lEUkjOr9rcRbFnPx7eLTRRI3C58jBFUxQYcG6zbSo
 						iYBbqea72Trn3z2jrytiIM2RYNoL7aS2eqfyIwEr9Q6cuDA=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="it">Open Science Data Cloud Console</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Center for Computational Science Research, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Open Science Data Cloud Console</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.opensciencedatacloud.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@opensciencedatacloud.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ray</md:GivenName>
-      <md:SurName>Powell</md:SurName>
-      <md:EmailAddress>mailto:rpowell1@uchicago.edu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="it">Open Science Data Cloud Console</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Center for Computational Science Research, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Open Science Data Cloud Console</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.opensciencedatacloud.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@opensciencedatacloud.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ray</md:GivenName>
+    <md:SurName>Powell</md:SurName>
+    <md:EmailAddress>mailto:rpowell1@uchicago.edu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml
index 32b55d20..c940e60b 100644
--- a/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pathcal.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T11:39:16Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T11:39:16Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pathcal.ac.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pathcal.ac.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pathcal.ac.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.pathcal.ac.uk/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PathCAL</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Series of online tutorials covering a wide range of pathology and pathophysiology subjects.</mdui:Description>
+        <mdui:Logo height="64" width="300">https://www.pathcal.ac.uk/pathcal_wayf.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pathcal.ac.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pathcal.ac.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pathcal.ac.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.pathcal.ac.uk/Shibboleth.sso/DS" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">PathCAL</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Series of online tutorials covering a wide range of pathology and pathophysiology subjects.</mdui:Description>
-          <mdui:Logo height="64" width="300">https://www.pathcal.ac.uk/pathcal_wayf.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDIDCCAgigAwIBAgIJAP0iPdXcGeGuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 						BAMTEXd3dy5wYXRoY2FsLmFjLnVrMB4XDTExMDMzMDE1MTIzNVoXDTIxMDMyNzE1
 						MTIzNVowHDEaMBgGA1UEAxMRd3d3LnBhdGhjYWwuYWMudWswggEiMA0GCSqGSIb3
@@ -53,46 +53,46 @@
 						Zy9ytOPZlc12HwkN83CgQD6dPOEr4zmypBtg7RR6Bf0lhD7ldrSlA1LvrTQX6/vz
 						GxJxVd0AU9FzIdALwx59lXkBvyhje3QI6dYfxwDZPyKxo4PA
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: PathCAL</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/index.asp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>PathCAL</md:GivenName>
-      <md:EmailAddress>mailto:pathcal@lists.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Arek</md:GivenName>
-      <md:SurName>Juszczyk</md:SurName>
-      <md:EmailAddress>mailto:arek.juszczyk@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: PathCAL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/index.asp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>PathCAL</md:GivenName>
+    <md:EmailAddress>mailto:pathcal@lists.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arek</md:GivenName>
+    <md:SurName>Juszczyk</md:SurName>
+    <md:EmailAddress>mailto:arek.juszczyk@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml b/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml
index 7d3a5e84..894ef99a 100644
--- a/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://www.pharmacopoeia.com/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-14T13:31:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-14T13:31:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">British Pharmacopoeia</mdui:Description>
+        <mdui:DisplayName xml:lang="en">British Pharmacopoeia</mdui:DisplayName>
+        <mdui:Logo height="106" width="480">https://www.pharmacopoeia.com/assets/bp/images/british-pharmacopoeia.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">British Pharmacopoeia</mdui:Description>
-          <mdui:DisplayName xml:lang="en">British Pharmacopoeia</mdui:DisplayName>
-          <mdui:Logo height="106" width="480">https://www.pharmacopoeia.com/assets/bp/images/british-pharmacopoeia.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcDCCAligAwIBAgIJAKNqg3+e59PHMA0GCSqGSIb3DQEBBQUAMC4xDDAKBgNV
 						BAoTA1RTTzEeMBwGA1UEAxMVd3d3LnBoYXJtYWNvcG9laWEuY29tMB4XDTE1MDgw
 						NzE1NDczNVoXDTI1MDgwNDE1NDczNVowLjEMMAoGA1UEChMDVFNPMR4wHAYDVQQD
@@ -37,13 +37,13 @@
 						2kpGXv46PNFW01vl+J/EVxq3YitsdWzopSmjHYIZR0eKXDG4bAS6ulPAAElDsKlE
 						0e00+Q6k8r5lfTGa50KV3OMQGR8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDcDCCAligAwIBAgIJAKNqg3+e59PHMA0GCSqGSIb3DQEBBQUAMC4xDDAKBgNV
 						BAoTA1RTTzEeMBwGA1UEAxMVd3d3LnBoYXJtYWNvcG9laWEuY29tMB4XDTE1MDgw
 						NzE1NDczNVoXDTI1MDgwNDE1NDczNVowLjEMMAoGA1UEChMDVFNPMR4wHAYDVQQD
@@ -64,25 +64,25 @@
 						2kpGXv46PNFW01vl+J/EVxq3YitsdWzopSmjHYIZR0eKXDG4bAS6ulPAAElDsKlE
 						0e00+Q6k8r5lfTGa50KV3OMQGR8=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pharmacopoeia.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pharmacopoeia.com/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Stationery Office Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">British Pharmacopoeia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.pharmacopoeia.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Nichol</md:GivenName>
-      <md:SurName>Pope</md:SurName>
-      <md:EmailAddress>mailto:nichol.pope@tso.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jaspaul</md:GivenName>
-      <md:SurName>Khurana</md:SurName>
-      <md:EmailAddress>mailto:Jaspaul.Khurana@tso.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pharmacopoeia.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pharmacopoeia.com/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Stationery Office Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">British Pharmacopoeia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pharmacopoeia.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nichol</md:GivenName>
+    <md:SurName>Pope</md:SurName>
+    <md:EmailAddress>mailto:nichol.pope@tso.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jaspaul</md:GivenName>
+    <md:SurName>Khurana</md:SurName>
+    <md:EmailAddress>mailto:Jaspaul.Khurana@tso.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
index fa252bc8..1e30ff2f 100644
--- a/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
+++ b/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pi-navigator.com/shibboleth/metadata">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-11T10:34:29Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-11T10:34:29Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pi-navigator.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.pi-navigator.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.pi-navigator.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.pi-navigator.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE4jCCA8qgAwIBAgIJAPEDnthEYHnfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
 						VQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMSAwHgYD
 						VQQKExdQZXJmZWN0IEluZm9ybWF0aW9uIEx0ZDELMAkGA1UECxMCSVQxHTAbBgNV
@@ -56,43 +56,43 @@
 						U4KKQy2lPVLHTtmiDdo3PVX4jrKA0QN6KMrAHNq1SwLitONOgjY/cxUlkLXMcBxC
 						xToFAE6F
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Perfect Information Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Perfect Information Ltd: PI Navigator</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.perfectinfo.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>McLoughlin</md:SurName>
-      <md:EmailAddress>mailto:paulmcl@perfectinfo.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>McLoughlin</md:SurName>
-      <md:EmailAddress>mailto:paulmcl@perfectinfo.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Perfect Information Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Perfect Information Ltd: PI Navigator</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.perfectinfo.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>McLoughlin</md:SurName>
+    <md:EmailAddress>mailto:paulmcl@perfectinfo.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>McLoughlin</md:SurName>
+    <md:EmailAddress>mailto:paulmcl@perfectinfo.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
index 0a15cd0f..e67f661e 100644
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.portal.euromonitor.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Passport</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Passport is a global market research database providing statistics, analysis,reports, surveys and breaking news on industries, countries and consumersworldwide</mdui:Description>
+        <mdui:Logo height="26" width="184">https://www.portal.euromonitor.com/portal/Images/logos/passport-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Passport</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Passport is a global market research database providing statistics, analysis,reports, surveys and breaking news on industries, countries and consumersworldwide</mdui:Description>
-          <mdui:Logo height="26" width="184">https://www.portal.euromonitor.com/portal/Images/logos/passport-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
 						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
@@ -40,13 +40,13 @@
 						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
 						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
 						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
@@ -70,31 +70,31 @@
 						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
 						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="8"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Euromonitor International Passport System</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jurgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jurgen</md:GivenName>
-      <md:SurName>Wiehan</md:SurName>
-      <md:EmailAddress>mailto:jurgen.wiehan@euromonitor.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Euromonitor International plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Euromonitor International Passport System</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jurgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jurgen</md:GivenName>
+    <md:SurName>Wiehan</md:SurName>
+    <md:EmailAddress>mailto:jurgen.wiehan@euromonitor.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml
index e9784045..22844692 100644
--- a/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.portal.ted.is.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-08T10:00:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-08T10:00:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDADCCAeigAwIBAgIJAMszihLucz6hMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3NhdC1lcC1rYjEuZWQuYWMudWswHhcNMTIwMzA1MTY1NjMyWhcNMjIwMzAz
 						MTY1NjMyWjAeMRwwGgYDVQQDExNzYXQtZXAta2IxLmVkLmFjLnVrMIIBIjANBgkq
@@ -31,28 +31,28 @@
 						nkS4wUZn15n5mdKZrScA2RbVMiQ5oqO5GHbC0Hnx1zmz/qnM0Eek7TeQGIi02dBv
 						hv3Y4Q==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - Live Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Application Technology Management</md:GivenName>
-      <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - Live Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Application Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml
index 6a74cb0b..3282c1ac 100644
--- a/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.publicinformationonline.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-27T10:52:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-27T10:52:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Public Information Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Collection of Parliamentary papers from the UK &amp; Scottish Parliaments, Northern Ireland Assembly &amp; Scottish Government.</mdui:Description>
+        <mdui:Logo height="98" width="350">https://www.publicinformationonline.com/images/piologo_350_98.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.publicinformationonline.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.publicinformationonline.com/Shibboleth.sso/WAYF/UKFederation"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Public Information Online</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Collection of Parliamentary papers from the UK &amp; Scottish Parliaments, Northern Ireland Assembly &amp; Scottish Government.</mdui:Description>
-          <mdui:Logo height="98" width="350">https://www.publicinformationonline.com/images/piologo_350_98.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.publicinformationonline.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.publicinformationonline.com/Shibboleth.sso/WAYF/UKFederation"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEbDCCA1SgAwIBAgIJAKyY0ChRtdbhMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD
 						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMRowGAYD
 						VQQKDBFEYW5keSBCb29rc2VsbGVyczEaMBgGA1UECwwRRGFuZHkgQm9va3NlbGxl
@@ -60,47 +60,47 @@
 						B51xhsr+EtVwsr9Ea/Q+uJUpwZIQY+s0LYY8rh7OmFzGdOdtfSG15nPJUvxh6RZV
 						MVwZJsRD1V5Hwsyr2D4yEVTkAQxUN1ZFs9jYhUuckd0=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Dandy Booksellers Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Public Information Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.dandybooksellers.com/acatalog/About_us.html</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Barrie</md:GivenName>
-      <md:SurName>Cooper</md:SurName>
-      <md:EmailAddress>mailto:barrie@nouver.net</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Barrie</md:GivenName>
-      <md:SurName>Cooper</md:SurName>
-      <md:EmailAddress>mailto:barrie@nouver.net</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dandy Booksellers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Public Information Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dandybooksellers.com/acatalog/About_us.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Barrie</md:GivenName>
+    <md:SurName>Cooper</md:SurName>
+    <md:EmailAddress>mailto:barrie@nouver.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barrie</md:GivenName>
+    <md:SurName>Cooper</md:SurName>
+    <md:EmailAddress>mailto:barrie@nouver.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml b/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml
index b3b4a3db..61e8f894 100644
--- a/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.purplemash.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDYjCCAkoCCQCm1vJwENC8ZzANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJH
 						QjEXMBUGA1UECAwOR3JlYXRlciBMb25kb24xDzANBgNVBAcMBkxvbmRvbjEdMBsG
 						A1UECgwUMlNpbXBsZSBTb2Z0d2FyZSBMdGQxGzAZBgNVBAMMEnd3dy5wdXJwbGVt
@@ -43,43 +43,43 @@
 						Vl4pLKvsajvjwxWp7CqnoWRuvrvQvEeBN2V+sVcD+j+sspvxCIruAXMuFZJQVam4
 						Z4RXYBzG
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purplemash.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purplemash.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.purplemash.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.purplemash.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">2Simple Software Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">2Simple Software Limited: Purple Mash</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.2simple.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Barnett</md:SurName>
-      <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sam</md:GivenName>
-      <md:SurName>Barnett</md:SurName>
-      <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purplemash.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purplemash.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.purplemash.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.purplemash.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">2Simple Software Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">2Simple Software Limited: Purple Mash</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.2simple.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Barnett</md:SurName>
+    <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sam</md:GivenName>
+    <md:SurName>Barnett</md:SurName>
+    <md:EmailAddress>mailto:sam@2simple.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml
index b2e45cc0..e91073b0 100644
--- a/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qmsu.org/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -25,38 +25,38 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qmsu.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qmsu.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qmsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qmsu.org/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions: Queen Mary SU</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.qmsu.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qmsu.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qmsu.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qmsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qmsu.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions: Queen Mary SU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmsu.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml b/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml
index cea78898..f8e0b811 100644
--- a/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rcpsych.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T15:43:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T15:43:27Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -49,32 +49,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Journals of the Royal College of Psychiatrists</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rcpsych.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Journals of the Royal College of Psychiatrists</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rcpsych.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml
index b8986c65..b9902de2 100644
--- a/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.reachoutcpd.com/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-13T11:02:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-13T11:02:22Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/shibtest"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/RMUnify"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ReachOut CPD</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Online access to ReachOutCPD</mdui:Description>
+        <mdui:Logo height="153" width="202">https://www.reachoutcpd.com/mdui-reachoutcpd-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/shibtest"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/RMUnify"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.reachoutcpd.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">ReachOut CPD</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Online access to ReachOutCPD</mdui:Description>
-          <mdui:Logo height="153" width="202">https://www.reachoutcpd.com/mdui-reachoutcpd-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKzCCAhOgAwIBAgIJALCh189m45NwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3d3dy5yZWFjaG91dGNwZC5jb20wHhcNMTUwNTA4MTYwMjE2WhcNMjUwNTA1
 						MTYwMjE2WjAeMRwwGgYDVQQDExN3d3cucmVhY2hvdXRjcGQuY29tMIIBIjANBgkq
@@ -55,47 +55,47 @@
 						mAvnSRd15cvz0L/XjDDwkE5VWWKwCDBeBJHCskUTW7ZMR+SqFuy7DsjFy+rf+P3M
 						AO1OuZ4E2l0BT6E/ESj62z3SCnMnaDkE7z4n64cXe7oZanfB5Wf3D/vI1HIiCes=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ReachOut CPD</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.reachoutcpd.com/about-us/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Patricia</md:GivenName>
-      <md:SurName>Kemp</md:SurName>
-      <md:EmailAddress>mailto:pkemp@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ReachOut CPD</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reachoutcpd.com/about-us/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Patricia</md:GivenName>
+    <md:SurName>Kemp</md:SurName>
+    <md:EmailAddress>mailto:pkemp@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml
index 3f42b04f..9615c2ce 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/bscidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BSC - Barcelona Supercomputing Center</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Barcelona Supercomputing Center</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsc.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">BSC - Barcelona Supercomputing Center</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of Barcelona Supercomputing Center</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsc.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -40,27 +40,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/bsc/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/bsc/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/bsc/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">BSC</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">BSC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Barcelona Supercomputing Center</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">Barcelona Supercomputing Center</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/bsc/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/bsc/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/bsc/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">BSC</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">BSC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Barcelona Supercomputing Center</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Barcelona Supercomputing Center</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
index 5e46ec0e..95e2a251 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/crgidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CRG - Centre for Genomic Regulation</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">CRG - Centre for Genomic Regulation</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Centre for Genomic Regulation</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad del centro de regulación genómica</mdui:Description>
+      </mdui:UIInfo>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">CRG - Centre for Genomic Regulation</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">CRG - Centre for Genomic Regulation</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of Centre for Genomic Regulation</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad del centro de regulación genómica</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaGoSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiEvzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5hUrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbuIgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7iPHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVFc8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cbDC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/crg/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/crg/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/crg/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Centre for Genomic Regulation</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Centre for Genomic Regulation</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.crg.eu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>José Manuel Macías</md:SurName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaGoSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiEvzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5hUrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbuIgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7iPHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVFc8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cbDC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/crg/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/crg/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/crg/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Centre for Genomic Regulation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Centre for Genomic Regulation</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.crg.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>José Manuel Macías</md:SurName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml
index 184dabeb..e6ffb8b1 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/ehuidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">EHU - University of the Basque Country</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">EHU - Universidad del País Vasco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of University of the Basque Country</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad del País Vasco</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehu.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">EHU - University of the Basque Country</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">EHU - Universidad del País Vasco</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of University of the Basque Country</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad del País Vasco</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehu.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ehu/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/ehu/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/ehu/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ehu/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/ehu/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">EHU</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">EHU</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="es">EHU - Universidad del País Vasco</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">EHU - University of the Basque Country</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ehu/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/ehu/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/ehu/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ehu/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/ehu/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EHU</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">EHU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="es">EHU - Universidad del País Vasco</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">EHU - University of the Basque Country</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-ifaeidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-ifaeidp.xml
index 4b857c53..d390537d 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-ifaeidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-ifaeidp.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/ifaeidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2016-04-19T09:06:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifae.es</shibmd:Scope>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2016-04-19T09:06:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAE - Institute for High Energy Physics at the Universitat Autònoma de Barcelona</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">IFAE - Instituto de Física de Altas Energías en la Universitat Autònoma de Barcelona</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Institute for High Energy Physics at the Universitat Autònoma de Barcelona</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad del Instituto de Física de Altas Energías en la Universitat Autònoma de Barcelona</mdui:Description>
+      </mdui:UIInfo>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifae.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">IFAE - Institute for High Energy Physics at the Universitat Autònoma de Barcelona</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">IFAE - Instituto de Física de Altas Energías en la Universitat Autònoma de Barcelona</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of Institute for High Energy Physics at the Universitat Autònoma de Barcelona</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad del Instituto de Física de Altas Energías en la Universitat Autònoma de Barcelona</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifae.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaGoSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiEvzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5hUrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbuIgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7iPHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVFc8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cbDC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ifae/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/ifae/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/ifae/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ifae/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/ifae/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Institute for High Energy Physics at the Universitat Autònoma de Barcelona</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Instituto de Física de Altas Energías en la Universitat Autònoma de Barcelona</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ifae.es/eng</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>José Manuel Macías</md:SurName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaGoSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiEvzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5hUrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbuIgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7iPHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVFc8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cbDC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ifae/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/ifae/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/ifae/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/ifae/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/ifae/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute for High Energy Physics at the Universitat Autònoma de Barcelona</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Instituto de Física de Altas Energías en la Universitat Autònoma de Barcelona</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ifae.es/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>José Manuel Macías</md:SurName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
index d8c8407d..7caf6988 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/rediristestidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RedIRIS - Spanish Research and Academic Network</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">RedIRIS - Red académica y de investigación española</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider run by RedIRIS</mdui:Description>
+        <mdui:Description xml:lang="es">Proveedor de identidad operado por RedIRIS</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">RedIRIS - Spanish Research and Academic Network</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">RedIRIS - Red académica y de investigación española</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity provider run by RedIRIS</mdui:Description>
-          <mdui:Description xml:lang="es">Proveedor de identidad operado por RedIRIS</mdui:Description>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -41,13 +41,13 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -71,23 +71,23 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
index 0899fbcb..2423252c 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UMA - University of Malaga</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UMA - Universidad de Málaga</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of University of Malaga</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UMA - University of Malaga</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">UMA - Universidad de Málaga</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of University of Malaga</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/uma/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UMA</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">UMA</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UMA - University of Malaga</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">UMA - Universidad de Málaga</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/uma/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UMA</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UMA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UMA - University of Malaga</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">UMA - Universidad de Málaga</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-umidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-umidp.xml
index 9c6e9356..d3228a71 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-umidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-umidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UM - University of Murcia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UM - Universidad de Murcia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of University of Murcia</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Murcia</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UM - University of Murcia</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">UM - Universidad de Murcia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of University of Murcia</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Murcia</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/um/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/um/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/um/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/um/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/um/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UM</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">UM</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Murcia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">Universidad de Murcia</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/um/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/um/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/um/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/um/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/um/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UM</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UM</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Murcia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universidad de Murcia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
index 198ed8a7..664ef00e 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/unedidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNED - National Distance Education University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UNED - Universidad Nacional de Educación a Distancia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of UNED</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de UNED</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uned.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNED - National Distance Education University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">UNED - Universidad Nacional de Educación a Distancia</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of UNED</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de UNED</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uned.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uned/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/uned/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNED</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">UNED</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNED - Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">UNED - National Distance Education University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uned/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/uned/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNED</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UNED</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNED - Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">UNED - National Distance Education University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
index 065cb177..dd568867 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/uocidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UOC Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="es">Proveedor de identidad de UOC</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.edu</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UOC Identity Provider</mdui:Description>
-          <mdui:Description xml:lang="es">Proveedor de identidad de UOC</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.edu</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/uoc/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uoc/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/uoc/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UOC</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">UOC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/uoc/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/uoc/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/uoc/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UOC</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UOC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-upvidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-upvidp.xml
index c98ffdef..45fda982 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-upvidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-upvidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/upvidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UPV - Universitat Politècnica de València</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UPV - Universitat Politècnica de València</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Universitat Politècnica de València</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universitat Politècnica de València</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upv.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UPV - Universitat Politècnica de València</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">UPV - Universitat Politècnica de València</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of Universitat Politècnica de València</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de la Universitat Politècnica de València</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upv.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/upv/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/upv/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/upv/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/upv/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/upv/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UPV</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">UPV</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UPV - Universitat Politècnica de València</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">UPV - Universitat Politècnica de València</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/upv/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/upv/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/upv/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/upv/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/upv/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UPV</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UPV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UPV - Universitat Politècnica de València</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">UPV - Universitat Politècnica de València</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
index 10f086e4..2c6ac0ae 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/urvidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">URV - Rovira i Virgili University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">URV - Universidad Rovira i Virgili</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="ca">URV - Universitat Rovira i Virgili</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of URV</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de URV</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urv.cat</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">URV - Rovira i Virgili University</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">URV - Universidad Rovira i Virgili</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="ca">URV - Universitat Rovira i Virgili</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of URV</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de URV</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urv.cat</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -43,28 +43,28 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/urv/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/urv/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/urv/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">URV</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">URV</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">URV - Rovira i Virgili University</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">URV - Universidad Rovira i Virgili</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="ca">URV - Universitat Rovira i Virgili</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/urv/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/urv/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/urv/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">URV</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">URV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">URV - Rovira i Virgili University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">URV - Universidad Rovira i Virgili</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="ca">URV - Universitat Rovira i Virgili</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml
index d57f3f1f..e9abf7fe 100644
--- a/swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/usjidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">USJ - Universidad San Jorge</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">USJ - Universidad San Jorge</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Universidad San Jorge</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad San Jorge</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usj.es</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">USJ - Universidad San Jorge</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="es">USJ - Universidad San Jorge</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The Identity Provider of Universidad San Jorge</mdui:Description>
-          <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad San Jorge</mdui:Description>
-        </mdui:UIInfo>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usj.es</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
@@ -42,27 +42,27 @@ ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
 PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
 c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
 DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/usj/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/usj/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/usj/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/usj/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/usj/shib13/idp/aa.php"/>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">USJ</md:OrganizationName>
-      <md:OrganizationName xml:lang="es">USJ</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Universidad San Jorge</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="es">Universidad San Jorge</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SIR helpdesk</md:GivenName>
-      <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/usj/saml2/idp/SingleLogoutService.php" ResponseLocation="https://sir.rediris.es/usj/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sir.rediris.es/usj/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/usj/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sir.rediris.es/usj/shib13/idp/aa.php"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">USJ</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">USJ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universidad San Jorge</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universidad San Jorge</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
index 7d9dfc77..070fe253 100644
--- a/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.refworks.com/shibboleth/sp">
-    <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T14:31:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T14:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEQjCCAyqgAwIBAgIJAPi0oqIBy55FMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
 						VQQGEwJVUzERMA8GA1UECBMITWFyeWxhbmQxETAPBgNVBAcTCEJldGhlc2RhMRUw
 						EwYDVQQKEwxQcm9RdWVzdCBMTEMxFTATBgNVBAsTDFJlZldvcmtzL0NPUzEZMBcG
@@ -50,46 +50,46 @@
 						207Q3sTfK+tvRQVkFrLeYce9IOUYgMS7f4drQAR/6pAnSXmMLzAFc5s896/iGDEX
 						afJHv7LMPbJAn4/aPxZ+VDE8GBrYzc8sOy5DZzjvZ6uvw8VGMEI=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.refworks.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.refworks.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.refworks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.refworks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.refworks.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.refworks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">RefWorks</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.refworks.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Technical Support Team</md:GivenName>
-      <md:EmailAddress>mailto:support@proquest.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Sanjay</md:GivenName>
-      <md:SurName>Joshi</md:SurName>
-      <md:EmailAddress>mailto:Sanjay.Joshi@proquest.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.refworks.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.refworks.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.refworks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.refworks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.refworks.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.refworks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Proquest Information and Learning Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RefWorks</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.refworks.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Technical Support Team</md:GivenName>
+    <md:EmailAddress>mailto:support@proquest.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sanjay</md:GivenName>
+    <md:SurName>Joshi</md:SurName>
+    <md:EmailAddress>mailto:Sanjay.Joshi@proquest.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml
index 39343351..85d10d3c 100644
--- a/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rememberingscotlandatwar.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-08T15:58:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-08T15:58:00Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIJALeFq3bo7Ze3MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
 						BAMTIGRzdnIwMDg4MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB4XDTEwMDIwMjEx
 						MDQ1NFoXDTIwMDEzMTExMDQ1NFowKzEpMCcGA1UEAxMgZHN2cjAwODgwOC5zY3Jl
@@ -29,13 +29,13 @@
 						0XUC+VnGeOSn+62j3HOjkFpSxSA3tj2en+dO7IjMtNWHQhtxm8R81do8n+DFMk03
 						zwQe2dDHy9r0Ggxc22wJ2gbPmb+jMME2uJvNZyFpl05VI7CCd0V0o7MRAg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIJALeFq3bo7Ze3MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
 						BAMTIGRzdnIwMDg4MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB4XDTEwMDIwMjEx
 						MDQ1NFoXDTIwMDEzMTExMDQ1NFowKzEpMCcGA1UEAxMgZHN2cjAwODgwOC5zY3Jl
@@ -54,38 +54,38 @@
 						0XUC+VnGeOSn+62j3HOjkFpSxSA3tj2en+dO7IjMtNWHQhtxm8R81do8n+DFMk03
 						zwQe2dDHy9r0Ggxc22wJ2gbPmb+jMME2uJvNZyFpl05VI7CCd0V0o7MRAg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Screenmedia Design Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Remembering Scotland at War</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.museumsgalleriesscotland.org.uk/who-we-are/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Carlos</md:SurName>
-      <md:EmailAddress>mailto:jon@screenmedia.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jon</md:GivenName>
-      <md:SurName>Carlos</md:SurName>
-      <md:EmailAddress>mailto:jon@screenmedia.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Screenmedia Design Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Remembering Scotland at War</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.museumsgalleriesscotland.org.uk/who-we-are/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Carlos</md:SurName>
+    <md:EmailAddress>mailto:jon@screenmedia.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jon</md:GivenName>
+    <md:SurName>Carlos</md:SurName>
+    <md:EmailAddress>mailto:jon@screenmedia.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
index 801fabef..6ca10350 100644
--- a/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.researchprofessional.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-25T09:10:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-25T09:10:08Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.researchprofessional.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">*Research Professional</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Research Professional is an intuitive platform for online access to news and funding services.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://info.researchprofessional.com</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.researchprofessional.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
-          <mdui:DisplayName xml:lang="en">*Research Professional</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Research Professional is an intuitive platform for online access to news and funding services.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://info.researchprofessional.com</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID6jCCAtKgAwIBAgIJALmfy/1EwX4NMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
 						BAYTAkdCMRcwFQYDVQQIEw5HcmVhdGVyIExvbmRvbjEPMA0GA1UEBxMGTG9uZG9u
 						MRYwFAYDVQQKEw1SZXNlYXJjaCBMdGQuMSUwIwYDVQQDExx3d3cucmVzZWFyY2hw
@@ -57,53 +57,53 @@
 						w56TWc4NlFDMfqvwFqedywQyt+FVLNJ3H3Gt3KXpootbOZBmtzd8Bsf/5/SevgkS
 						tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Research Professional</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Research Research Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research Professional</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.researchresearch.com/rp</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Potter</md:SurName>
-      <md:EmailAddress>mailto:sp@researchresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steve</md:GivenName>
-      <md:SurName>Potter</md:SurName>
-      <md:EmailAddress>mailto:sso-uk@researchresearch.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Research Professional</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Research Research Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research Professional</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.researchresearch.com/rp</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Potter</md:SurName>
+    <md:EmailAddress>mailto:sp@researchresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steve</md:GivenName>
+    <md:SurName>Potter</md:SurName>
+    <md:EmailAddress>mailto:sso-uk@researchresearch.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml
index 9629b608..8191ebc5 100644
--- a/swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rguunion.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-03T14:39:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-03T14:39:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rguunion.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rguunion.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -30,33 +30,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rguunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Robert Gordon Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rguunion.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rguunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Robert Gordon Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rguunion.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml
index 8c1d60fc..486b7fcd 100644
--- a/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ripdev.co.uk/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-02T16:24:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-02T16:24:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Research in Practice (Development)</mdui:DisplayName>
+        <mdui:Logo height="72" width="161">https://rip.org.uk/assets/_userfiles/images/general/Partner_logos/rip__logo_thumb_161_72.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Research in Practice (Development)</mdui:DisplayName>
-          <mdui:Logo height="72" width="161">https://rip.org.uk/assets/_userfiles/images/general/Partner_logos/rip__logo_thumb_161_72.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDiDCCAnCgAwIBAgIJAL/6MNP9H2wJMA0GCSqGSIb3DQEBBQUAMDYxGTAXBgNV
 						BAoTEFRlc3QgYXBwbGljYXRpb24xGTAXBgNVBAMTEHd3dy5yaXBkZXYuY28udWsw
 						HhcNMTQwOTAyMTU1NTI2WhcNMjQwODMwMTU1NTI2WjA2MRkwFwYDVQQKExBUZXN0
@@ -36,13 +36,13 @@
 						Q/e1eBcyJbEwzX7XZGlIA2LLqfCTaUdBKxKv8tM8+ozleQsBqApwAsU3v/fMpiKP
 						9GcwjlRRJJrPgrX4dEDHCj2YUhnKS3CIgxT7eVW0OC3EoJ2P26mL6RWyWOY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDiDCCAnCgAwIBAgIJAL/6MNP9H2wJMA0GCSqGSIb3DQEBBQUAMDYxGTAXBgNV
 						BAoTEFRlc3QgYXBwbGljYXRpb24xGTAXBgNVBAMTEHd3dy5yaXBkZXYuY28udWsw
 						HhcNMTQwOTAyMTU1NTI2WhcNMjQwODMwMTU1NTI2WjA2MRkwFwYDVQQKExBUZXN0
@@ -63,27 +63,27 @@
 						Q/e1eBcyJbEwzX7XZGlIA2LLqfCTaUdBKxKv8tM8+ozleQsBqApwAsU3v/fMpiKP
 						9GcwjlRRJJrPgrX4dEDHCj2YUhnKS3CIgxT7eVW0OC3EoJ2P26mL6RWyWOY=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripdev.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ripdev.co.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripdev.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ripdev.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research in Practice (Development)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://rip.org.uk/about-us/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dawid</md:GivenName>
-      <md:SurName>Maeser</md:SurName>
-      <md:EmailAddress>mailto:dawid.maeser@rip.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Dawid</md:GivenName>
-      <md:SurName>Maeser</md:SurName>
-      <md:EmailAddress>mailto:dawid.maeser@rip.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripdev.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ripdev.co.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripdev.co.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ripdev.co.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research in Practice (Development)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://rip.org.uk/about-us/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dawid</md:GivenName>
+    <md:SurName>Maeser</md:SurName>
+    <md:EmailAddress>mailto:dawid.maeser@rip.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dawid</md:GivenName>
+    <md:SurName>Maeser</md:SurName>
+    <md:EmailAddress>mailto:dawid.maeser@rip.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml
index 52ef45a2..9a6b4cf1 100644
--- a/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ripfa.org.uk/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-21T13:50:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-21T13:50:02Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Research in Practice for Adults (RIPFA)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Research in Practice for Adults (RIPFA)</mdui:Description>
+        <mdui:Logo height="76" width="132">https://www.ripfa.org.uk/images/ripfa_logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Research in Practice for Adults (RIPFA)</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Research in Practice for Adults (RIPFA)</mdui:Description>
-          <mdui:Logo height="76" width="132">https://www.ripfa.org.uk/images/ripfa_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIJAP9VQ0E4SPcHMA0GCSqGSIb3DQEBBQUAMCcxDjAMBgNV
 						BAoTBVJpUGZBMRUwEwYDVQQDEwxyaXBmYS5vcmcudWswHhcNMTQwMTA1MDkwOTUx
 						WhcNMjQwMTAzMDkwOTUxWjAnMQ4wDAYDVQQKEwVSaVBmQTEVMBMGA1UEAxMMcmlw
@@ -36,13 +36,13 @@
 						Md1x+QWoWBLqma/MqkZcUrdm2BlEZD2HCtv6lzaTy0t8jSLyaeYxHhemrVGZpcHm
 						m1WhrEyo1V1gcUfonTxnCTTA6Wp4Qz2rVwAwpzfDPa7vS6rlp+XgtPhVXqNWfwE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDWzCCAkOgAwIBAgIJAP9VQ0E4SPcHMA0GCSqGSIb3DQEBBQUAMCcxDjAMBgNV
 						BAoTBVJpUGZBMRUwEwYDVQQDEwxyaXBmYS5vcmcudWswHhcNMTQwMTA1MDkwOTUx
 						WhcNMjQwMTAzMDkwOTUxWjAnMQ4wDAYDVQQKEwVSaVBmQTEVMBMGA1UEAxMMcmlw
@@ -62,27 +62,27 @@
 						Md1x+QWoWBLqma/MqkZcUrdm2BlEZD2HCtv6lzaTy0t8jSLyaeYxHhemrVGZpcHm
 						m1WhrEyo1V1gcUfonTxnCTTA6Wp4Qz2rVwAwpzfDPa7vS6rlp+XgtPhVXqNWfwE=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripfa.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ripfa.org.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripfa.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ripfa.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research in Practice for Adults (RIPFA)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rip.org.uk/about-us</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robin</md:GivenName>
-      <md:SurName>Catling</md:SurName>
-      <md:EmailAddress>mailto:robin.catling@ripfa.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Mangan</md:SurName>
-      <md:EmailAddress>mailto:paul@headmonaut.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripfa.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ripfa.org.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripfa.org.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ripfa.org.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research in Practice for Adults (RIPFA)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rip.org.uk/about-us</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robin</md:GivenName>
+    <md:SurName>Catling</md:SurName>
+    <md:EmailAddress>mailto:robin.catling@ripfa.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Mangan</md:SurName>
+    <md:EmailAddress>mailto:paul@headmonaut.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml b/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml
index f2fd41ac..4002b823 100644
--- a/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml
+++ b/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ripfa.org.uk/openathens">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-28T13:25:18Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-28T13:25:18Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID7TCCAtWgAwIBAgIJAMbb5T7zPYR8MA0GCSqGSIb3DQEBBQUAMFcxKDAmBgNV
 						BAoTH1Jlc2VhcmNoIGluIFByYWN0aWNlIGZvciBBZHVsdHMxKzApBgNVBAMTInJl
 						c2VhcmNoaW5wcmFjdGljZWZvcmFkdWx0cy5vcmcudWswHhcNMTMwMzEyMTgwNzQx
@@ -31,13 +31,13 @@
 						SVsAm2b+nTeCEBxZq2M6Wo/SfXSpuKp3zMbfn+E/nhGd6kxDCl1OcDWi8FAC5/fD
 						MQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIID7TCCAtWgAwIBAgIJAMbb5T7zPYR8MA0GCSqGSIb3DQEBBQUAMFcxKDAmBgNV
 						BAoTH1Jlc2VhcmNoIGluIFByYWN0aWNlIGZvciBBZHVsdHMxKzApBgNVBAMTInJl
 						c2VhcmNoaW5wcmFjdGljZWZvcmFkdWx0cy5vcmcudWswHhcNMTMwMzEyMTgwNzQx
@@ -61,27 +61,27 @@
 						SVsAm2b+nTeCEBxZq2M6Wo/SfXSpuKp3zMbfn+E/nhGd6kxDCl1OcDWi8FAC5/fD
 						MQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/shib/art" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research in Practice for Adults</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ripfa.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Mangan</md:SurName>
-      <md:EmailAddress>mailto:Paul@headmonaut.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Mangan</md:SurName>
-      <md:EmailAddress>mailto:Paul@headmonaut.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research in Practice for Adults</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ripfa.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Mangan</md:SurName>
+    <md:EmailAddress>mailto:Paul@headmonaut.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Mangan</md:SurName>
+    <md:EmailAddress>mailto:Paul@headmonaut.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripfadev.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.ripfadev.co.uk-oa-metadata.xml
index e8f41129..4f3a57cf 100644
--- a/swamid-interfederations-2.0/www.ripfadev.co.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.ripfadev.co.uk-oa-metadata.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ripfadev.co.uk/oa/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T15:04:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-03-03T15:04:35Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Research in Practice for Adults TEST SITE</mdui:DisplayName>
-          <mdui:Description xml:lang="en">TEST - Learning resources for the Social Care sector 
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Research in Practice for Adults TEST SITE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TEST - Learning resources for the Social Care sector 
 			supporting evidence-informed practice with adults and families</mdui:Description>
-          <mdui:Logo height="76" width="132">https://www.ripfadev.co.uk/assets/_userfiles/images/general/Partner_logos/ripfa_logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="76" width="132">https://www.ripfadev.co.uk/assets/_userfiles/images/general/Partner_logos/ripfa_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDdjCCAl6gAwIBAgIJAJQrX225OXYjMA0GCSqGSIb3DQEBBQUAMDAxETAPBgNV
 					BAoTCFJJUEZBREVWMRswGQYDVQQDExJ3d3cucmlwZmFkZXYuY28udWswHhcNMTYw
 					MjI5MTU0MjE4WhcNMjYwMjI2MTU0MjE4WjAwMREwDwYDVQQKEwhSSVBGQURFVjEb
@@ -38,13 +38,13 @@
 					F2l7wflWxH2ODGqHFrm6QfnHelFIeb2svSh65fb7mzvpoC15t53P44CzeUNF3b7E
 					fLQb7ewjZCVQ8T4edUSWQv2mF7ZBw7ntAOQ=
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDdjCCAl6gAwIBAgIJAJQrX225OXYjMA0GCSqGSIb3DQEBBQUAMDAxETAPBgNV
 					BAoTCFJJUEZBREVWMRswGQYDVQQDExJ3d3cucmlwZmFkZXYuY28udWswHhcNMTYw
 					MjI5MTU0MjE4WhcNMjYwMjI2MTU0MjE4WjAwMREwDwYDVQQKEwhSSVBGQURFVjEb
@@ -65,25 +65,25 @@
 					F2l7wflWxH2ODGqHFrm6QfnHelFIeb2svSh65fb7mzvpoC15t53P44CzeUNF3b7E
 					fLQb7ewjZCVQ8T4edUSWQv2mF7ZBw7ntAOQ=
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripfadev.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripfadev.co.uk/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Research in Practice for Adults TEST SITE</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.ripfa.org.uk/about-us/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robin</md:GivenName>
-      <md:SurName>Catling</md:SurName>
-      <md:EmailAddress>mailto:robin.catling@ripfa.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Robin</md:GivenName>
-      <md:SurName>Catling</md:SurName>
-      <md:EmailAddress>mailto:robin.catling@ripfa.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripfadev.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripfadev.co.uk/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Dartington Hall Trust</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Research in Practice for Adults TEST SITE</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.ripfa.org.uk/about-us/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robin</md:GivenName>
+    <md:SurName>Catling</md:SurName>
+    <md:EmailAddress>mailto:robin.catling@ripfa.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robin</md:GivenName>
+    <md:SurName>Catling</md:SurName>
+    <md:EmailAddress>mailto:robin.catling@ripfa.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
index 930486da..d83e8eb2 100644
--- a/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rocksbackpages.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-04T16:02:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-04T16:02:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rocksbackpages.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rocksbackpages.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rocksbackpages.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rocksbackpages.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVDCCAjwCCQCtwU/QO/+YATANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
 						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNVBAoTEUJh
 						Y2twYWdlcyBMaW1pdGVkMR8wHQYDVQQDExZ3d3cucm9ja3NiYWNrcGFnZXMuY29t
@@ -49,43 +49,43 @@
 						hIxCmOazWe8SW37boax/Z9O+VLY0L89MNy8ecMYwzxItMoT9NTx5eUeQQUCZ4KJu
 						HA3BA/dZ2JlmxV3ih36IbgVXqQUiJDFz7ts7DJ2zZwnmwAqSXaXT8w==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Backpages Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Backpages Limited: Rock's Backpages</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rocksbackpages.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Kelly</md:SurName>
-      <md:EmailAddress>mailto:paul@rocksbackpages.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Paul</md:GivenName>
-      <md:SurName>Kelly</md:SurName>
-      <md:EmailAddress>mailto:paul@rocksbackpages.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Backpages Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Backpages Limited: Rock's Backpages</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rocksbackpages.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Kelly</md:SurName>
+    <md:EmailAddress>mailto:paul@rocksbackpages.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Kelly</md:SurName>
+    <md:EmailAddress>mailto:paul@rocksbackpages.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml b/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
index ea1762a8..0d0354eb 100644
--- a/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
@@ -1,28 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rsmjournals.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T15:43:27Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-29T15:43:27Z">
-		</mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
 						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
@@ -48,32 +47,32 @@
 						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
 						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Royal Society of Medicine Press Journals</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rsmjournals.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
-      <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/POST" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HighWire Press, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Royal Society of Medicine Press Journals</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rsmjournals.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Highwire Shibboleth Admin</md:GivenName>
+    <md:EmailAddress>mailto:shibboleth-admin@highwire.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml
index 05e2ebbc..f96dcd80 100644
--- a/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rusu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-07T12:39:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-07T12:39:06Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rusu.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rusu.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rusu.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rusu.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rusu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Reading University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.rusu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rusu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Reading University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rusu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml
index 9e34c136..ed07ff25 100644
--- a/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sauws.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T11:49:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T11:49:17Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sauws.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sauws.org.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sauws.org.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sauws.org.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sauws.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Students' Association of the University of the West of Scotland</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sauws.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sauws.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Students' Association of the University of the West of Scotland</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sauws.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml
index 6fc51503..01509b16 100644
--- a/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.school-portal.co.uk/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-24T14:11:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-24T14:11:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE8TCCA9mgAwIBAgIJAM7Pg7fr+cKKMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdSZWFkaW5nMRsw
 						GQYDVQQKExJVbmlTZXJ2aXR5IExpbWl0ZWQxEDAOBgNVBAsTB1N1cHBvcnQxIDAe
@@ -38,13 +38,13 @@
 						b6BCgz3fqaNRQJEpSSOpcndNKJ0NtXw0lWcF1BUIXeGYgYr+/f+QsofPu2JjtkTc
 						7UAwF7gdFAY1KwlgXEFthStJX1I8
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIE8TCCA9mgAwIBAgIJAM7Pg7fr+cKKMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
 						VQQGEwJHQjESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdSZWFkaW5nMRsw
 						GQYDVQQKExJVbmlTZXJ2aXR5IExpbWl0ZWQxEDAOBgNVBAsTB1N1cHBvcnQxIDAe
@@ -73,28 +73,28 @@
 						b6BCgz3fqaNRQJEpSSOpcndNKJ0NtXw0lWcF1BUIXeGYgYr+/f+QsofPu2JjtkTc
 						7UAwF7gdFAY1KwlgXEFthStJX1I8            
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.school-portal.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.school-portal.co.uk/Shibboleth.sso/SAML/POST" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UniServity Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UniServity: cLc Service</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uniservity.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UniServity Support</md:GivenName>
-      <md:EmailAddress>mailto:support@uniservity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rezar</md:GivenName>
-      <md:SurName>Zefaj</md:SurName>
-      <md:EmailAddress>mailto:rezar.zafaj@uniservity.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.school-portal.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.school-portal.co.uk/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UniServity Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UniServity: cLc Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniservity.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UniServity Support</md:GivenName>
+    <md:EmailAddress>mailto:support@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rezar</md:GivenName>
+    <md:SurName>Zefaj</md:SurName>
+    <md:EmailAddress>mailto:rezar.zafaj@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml b/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
index cd5da9ab..5b4215a2 100644
--- a/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sci-ware-customer.com/preprod/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T16:02:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T16:02:51Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDDCCAfSgAwIBAgIJAPOcCZG4kjBhMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF3NlY3ByZXdlYjEuc2NpLXdhcmUuY29tMB4XDTEzMDkwMzE0MjMyN1oXDTIz
 						MDkwMTE0MjMyN1owIjEgMB4GA1UEAxMXc2VjcHJld2ViMS5zY2ktd2FyZS5jb20w
@@ -45,43 +45,43 @@
 						cOVsF94ZY4wriD0goxTHy7xKE9ICkUrT7kUF1kXBeImpM5Y8ak5mdYWPbZDTdN2M
 						6NM1c5BqI+6jWLfWoTJNMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science Warehouse PreProd1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Support</md:GivenName>
-      <md:EmailAddress>mailto:customersupport@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ondrej</md:GivenName>
-      <md:SurName>Scecina</md:SurName>
-      <md:EmailAddress>mailto:ondrej.scecina@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science Warehouse PreProd1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:customersupport@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ondrej</md:GivenName>
+    <md:SurName>Scecina</md:SurName>
+    <md:EmailAddress>mailto:ondrej.scecina@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml b/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml
index 3e9016c9..23190214 100644
--- a/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sci-ware-customer.com/prod/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T15:51:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T15:51:20Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sci-ware-customer.com/Shibboleth.sso/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sci-ware-customer.com/Shibboleth.sso/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sci-ware-customer.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sci-ware-customer.com/Shibboleth.sso/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sci-ware-customer.com/Shibboleth.sso/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sci-ware-customer.com/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJAKlKWUryntpMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGXByaW1lcHJkd2ViMS5zY2ktd2FyZS5jb20wHhcNMTMwOTAzMTExMjEwWhcN
 						MjMwOTAxMTExMjEwWjAkMSIwIAYDVQQDExlwcmltZXByZHdlYjEuc2NpLXdhcmUu
@@ -45,43 +45,43 @@
 						f92do3qVdA2tG+NS4/sKj5ge1TOC1SRIclDy286Fp+9De5zRAsGT7hTyNjR2IQxN
 						Q/xODP8/OH7oPsl9aC8UfiSUxgwqsw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Science Warehouse Prod</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Customer Support</md:GivenName>
-      <md:EmailAddress>mailto:customersupport@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ondrej</md:GivenName>
-      <md:SurName>Scecina</md:SurName>
-      <md:EmailAddress>mailto:ondrej.scecina@sci-ware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Science Warehouse Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science Warehouse Prod</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sci-ware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Customer Support</md:GivenName>
+    <md:EmailAddress>mailto:customersupport@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ondrej</md:GivenName>
+    <md:SurName>Scecina</md:SurName>
+    <md:EmailAddress>mailto:ondrej.scecina@sci-ware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scl.org-shibboleth.xml b/swamid-interfederations-2.0/www.scl.org-shibboleth.xml
index aa7065dc..48b73cb2 100644
--- a/swamid-interfederations-2.0/www.scl.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.scl.org-shibboleth.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.scl.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scl.org/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scl.org/Shibboleth.sso/DS" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scl.org/Shibboleth.sso/Login" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scl.org/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scl.org/Shibboleth.sso/DS" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJjCCAg4CCQDUnjO6ZKGpPDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
 						QjEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3RvbDEMMAoGA1UEChMD
 						U0NMMRQwEgYDVQQDEwt3d3cuc2NsLm9yZzAeFw0xMTA0MTMxMTQ2MTVaFw0yMTA0
@@ -34,34 +34,34 @@
 						GW0p49jHWFTkfcouOOYuegXvOVlYC+F8ADXkLJ8kvm49+rjshBUdgvCXsSLXm2sI
 						VJrQwcWwv/qkr5blBBUobtIJwGrcoWF9Nic1xxJhm3E3vLRBiNWhOTKD
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scl.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scl.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scl.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scl.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scl.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scl.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scl.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scl.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scl.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scl.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scl.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Society for Computers and Law</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Society for Computers and Law: SCL</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scl.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ed</md:GivenName>
-      <md:SurName>Beddows</md:SurName>
-      <md:EmailAddress>mailto:ebeddows@overtsoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Forrester</md:SurName>
-      <md:EmailAddress>mailto:hairy@zehuti.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scl.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scl.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scl.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scl.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scl.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scl.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scl.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scl.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scl.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scl.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scl.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Society for Computers and Law</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Society for Computers and Law: SCL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scl.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ed</md:GivenName>
+    <md:SurName>Beddows</md:SurName>
+    <md:EmailAddress>mailto:ebeddows@overtsoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Forrester</md:SurName>
+    <md:EmailAddress>mailto:hairy@zehuti.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
index 0944acf6..88d39ea1 100644
--- a/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.scran.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:54:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:54:18Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scran</mdui:DisplayName>
+        <mdui:Description xml:lang="en">370,000 images from museums, galleries &amp; archives. All resources rights cleared for use in teaching and learning.</mdui:Description>
+        <mdui:Logo height="109" width="350">https://shib.scran.ac.uk/images/logo-scran.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scran.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="1"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/Shibboleth.sso/glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/Shibboleth.sso/DS/UKFederation"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="2"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Scran</mdui:DisplayName>
-          <mdui:Description xml:lang="en">370,000 images from museums, galleries &amp; archives. All resources rights cleared for use in teaching and learning.</mdui:Description>
-          <mdui:Logo height="109" width="350">https://shib.scran.ac.uk/images/logo-scran.png</mdui:Logo>
-          <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scran.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="1"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/Shibboleth.sso/glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib.scran.ac.uk/Shibboleth.sso/DS/UKFederation"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="2"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
 						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
 						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
@@ -63,70 +63,70 @@
 						LTUxK70J8DSNHEuzC8s+rTfXhsn01ZUKGDQqeFDO3TccF/x8iespeHPJO7uD/klz
 						bjQPf6gJKSkRW/uiwoDLkt/CChMGLGbYpQcx/7RpyzUpN4u4PHLduf03kQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Scran</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scran</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.scran.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
-      <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Scran</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scran Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scran</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.scran.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Scran/RCAHMS Web Admins</md:GivenName>
+    <md:EmailAddress>mailto:webadmins@rcahms.gov.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml
index 65c6c6fb..839a3d15 100644
--- a/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sdeo.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-23T09:02:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-23T09:02:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sdeo.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sdeo.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">Interactive online learning and teaching resources to support dental education.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Scottish Dental Education Online</mdui:DisplayName>
+        <mdui:Logo height="146" width="300">https://www.sdeo.ac.uk/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sdeo.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sdeo.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:Description xml:lang="en">Interactive online learning and teaching resources to support dental education.</mdui:Description>
-          <mdui:DisplayName xml:lang="en">Scottish Dental Education Online</mdui:DisplayName>
-          <mdui:Logo height="146" width="300">https://www.sdeo.ac.uk/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC8TCCAdmgAwIBAgIJAPNguqNnSFj+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 						BAMTDnd3dy5zZGVvLmFjLnVrMB4XDTE0MDgxNDE0MzMzMVoXDTI0MDgxMTE0MzMz
 						MVowGTEXMBUGA1UEAxMOd3d3LnNkZW8uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
@@ -47,42 +47,42 @@
 						+3eucC8gDxQ8AjjNOg/SKGcRLQe5fYa6X2GYy2yLY0QpN7VwP0cVRHyNy+cdWlQ6
 						LhzcTCIPjQ9bO+7235hm6tzlYYfOG6yAcAolWtWiQuVcnHbbkA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sdeo.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Scottish Dental Education Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sdeo.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Admin</md:GivenName>
-      <md:EmailAddress>mailto:admin@sdeo.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Service Desk</md:GivenName>
-      <md:EmailAddress>mailto:servicedesk@abdn.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sdeo.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Aberdeen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Scottish Dental Education Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sdeo.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Admin</md:GivenName>
+    <md:EmailAddress>mailto:admin@sdeo.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:servicedesk@abdn.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.service4mobility.com-europe.xml b/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
index 54d2d75f..9faff5a4 100644
--- a/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
+++ b/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.service4mobility.com/europe">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-07T12:54:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-07T12:54:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Mobility-Online</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The High-End Standard Software for the web-based
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Mobility-Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The High-End Standard Software for the web-based
 					management of international educational cooperation and all types of academic
 					mobilities.</mdui:Description>
-          <mdui:Logo height="45" width="255">https://www.service4mobility.com/europe/images/mobility-online.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        <mdui:Logo height="45" width="255">https://www.service4mobility.com/europe/images/mobility-online.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFtDCCBJygAwIBAgIQJF23Zp+qyEMZ5HUvD3iMRDANBgkqhkiG9w0BAQUFADCB
 						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -51,13 +51,13 @@
 						mQ/83slRUxDdY+CTn/2Cb0FMFXcE6w4HBT4E5+aXDS+SRqtb/Bw/sGgCNPkIFYvg
 						Tp8UjvFkYCREanI8dOGH+8lgNMXPmYGk
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIFtDCCBJygAwIBAgIQJF23Zp+qyEMZ5HUvD3iMRDANBgkqhkiG9w0BAQUFADCB
 						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -90,40 +90,40 @@
 						mQ/83slRUxDdY+CTn/2Cb0FMFXcE6w4HBT4E5+aXDS+SRqtb/Bw/sGgCNPkIFYvg
 						Tp8UjvFkYCREanI8dOGH+8lgNMXPmYGk
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.service4mobility.com/europe/saml/LogoutServiceSOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPPost" ResponseLocation="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirectResponse"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.service4mobility.com/europe/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.service4mobility.com/europe/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">https://www.service4mobility.com/europe</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">SOP Hilmbauer &amp; Mauberger GmbH &amp; Co.KG</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Mobility-Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.service4mobility.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Support</md:GivenName>
-      <md:EmailAddress>mailto:support@sop.co.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Steffen</md:GivenName>
-      <md:SurName>Basedow</md:SurName>
-      <md:EmailAddress>mailto:steffen.basedow@sop.co.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.service4mobility.com/europe/saml/LogoutServiceSOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPPost" ResponseLocation="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.service4mobility.com/europe/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.service4mobility.com/europe/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">https://www.service4mobility.com/europe</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SOP Hilmbauer &amp; Mauberger GmbH &amp; Co.KG</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Mobility-Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.service4mobility.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@sop.co.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Steffen</md:GivenName>
+    <md:SurName>Basedow</md:SurName>
+    <md:EmailAddress>mailto:steffen.basedow@sop.co.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml
index 01b3930d..dfe9db47 100644
--- a/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sgsu.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T14:37:41Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T14:37:41Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sgsu.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sgsu.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,38 +28,38 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">St George's Students Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sgsu.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">St George's Students Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sgsu.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml b/swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml
index 14db98b3..39d88a8c 100644
--- a/swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sjcoxford.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T10:42:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T10:42:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sjcoxford.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TCAS Online</mdui:DisplayName>
+        <mdui:Description xml:lang="en">TCAS Online is a cloud-based management platform for student accommodation portfolios.</mdui:Description>
+        <mdui:Logo height="52" width="160">https://www.sjcoxford.com/images/TCAS_header_06.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sjcoxford.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">TCAS Online</mdui:DisplayName>
-          <mdui:Description xml:lang="en">TCAS Online is a cloud-based management platform for student accommodation portfolios.</mdui:Description>
-          <mdui:Logo height="52" width="160">https://www.sjcoxford.com/images/TCAS_header_06.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC6DCCAdCgAwIBAgIJANpmEKYj4D/2MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
 						BAMTC3RjYXNzZXJ2ZXIzMB4XDTE1MDUxMzA2NTgwM1oXDTI1MDUxMDA2NTgwM1ow
 						FjEUMBIGA1UEAxMLdGNhc3NlcnZlcjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
@@ -51,43 +51,43 @@
 						dQrGI9VaOWtJVA0z8Z1zrnB3MvlQUZw0Ma2DsGpgZITKmLFc8hiR3uJtRyxMUzwK
 						1Uj11XkAOJyNcStbwH7Cfr7OGdjeW4tYyLjfMw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sjcoxford.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sjcoxford.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sjcoxford.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sjcoxford.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sjcoxford.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sjcoxford.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sjcoxford.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TCAS Online Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TCAS Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://tcasonline.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Rachel</md:GivenName>
-      <md:SurName>Slater</md:SurName>
-      <md:EmailAddress>mailto:rslater@tcasonline.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Fazal</md:GivenName>
-      <md:SurName>Amin</md:SurName>
-      <md:EmailAddress>mailto:famin@tcasonline.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sjcoxford.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sjcoxford.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sjcoxford.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sjcoxford.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sjcoxford.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sjcoxford.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sjcoxford.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TCAS Online Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TCAS Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://tcasonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Rachel</md:GivenName>
+    <md:SurName>Slater</md:SurName>
+    <md:EmailAddress>mailto:rslater@tcasonline.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fazal</md:GivenName>
+    <md:SurName>Amin</md:SurName>
+    <md:EmailAddress>mailto:famin@tcasonline.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml
index 0b015412..cb2287c7 100644
--- a/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.solentsu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-24T10:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-24T10:30:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.solentsu.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.solentsu.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.solentsu.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.solentsu.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.solentsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Solent Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.solentsu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.solentsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Solent Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.solentsu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
index a574d643..e77617d7 100644
--- a/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-11T14:59:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-11T14:59:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-erlangen.de</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Erlangen-Nürnberg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Erlangen-Nürnberg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.sso.uni-erlangen.de/images/logos/FAU_rgb-transparent-16-16.png</mdui:Logo>
+        <mdui:Logo height="70" width="350">https://www.sso.uni-erlangen.de/images/logos/FAU_rgb-transparent-350-70.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.sso.uni-erlangen.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sso.uni-erlangen.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-erlangen.de</shibmd:Scope>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Erlangen-Nürnberg</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Erlangen-Nürnberg</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
-          <mdui:Logo height="16" width="16">https://www.sso.uni-erlangen.de/images/logos/FAU_rgb-transparent-16-16.png</mdui:Logo>
-          <mdui:Logo height="70" width="350">https://www.sso.uni-erlangen.de/images/logos/FAU_rgb-transparent-350-70.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">https://www.sso.uni-erlangen.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">https://www.sso.uni-erlangen.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.sso.fau.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www.sso.fau.de,OU=RRZE,O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIH2TCCBsGgAwIBAgIHGJ5nV/NnXTANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.sso.fau.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.sso.fau.de,OU=RRZE,O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIH2TCCBsGgAwIBAgIHGJ5nV/NnXTANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
 BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
 WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
@@ -69,37 +69,37 @@ lYO7R1fbNDz31MfFPBf3R8cKQmWOmRZbR3xGtsyEox1DxXF/TEJvMVtTADsWSfn9
 OJTEVIhCG9C3vx/ua306YZX12QHrPtyUEMJcYqkP2hloKY/iJCaLXCBwcBv9OYPl
 pEpqprRECWq3dNLXmUBnqHCsiPa4TY2gVssAlQcmsasBj7ieuhFktDD/Y0vP
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sso.uni-erlangen.de/idp/profile/SAML2/SOAP/ECP"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e131</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e131</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Tröger</md:SurName>
-      <md:EmailAddress>mailto:sso-admins@rrze.fau.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Tröger</md:SurName>
-      <md:EmailAddress>mailto:sso@fau.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Frank</md:GivenName>
-      <md:SurName>Tröger</md:SurName>
-      <md:EmailAddress>mailto:sso-admins@rrze.fau.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sso.uni-erlangen.de/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e131</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e131</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Tröger</md:SurName>
+    <md:EmailAddress>mailto:sso-admins@rrze.fau.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Tröger</md:SurName>
+    <md:EmailAddress>mailto:sso@fau.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Frank</md:GivenName>
+    <md:SurName>Tröger</md:SurName>
+    <md:EmailAddress>mailto:sso-admins@rrze.fau.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml b/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml
index 8c6d52fd..b04719d6 100644
--- a/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sthelenslife.net/shibboleth-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-01T16:34:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-01T16:34:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sthelenslife.net/Shibboleth.sso/Secure"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.sthelenslife.net/Shibboleth.sso/Secure"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLDCCAhSgAwIBAgIJAMzAs1ASwVMDMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHd3dy5zdGhlbGVuc2xpZmUubmV0MB4XDTExMDgzMTEzMTk0M1oXDTIxMDgy
 						ODEzMTk0M1owHzEdMBsGA1UEAxMUd3d3LnN0aGVsZW5zbGlmZS5uZXQwggEiMA0G
@@ -31,28 +31,28 @@
 						afPqDUGNuJgpItPpvxVX7yKHooGSQkdigJqwN+lyrusV6OZt2fnrKZkr3nSTjYfg
 						yQBZZJMd4TmXDz4KAxPrktUlomUIorfnKHBMSVwvF6hYYNOe4rXpTCqHxeNetBcW
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sthelenslife.net/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sthelenslife.net/Shibboleth.sso/SAML/POST" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UniServity Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UniServity Limited: St Helens Council</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uniservity.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>UniServity Support</md:GivenName>
-      <md:EmailAddress>mailto:support@uniservity.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Rezar</md:GivenName>
-      <md:SurName>Zefaj</md:SurName>
-      <md:EmailAddress>mailto:rezar.zafaj@uniservity.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sthelenslife.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sthelenslife.net/Shibboleth.sso/SAML/POST" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UniServity Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UniServity Limited: St Helens Council</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniservity.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>UniServity Support</md:GivenName>
+    <md:EmailAddress>mailto:support@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rezar</md:GivenName>
+    <md:SurName>Zefaj</md:SurName>
+    <md:EmailAddress>mailto:rezar.zafaj@uniservity.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml
index b7d4336c..ee817ba6 100644
--- a/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.stirlingstudentsunion.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-03T12:01:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-03T12:01:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Stirling Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.stirlingstudentsunion.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stirling Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.stirlingstudentsunion.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml b/swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml
index 48656bfb..84b81ae4 100644
--- a/swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.structuralbiology.eu/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-27T09:57:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-27T09:57:09Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.structuralbiology.eu/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.structuralbiology.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Instruct</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Instruct Hub &amp; Submission Systems</mdui:Description>
+        <mdui:Logo height="800" width="800">https://www.structuralbiology.eu/images/idplogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.structuralbiology.eu/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.structuralbiology.eu/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Instruct</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Instruct Hub &amp; Submission Systems</mdui:Description>
-          <mdui:Logo height="800" width="800">https://www.structuralbiology.eu/images/idplogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDEjCCAfqgAwIBAgIJAN+JlXZQTIqEMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 						BAMTGWluc3RydWN0My5zdHJ1Ymkub3guYWMudWswHhcNMTUwODIwMTQyNDAwWhcN
 						MjUwODE3MTQyNDAwWjAkMSIwIAYDVQQDExlpbnN0cnVjdDMuc3RydWJpLm94LmFj
@@ -48,57 +48,57 @@
 						bXSBng+QaO933jEauYxkAiHIddQn+KCPu+bOFW1MRvd4ttKt5dtNTikRIDBm3f6C
 						Mf9E9cJ5KenVAYmDtaBbf17stP5/1A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.structuralbiology.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Instruct</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.structuralbiology.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Instruct</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
 				Instruct Academic Services
 			</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Instruct Academic Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Instruct</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.structuralbiology.eu/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Instruct Team</md:GivenName>
-      <md:EmailAddress>mailto:admin@structuralbiology.eu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Callum</md:GivenName>
-      <md:SurName>Smith</md:SurName>
-      <md:EmailAddress>mailto:callum@strubi.ox.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Instruct Academic Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Instruct</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.structuralbiology.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Instruct Team</md:GivenName>
+    <md:EmailAddress>mailto:admin@structuralbiology.eu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Callum</md:GivenName>
+    <md:SurName>Smith</md:SurName>
+    <md:EmailAddress>mailto:callum@strubi.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml b/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml
index 38d5170e..63bcb074 100644
--- a/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studentsales.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T10:57:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T10:57:14Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.studentsales.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studentsales.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Sales</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Global Platform for Student Discounts</mdui:Description>
+        <mdui:Logo height="64" width="64">https://www.studentsales.com/images/logos/ss-logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.studentsales.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.studentsales.com/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Student Sales</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Global Platform for Student Discounts</mdui:Description>
-          <mdui:Logo height="64" width="64">https://www.studentsales.com/images/logos/ss-logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAOmLHL1xUklsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHN0dWRlbnRzYWxlcy5jb20wHhcNMTUxMTIwMDAxNjU1WhcNMjUxMTE3MDAx
 						NjU1WjAbMRkwFwYDVQQDExBzdHVkZW50c2FsZXMuY29tMIIBIjANBgkqhkiG9w0B
@@ -52,43 +52,43 @@
 						qOQR16hpXiNGbsbwdg5x/8OXwMYxW238zxIDRAlorgDPvyzQwJmkdbJ3JXAdli7Y
 						Quuv0pXFaKbFjyCOog/Ite+KJWonNI6tGPrpqMl9yd67mY0KrDeEiNOeXQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsales.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsales.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Student Sales Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Sales</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.studentsales.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Ali</md:GivenName>
-      <md:SurName>Onder</md:SurName>
-      <md:EmailAddress>mailto:ali@studentsales.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ali</md:GivenName>
-      <md:SurName>Onder</md:SurName>
-      <md:EmailAddress>mailto:ali@studentsales.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsales.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsales.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Student Sales Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Sales</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.studentsales.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ali</md:GivenName>
+    <md:SurName>Onder</md:SurName>
+    <md:EmailAddress>mailto:ali@studentsales.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ali</md:GivenName>
+    <md:SurName>Onder</md:SurName>
+    <md:EmailAddress>mailto:ali@studentsales.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml b/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
index 3fd3dc7a..d3d9893a 100644
--- a/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studentsupermarket.com/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T10:12:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T10:12:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.studentsupermarket.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Supermarket</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A global online platform to provide services for students everyday lives</mdui:Description>
+        <mdui:Logo height="60" width="80">https://studentsupermarket.com/images/logos/studentlogo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.studentsupermarket.com/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Student Supermarket</mdui:DisplayName>
-          <mdui:Description xml:lang="en">A global online platform to provide services for students everyday lives</mdui:Description>
-          <mdui:Logo height="60" width="80">https://studentsupermarket.com/images/logos/studentlogo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAM+NtIG/0ge4MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEGlwLTE3Mi0zMS0xOS0yNDIwHhcNMTUwMzEwMTYzNTEyWhcNMjUwMzA3MTYz
 						NTEyWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMTktMjQyMIIBIjANBgkqhkiG9w0B
@@ -51,43 +51,43 @@
 						3ewD2JCEJ+ORBj1AL+QF5TqJghWyH6a3IKkMVkIHk+7NHq4L6QZvFW7togFp+0Oa
 						W/4oy5wJRf4niwyvkV8gDlo/H5cIxc7nt0nwpotbejw3/FNEu8WkrKzrXQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsupermarket.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Student Supermarket Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Student Supermarket</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.studentsupermarket.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Robert</md:GivenName>
-      <md:SurName>Gray</md:SurName>
-      <md:EmailAddress>mailto:robert@studentsupermarket.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Ali</md:GivenName>
-      <md:SurName>Onder</md:SurName>
-      <md:EmailAddress>mailto:ali@studentsupermarket.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsupermarket.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Student Supermarket Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Student Supermarket</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.studentsupermarket.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Gray</md:SurName>
+    <md:EmailAddress>mailto:robert@studentsupermarket.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ali</md:GivenName>
+    <md:SurName>Onder</md:SurName>
+    <md:EmailAddress>mailto:ali@studentsupermarket.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml
index 6715e3f5..87f9f72d 100644
--- a/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sussexstudent.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-18T14:24:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-18T14:24:25Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sussexstudent.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.sussexstudent.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Sussex Students’ Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.sussexstudent.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Sussex Students’ Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sussexstudent.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml
index 9affc047..fecbb318 100644
--- a/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.suug.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-15T14:58:52Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-15T14:58:52Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.suug.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.suug.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.suug.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.suug.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.suug.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.suug.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.suug.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Greenwich Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.suug.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.suug.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.suug.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.suug.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Greenwich Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.suug.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml
index 9c02ad95..c5e25cc0 100644
--- a/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.swansea-union.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-23T10:48:58Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-23T10:48:58Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Swansea University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.swansea-union.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swansea University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swansea-union.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml b/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
index da197464..e15d7b1b 100644
--- a/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sympa.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T14:53:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T14:53:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
-          <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Sympa.org - le site web</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://www.sympa.org</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Sympa.org - le site web</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.sympa.org/coco.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Sympa.org - le site web</mdui:DisplayName>
-          <mdui:InformationURL xml:lang="fr">https://www.sympa.org</mdui:InformationURL>
-          <mdui:Description xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Sympa.org - le site web</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</mdui:Description>
-          <mdui:PrivacyStatementURL xml:lang="en">https://www.sympa.org/coco.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC6zCCAdOgAwIBAgIJAOHudP2hFB4CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDHZlc3BhLmNydS5mcjAeFw0xNTEwMDgxMjQwNTJaFw0yNTEwMDUxMjQwNTJa
 MBcxFTATBgNVBAMTDHZlc3BhLmNydS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -44,13 +44,13 @@ W2Re4EiVyTm7cyC0db/eBPCPzd09FXdYFJiHuTOXfNB7Nwe+6QuIrNr59YXbISXi
 LB62PE5cL3gx719J0ga1Lze3M0QxvGi+gJibdoEne8np8EQUZ2ipdx+S2q6aFo0m
 BT0r1p+WzgcEohiQNP8sn1rNIh1JfKl3BIlXGFXLcg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIC6zCCAdOgAwIBAgIJAOHudP2hFB4CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
 BAMTDHZlc3BhLmNydS5mcjAeFw0xNTEwMDgxMjQwNTJaFw0yNTEwMDUxMjQwNTJa
 MBcxFTATBgNVBAMTDHZlc3BhLmNydS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
@@ -68,13 +68,13 @@ W2Re4EiVyTm7cyC0db/eBPCPzd09FXdYFJiHuTOXfNB7Nwe+6QuIrNr59YXbISXi
 LB62PE5cL3gx719J0ga1Lze3M0QxvGi+gJibdoEne8np8EQUZ2ipdx+S2q6aFo0m
 BT0r1p+WzgcEohiQNP8sn1rNIh1JfKl3BIlXGFXLcg==
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIICejCCAeOgAwIBAgIJAJnxdJGVfGAeMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
 BAYTAkZSMQwwCgYDVQQKEwNDUlUxFjAUBgNVBAMTDXd3dy5zeW1wYS5vcmcwHhcN
 MDgwMzIwMTQ0NTQ4WhcNMjgwMzE1MTQ0NTQ4WjAzMQswCQYDVQQGEwJGUjEMMAoG
@@ -90,25 +90,24 @@ A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAlB3jg+IyBkO45Wo61YE32N6O
 d99p9wFKc5VN5aKrlDrU5guLjbl4avX/IEi1Sjj2eio6sKE/E5JsUs0ct3edtkXB
 QfGIdEliJJoWsN5ba6I=
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sympa.org/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sympa.org/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="fr">Sympa.org - le site web</md:ServiceName>
-        <md:ServiceDescription xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
-			 </md:RequestedAttribute>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>sympa-authors@listes.renater.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sympa.org/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sympa.org/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="fr">Sympa.org - le site web</md:ServiceName>
+      <md:ServiceDescription xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sympa-authors@listes.renater.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml b/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml
index b711cd74..752dd55c 100644
--- a/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tandfebooks.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T11:09:57Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T11:09:57Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDqzCCApOgAwIBAgIJAMt/QdGE5hPLMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
 						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
 						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
@@ -29,24 +29,24 @@
 						7klAv8c4dTvFs80m4uZsDo6XpJGEfWJvkY6QqxCrwCMAc2lq9k1UqIjEV0BeoB2G
 						hcbFdcOTCuBK+8YKVxLElKzwQCc0OYx1mQkGYcA7eA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tandfebooks.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfebooks.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tandfebooks.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Group eBooks</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tandfebooks.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tandfebooks.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfebooks.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tandfebooks.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Group eBooks</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tandfebooks.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml
index 62361925..57f95d4c 100644
--- a/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tandfonline.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
 						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
 						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
@@ -26,24 +26,24 @@
 						hNI51amuMNcL46a8+E1IW8L59W656YzJnJ8I2A9nuHdmWQGs5jICuG4dr7+70wCP
 						Lv0VNFSwnTxjA5Rocmae95yzHIE0I4tW7VD+q+yeEStXHCCN1rWHgLWJb/U=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tandfonline.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfonline.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tandfonline.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Online</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.tandfonline.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>SSO-Support</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>SSO-Tech</md:GivenName>
-      <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tandfonline.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfonline.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tandfonline.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Online</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.tandfonline.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:EmailAddress>mailto:SSO-Tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml b/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
index 4929b301..b445b528 100644
--- a/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
+++ b/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.teamseer.com/ukfederation">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-10T14:24:44Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-10T14:24:44Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.teamseer.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.teamseer.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.teamseer.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.teamseer.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDaTCCAlGgAwIBAgIJAICE7/jPSr5LMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNV
 						BAYTAlVLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFjAU
 						BgNVBAoMDUFjY2VzcyBVSyBMdGQwHhcNMTQxMjA5MTEwNTI5WhcNMjQxMjE2MTEw
@@ -34,38 +34,38 @@
 						LnFmiQIt4pfOl5Gctx3NhRDUKgH1gesJ1RgbONnmw/HY4S8NB/0lZqrvM5ausXzC
 						zKby7313KTnn/XqGNg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.teamseer.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.teamseer.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.teamseer.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.teamseer.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.teamseer.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.teamseer.com/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.teamseer.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">TeamSeer Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TeamSeer</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.teamseer.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>TeamSeer Support</md:GivenName>
-      <md:EmailAddress>mailto:support@teamseer.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mahbub</md:GivenName>
-      <md:SurName>Kabir</md:SurName>
-      <md:EmailAddress>mailto:Mahbub.Kabir@teamseer.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Flaviu Gheorghe</md:GivenName>
-      <md:SurName>Grosan</md:SurName>
-      <md:EmailAddress>mailto:Flaviu.Grosan@theaccessgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.teamseer.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.teamseer.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.teamseer.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.teamseer.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.teamseer.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.teamseer.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.teamseer.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TeamSeer Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TeamSeer</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.teamseer.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>TeamSeer Support</md:GivenName>
+    <md:EmailAddress>mailto:support@teamseer.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mahbub</md:GivenName>
+    <md:SurName>Kabir</md:SurName>
+    <md:EmailAddress>mailto:Mahbub.Kabir@teamseer.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Flaviu Gheorghe</md:GivenName>
+    <md:SurName>Grosan</md:SurName>
+    <md:EmailAddress>mailto:Flaviu.Grosan@theaccessgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml
index 7fbc5b77..279fb08d 100644
--- a/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ted.is.ed.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T15:13:49Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T15:13:49Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDAzCCAeugAwIBAgIJAJ3YiJdUsT7jMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
 						BAMTFHNhdC13ZWIta2IxLmVkLmFjLnVrMB4XDTEzMDgyMzEwMDgxN1oXDTIzMDgy
 						MTEwMDgxN1owHzEdMBsGA1UEAxMUc2F0LXdlYi1rYjEuZWQuYWMudWswggEiMA0G
@@ -46,41 +46,41 @@
 						BK/4nId/6jClutTo+cJejqf4BcgZhstRYp9YBnxYsWG405B/8dSzchSbi1HHYrp2
 						F2HTxES/+A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Timetabling Web Apps - LIVE Environment</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IS Helpline</md:GivenName>
-      <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>IS Apps Technology Management</md:GivenName>
-      <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Timetabling Web Apps - LIVE Environment</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IS Helpline</md:GivenName>
+    <md:EmailAddress>mailto:is.helpline@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IS Apps Technology Management</md:GivenName>
+    <md:EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml
index ec307251..1fe1adb6 100644
--- a/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.theacademiclibrary.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-16T15:48:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-16T15:48:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo6gAwIBAgIJAPs1pKAPoYV7MA0GCSqGSIb3DQEBBQUAMEAxGTAXBgNV
 						BAoTEEFjYWRlbWljIExpYnJhcnkxIzAhBgNVBAMTGnd3dy50aGVhY2FkZW1pY2xp
 						YnJhcnkuY29tMB4XDTE2MDIxMDE0MDk1MVoXDTI2MDIwNzE0MDk1MVowQDEZMBcG
@@ -31,13 +31,13 @@
 						59XCigD56OeJwGTf+dtUCq6D/MEPbEH/HbiNDwo8bFQo+vXWW69PsXh0Y28bPUKI
 						ldEPubpuegrPDcXT9xfexgy93PV17kmR7TU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDpjCCAo6gAwIBAgIJAPs1pKAPoYV7MA0GCSqGSIb3DQEBBQUAMEAxGTAXBgNV
 						BAoTEEFjYWRlbWljIExpYnJhcnkxIzAhBgNVBAMTGnd3dy50aGVhY2FkZW1pY2xp
 						YnJhcnkuY29tMB4XDTE2MDIxMDE0MDk1MVoXDTI2MDIwNzE0MDk1MVowQDEZMBcG
@@ -59,25 +59,25 @@
 						59XCigD56OeJwGTf+dtUCq6D/MEPbEH/HbiNDwo8bFQo+vXWW69PsXh0Y28bPUKI
 						ldEPubpuegrPDcXT9xfexgy93PV17kmR7TU=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theacademiclibrary.com/oa/auth/rcv/saml2/post" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Academic Library Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Academic Library</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.theacademiclibrary.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Pat</md:GivenName>
-      <md:SurName>Coyne</md:SurName>
-      <md:EmailAddress>mailto:info@theacademiclibrary.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Pat</md:GivenName>
-      <md:SurName>Coyne</md:SurName>
-      <md:EmailAddress>mailto:info@theacademiclibrary.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theacademiclibrary.com/oa/auth/rcv/saml2/post" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Academic Library Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Academic Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.theacademiclibrary.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Pat</md:GivenName>
+    <md:SurName>Coyne</md:SurName>
+    <md:EmailAddress>mailto:info@theacademiclibrary.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pat</md:GivenName>
+    <md:SurName>Coyne</md:SurName>
+    <md:EmailAddress>mailto:info@theacademiclibrary.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml b/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml
index 4d8f89eb..79924f93 100644
--- a/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.theunionmmu.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T10:00:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T10:00:33Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.theunionmmu.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.theunionmmu.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,37 +30,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Manchester Metropolitan Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.theunionmmu.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Manchester Metropolitan Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.theunionmmu.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml
index 2f91ffaf..6472e811 100644
--- a/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tigtagworld.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-10T11:25:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-10T11:25:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/shibtest"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/shibtest"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDMzCCAhugAwIBAgIJAPUDpIXdPLQCMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 						BAMTFXd3dy50aWd0YWd3b3JsZC5jby51azAeFw0xMzEyMDkxNTE0MDNaFw0yMzEy
 						MDcxNTE0MDNaMCAxHjAcBgNVBAMTFXd3dy50aWd0YWd3b3JsZC5jby51azCCASIw
@@ -45,44 +45,44 @@
 						gKZ8fY0XYWXYveYelRTKkOYKLV85AfdHOq/6OTSu39hDlFjhTQXFqeIsrBn1YmUX
 						o+Sieepoag==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">TigTag UK Shibboleth SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.twig-world.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TigTag UK Shibboleth SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.twig-world.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml
index b708894c..911986c8 100644
--- a/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.twigonglow.com/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-22T15:15:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-22T15:15:58Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/shibtest"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/Glow"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/RMUnify"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/shibtest"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/Glow"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/RMUnify"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.twigonglow.com/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDJzCCAg+gAwIBAgIJAMTlVAXkOmrZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
 						BAMTEnd3dy50d2lnb25nbG93LmNvbTAeFw0xMjExMTMxMTAxNDVaFw0yMjExMTEx
 						MTAxNDVaMB0xGzAZBgNVBAMTEnd3dy50d2lnb25nbG93LmNvbTCCASIwDQYJKoZI
@@ -45,44 +45,44 @@
 						ud1Wodm6t+Nrbyh4XA3YbekaxHPRO9bBIjo+sncONDf6JfFL57s4i74LeZVOMeQC
 						yFFf/Cs64qzIILqKQWM0wqZq1vOavCR+OhOTdyjjKejhDKb9CWLzXSuOFw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.twigonglow.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.twigonglow.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Twig World Limited: Glow Science</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.twigonglow.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Patricia</md:GivenName>
-      <md:SurName>Kemp</md:SurName>
-      <md:EmailAddress>mailto:pkemp@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>David</md:GivenName>
-      <md:SurName>Munn</md:SurName>
-      <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.twigonglow.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.twigonglow.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Twig World Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Twig World Limited: Glow Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.twigonglow.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Patricia</md:GivenName>
+    <md:SurName>Kemp</md:SurName>
+    <md:EmailAddress>mailto:pkemp@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Munn</md:SurName>
+    <md:EmailAddress>mailto:dmunn@twig-world.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml
index fe988ab2..801e9b63 100644
--- a/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ubu.org.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ubu.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ubu.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,13 +28,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -52,37 +52,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: University of Bristol Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ubu.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: University of Bristol Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ubu.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
index 461a0053..327a7c5c 100644
--- a/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uco.fr/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-07-09T14:39:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-07-09T14:39:03Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uco.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACN0lEQVQ4y5WSX0hTcRTHv+f+370NiRKSZehAJoWJhVp7ab1UL0GQ2EMwXZmWJoQakiYUCUuCwLQeDPG5x8CHwrAXIQgyEq10JKmbtNlM5/7cuzv366Usazr8vp5zPpzzPV8gi4aGhopu3+25v1WdywbweDw+RlThaez8kK13O4lVNc2staP7xY43+CWzpNjeNzE9e7rv8VP3jgBtbQ80ALDl7X5m3aVifMrn/btOmYYGB59bDSNcuRyJHPPNL97TLMqCw26rmZyeG15Zi6onKktOXb96ZQQAhEyAz198DwVpfe9Xf/CcKPAIhX/kW1W1VpHlIBeLFwYC4TIAIxlPaO3sfg3Sc3jixpOmCUHgocgSQMRiup5PBAgin5vRg/7+gfNTM3OuQnte14G8PW+ICLFEAo6C/B6eI9MwDIGIg5lKhzICJmf93ZoqA5BRX3/plfOwo6i85FCFRVEC/uBSnSSKYIwhx6q++w/Q2zvgXItGi2VJAtONXABoaWmaX42sut9/mnlERDCSJjSL7Lt1s3n099yGifEUs6XTafC8gIVvoZr2Lu/lQChc65sLQLMoMMwU4rqOM67K5sG+P1tvABSJXyTiIIkCAkvLdan1dUiCAF6WEEvoYACcR0ob3RcvvNwyB9dudLz9vhott2oqGGOMIyIQQeS4ibKDjqaGBvfYv1/blIOTzuNVw6NjH1cia5osSVSwf98T7532pu2SuukL1dVn510VRwtLHXavqigLST09hiz6CVvKytA9JOWYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="fr">http://www.uco.fr</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="fr">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uco.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACN0lEQVQ4y5WSX0hTcRTHv+f+370NiRKSZehAJoWJhVp7ab1UL0GQ2EMwXZmWJoQakiYUCUuCwLQeDPG5x8CHwrAXIQgyEq10JKmbtNlM5/7cuzv366Usazr8vp5zPpzzPV8gi4aGhopu3+25v1WdywbweDw+RlThaez8kK13O4lVNc2staP7xY43+CWzpNjeNzE9e7rv8VP3jgBtbQ80ALDl7X5m3aVifMrn/btOmYYGB59bDSNcuRyJHPPNL97TLMqCw26rmZyeG15Zi6onKktOXb96ZQQAhEyAz198DwVpfe9Xf/CcKPAIhX/kW1W1VpHlIBeLFwYC4TIAIxlPaO3sfg3Sc3jixpOmCUHgocgSQMRiup5PBAgin5vRg/7+gfNTM3OuQnte14G8PW+ICLFEAo6C/B6eI9MwDIGIg5lKhzICJmf93ZoqA5BRX3/plfOwo6i85FCFRVEC/uBSnSSKYIwhx6q++w/Q2zvgXItGi2VJAtONXABoaWmaX42sut9/mnlERDCSJjSL7Lt1s3n099yGifEUs6XTafC8gIVvoZr2Lu/lQChc65sLQLMoMMwU4rqOM67K5sG+P1tvABSJXyTiIIkCAkvLdan1dUiCAF6WEEvoYACcR0ob3RcvvNwyB9dudLz9vhott2oqGGOMIyIQQeS4ibKDjqaGBvfYv1/blIOTzuNVw6NjH1cia5osSVSwf98T7532pu2SuukL1dVn510VRwtLHXavqigLST09hiz6CVvKytA9JOWYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.uco.fr</mdui:InformationURL>
-          <mdui:DisplayName xml:lang="fr">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDFDCCAfygAwIBAgIVAPhF6Z+pMtMAffPTgC8LNS+CPPoMMA0GCSqGSIb3DQEB
 BQUAMBUxEzARBgNVBAMTCnd3dy51Y28uZnIwHhcNMTEwNzIwMTQyMzUwWhcNMzEw
 NzIwMTQyMzUwWjAVMRMwEQYDVQQDEwp3d3cudWNvLmZyMIIBIjANBgkqhkiG9w0B
@@ -37,26 +37,26 @@ Mk7/mIJoHFhYEh81ZVlwKHPGmZ/ST8Y0GXeH95nO3BuuFp6cWgE7Eu4u9XiF5Ice
 N4chOWs7G4bomBuESzkGeydsJjWl7WmhuoKqfTV5V6W+hsBnkXGG4cpfB9R3Du+v
 0m1zBj8dwon9dDvWHf2On3KrRYbYl2Ff
 					    </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uco.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uco.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.uco.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Université Catholique de l'Ouest - Angers</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uco.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Lucas Joachim</md:SurName>
-      <md:EmailAddress>joachim.lucas@uco.fr</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Zoundi Patrick</md:SurName>
-      <md:EmailAddress>patrick.zoundi@uco.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uco.fr/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uco.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.uco.fr/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Université Catholique de l'Ouest - Angers</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uco.fr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Lucas Joachim</md:SurName>
+    <md:EmailAddress>joachim.lucas@uco.fr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Zoundi Patrick</md:SurName>
+    <md:EmailAddress>patrick.zoundi@uco.fr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml
index 903fe8d7..af59863e 100644
--- a/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.udsu.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-04T09:51:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-04T09:51:46Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.udsu.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.udsu.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.udsu.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.udsu.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.udsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Derby Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.udsu.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.udsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Derby Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.udsu.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml
index 5e33c1eb..2f43bdba 100644
--- a/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.umaber.co.uk/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T14:42:08Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T14:42:08Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.umaber.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.umaber.co.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.umaber.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.umaber.co.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -29,33 +29,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.umaber.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Aberystwyth University Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.umaber.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.umaber.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aberystwyth University Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umaber.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml
index d1c5ee83..91cffe3c 100644
--- a/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uni-market.co.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-22T10:09:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-22T10:09:29Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.uni-market.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.uni-market.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Uni Market</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Your student marketplace has arrived. Buy and sell university essentials on a safe online platform!</mdui:Description>
+        <mdui:Logo height="130" width="130">https://www.uni-market.co.uk/Content/images/common/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.uni-market.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.uni-market.co.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Uni Market</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Your student marketplace has arrived. Buy and sell university essentials on a safe online platform!</mdui:Description>
-          <mdui:Logo height="130" width="130">https://www.uni-market.co.uk/Content/images/common/logo.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAIMM91GfaXNYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHVuaS1tYXJrZXQuY28udWswHhcNMTUwOTAyMTQzODQ4WhcNMjUwODMwMTQz
 						ODQ4WjAbMRkwFwYDVQQDExB1bmktbWFya2V0LmNvLnVrMIIBIjANBgkqhkiG9w0B
@@ -52,41 +52,41 @@
 						oDXqb5aLalOGbSRALV1UyVZJQUr0Z+7zZh2HWwk2VqhOgBdXlrG48/E+orSYHodG
 						zZIKEZpWB/Mio9aTqkqLW5eEI3zHyBK+ywCylVl8PVWIY7fSo1OCVL//zA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uni-market.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Uni-Market Enterprises Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Uni Market</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uni-market.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Uni Market</md:GivenName>
-      <md:EmailAddress>mailto:support@uni-market.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Uni Market</md:GivenName>
-      <md:EmailAddress>mailto:support@uni-market.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uni-market.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uni-Market Enterprises Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uni Market</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uni-market.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Uni Market</md:GivenName>
+    <md:EmailAddress>mailto:support@uni-market.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Uni Market</md:GivenName>
+    <md:EmailAddress>mailto:support@uni-market.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
index aef09c46..7047c997 100644
--- a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.unioncloud.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-05T13:45:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-05T13:45:10Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.unioncloud.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.unioncloud.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIJANZRUr3l66IUMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
 						BAMTMGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdz
 						LmNvbTAeFw0xMjA1MTQwOTExNThaFw0yMjA1MTIwOTExNThaMDsxOTA3BgNVBAMT
@@ -43,217 +43,217 @@
 						LbD66CIPaC/TtydoiCUfS7s9Hr3hSJUnJ0gi+fzXh/5/z/+NjMZXd4G4FPVMonXy
 						XrRfr87YvwJm38sU/z+Gnka487212biN6XS36YGLSohRByTKTNZM+H1x8A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloud.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unioncloud.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/Artifact" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/ECP" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.trentstudents.org/Shibboleth.sso/SAML/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.trentstudents.org/Shibboleth.sso/SAML/Artifact" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suarts.org/Shibboleth.sso/SAML2/POST" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.suarts.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suarts.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.suarts.org/Shibboleth.sso/SAML2/ECP" index="40"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.suarts.org/Shibboleth.sso/SAML/POST" index="41"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.suarts.org/Shibboleth.sso/SAML/Artifact" index="42"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/POST" index="43"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/Artifact" index="45"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/ECP" index="46"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.subu.org.uk/Shibboleth.sso/SAML/POST" index="47"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.subu.org.uk/Shibboleth.sso/SAML/Artifact" index="48"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST" index="49"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="51"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/ECP" index="52"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/POST" index="53"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/Artifact" index="54"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/POST" index="55"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="56"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/Artifact" index="57"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/ECP" index="58"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uadsa.com/Shibboleth.sso/SAML/POST" index="59"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uadsa.com/Shibboleth.sso/SAML/Artifact" index="60"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/POST" index="67"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="68"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/Artifact" index="69"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/ECP" index="70"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML/POST" index="71"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML/Artifact" index="72"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/POST" index="79"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="80"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="81"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/ECP" index="82"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML/POST" index="83"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML/Artifact" index="84"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/POST" index="85"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/Artifact" index="87"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/ECP" index="88"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.durhamsu.com/Shibboleth.sso/SAML/POST" index="89"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.durhamsu.com/Shibboleth.sso/SAML/Artifact" index="90"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/POST" index="91"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="92"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/Artifact" index="93"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/ECP" index="94"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mdxsu.com/Shibboleth.sso/SAML/POST" index="95"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mdxsu.com/Shibboleth.sso/SAML/Artifact" index="96"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/POST" index="97"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/Artifact" index="99"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/ECP" index="100"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML/POST" index="101"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML/Artifact" index="102"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/POST" index="103"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/POST-SimpleSign" index="104"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/Artifact" index="105"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/ECP" index="106"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsu.me/Shibboleth.sso/SAML/POST" index="107"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsu.me/Shibboleth.sso/SAML/Artifact" index="108"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="111"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/ECP" index="112"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML/POST" index="113"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML/Artifact" index="114"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/POST" index="115"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="116"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="117"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/ECP" index="118"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML/POST" index="119"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML/Artifact" index="120"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/POST" index="121"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/Artifact" index="123"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/ECP" index="124"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML/POST" index="125"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML/Artifact" index="126"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/POST" index="127"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="128"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/Artifact" index="129"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/ECP" index="130"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ueastudent.com/Shibboleth.sso/SAML/POST" index="131"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ueastudent.com/Shibboleth.sso/SAML/Artifact" index="132"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/POST" index="133"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="135"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="136"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML/POST" index="137"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="138"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/POST" index="139"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="140"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/Artifact" index="141"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/ECP" index="142"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uwlsu.com/Shibboleth.sso/SAML/POST" index="143"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uwlsu.com/Shibboleth.sso/SAML/Artifact" index="144"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/POST" index="145"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/Artifact" index="147"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/ECP" index="148"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML/POST" index="149"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML/Artifact" index="150"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/POST" index="151"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="152"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/Artifact" index="153"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/ECP" index="154"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML/POST" index="156"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML/Artifact" index="157"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/POST" index="159"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="160"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/Artifact" index="161"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/ECP" index="162"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML/POST" index="163"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML/Artifact" index="164"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/POST" index="165"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/Artifact" index="167"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/ECP" index="168"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uswsu.com/Shibboleth.sso/SAML/POST" index="169"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uswsu.com/Shibboleth.sso/SAML/Artifact" index="170"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/POST" index="171"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="172"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/Artifact" index="173"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/ECP" index="174"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abertaysa.com/Shibboleth.sso/SAML/POST" index="175"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abertaysa.com/Shibboleth.sso/SAML/Artifact" index="176"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/POST" index="177"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="178"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/Artifact" index="179"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/ECP" index="180"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/POST" index="181"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/Artifact" index="182"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST" index="183"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="184"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="185"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/ECP" index="186"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/POST" index="187"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/Artifact" index="188"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST" index="189"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="191"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/ECP" index="192"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/POST" index="193"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/Artifact" index="194"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/POST" index="201"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="202"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="203"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="204"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML/POST" index="205"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="206"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NUS Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NUS Digital Unioncloud Service Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unioncloud.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@zendesk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shoba</md:GivenName>
-      <md:SurName>Menon</md:SurName>
-      <md:EmailAddress>mailto:shoba.menon@arrkgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Unioncloud Support</md:GivenName>
-      <md:EmailAddress>mailto:unioncloudsupport@nus.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloud.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unioncloud.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/Artifact" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/ECP" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.trentstudents.org/Shibboleth.sso/SAML/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.trentstudents.org/Shibboleth.sso/SAML/Artifact" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suarts.org/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.suarts.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suarts.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.suarts.org/Shibboleth.sso/SAML2/ECP" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.suarts.org/Shibboleth.sso/SAML/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.suarts.org/Shibboleth.sso/SAML/Artifact" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/POST" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/Artifact" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/ECP" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.subu.org.uk/Shibboleth.sso/SAML/POST" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.subu.org.uk/Shibboleth.sso/SAML/Artifact" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/ECP" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/Artifact" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/POST" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/Artifact" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/ECP" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uadsa.com/Shibboleth.sso/SAML/POST" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uadsa.com/Shibboleth.sso/SAML/Artifact" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/POST" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/Artifact" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/ECP" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML/POST" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML/Artifact" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/POST" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/ECP" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML/POST" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML/Artifact" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/Artifact" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/ECP" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.durhamsu.com/Shibboleth.sso/SAML/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.durhamsu.com/Shibboleth.sso/SAML/Artifact" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/POST" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/Artifact" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/ECP" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mdxsu.com/Shibboleth.sso/SAML/POST" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mdxsu.com/Shibboleth.sso/SAML/Artifact" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/Artifact" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/ECP" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML/Artifact" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/POST" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/POST-SimpleSign" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/Artifact" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/ECP" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsu.me/Shibboleth.sso/SAML/POST" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsu.me/Shibboleth.sso/SAML/Artifact" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/ECP" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML/Artifact" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/POST" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/ECP" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML/POST" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML/Artifact" index="120"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/POST" index="121"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/Artifact" index="123"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/ECP" index="124"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML/POST" index="125"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML/Artifact" index="126"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/POST" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="128"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/Artifact" index="129"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/ECP" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ueastudent.com/Shibboleth.sso/SAML/POST" index="131"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ueastudent.com/Shibboleth.sso/SAML/Artifact" index="132"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/POST" index="133"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="135"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="136"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML/POST" index="137"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="138"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/POST" index="139"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="140"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/Artifact" index="141"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/ECP" index="142"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uwlsu.com/Shibboleth.sso/SAML/POST" index="143"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uwlsu.com/Shibboleth.sso/SAML/Artifact" index="144"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/POST" index="145"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/Artifact" index="147"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/ECP" index="148"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML/POST" index="149"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML/Artifact" index="150"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/POST" index="151"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="152"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/Artifact" index="153"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/ECP" index="154"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML/POST" index="156"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML/Artifact" index="157"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/POST" index="159"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="160"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/Artifact" index="161"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/ECP" index="162"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML/POST" index="163"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML/Artifact" index="164"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/POST" index="165"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/Artifact" index="167"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/ECP" index="168"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uswsu.com/Shibboleth.sso/SAML/POST" index="169"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uswsu.com/Shibboleth.sso/SAML/Artifact" index="170"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/POST" index="171"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="172"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/Artifact" index="173"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/ECP" index="174"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abertaysa.com/Shibboleth.sso/SAML/POST" index="175"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abertaysa.com/Shibboleth.sso/SAML/Artifact" index="176"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/POST" index="177"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="178"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/Artifact" index="179"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/ECP" index="180"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/POST" index="181"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/Artifact" index="182"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST" index="183"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="184"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="185"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/ECP" index="186"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/POST" index="187"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/Artifact" index="188"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST" index="189"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="191"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/ECP" index="192"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/POST" index="193"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/Artifact" index="194"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/POST" index="201"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="202"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="203"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="204"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML/POST" index="205"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lansu.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="206"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NUS Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NUS Digital Unioncloud Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unioncloud.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@zendesk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shoba</md:GivenName>
+    <md:SurName>Menon</md:SurName>
+    <md:EmailAddress>mailto:shoba.menon@arrkgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Unioncloud Support</md:GivenName>
+    <md:EmailAddress>mailto:unioncloudsupport@nus.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
index f0971980..fec887fd 100644
--- a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.unioncloudstaging.org/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-05T14:40:53Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-05T14:40:53Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.unioncloudstaging.org/Shibboleth.sso/Login"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.unioncloudstaging.org/Shibboleth.sso/Login"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDVzCCAj+gAwIBAgIJANZRUr3l66IUMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
 						BAMTMGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdz
 						LmNvbTAeFw0xMjA1MTQwOTExNThaFw0yMjA1MTIwOTExNThaMDsxOTA3BgNVBAMT
@@ -41,217 +41,217 @@
 						LbD66CIPaC/TtydoiCUfS7s9Hr3hSJUnJ0gi+fzXh/5/z/+NjMZXd4G4FPVMonXy
 						XrRfr87YvwJm38sU/z+Gnka487212biN6XS36YGLSohRByTKTNZM+H1x8A==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloudstaging.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="37"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="40"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="41"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="42"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="43"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="45"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="46"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="47"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="48"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="49"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="51"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="52"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="53"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="54"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="55"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="56"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="57"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="58"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="59"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="60"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="61"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="63"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="64"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="65"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="66"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="67"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="68"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="69"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="70"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="71"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="72"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="73"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="75"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="76"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="77"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="78"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="79"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="80"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="81"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="82"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="83"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="84"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="85"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="87"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="88"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="89"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="90"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="91"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="92"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="93"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="94"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="95"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="96"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="97"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="99"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="100"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="101"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="102"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="103"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="104"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="105"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="106"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="107"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="108"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="109"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="111"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="112"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="113"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="114"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="115"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="116"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="117"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="118"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="119"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="120"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="127"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="128"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="129"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="130"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="131"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="132"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="133"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="135"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="136"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="137"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="138"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="151"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="152"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="153"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="154"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="155"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="156"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="157"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="159"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="160"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="161"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="162"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="163"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="164"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="165"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="166"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="167"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="168"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="169"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="171"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="172"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="173"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="174"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="175"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="176"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="177"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="178"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="179"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="180"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="181"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="183"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="184"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="185"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="186"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="187"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="188"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="189"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="190"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="191"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="192"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="195"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="196"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="197"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="198"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="199"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="200"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">NUS Services Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">NUS Digital Unioncloud Test Service Provider</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unioncloud.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Help Desk</md:GivenName>
-      <md:EmailAddress>mailto:support@zendesk.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Shoba</md:GivenName>
-      <md:SurName>Menon</md:SurName>
-      <md:EmailAddress>mailto:shoba.menon@arrkgroup.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Unioncloud Support</md:GivenName>
-      <md:EmailAddress>mailto:unioncloudsupport@nus.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloudstaging.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="37"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="40"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="41"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="42"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="43"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="45"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="46"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="47"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="48"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="49"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="51"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="52"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="53"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="54"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="55"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="56"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="57"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="58"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="59"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="60"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="61"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="63"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="64"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="65"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="66"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="67"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="68"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="69"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="70"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="71"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="72"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="73"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="75"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="76"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="77"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="78"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="79"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="80"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="81"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="82"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="83"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="84"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="85"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="87"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="88"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="89"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="90"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="91"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="92"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="93"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="94"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="95"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="96"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="97"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="99"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="100"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="101"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="102"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="103"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="104"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="105"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="106"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="107"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="108"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="109"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="111"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="112"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="113"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="114"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="115"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="116"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="117"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="118"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="119"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="120"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="127"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="128"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="129"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="130"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="131"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="132"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="133"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="135"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="136"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="137"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="138"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="151"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="152"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="153"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="154"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="155"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="156"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="157"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="159"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="160"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="161"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="162"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="163"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="164"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="165"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="166"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="167"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="168"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="169"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="171"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="172"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="173"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="174"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="175"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="176"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="177"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="178"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="179"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="180"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="181"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="183"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="184"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="185"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="186"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="187"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="188"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="189"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="190"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="191"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="192"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="195"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="196"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="197"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="198"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="199"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://yusu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="200"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NUS Services Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NUS Digital Unioncloud Test Service Provider</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unioncloud.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Help Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@zendesk.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shoba</md:GivenName>
+    <md:SurName>Menon</md:SurName>
+    <md:EmailAddress>mailto:shoba.menon@arrkgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Unioncloud Support</md:GivenName>
+    <md:EmailAddress>mailto:unioncloudsupport@nus.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml
index 05587fa1..4b488843 100644
--- a/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.unochapeco.edu.br/idp/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="pt-br">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
                                 http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
                               </mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unochapeco.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unochapeco.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unochapeco.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unochapeco.edu.br</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:DisplayName>
-          <mdui:Description xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:Description>
-          <mdui:Description xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.unochapeco.edu.br</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="pt-br">http://www.unochapeco.edu.br</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
     MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xRzBFBgNVBAoUPlVub2NoYXBl
 Y8OzIC0gVW5pdmVyc2lkYWRlIENvbXVuaXTDoXJpYSBkYSBSZWdpw6NvIGRlIENo
 YXBlY8OzMRAwDgYDVQQLEwdEVEkvTk9DMSQwIgYJKoZIhvcNAQkBFhVub2NAdW5v
@@ -47,26 +47,26 @@ CJJhhufOn3vDZieOVMftowNlbfIhA1qUwq89xYYfCpl7WFxBML+YLYbldANvNORG
 jwVUyBHQxt9gXIb24HHCxcGMadrci9TALlPS+mtq85EtGs2p/5rhxvnbOY1Zn5ut
 0nVBT2KqSJwmgHZ2HSiOz5h2xoemBg==
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.unochapeco.edu.br/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unochapeco.edu.br</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.unochapeco.edu.br/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unochapeco.edu.br</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
       
 MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xRzBFBgNVBAoUPlVub2NoYXBl
 Y8OzIC0gVW5pdmVyc2lkYWRlIENvbXVuaXTDoXJpYSBkYSBSZWdpw6NvIGRlIENo
@@ -93,24 +93,24 @@ jwVUyBHQxt9gXIb24HHCxcGMadrci9TALlPS+mtq85EtGs2p/5rhxvnbOY1Zn5ut
 0nVBT2KqSJwmgHZ2HSiOz5h2xoemBg==
                           
             </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationName>
-      <md:OrganizationName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.unochapeco.edu.br</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="pt-br">http://www.unochapeco.edu.br</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Jhony Maseto</md:SurName>
-      <md:EmailAddress>noc@unochapeco.edu.br</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationName>
+    <md:OrganizationName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chapeco</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unochapeco.edu.br</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pt-br">http://www.unochapeco.edu.br</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Jhony Maseto</md:SurName>
+    <md:EmailAddress>noc@unochapeco.edu.br</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml
index c72ee8e8..d8371586 100644
--- a/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.upay.co.uk/shibboleth-sp">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-29T15:41:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-29T15:41:57Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.upay.co.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.upay.co.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Upay</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Upay online payment processing and cashless account management.</mdui:Description>
+        <mdui:Logo height="55" width="218">https://www.upay.co.uk/images/upay.jpg</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.upay.co.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.upay.co.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Upay</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Upay online payment processing and cashless account management.</mdui:Description>
-          <mdui:Logo height="55" width="218">https://www.upay.co.uk/images/upay.jpg</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					MIIDCTCCAfGgAwIBAgIJAPuCQS/zC4R2MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
 					BAMTFnUwMTU4MjQuY2FzaGxlc3MubG9jYWwwHhcNMTIwNTI4MTQwMDI3WhcNMjIw
 					NTI2MTQwMDI3WjAhMR8wHQYDVQQDExZ1MDE1ODI0LmNhc2hsZXNzLmxvY2FsMIIB
@@ -53,43 +53,43 @@
 					0eEFK2StndDnHHteY0pFIbFv0wX7/PzIN9HHmLMd2vMhX9LOpMX5j8J14VB9HVm+
 					XXxEezyYkBQIe2xJxg==
 				</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upay.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Uniware Systems Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Uniware Systems Limited: Upay Cashless Payments</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uniware.co.uk/cashless-payments</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Dean</md:GivenName>
-      <md:SurName>Cachia</md:SurName>
-      <md:EmailAddress>mailto:dean.cachia@uniware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Craig</md:GivenName>
-      <md:SurName>Moore</md:SurName>
-      <md:EmailAddress>mailto:Craig.Moore@uniware.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upay.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uniware Systems Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uniware Systems Limited: Upay Cashless Payments</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uniware.co.uk/cashless-payments</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Dean</md:GivenName>
+    <md:SurName>Cachia</md:SurName>
+    <md:EmailAddress>mailto:dean.cachia@uniware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Craig</md:GivenName>
+    <md:SurName>Moore</md:SurName>
+    <md:EmailAddress>mailto:Craig.Moore@uniware.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml b/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml
index 5b6e63fe..b2b2d1cf 100644
--- a/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.upsu.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-28T13:45:55Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-28T13:45:55Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.upsu.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.upsu.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upsu.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upsu.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upsu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upsu.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upsu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.upsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Plymouth Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.upsu.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upsu.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upsu.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upsu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upsu.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upsu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.upsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Plymouth Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upsu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml b/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml
index 49ddf553..43dc5e4a 100644
--- a/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uusuvote.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:15:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:15:38Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.uusuvote.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.uusuvote.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -30,13 +30,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -54,37 +54,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uusuvote.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uusuvote.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Ulster SU Voting</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.uusuvote.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uusuvote.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uusuvote.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Ulster SU Voting</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uusuvote.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vho.de-idpvzg.xml b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
index dba2e6f2..b3e5c0f0 100644
--- a/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
+++ b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vho.de/idpvzg">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-02-10T14:50:56Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-02-10T14:50:56Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gbv.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
+        <mdui:Description xml:lang="en">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.vho.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vho.de</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gbv.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
-          <mdui:Description xml:lang="de">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
-          <mdui:Description xml:lang="en">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
-          <mdui:InformationURL xml:lang="de">http://www.vho.de</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.vho.de</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.vho.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www.vho.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG5zCCBc+gAwIBAgIHGU8vu26rPTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.vho.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.vho.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG5zCCBc+gAwIBAgIHGU8vu26rPTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
 RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
 IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
@@ -61,28 +61,28 @@ DvQZHKOJBbYvLe2bwDSp14eAwnJjX/JUKW0J+4prAx684qTS7bycYXcErU6ENc95
 h6ZnXWIR/hFykNOyKWQdVt9Azz7gClrJwypVWp7U1uCcVDIuVzI6u+CPcaLNy6t/
 NBtxgZjOFsGvbdVNBzjz26LYkgbur7z7lMG4ReTzhHeFMCD3h3rwF6cyOA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.vho.de/idpvzg/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpvzg/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpvzg/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpvzg/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gbv.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.vho.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www.vho.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIG5zCCBc+gAwIBAgIHGU8vu26rPTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.vho.de/idpvzg/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpvzg/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpvzg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpvzg/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gbv.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.vho.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.vho.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIG5zCCBc+gAwIBAgIHGU8vu26rPTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
 BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
 RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
 IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
@@ -120,35 +120,35 @@ DvQZHKOJBbYvLe2bwDSp14eAwnJjX/JUKW0J+4prAx684qTS7bycYXcErU6ENc95
 h6ZnXWIR/hFykNOyKWQdVt9Azz7gClrJwypVWp7U1uCcVDIuVzI6u+CPcaLNy6t/
 NBtxgZjOFsGvbdVNBzjz26LYkgbur7z7lMG4ReTzhHeFMCD3h3rwF6cyOA==
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e45</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e45</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.vho.de</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.vho.de</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Franck</md:GivenName>
-      <md:SurName>Borel</md:SurName>
-      <md:EmailAddress>mailto:borel@gbv.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Gerald</md:GivenName>
-      <md:SurName>Steilen</md:SurName>
-      <md:EmailAddress>mailto:steilen@gbv.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Till</md:GivenName>
-      <md:SurName>Kinstler</md:SurName>
-      <md:EmailAddress>mailto:kinstler@gbv.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e45</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e45</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.vho.de</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vho.de</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Franck</md:GivenName>
+    <md:SurName>Borel</md:SurName>
+    <md:EmailAddress>mailto:borel@gbv.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Gerald</md:GivenName>
+    <md:SurName>Steilen</md:SurName>
+    <md:EmailAddress>mailto:steilen@gbv.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Till</md:GivenName>
+    <md:SurName>Kinstler</md:SurName>
+    <md:EmailAddress>mailto:kinstler@gbv.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
index 4231fd57..0c1ef938 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.videotorium.hu/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>niifi</saml:AttributeValue>
+        <saml:AttributeValue>href</saml:AttributeValue>
+        <saml:AttributeValue>href-edugain</saml:AttributeValue>
+        <saml:AttributeValue>sulinet</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
+      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>niifi</saml:AttributeValue>
-          <saml:AttributeValue>href</saml:AttributeValue>
-          <saml:AttributeValue>href-edugain</saml:AttributeValue>
-          <saml:AttributeValue>sulinet</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-        <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="hu">Videotorium</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Videotorium</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">A Videotorium a felsőoktatás és kutatás szereplői számára létrehozott videó/audió megosztó portál, amely helyet és professzionális megjelenési formát biztosít a felsőoktatási intézményekben, kutatóintézetekben és közgyűjteményekben készített videó-tartalom számára.</mdui:Description>
+        <mdui:Description xml:lang="en">Videotorium is a video/audio sharing portal created for the players of research and education. Videotorium provides professional presentation of video content recorded at higher-education organisations, research institutions and public collections.</mdui:Description>
+        <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
+        <mdui:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="hu">Videotorium</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Videotorium</mdui:DisplayName>
-          <mdui:Description xml:lang="hu">A Videotorium a felsőoktatás és kutatás szereplői számára létrehozott videó/audió megosztó portál, amely helyet és professzionális megjelenési formát biztosít a felsőoktatási intézményekben, kutatóintézetekben és közgyűjteményekben készített videó-tartalom számára.</mdui:Description>
-          <mdui:Description xml:lang="en">Videotorium is a video/audio sharing portal created for the players of research and education. Videotorium provides professional presentation of video content recorded at higher-education organisations, research institutions and public collections.</mdui:Description>
-          <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
-          <mdui:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAMKdDVZkKR0MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTAeFw0wOTExMjAxMjMzMjRaFw0xOTExMTgxMjMzMjRaMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOhapHXauA4X/BNSZIhLERDmHjx/7zdw1dxgmkr8GmDzEH1BGZ6/nSdXMAhkrI1HVOGiSz6QhR0l2r6A7mSLXh8u0Sjc3TzCSsAIzz/ygh6Vljl5WMRE9u9uxtkvd+5d4cZP4lUbL9aFOTvNBh3Gizy7oZwWjbp64rSupRNqnz8JFGFPyPnRpXo8HjpNHYeaLyqOqTww9lHTlGWKTqibsyV7CctiFKbADlU2ol/8cdKLiSVAWqlsIed3proxg0fgHskpmyB8cFr77lylFnirJGRXjXMXlVwr1XxlOghfJqBsRxz/wKMXvMNr9sWYoDw14kYBls8S9RCDNF34Fx+UOcECAwEAAaM9MDswGgYDVR0RBBMwEYIPdnBvcnRhbC5uaWlmLmh1MB0GA1UdDgQWBBQgKCZFxt8oR2XfhQ7zGmF7auxUdzANBgkqhkiG9w0BAQUFAAOCAQEAX+R7y/xZi46N65LoxI7OS0a0U9vVh4PxGfylYafbDpPy+FPw1Dh6IqG1R8gt1TSRUouVdoRb9b2k8CjAAkRq4lbF5XctWcsWqMEU69BcUlbzzAtgnpgghVSk8dFlMrEWugQvzd6RL4HDPPrvFsjdMj52+p1mBMtw9SUrazPp+hU1y8zeDdocI2RdyLEhArR5xQVKmV32hDFr754zNdZorvcRuuarkO83b1732Lc//S38m9Co/U1WAPN2sSUN5S7yIZ/EjubTbvf8gcGvEHT1rffoOzqHksfcd+gG9nbNZLO6xZJJEwNwPcOoxEWZXhv3ynvCtFcuvmtcGQazcy0s9Q==</ds:X509Certificate>
-          </ds:X509Data>
-          <ds:KeyName>vportal.niif.hu</ds:KeyName>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-      <md:NameIDFormat>undefined</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AttributeConsumingService index="1" isDefault="true">
-        <md:ServiceName xml:lang="hu">Videotorium</md:ServiceName>
-        <md:ServiceName xml:lang="en">Videotorium</md:ServiceName>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:SurName>Videotorium Admin</md:SurName>
-      <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:SurName>Videotorium Admin</md:SurName>
-      <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Videtorium Admin</md:SurName>
-      <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAMKdDVZkKR0MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTAeFw0wOTExMjAxMjMzMjRaFw0xOTExMTgxMjMzMjRaMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOhapHXauA4X/BNSZIhLERDmHjx/7zdw1dxgmkr8GmDzEH1BGZ6/nSdXMAhkrI1HVOGiSz6QhR0l2r6A7mSLXh8u0Sjc3TzCSsAIzz/ygh6Vljl5WMRE9u9uxtkvd+5d4cZP4lUbL9aFOTvNBh3Gizy7oZwWjbp64rSupRNqnz8JFGFPyPnRpXo8HjpNHYeaLyqOqTww9lHTlGWKTqibsyV7CctiFKbADlU2ol/8cdKLiSVAWqlsIed3proxg0fgHskpmyB8cFr77lylFnirJGRXjXMXlVwr1XxlOghfJqBsRxz/wKMXvMNr9sWYoDw14kYBls8S9RCDNF34Fx+UOcECAwEAAaM9MDswGgYDVR0RBBMwEYIPdnBvcnRhbC5uaWlmLmh1MB0GA1UdDgQWBBQgKCZFxt8oR2XfhQ7zGmF7auxUdzANBgkqhkiG9w0BAQUFAAOCAQEAX+R7y/xZi46N65LoxI7OS0a0U9vVh4PxGfylYafbDpPy+FPw1Dh6IqG1R8gt1TSRUouVdoRb9b2k8CjAAkRq4lbF5XctWcsWqMEU69BcUlbzzAtgnpgghVSk8dFlMrEWugQvzd6RL4HDPPrvFsjdMj52+p1mBMtw9SUrazPp+hU1y8zeDdocI2RdyLEhArR5xQVKmV32hDFr754zNdZorvcRuuarkO83b1732Lc//S38m9Co/U1WAPN2sSUN5S7yIZ/EjubTbvf8gcGvEHT1rffoOzqHksfcd+gG9nbNZLO6xZJJEwNwPcOoxEWZXhv3ynvCtFcuvmtcGQazcy0s9Q==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>vportal.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>undefined</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="hu">Videotorium</md:ServiceName>
+      <md:ServiceName xml:lang="en">Videotorium</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Videotorium Admin</md:SurName>
+    <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Videotorium Admin</md:SurName>
+    <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Videtorium Admin</md:SurName>
+    <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml
index abf7ee2e..67df6a48 100644
--- a/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vist.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-15T15:49:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-15T15:49:04Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.vist.org.uk/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.vist.org.uk/Shibboleth.sso/WAYF"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.vist.org.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.vist.org.uk/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.vist.org.uk/Shibboleth.sso/Login"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.vist.org.uk/Shibboleth.sso/WAYF"/>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.vist.org.uk/Shibboleth.sso/DS"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.vist.org.uk/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
 						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
@@ -50,42 +50,42 @@
 						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
 						RsenNm/aXp0wIU+jHVmi/GAPCQ==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vist.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vist.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The Vertebral artery Ischaemia Stenting Trial</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.vist.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Falcon Support</md:GivenName>
-      <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vist.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vist.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Cambridge</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Vertebral artery Ischaemia Stenting Trial</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.vist.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Falcon Support</md:GivenName>
+    <md:EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml b/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
index e9397a91..b12d012c 100644
--- a/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
+++ b/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vutbr.cz/SSO/saml2/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T12:05:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T12:05:52Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vutbr.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brno University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoké učení technické v Brně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Brno University of Technology</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysokého učení technického v Brně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vutbr.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vutbr.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="116">https://www.vutbr.cz/logo_idp.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vutbr.cz</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Brno University of Technology</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Vysoké učení technické v Brně</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Identity Provider for employees and students of the Brno University of Technology</mdui:Description>
-          <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysokého učení technického v Brně</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.vutbr.cz/en/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.vutbr.cz/</mdui:InformationURL>
-          <mdui:Logo height="40" width="116">https://www.vutbr.cz/logo_idp.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/BUTSingleLogoutService.php" ResponseLocation="https://www.vutbr.cz/SSO/saml2/idp/SingleLogoutService.php"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Brno University of Technology</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Brno University of Technology</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.vutbr.cz/en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.vutbr.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Webmasters</md:GivenName>
-      <md:SurName>VUT Portal</md:SurName>
-      <md:EmailAddress>portal@vutbr.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/BUTSingleLogoutService.php" ResponseLocation="https://www.vutbr.cz/SSO/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Brno University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Brno University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vutbr.cz/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.vutbr.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Webmasters</md:GivenName>
+    <md:SurName>VUT Portal</md:SurName>
+    <md:EmailAddress>portal@vutbr.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml
index c8bd004f..9bad99f0 100644
--- a/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.walesdtc.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T13:10:37Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T13:10:37Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAPbailijb9L3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHNvY3NpMDEuY2YuYWMudWswHhcNMTMwMzI2MDk0NDQ2WhcNMjMwMzI0MDk0
 						NDQ2WjAbMRkwFwYDVQQDExBzb2NzaTAxLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0B
@@ -40,40 +40,40 @@
 						VwKUrkl1bpbG60AK3IBkQJsV4Jj4lswoDbrBvugoKqAQ3QsKuYRFOw5EMGTwhjEx
 						pkeB18XsxDB/+q81BcLHYxqHOeAWUr7x/dhavNYQVZ5FdNgt5bAbHOjBNw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Wales Doctoral Training College</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.walesdtc.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Wood</md:SurName>
-      <md:EmailAddress>mailto:WoodSN2@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Simon</md:GivenName>
-      <md:SurName>Wood</md:SurName>
-      <md:EmailAddress>mailto:WoodSN2@cardiff.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cardiff University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Wales Doctoral Training College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.walesdtc.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Wood</md:SurName>
+    <md:EmailAddress>mailto:WoodSN2@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Simon</md:GivenName>
+    <md:SurName>Wood</md:SurName>
+    <md:EmailAddress>mailto:WoodSN2@cardiff.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml b/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml
index 1cbaf088..8b911fa0 100644
--- a/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.warwicksu.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJALHfJpUPBSpAMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG3dlYnNydi5zdW5pb24ud2Fyd2ljay5hYy51azAeFw0wOTEyMTgxNDI5NDRa
 						Fw0xOTEyMTYxNDI5NDRaMCYxJDAiBgNVBAMTG3dlYnNydi5zdW5pb24ud2Fyd2lj
@@ -26,13 +26,13 @@
 						QcT+Fcj3pLh99q9sovhvjqslHLBFYsQBIO+AhDYuP96HYwlRc0dNBK/ffyDnLInD
 						qNB3N90Cm4ioo1ZIRxVn7ah/l65DE3Bc2fmXqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDGDCCAgCgAwIBAgIJALHfJpUPBSpAMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 						BAMTG3dlYnNydi5zdW5pb24ud2Fyd2ljay5hYy51azAeFw0wOTEyMTgxNDI5NDRa
 						Fw0xOTEyMTYxNDI5NDRaMCYxJDAiBgNVBAMTG3dlYnNydi5zdW5pb24ud2Fyd2lj
@@ -51,38 +51,38 @@
 						QcT+Fcj3pLh99q9sovhvjqslHLBFYsQBIO+AhDYuP96HYwlRc0dNBK/ffyDnLInD
 						qNB3N90Cm4ioo1ZIRxVn7ah/l65DE3Bc2fmXqg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.warwicksu.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.warwicksu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions: Warwick SU</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.warwicksu.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.warwicksu.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.warwicksu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions: Warwick SU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.warwicksu.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml b/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml
index 07afa25a..baacdc6c 100644
--- a/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml
+++ b/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.westlaw.co.uk/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Westlaw UK</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Westlaw UK gives you access to vast but easily searchable databases of case law, legislation, legal journals, commentary and EU legal materials.</mdui:Description>
+        <mdui:Logo height="98" width="350">https://login.westlaw.co.uk//wluk/images/logos/westlaw_uk_logo.gif</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Westlaw UK</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Westlaw UK gives you access to vast but easily searchable databases of case law, legislation, legal journals, commentary and EU legal materials.</mdui:Description>
-          <mdui:Logo height="98" width="350">https://login.westlaw.co.uk//wluk/images/logos/westlaw_uk_logo.gif</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDDjCCAfagAwIBAgIETjbD0TANBgkqhkiG9w0BAQUFADBJMSkwJwYDVQQKEyBUaG9tc29uIFJl
 						dXRlcnMgKExlZ2FsKSBMaW1pdGVkLjEcMBoGA1UEAxMTbG9naW4ud2VzdGxhdy5jby51azAeFw0x
 						MTA4MDExNTE4NDFaFw0yMTA3MjkxNTE4NDFaMEkxKTAnBgNVBAoTIFRob21zb24gUmV1dGVycyAo
@@ -30,62 +30,62 @@
 						owb5qZGmukHvcWTAXnypf5NspgAOfCrltLjzXDHbwVgO18uK438wB/KQGBqEQ3bgTZFeX4vhBiA5
 						riiNruaVCg47WT6HKGoOHDFd8I6L/CNOkfIRxkPkLljpmcFV6OmEOw5jCtbU
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk/app/authentication/sso/ukfed/auth/rcv" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk/app/authentication/sso/ukfed/auth/rcv" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/app/authentication/sso/ukfed/auth/rcv" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/app/authentication/sso/ukfed/auth/rcv" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://labs.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://labs.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="11"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukqc.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="12"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukqc.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="13"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt3.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="14"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt3.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="15"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukqc2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="16"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukqc2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="17"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prd.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="18"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prd.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="19"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prd.wluklabs.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="20"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prd.wluklabs.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="21"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="22"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="23"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qc.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="24"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qc.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="25"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="26"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="27"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="28"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="29"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="30"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="31"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="32"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="33"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk.dev.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="34"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk.dev.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="35"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk.qc.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="36"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk.qc.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="37"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Westlaw UK</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.westlaw.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Douglas</md:GivenName>
-      <md:SurName>Potts</md:SurName>
-      <md:EmailAddress>mailto:douglas.potts@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Andy</md:GivenName>
-      <md:SurName>Halford</md:SurName>
-      <md:EmailAddress>mailto:andrew.halford@thomsonreuters.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk/app/authentication/sso/ukfed/auth/rcv" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk/app/authentication/sso/ukfed/auth/rcv" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/app/authentication/sso/ukfed/auth/rcv" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/app/authentication/sso/ukfed/auth/rcv" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://labs.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://labs.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukqc.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukqc.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt3.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="14"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt3.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukqc2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukqc2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prd.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prd.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prd.wluklabs.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prd.wluklabs.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="22"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="23"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qc.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="24"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qc.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="25"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="26"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="27"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="28"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="29"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="30"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="31"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="32"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="33"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk.dev.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="34"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk.dev.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="35"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk.qc.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="36"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk.qc.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="37"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Westlaw UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.westlaw.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Douglas</md:GivenName>
+    <md:SurName>Potts</md:SurName>
+    <md:EmailAddress>mailto:douglas.potts@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andy</md:GivenName>
+    <md:SurName>Halford</md:SurName>
+    <md:EmailAddress>mailto:andrew.halford@thomsonreuters.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml
index e1cbbb07..3ed55768 100644
--- a/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.wheredoyoustand.org.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-31T08:53:05Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-31T08:53:05Z"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Where Do You Stand?</mdui:DisplayName>
+        <mdui:Logo height="72" width="170">https://www.wheredoyoustand.org.uk/content/images/where-do-you-stand-logo-170x72.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/Login"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Where Do You Stand?</mdui:DisplayName>
-          <mdui:Logo height="72" width="170">https://www.wheredoyoustand.org.uk/content/images/where-do-you-stand-logo-170x72.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDFTCCAf2gAwIBAgIJAJk9Zq3V7q4aMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 						BAMTGnd3dy53aGVyZWRveW91c3RhbmQub3JnLnVrMB4XDTEzMDUzMDE1MjI0NloX
 						DTIzMDUyODE1MjI0NlowJTEjMCEGA1UEAxMad3d3LndoZXJlZG95b3VzdGFuZC5v
@@ -49,43 +49,43 @@
 						TH2p/tyQly+tSTrRgtVTArS4AD1LlEJ0+iQIKwGZK7K1CjCwuJp1G6Oi2u/svbtj
 						IFsCv2VSURU413gGBeXs5Ngi1QsibTfnfw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">D2.Digital By Design Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Where Do You Stand?</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.wheredoyoustand.org.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Thorpe</md:SurName>
-      <md:EmailAddress>mailto:support@wheredoyoustand.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Adam</md:GivenName>
-      <md:SurName>Thorpe</md:SurName>
-      <md:EmailAddress>mailto:support@wheredoyoustand.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">D2.Digital By Design Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Where Do You Stand?</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.wheredoyoustand.org.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Thorpe</md:SurName>
+    <md:EmailAddress>mailto:support@wheredoyoustand.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Thorpe</md:SurName>
+    <md:EmailAddress>mailto:support@wheredoyoustand.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.wmsf.ac.uk.xml b/swamid-interfederations-2.0/www.wmsf.ac.uk.xml
index 9d6faa92..d23b5b88 100644
--- a/swamid-interfederations-2.0/www.wmsf.ac.uk.xml
+++ b/swamid-interfederations-2.0/www.wmsf.ac.uk.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.wmsf.ac.uk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-18T15:18:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-18T15:18:00Z"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmsf.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmsf.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/wmsf.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/wmsf.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">William Morris Sixth Form</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wmsf.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/wmsf.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/wmsf.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">William Morris Sixth Form</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wmsf.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml b/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml
index 971decb4..cda0e777 100644
--- a/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.wolvesunion.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.wolvesunion.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.wolvesunion.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,13 +28,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -52,38 +52,38 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Wolverhampton Students' Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.wolvesunion.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Wolverhampton Students' Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.wolvesunion.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
index a49a46e2..32067934 100644
--- a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.worldscientific.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T08:34:41Z"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T08:34:41Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDODCCAiCgAwIBAgIJAMo7kaDwR+c9MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
 						BAMTF3d3dy53b3JsZHNjaWVudGlmaWMuY29tMB4XDTE0MDMxNDA1MDQwNVoXDTE3
 						MDMxMzA1MDQwNVowIjEgMB4GA1UEAxMXd3d3Lndvcmxkc2NpZW50aWZpYy5jb20w
@@ -27,24 +27,24 @@
 						nXDw4i3MX1B4IxF9F0PWb0z7OWVaaqRou/VfFhOB8mKEKCeXxmIseSXMJ+dZITvH
 						tfeTpSAfBcbH1XmK
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.worldscientific.com/action/samlACS" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.worldscientific.com/action/saml2post" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.worldscientific.com/action/saml2artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">World Scientific Publishing</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.worldscientific.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>sso-support</md:GivenName>
-      <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>sso-tech</md:GivenName>
-      <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.worldscientific.com/action/samlACS" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.worldscientific.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.worldscientific.com/action/saml2artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Atypon Systems, Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">World Scientific Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.worldscientific.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>sso-support</md:GivenName>
+    <md:EmailAddress>mailto:sso-support@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>sso-tech</md:GivenName>
+    <md:EmailAddress>mailto:sso-tech@atypon.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml
index 6e190568..bdd1d5d1 100644
--- a/swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.yourstudentsunion.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-19T13:50:13Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-19T13:50:13Z"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.yourstudentsunion.com/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.yourstudentsunion.com/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -28,13 +28,13 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
 						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
 						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
@@ -52,37 +52,37 @@
 						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
 						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/Artifact"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/POST"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/Redirect"/>
-      <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML/POST" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/POST" index="10"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">University of Gloucestershire Students Union</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.yourstudentsunion.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Gloucestershire Students Union</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.yourstudentsunion.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml b/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml
index f85f5057..0a124918 100644
--- a/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.yourunion.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-02T14:00:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-02T14:00:15Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.yourunion.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.yourunion.net/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.yourunion.net/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.yourunion.net/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
 						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
@@ -31,33 +31,33 @@
 						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
 						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourunion.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourunion.net/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourunion.net/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourunion.net/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourunion.net/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.yourunion.net/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.yourunion.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">The University of St Andrews Students' Association</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.yourunion.net/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>MSL Support</md:GivenName>
-      <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>James</md:GivenName>
-      <md:SurName>Bonsall</md:SurName>
-      <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourunion.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourunion.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourunion.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourunion.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourunion.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.yourunion.net/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.yourunion.net/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Membership Solutions Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The University of St Andrews Students' Association</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.yourunion.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>MSL Support</md:GivenName>
+    <md:EmailAddress>mailto:support@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>James</md:GivenName>
+    <md:SurName>Bonsall</md:SurName>
+    <md:EmailAddress>mailto:james.bonsall@ukmsl.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.foodle.cz-sp.xml b/swamid-interfederations-2.0/www2.foodle.cz-sp.xml
index 7912a954..f97f02f4 100644
--- a/swamid-interfederations-2.0/www2.foodle.cz-sp.xml
+++ b/swamid-interfederations-2.0/www2.foodle.cz-sp.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.foodle.cz/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-10-07T10:58:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-10-07T10:58:21Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Foodle.CZ</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Foodle.CZ</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An easy survey tool suitable for questionnaire and meetings organization</mdui:Description>
+        <mdui:Description xml:lang="cs">Nástroj pro jednoduché průzkumy, dotazníky a organizování schůzek</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.foodle.cz/?language=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">https://www.foodle.cz/?language=cs</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Foodle.CZ</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">Foodle.CZ</mdui:DisplayName>
-          <mdui:Description xml:lang="en">An easy survey tool suitable for questionnaire and meetings organization</mdui:Description>
-          <mdui:Description xml:lang="cs">Nástroj pro jednoduché průzkumy, dotazníky a organizování schůzek</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://www.foodle.cz/?language=en</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">https://www.foodle.cz/?language=cs</mdui:InformationURL>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIERTCCAy2gAwIBAgIJAJN3zL4BngHpMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejAeFw0xMzA3MDMxMzQ2NThaFw0yMzA0MDQxMzQ2NThaMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOt73CeplE5zEyBegPWgvXtlqidip0KWPrm3K+XEBzZrHddtFEN13tMXiMKILyPveIXp7mvNqeuY9LrAZje9N2IfIi2VIXTucc50oK3xQOxUzz46cvRM/vnyjb+HYzws2pNofnp3o3bPj69P6CAhrJyTxqFQS4BYPk6zDX88ijObbTyJiFv0x4dVHdM79NFVV8XecDNo5QVES1o/psw4jLXkx8QlMkdj8TB1Dk/agWUPkQTmPA5TxwKSJmhMJ9V6gaTl/Z+XiXlmtXbT+w04L83FvNRdlzdhp4bCQS7687E1j+CYGn2ZzLvkT8R5S2yJG7S/gbPZW1qUhw6nW31UBkMCAwEAAaNQME4wHQYDVR0OBBYEFGVSDRhcEoDuGxq10dU1+/gEEQz6MB8GA1UdIwQYMBaAFGVSDRhcEoDuGxq10dU1+/gEEQz6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMxHgQ59DOSME1gRIplKowdK424c2L/mlV8UaqahMKciueGJw2Jut3Mr0LLTzYl3XOs9a5vpyqkffCYlM11nwTw8EoT/t+bIHerwA057VskCbXKp3ObeCYWTj1GP172kJLdOm4OjT3NwrmrDdvqYBmBhhreNN023kVa8F+SH5earfnMp9jjb1piMU2cB7scXFrgh4sJCKlN77HB/RLwqHE/Khn7kHuAsDX0MI/NBQQX+sz+ZxfjJHQtmpKZNjZ1ltIzMAzuRUBKcQamE9WOHf/Lc81p09AZgOPBxlKPzK02B+k6ID1JZPOojNMKTvyZzyadzRTfIS83bZ4Btz69F3lo=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>MIIERTCCAy2gAwIBAgIJAJN3zL4BngHpMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejAeFw0xMzA3MDMxMzQ2NThaFw0yMzA0MDQxMzQ2NThaMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOt73CeplE5zEyBegPWgvXtlqidip0KWPrm3K+XEBzZrHddtFEN13tMXiMKILyPveIXp7mvNqeuY9LrAZje9N2IfIi2VIXTucc50oK3xQOxUzz46cvRM/vnyjb+HYzws2pNofnp3o3bPj69P6CAhrJyTxqFQS4BYPk6zDX88ijObbTyJiFv0x4dVHdM79NFVV8XecDNo5QVES1o/psw4jLXkx8QlMkdj8TB1Dk/agWUPkQTmPA5TxwKSJmhMJ9V6gaTl/Z+XiXlmtXbT+w04L83FvNRdlzdhp4bCQS7687E1j+CYGn2ZzLvkT8R5S2yJG7S/gbPZW1qUhw6nW31UBkMCAwEAAaNQME4wHQYDVR0OBBYEFGVSDRhcEoDuGxq10dU1+/gEEQz6MB8GA1UdIwQYMBaAFGVSDRhcEoDuGxq10dU1+/gEEQz6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMxHgQ59DOSME1gRIplKowdK424c2L/mlV8UaqahMKciueGJw2Jut3Mr0LLTzYl3XOs9a5vpyqkffCYlM11nwTw8EoT/t+bIHerwA057VskCbXKp3ObeCYWTj1GP172kJLdOm4OjT3NwrmrDdvqYBmBhhreNN023kVa8F+SH5earfnMp9jjb1piMU2cB7scXFrgh4sJCKlN77HB/RLwqHE/Khn7kHuAsDX0MI/NBQQX+sz+ZxfjJHQtmpKZNjZ1ltIzMAzuRUBKcQamE9WOHf/Lc81p09AZgOPBxlKPzK02B+k6ID1JZPOojNMKTvyZzyadzRTfIS83bZ4Btz69F3lo=</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CESNET, a. l. e.</md:OrganizationName>
-      <md:OrganizationName xml:lang="cs">CESNET, z. s. p. o</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/?lang=cs</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Oppolzer</md:SurName>
-      <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIERTCCAy2gAwIBAgIJAJN3zL4BngHpMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejAeFw0xMzA3MDMxMzQ2NThaFw0yMzA0MDQxMzQ2NThaMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOt73CeplE5zEyBegPWgvXtlqidip0KWPrm3K+XEBzZrHddtFEN13tMXiMKILyPveIXp7mvNqeuY9LrAZje9N2IfIi2VIXTucc50oK3xQOxUzz46cvRM/vnyjb+HYzws2pNofnp3o3bPj69P6CAhrJyTxqFQS4BYPk6zDX88ijObbTyJiFv0x4dVHdM79NFVV8XecDNo5QVES1o/psw4jLXkx8QlMkdj8TB1Dk/agWUPkQTmPA5TxwKSJmhMJ9V6gaTl/Z+XiXlmtXbT+w04L83FvNRdlzdhp4bCQS7687E1j+CYGn2ZzLvkT8R5S2yJG7S/gbPZW1qUhw6nW31UBkMCAwEAAaNQME4wHQYDVR0OBBYEFGVSDRhcEoDuGxq10dU1+/gEEQz6MB8GA1UdIwQYMBaAFGVSDRhcEoDuGxq10dU1+/gEEQz6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMxHgQ59DOSME1gRIplKowdK424c2L/mlV8UaqahMKciueGJw2Jut3Mr0LLTzYl3XOs9a5vpyqkffCYlM11nwTw8EoT/t+bIHerwA057VskCbXKp3ObeCYWTj1GP172kJLdOm4OjT3NwrmrDdvqYBmBhhreNN023kVa8F+SH5earfnMp9jjb1piMU2cB7scXFrgh4sJCKlN77HB/RLwqHE/Khn7kHuAsDX0MI/NBQQX+sz+ZxfjJHQtmpKZNjZ1ltIzMAzuRUBKcQamE9WOHf/Lc81p09AZgOPBxlKPzK02B+k6ID1JZPOojNMKTvyZzyadzRTfIS83bZ4Btz69F3lo=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIERTCCAy2gAwIBAgIJAJN3zL4BngHpMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejAeFw0xMzA3MDMxMzQ2NThaFw0yMzA0MDQxMzQ2NThaMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOt73CeplE5zEyBegPWgvXtlqidip0KWPrm3K+XEBzZrHddtFEN13tMXiMKILyPveIXp7mvNqeuY9LrAZje9N2IfIi2VIXTucc50oK3xQOxUzz46cvRM/vnyjb+HYzws2pNofnp3o3bPj69P6CAhrJyTxqFQS4BYPk6zDX88ijObbTyJiFv0x4dVHdM79NFVV8XecDNo5QVES1o/psw4jLXkx8QlMkdj8TB1Dk/agWUPkQTmPA5TxwKSJmhMJ9V6gaTl/Z+XiXlmtXbT+w04L83FvNRdlzdhp4bCQS7687E1j+CYGn2ZzLvkT8R5S2yJG7S/gbPZW1qUhw6nW31UBkMCAwEAAaNQME4wHQYDVR0OBBYEFGVSDRhcEoDuGxq10dU1+/gEEQz6MB8GA1UdIwQYMBaAFGVSDRhcEoDuGxq10dU1+/gEEQz6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMxHgQ59DOSME1gRIplKowdK424c2L/mlV8UaqahMKciueGJw2Jut3Mr0LLTzYl3XOs9a5vpyqkffCYlM11nwTw8EoT/t+bIHerwA057VskCbXKp3ObeCYWTj1GP172kJLdOm4OjT3NwrmrDdvqYBmBhhreNN023kVa8F+SH5earfnMp9jjb1piMU2cB7scXFrgh4sJCKlN77HB/RLwqHE/Khn7kHuAsDX0MI/NBQQX+sz+ZxfjJHQtmpKZNjZ1ltIzMAzuRUBKcQamE9WOHf/Lc81p09AZgOPBxlKPzK02B+k6ID1JZPOojNMKTvyZzyadzRTfIS83bZ4Btz69F3lo=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET, a. l. e.</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">CESNET, z. s. p. o</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/?lang=cs</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Oppolzer</md:SurName>
+    <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
index 4ad67ada..2e7f389e 100644
--- a/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
+++ b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.eduid.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-03T10:42:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-03T10:42:36Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <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://www3.eduid.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www3.eduid.cz/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduID.cz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">eduID.cz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Informational web of the eduID.cz federation. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
+        <mdui:Description xml:lang="cs">Informační web projektu eduID.cz, který přináší informace jak pro koncové uživatele tak pro správce na jednotlivých institucích.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.eduid.cz/en/index</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.eduid.cz</mdui:InformationURL>
+        <mdui:Logo height="63" width="150">https://www.eduid.cz/eduid-logo-150.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md: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://www3.eduid.cz/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www3.eduid.cz/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">eduID.cz</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="cs">eduID.cz</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Informational web of the eduID.cz federation. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
-          <mdui:Description xml:lang="cs">Informační web projektu eduID.cz, který přináší informace jak pro koncové uživatele tak pro správce na jednotlivých institucích.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.eduid.cz/en/index</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="cs">http://www.eduid.cz</mdui:InformationURL>
-          <mdui:Logo height="63" width="150">https://www.eduid.cz/eduid-logo-150.png</mdui:Logo>
-        </mdui:UIInfo>
-        <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-          <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-        </eduidmd:RepublishRequest>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://www3.eduid.cz/shibboleth</ds:KeyName>
-          <ds:KeyName>www3.eduid.cz</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=www3.eduid.cz</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJAIxP8cTUiGsTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www3.eduid.cz/shibboleth</ds:KeyName>
+        <ds:KeyName>www3.eduid.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www3.eduid.cz</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJAIxP8cTUiGsTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
 BAMTDXd3dzMuZWR1aWQuY3owHhcNMTQwMjAxMTc1ODA1WhcNMTcwMTMxMTc1ODA1
 WjAYMRYwFAYDVQQDEw13d3czLmVkdWlkLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAyNfO9oxDUu8gABeGHQ6hvtQRYEsp5DnPy40Lugfetbr49eX2
@@ -52,39 +52,39 @@ Fg9FttPBtPrn9khoZcIebOlktQATVCrazQKU0MK2smgxcqIWBoeanyhHuFbNxA/Q
 5FX1LepWs6GsCmK1qxhXj1JRBisqPEaGuauhp1CgtJJdwj5DJ3Fcw29mujFvdnln
 QioqbJmv4wcuTrPvTGy8h1+Q4iI=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="7"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/ECP" index="8"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/POST" index="9"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/Artifact" index="10"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Tomášek</md:SurName>
-      <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Jan</md:GivenName>
-      <md:SurName>Oppolzer</md:SurName>
-      <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/Artifact" index="10"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Tomášek</md:SurName>
+    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Oppolzer</md:SurName>
+    <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml
index 84650bab..3195a9b9 100644
--- a/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://x-oecd-beta-01.ingenta.com/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-20T13:31:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-20T13:31:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDnDCCAoSgAwIBAgIEU2tnmDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
 						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
 						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
@@ -31,24 +31,24 @@
 						1LTGupGqUopZZyotjBNOxgT3HINZTWWk5Mko7+P0Ciu9PNsG5uLJ+mlpMHuw3EoQ
 						YG8iKq+uLKv2HNYDqF8x2g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x-oecd-beta-01.ingenta.com/session/shib" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x-oecd-beta-01.ingenta.com/session/shib" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Publishing Technology: OECD iLibrary [BETA]</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://x-oecd-beta-01.ingenta.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Talvinder</md:GivenName>
-      <md:SurName>Matharu</md:SurName>
-      <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OpenAthens Support</md:GivenName>
-      <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x-oecd-beta-01.ingenta.com/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x-oecd-beta-01.ingenta.com/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ingenta PLC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Publishing Technology: OECD iLibrary [BETA]</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://x-oecd-beta-01.ingenta.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Talvinder</md:GivenName>
+    <md:SurName>Matharu</md:SurName>
+    <md:EmailAddress>mailto:Talvinder.matharu@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OpenAthens Support</md:GivenName>
+    <md:EmailAddress>mailto:openathens@ingenta.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
index 790100e4..ff3a2071 100644
--- a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xperthr.co.uk/shibboleth">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICuDCCAaCgAwIBAgIQHM2Lp8kyJbFBLusiWKKoiTANBgkqhkiG9w0BAQUFADAY
 						MRYwFAYDVQQDEw14cGVydGhyLmNvLnVrMB4XDTE1MDcyOTIzMDAwMFoXDTI1MDgw
 						NTIzMDAwMFowGDEWMBQGA1UEAxMNeHBlcnRoci5jby51azCCASIwDQYJKoZIhvcN
@@ -24,24 +24,24 @@
 						0WsqU49byD29YK3Vfkdc/IaYvcG3t8Fx4Ea2RqS/Ds+xaMe2VR0z8OuIKEcQmf5n
 						QYmPHCWdJOSgj/48Qz8WAQ+/gk/bl6DkgMjE3g==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="2"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">XpertHR - Online HR Intelligence</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.xperthr.co.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:helpdesk@xperthr.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Viper Team</md:GivenName>
-      <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Reed Business Information Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">XpertHR - Online HR Intelligence</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.xperthr.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@xperthr.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Viper Team</md:GivenName>
+    <md:EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml b/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml
index 9b1d39b4..83729fc0 100644
--- a/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xploreuat.ieee.org/shibboleth-sp">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIICtjCCAZ6gAwIBAgIEUcCIQjANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJ4cGxvcmV1YXQu
 						aWVlZS5vcmcwHhcNMTMwNjE4MTYxODEwWhcNMTYwNjE3MTYxODEwWjAdMRswGQYDVQQDExJ4cGxv
 						cmV1YXQuaWVlZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMJ0TBsTib1e6j
@@ -22,27 +22,27 @@
 						Giru0Nun+Co7b5Wj3MMzLfAIpvVZEZSPKf7x/BO0Wht7QWpVQQ6jxe4k8oRa9Sze4gIRNPVr5p2W
 						YbSvqmDBZaFbuvrNaD4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The Institute of Electrical And Electronics Engineers, Incorporated</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">IEEE Xplore Digital Library Test SP</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.ieee.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Don</md:GivenName>
-      <md:SurName>Caldwell</md:SurName>
-      <md:EmailAddress>mailto:d.caldwell@ieee.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mehul</md:GivenName>
-      <md:SurName>Trivedi</md:SurName>
-      <md:EmailAddress>mailto:mh.trivedi@ieee.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Institute of Electrical And Electronics Engineers, Incorporated</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IEEE Xplore Digital Library Test SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ieee.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Don</md:GivenName>
+    <md:SurName>Caldwell</md:SurName>
+    <md:EmailAddress>mailto:d.caldwell@ieee.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mehul</md:GivenName>
+    <md:SurName>Trivedi</md:SurName>
+    <md:EmailAddress>mailto:mh.trivedi@ieee.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/york.simitive.com.xml b/swamid-interfederations-2.0/york.simitive.com.xml
index b593033a..a4195e9c 100644
--- a/swamid-interfederations-2.0/york.simitive.com.xml
+++ b/swamid-interfederations-2.0/york.simitive.com.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://york.simitive.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T10:57:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-04-21T10:57:19Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://york.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://york.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://york.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://york.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDKjCCAhKgAwIBAgIJANNitvpdYaPLMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNjA0MjAxNTE4MTlaFw0y
 						NjA0MTgxNTE4MTlaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
@@ -48,43 +48,43 @@
 						skxueh4ZabfN2eQXi63AmOtC4ka1PmyTDUYUCqQyvcZRpzLR51KiGrWqJ+uqtIG0
 						ped8sZfVKW1bfvTQxFjtljg8G3El4L++LcrTxzhAb5NascrA8xYkm+MgNo0kxw==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://york.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://york.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://york.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://york.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://york.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://york.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://york.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://york.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://york.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://york.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://york.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://york.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://york.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://york.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://york.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://york.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://york.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://york.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
index 05965ad6..9b2e7a30 100644
--- a/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://yorksj.idm.oclc.org/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-08T10:21:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-08T10:21:53Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol ">
-      <md:Extensions>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMR4wHAYDVQQDFBUqLnlv
 						cmtzai5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUw
 						IwYJKoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE1MTIwMzEy
@@ -36,25 +36,25 @@
 						x8+iWhypU+0PMmbT7UrlG2+/uSRmRLNeaCoQVr+14W0xwHxhCJDmtj9b7zeOpo83
 						0HjZ+GpyGsL30j9kUcEvOhsYYDPKvA==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">York St John University Hosted EZProxy</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>OCLC UK Support Desk</md:GivenName>
-      <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">York St John University Hosted EZProxy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>OCLC UK Support Desk</md:GivenName>
+    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/yorksso.simitive.com.xml b/swamid-interfederations-2.0/yorksso.simitive.com.xml
index 29e33fc5..9c7af277 100644
--- a/swamid-interfederations-2.0/yorksso.simitive.com.xml
+++ b/swamid-interfederations-2.0/yorksso.simitive.com.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://yorksso.simitive.com">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-12T16:42:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-12T16:42:26Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://yorksso.simitive.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://yorksso.simitive.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://yorksso.simitive.com/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://yorksso.simitive.com/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDLTCCAhWgAwIBAgIJAOTSwr6sbvhpMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNjAxMTExMTE2MTBaFw0y
 						NjAxMDgxMTE2MTBaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
@@ -44,40 +44,40 @@
 						qvHZtI187EMIPMJz9NR6XzLLqN66sgeUT0nu+X3QgE0z/dQfKN5kKr5bN4KFb+52
 						Mg==
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://yorksso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.simitive.com</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Chris</md:GivenName>
-      <md:SurName>Dolby</md:SurName>
-      <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://yorksso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Simitive Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Simitive</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.simitive.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Dolby</md:SurName>
+    <md:EmailAddress>mailto:chris.dolby@simitive.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml b/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml
index 301e0a86..c993f19d 100644
--- a/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://youidlite.youid.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T14:56:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T14:56:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">youid.net</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">youid.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUa8xPw+mOVIxAKWoeoNJ1T1hc6p4wDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAxMTeW91aWRsaXRlLnlvdWlkLm5ldDAeFw0xNDA2MTExMjQ4
 						MDhaFw0zNDA2MTExMjQ4MDhaMB4xHDAaBgNVBAMTE3lvdWlkbGl0ZS55b3VpZC5u
@@ -32,26 +32,26 @@
 						X2IqdL5C4SpWjnrD6/Y3VQAZl+FkssUHp4N/ebLeWRg2/ZsqhikESOcAOMnYnN2P
 						ASTdIdKTeaOQfXw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://youidlite.youid.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://youidlite.youid.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://youidlite.youid.net:446/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://youidlite.youid.net:446/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://youidlite.youid.net:446/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://youidlite.youid.net:446/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">youid.net</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://youidlite.youid.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://youidlite.youid.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://youidlite.youid.net:446/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://youidlite.youid.net:446/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://youidlite.youid.net:446/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://youidlite.youid.net:446/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">youid.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDNzCCAh+gAwIBAgIUa8xPw+mOVIxAKWoeoNJ1T1hc6p4wDQYJKoZIhvcNAQEF
 						BQAwHjEcMBoGA1UEAxMTeW91aWRsaXRlLnlvdWlkLm5ldDAeFw0xNDA2MTExMjQ4
 						MDhaFw0zNDA2MTExMjQ4MDhaMB4xHDAaBgNVBAMTE3lvdWlkbGl0ZS55b3VpZC5u
@@ -71,27 +71,27 @@
 						X2IqdL5C4SpWjnrD6/Y3VQAZl+FkssUHp4N/ebLeWRg2/ZsqhikESOcAOMnYnN2P
 						ASTdIdKTeaOQfXw=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://youidlite.youid.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://youidlite.youid.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Impero Solutions Ltd</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">YouID-E2BN Integration</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.imperosoftware.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Payne</md:SurName>
-      <md:EmailAddress>mailto:mpayne@imperosoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Michael</md:GivenName>
-      <md:SurName>Payne</md:SurName>
-      <md:EmailAddress>mailto:mpayne@imperosoftware.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://youidlite.youid.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://youidlite.youid.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Impero Solutions Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">YouID-E2BN Integration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.imperosoftware.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Payne</md:SurName>
+    <md:EmailAddress>mailto:mpayne@imperosoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michael</md:GivenName>
+    <md:SurName>Payne</md:SurName>
+    <md:EmailAddress>mailto:mpayne@imperosoftware.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml b/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml
index b5d93314..d86cc8c2 100644
--- a/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml
+++ b/swamid-interfederations-2.0/zbgva-edusso.zettabox.com-core-AuthServices.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zbgva-edusso.zettabox.com/core/AuthServices">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2016-03-02T17:13:36Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2016-03-02T17:13:36Z"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Zettabox</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Share, sync, collaborate in a safe European cloud, keeping you and your company compliant with EU law.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://zettabox.com</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Zettabox</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Share, sync, collaborate in a safe European cloud, keeping you and your company compliant with EU law.</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://zettabox.com</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIFRDCCBCygAwIBAgISESFUpPvOFMU7IkSQ7nOMKq0FMA0GCSqGSIb3DQEBCwUA
 MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
 VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
@@ -45,39 +45,39 @@ xsVd3HpHjWql0BPnxK1bXFXk3NbZZLd6z5guCECHApIkvOvnLMRUXGj8PuUyubV2
 u2iJkBeqsi5RPHeMZ+2TJx66zAIQXRQRSkSF2VNWfCSJr+p1/0AhR9hpCEuzjAO5
 GrEsD4kUa1U=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zbgva-edusso.zettabox.com/core/AuthServices/Acs" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zbgva-sso.zettabox.com/core/AuthServices/Acs" index="0" isDefault="true"/>
-      <md:AttributeConsumingService index="0">
-        <md:ServiceName xml:lang="en">Zettabox</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Share, sync, collaborate in a safe European cloud, keeping you and your company compliant with EU law.</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">ZettaBox</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">ZettaBox1</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">https://www.zettabox.com/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Grigory</md:GivenName>
-      <md:SurName>Belkin</md:SurName>
-      <md:EmailAddress>mailto:grigory@zettabox.com</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Albert</md:GivenName>
-      <md:SurName>Russell</md:SurName>
-      <md:EmailAddress>mailto:russell@zettabox.com</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zbgva-edusso.zettabox.com/core/AuthServices/Acs" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zbgva-sso.zettabox.com/core/AuthServices/Acs" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Zettabox</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Share, sync, collaborate in a safe European cloud, keeping you and your company compliant with EU law.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ZettaBox</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ZettaBox1</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.zettabox.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Grigory</md:GivenName>
+    <md:SurName>Belkin</md:SurName>
+    <md:EmailAddress>mailto:grigory@zettabox.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Albert</md:GivenName>
+    <md:SurName>Russell</md:SurName>
+    <md:EmailAddress>mailto:russell@zettabox.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zed.bcu.ac.uk-entity.xml b/swamid-interfederations-2.0/zed.bcu.ac.uk-entity.xml
index eb0f4e0f..fd107d5e 100644
--- a/swamid-interfederations-2.0/zed.bcu.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/zed.bcu.ac.uk-entity.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zed.bcu.ac.uk/entity">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcu.ac.uk</shibmd:Scope>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcu.ac.uk</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
 						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
 						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
@@ -33,23 +33,23 @@
 						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
 						NE4=
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bcu.ac.uk/c/ukfed"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bcu.ac.uk/c/ukfed"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Birmingham City University</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.bcu.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Athens Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bcu.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bcu.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Birmingham City University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.bcu.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml
index f793a79d..f4b96fca 100644
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml
+++ b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it-12081-shibboleth.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor 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>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
+        <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
-          <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
-          <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
-          <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
-          <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
@@ -53,13 +53,13 @@ RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
 CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
 EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
@@ -86,36 +86,36 @@ RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
 CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
 EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-      <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
-      <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="administrative">
-      <md:SurName>Massimo Del Sarto</md:SurName>
-      <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Massimo Del Sarto</md:SurName>
+    <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
index c27adefe..13c6ef6f 100644
--- a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zetoc.mimas.ac.uk/shibboleth">
+  <md:Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-07T14:00:37Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-      <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-07T14:00:37Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Zetoc</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The monitoring and search service for global research publications</mdui:Description>
+        <mdui:Logo height="112" width="350">https://zetoc.mimas.ac.uk/images/zetoc/z-logo-black.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Zetoc</mdui:DisplayName>
-          <mdui:Description xml:lang="en">The monitoring and search service for global research publications</mdui:Description>
-          <mdui:Logo height="112" width="350">https://zetoc.mimas.ac.uk/images/zetoc/z-logo-black.png</mdui:Logo>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 						MIIEKDCCAxCgAwIBAgIJAODl1JSkgO8pMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
 						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
 						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
@@ -59,41 +59,41 @@
 						hwLrdq22270F8hgo4EPDPAgngmgL4YHNU5vXfO8C2qbdJwF6Ie4wI5U/SeiARYiO
 						HzhFwIeEOToreweN
 					</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-        <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Zetoc</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Zetoc Helpdesk</md:GivenName>
-      <md:EmailAddress>mailto:zetoc@mimas.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Mimas Technical Support</md:GivenName>
-      <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The University of Manchester</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Zetoc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mimas.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zetoc Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:zetoc@mimas.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mimas Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
index e14d3f4f..1752cdae 100644
--- a/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
+++ b/swamid-interfederations-2.0/zeus.grnet.gr-shibboleth.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeus.grnet.gr/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.grnet.gr/">
-        <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Zeus Elections</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Ψηφοφορίες «Ζευς»</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Zeus Digital Ballot Box is an information system for unimpeachable conduct of confidential voting by purely electronic means</mdui:Description>
+        <mdui:Description xml:lang="el">Η «Ψηφιακή Κάλπη Ζευς» είναι ένα πληροφοριακό σύστημα για την αδιάβλητη διεξαγωγή απόρρητων ψηφοφοριών με αμιγώς ηλεκτρονικό τρόπο</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://zeus.grnet.gr/zeus/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">https://zeus.grnet.gr/zeus/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://zeus.grnet.gr/zeus/terms/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="150" width="890" xml:lang="en">https://zeus.grnet.gr/static/zeus/images/zeus-logo-en.png</mdui:Logo>
+        <mdui:Logo height="150" width="890" xml:lang="el">https://zeus.grnet.gr/static/zeus/images/zeus-logo-el.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-      <md:Extensions>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Zeus Elections</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="el">Ψηφοφορίες «Ζευς»</mdui:DisplayName>
-          <mdui:Description xml:lang="en">Zeus Digital Ballot Box is an information system for unimpeachable conduct of confidential voting by purely electronic means</mdui:Description>
-          <mdui:Description xml:lang="el">Η «Ψηφιακή Κάλπη Ζευς» είναι ένα πληροφοριακό σύστημα για την αδιάβλητη διεξαγωγή απόρρητων ψηφοφοριών με αμιγώς ηλεκτρονικό τρόπο</mdui:Description>
-          <mdui:InformationURL xml:lang="en">https://zeus.grnet.gr/zeus/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="el">https://zeus.grnet.gr/zeus/</mdui:InformationURL>
-          <mdui:PrivacyStatementURL xml:lang="en">https://zeus.grnet.gr/zeus/terms/</mdui:PrivacyStatementURL>
-          <mdui:Logo height="150" width="890" xml:lang="en">https://zeus.grnet.gr/static/zeus/images/zeus-logo-en.png</mdui:Logo>
-          <mdui:Logo height="150" width="890" xml:lang="el">https://zeus.grnet.gr/static/zeus/images/zeus-logo-el.png</mdui:Logo>
-        </mdui:UIInfo>
-        <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Login"/>
-        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Login" index="1"/>
-      </md:Extensions>
-      <md:KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>https://zeus.grnet.gr/shibboleth</ds:KeyName>
-          <ds:KeyName>zeus.grnet.gr</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>CN=zeus.grnet.gr</ds:X509SubjectName>
-            <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJANMdvx+ohi/gMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://zeus.grnet.gr/shibboleth</ds:KeyName>
+        <ds:KeyName>zeus.grnet.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zeus.grnet.gr</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJANMdvx+ohi/gMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
                             BAMTDXpldXMuZ3JuZXQuZ3IwHhcNMTYwMjEwMTgzODA0WhcNMjEwMjA4MTgzODA0
                             WjAYMRYwFAYDVQQDEw16ZXVzLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
                             AQ8AMIIBCgKCAQEAqZY6MxafENaLnAJEfcQiLe6/q5Pq6SKrihjXRhUVWM+0O7UN
@@ -51,54 +51,54 @@
                             tUjWB99zWt4Ske4Prz5RAiSsfYvZHl1v4NjFJtSbIp/u8oW8Xk/WSxTrVdq+eqSH
                             BeFAMmfxrsmNkv2p7y88VjtdsHc=
                         </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Artifact/SOAP" index="0"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/SOAP"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/Redirect"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/POST"/>
-      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/Artifact"/>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/POST" index="0"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/Artifact" index="2"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/ECP" index="3"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML/POST" index="4"/>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML/Artifact" index="5"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-        <md:ServiceName xml:lang="en">Zeus Elections</md:ServiceName>
-        <md:ServiceName xml:lang="el">Ψηφοφορίες «Ζευς»</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">Zeus Digital Ballot Box is an information system for unimpeachable conduct of confidential voting by purely electronic means</md:ServiceDescription>
-        <md:ServiceDescription xml:lang="el">Η «Ψηφιακή Κάλπη Ζευς» είναι ένα πληροφοριακό σύστημα για την αδιάβλητη διεξαγωγή απόρρητων ψηφοφοριών με αμιγώς ηλεκτρονικό τρόπο</md:ServiceDescription>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-      <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:Company>Greek Research and Technology Network</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-      <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:Company>Greek Research and Technology Network</md:Company>
-      <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-      <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SLO/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeus.grnet.gr/zeus/auth/auth/shibboleth/default/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">Zeus Elections</md:ServiceName>
+      <md:ServiceName xml:lang="el">Ψηφοφορίες «Ζευς»</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Zeus Digital Ballot Box is an information system for unimpeachable conduct of confidential voting by purely electronic means</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="el">Η «Ψηφιακή Κάλπη Ζευς» είναι ένα πληροφοριακό σύστημα για την αδιάβλητη διεξαγωγή απόρρητων ψηφοφοριών με αμιγώς ηλεκτρονικό τρόπο</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Greek Research and Technology Network</md:Company>
+    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
+    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
index 36627bb9..fa1552b4 100644
--- a/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zididp.uni-graz.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-01-29T22:40:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-01-29T22:40:01Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-graz.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Graz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Graz</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-graz.at</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Graz</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">University of Graz</mdui:DisplayName>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
 VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
 bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
@@ -38,27 +38,27 @@ pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
 fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
 lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
 qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zididp.uni-graz.at/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zididp.uni-graz.at/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-graz.at</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:X509Data>
-            <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zididp.uni-graz.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zididp.uni-graz.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-graz.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
 VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
 bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
@@ -80,31 +80,31 @@ pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
 fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
 lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
 qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">Universität Graz</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">University of Graz</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Universität Graz</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">University of Graz</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-graz.at/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-graz.at/E/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Technical</md:GivenName>
-      <md:SurName>Support</md:SurName>
-      <md:EmailAddress>mailto:guenther.berthold@uni-graz.at</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>IT-Support</md:GivenName>
-      <md:SurName>Helpdesk</md:SurName>
-      <md:EmailAddress>mailto:servicedesk@uni-graz.at</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Graz</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Graz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Graz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Graz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-graz.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-graz.at/E/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:guenther.berthold@uni-graz.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT-Support</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@uni-graz.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
index cd8f7bd9..57ef95da 100644
--- a/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zividp.uni-muenster.de/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-08-09T14:28:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-08-09T14:28:54Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-        <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
-          <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
-          <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
-          <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
-          <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-          <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
-          <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
-          <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
-        </mdui:UIInfo>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
 MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
@@ -59,15 +59,15 @@ GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
 3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
 UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
 MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
@@ -101,28 +101,28 @@ GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
 3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
 UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-      <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/Redirect/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</shibmd:Scope>
-      </md:Extensions>
-      <md:KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
 MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
@@ -156,15 +156,15 @@ GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
 3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
 UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-          <ds:X509Data>
-            <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-            <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
 MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
@@ -198,30 +198,30 @@ GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
 3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
 UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
 </ds:X509Certificate>
-          </ds:X509Data>
-        </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-      <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    </md:AttributeAuthorityDescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
-      <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-      <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
-      <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Christian</md:GivenName>
-      <md:SurName>Schild</md:SurName>
-      <md:EmailAddress>mailto:schild@uni-muenster.de</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="support">
-      <md:GivenName>Christian</md:GivenName>
-      <md:SurName>Schild</md:SurName>
-      <md:EmailAddress>mailto:schild@uni-muenster.de</md:EmailAddress>
-    </md:ContactPerson>
-  </md:EntityDescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Christian</md:GivenName>
+    <md:SurName>Schild</md:SurName>
+    <md:EmailAddress>mailto:schild@uni-muenster.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Christian</md:GivenName>
+    <md:SurName>Schild</md:SurName>
+    <md:EmailAddress>mailto:schild@uni-muenster.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>